From d01658c63cd541fe4ea5cec5c4bd7f23b9408cdb Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期六, 18 十月 2025 15:04:56 +0800
Subject: [PATCH] 前端，pda，后端接口更改，新增，优化
---
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs | 1395 +++++++++++++++++++--------------------------------------
1 files changed, 460 insertions(+), 935 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs
index 5ef4d2a..2448941 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs
@@ -21,6 +21,11 @@
using WIDESEA_Common;
using WIDESEA_DTO.Outbound;
using WIDESEA_Core.Utilities;
+using System.Transactions;
+using Microsoft.Data.SqlClient;
+using WIDESEA_Model.Models.Outbound;
+using WIDESEA_Common.OrderEnum;
+using WIDESEA_Core.CodeConfigEnum;
namespace WIDESEA_TaskInfoService
{
@@ -32,7 +37,7 @@
/// </summary>
/// <param name="stockInfos"></param>
/// <returns></returns>
- public List<Dt_Task> GetTasks(List<Dt_StockInfo> stockInfos)
+ public List<Dt_Task> GetTasks(List<Dt_StockInfo> stockInfos, TaskTypeEnum taskType)
{
List<Dt_Task> tasks = new List<Dt_Task>();
for (int i = 0; i < stockInfos.Count; i++)
@@ -42,34 +47,128 @@
if (stockInfo != null)
{
Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode);
+ Dt_Task dt_Task = BaseDal.QueryFirst(x => x.SourceAddress == locationInfo.LocationCode || x.TargetAddress == locationInfo.LocationCode);
+ if (dt_Task != null)
+ {
+ throw new Exception("璇ヨ揣浣嶅凡瀛樺湪璧风偣浠诲姟鎴栫粓鐐逛换鍔�");
+ }
+ Dt_Task dt_Task1 = BaseDal.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
+ if (dt_Task1 != null)
+ {
+ throw new Exception("璇ユ墭鐩樺凡瀛樺湪浠诲姟");
+ }
Dt_RoadwayInfo roadwayInfo = _basicService.RoadwayInfoService.Repository.QueryFirst(x => x.RoadwayNo == locationInfo.RoadwayNo);
Dt_StockInfoDetail stockInfoDetail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == stockInfo.Id);
if (roadwayInfo != null)
{
Dt_Task task = new()
{
- OrderNo=stockInfoDetail.OrderNo,
- CurrentAddress = "0",
+ PalletType = stockInfo.PalletType,
+ OrderNo = stockInfoDetail.OrderNo,
+ CurrentAddress = locationInfo.LocationCode,
Grade = 0,
Creater = "WMS",
PalletCode = stockInfo.PalletCode,
- NextAddress = "0",
+ NextAddress = roadwayInfo.OutSCStationCode,
Roadway = locationInfo.RoadwayNo,
- SourceAddress = stockInfo.LocationCode,
- TargetAddress = roadwayInfo.OutStationCode,
+ SourceAddress = locationInfo.LocationCode,
+ TargetAddress = "",
TaskStatus = OutTaskStatusEnum.OutNew.ObjToInt(),
- TaskType = TaskTypeEnum.Outbound.ObjToInt(),
+ TaskType = taskType.ObjToInt(),
Depth = locationInfo.Depth,
+ WarehouseId = stockInfo.WarehouseId,
TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum))
};
+ if (taskType != TaskTypeEnum.OutEmpty)
+ {
+ task.MaterielCode = stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
+ task.Quantity = (float)stockInfo.Details?.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
+ }
tasks.Add(task);
- BaseDal.AddData(tasks);
- //var responses = HttpHelper.Post<WebResponseContent>(ReceiveTask, tasks, "绔嬪簱鍑哄簱鏁伴噺鍥炰紶WMS");
}
}
+
}
return tasks;
}
+
+
+
+ /// <summary>
+ /// 鍑哄簱浠诲姟鏁版嵁澶勭悊
+ /// </summary>
+ /// <param name="orderDetailId"></param>
+ /// <param name="stockSelectViews"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) OutboundTaskDataHandle(int[] keys)
+ {
+ List<Dt_Task> tasks = new List<Dt_Task>();
+ List<Dt_OutboundOrderDetail> outboundOrderDetails = _outboundService.OutboundOrderDetailService.Repository.QueryData(x => keys.Contains(x.Id));
+
+ if (outboundOrderDetails == null || outboundOrderDetails.Count == 0)
+ {
+ throw new Exception("鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅");
+ }
+ if (outboundOrderDetails.FirstOrDefault(x => x.OrderDetailStatus > OrderDetailStatusEnum.New.ObjToInt() && x.OrderDetailStatus != OrderDetailStatusEnum.AssignOverPartial.ObjToInt()) != null)
+ {
+ throw new Exception("鎵�閫夊嚭搴撳崟鏄庣粏瀛樺湪鍑哄簱涓垨宸插畬鎴�");
+ }
+ List<Dt_StockInfo>? stockInfos = null;
+ List<Dt_OutboundOrderDetail>? orderDetails = null;
+ List<Dt_OutStockLockInfo>? outStockLockInfos = null;
+ List<Dt_LocationInfo>? locationInfos = null;
+ //if (outboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
+ {
+ (List<Dt_StockInfo>, List<Dt_OutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.OutboundOrderDetailService.AssignStockOutbound(outboundOrderDetails);
+ if (result.Item1 != null && result.Item1.Count > 0)
+ {
+ Dt_OutboundOrder outboundOrder = _outboundService.OutboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetails.FirstOrDefault().OrderId);
+ TaskTypeEnum typeEnum = outboundOrder.OrderType switch
+ {
+ (int)OrderTypeEnum.鐢熶骇鍑哄簱鍗� => TaskTypeEnum.Outbound,
+ (int)OrderTypeEnum.璋冩嫧鍑哄簱鍗� => TaskTypeEnum.OutAllocate,
+ (int)OrderTypeEnum.鍙嶆嫞鍑哄簱鍗� => TaskTypeEnum.ReverseOut,
+ _ => new TaskTypeEnum()
+ };
+ tasks = GetTasks(result.Item1,typeEnum);
+ tasks.ForEach(x =>
+ {
+ x.OrderNo = outboundOrder.OrderNo;
+ });
+ result.Item2.ForEach(x =>
+ {
+ x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
+ });
+ result.Item3.ForEach(x =>
+ {
+
+ x.Status = OutStockStatus.鍑哄簱涓�.ObjToInt();
+ });
+
+ stockInfos = result.Item1;
+ orderDetails = result.Item2;
+ outStockLockInfos = result.Item3;
+ locationInfos = result.Item4;
+ }
+ else
+ {
+ throw new Exception("鏃犲簱瀛�");
+ }
+ }
+ //else
+ //{
+ // List<Dt_OutStockLockInfo> stockLockInfos = _outboundService.OutboundStockLockInfoService.GetByOrderDetailId(outboundOrderDetail.OrderId, OutLockStockStatusEnum.宸插垎閰�);
+ // if (stockLockInfos != null && stockLockInfos.Count > 0)
+ // {
+ // List<Dt_StockInfo> stocks = _stockService.StockInfoService.Repository.GetStockInfosByPalletCodes(stockLockInfos.Select(x => x.PalletCode).Distinct().ToList());
+ // tasks = GetTasks(stocks);
+ // }
+ //}
+
+ return (tasks, stockInfos, orderDetails, outStockLockInfos, locationInfos);
+ }
+
/// <summary>
/// 鍑哄簱浠诲姟鏁版嵁澶勭悊
@@ -101,12 +200,15 @@
(List<Dt_StockInfo>, Dt_OutboundOrderDetail, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.OutboundOrderDetailService.AssignStockOutbound(outboundOrderDetail, stockSelectViews);
if (result.Item1 != null && result.Item1.Count > 0)
{
- tasks = GetTasks(result.Item1);
- int task = tasks[0].TaskNum;
- result.Item3.ForEach(x =>
+ Dt_OutboundOrder outboundOrder = _outboundService.OutboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetail.OrderId);
+ TaskTypeEnum typeEnum = outboundOrder.OrderType switch
{
- x.TaskNum = task;
- });
+ (int)OrderTypeEnum.鐢熶骇鍑哄簱鍗� => TaskTypeEnum.Outbound,
+ (int)OrderTypeEnum.璋冩嫧鍑哄簱鍗� => TaskTypeEnum.OutAllocate,
+ (int)OrderTypeEnum.鍙嶆嫞鍥炲簱鍗� => TaskTypeEnum.ReverseIn,
+ _ => new TaskTypeEnum()
+ };
+ tasks = GetTasks(result.Item1, typeEnum);
result.Item2.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
result.Item3.ForEach(x =>
{
@@ -128,70 +230,217 @@
if (stockLockInfos != null && stockLockInfos.Count > 0)
{
List<Dt_StockInfo> stocks = _stockService.StockInfoService.Repository.GetStockInfosByPalletCodes(stockLockInfos.Select(x => x.PalletCode).Distinct().ToList());
- tasks = GetTasks(stocks);
+ tasks = GetTasks(stocks, TaskTypeEnum.Outbound);
}
}
return (tasks, stockInfos, orderDetail == null ? null : new List<Dt_OutboundOrderDetail> { orderDetail }, outStockLockInfos, locationInfos);
}
+
+
+ /// <summary>
+ /// 绔嬪簱鍑哄簱鎸囦护涓婁紶锛屽嚭搴撲换鍔′笅鍙�
+ /// </summary>
+ /// <param name="orderAddDTO"></param>
+ /// <returns></returns>
public WebResponseContent AddOutboundOrders(Houseounbound orderAddDTO)
{
WebResponseContent content = new();
try
{
- OutboundOrderAddDTO orderAddDTO1 = new OutboundOrderAddDTO();
- orderAddDTO1.OrderNo = orderAddDTO.No;
- orderAddDTO1.UpperOrderNo = orderAddDTO.No;
- orderAddDTO1.OutWareHouse = orderAddDTO.OutWareHouse;
- orderAddDTO1.TransactionCode = orderAddDTO.TransactionCode;
- orderAddDTO1.InoutType = orderAddDTO.OrderType;
- orderAddDTO1.OrderType = orderAddDTO.InoutType.ObjToInt();
- IEnumerable<int> inOrderTypes = Enum.GetValues<OrderTypeEmun>().Cast<int>();
- orderAddDTO1.OrderType = orderAddDTO.OrderType.ObjToInt();
- orderAddDTO1.Details = orderAddDTO.DetailList.DicToIEnumerable<OutboundOrderDetailAddDTO>();
- #region 楠岃瘉鏁版嵁
- (bool, string, object?) result = CheckOutboundOrderAddData(orderAddDTO1);
- if (!result.Item1) return content = WebResponseContent.Instance.Error(result.Item2);
- #endregion
-
- Dt_OutboundOrder inboundOrder = _mapper.Map<Dt_OutboundOrder>(orderAddDTO1);
- inboundOrder.OrderStatus = InboundStatusEnum.鏈紑濮�.ObjToInt();
- inboundOrder.Creater = "WMS";
- inboundOrder.CreateDate = DateTime.Now;
- bool a = BaseDal.Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
- Dt_OutboundOrder oldOutboundOrder = BaseDal.Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == orderAddDTO1.OrderNo).Includes(x => x.Details).First();
- Dt_OutboundOrderDetail outboundOrderDetail = _outboundService.OutboundOrderDetailService.Repository.QueryFirst(x => x.OrderId == oldOutboundOrder.Id);
- List<StockSelectViewDTO> stockSelectViews = new List<StockSelectViewDTO>();
- StockSelectViewDTO stockSelectViewDTO = new()
+ Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseCode == orderAddDTO.OutWareHouse);
+ if (warehouse == null)
{
- OrderNo = orderAddDTO1.OrderNo,
- MaterielCode = outboundOrderDetail.MaterielCode,
- MaterielName = outboundOrderDetail.MaterielName,
- UseableQuantity = outboundOrderDetail.OrderQuantity,
- BatchNo = outboundOrderDetail.BatchNo,
- LinId=outboundOrderDetail.LinId,
- };
- stockSelectViews.Add(stockSelectViewDTO);
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌浠撳簱淇℃伅");
+ }
+ Dt_OutboundOrder oldOuboundOrder = BaseDal.Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == orderAddDTO.No).Includes(x => x.Details).First();
+ Dt_Production production = new Dt_Production();
+ if (oldOuboundOrder != null)
+ {
+ if (oldOuboundOrder.OutWareHouse != warehouse.WarehouseCode)
+ {
+ return WebResponseContent.Instance.Error($"浠撳簱涓嶄竴鑷�");
+ }
+ else
+ {
+ OutboundOrderAddDTO orderAddDTO1 = new OutboundOrderAddDTO();
+ orderAddDTO1.Details = orderAddDTO.DetailList.DicToIEnumerable<OutboundOrderDetailAddDTO>();
+ var details = orderAddDTO1.Details.FirstOrDefault();
+ Dt_OutboundOrderDetail outboundOrderDetail = new Dt_OutboundOrderDetail()
+ {
+ LPNNo = details.LPNNo,
+ BatchNo = details.BatchNo,
+ MaterielCode = details.MaterielCode,
+ MaterielName = details.MaterielName,
+ MaterieSpec = details.MaterieSpec,
+ OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
+ OrderQuantity = details.OrderQuantity,
+ LinId = details.LinId,
+ OrderId = oldOuboundOrder.Id,
+ Creater = "WMS",
+ CreateDate = DateTime.Now,
+ Remark = details.Remark,
+ SupplierBatch = details.SupplierBatch
+ };
+ _outboundOrderDetailRepository.AddData(outboundOrderDetail);
+ foreach (var item in orderAddDTO1.Details)
+ {
+ if (string.IsNullOrWhiteSpace(item.Remark))
+ {
+ continue;
+ }
+ string[] remarkEntries = item.Remark.Split(
+ new[] { ';' },
+ StringSplitOptions.RemoveEmptyEntries
+ );
- //stockSelectViewDTO.PalletCode = orderAddDTO1;
- //stockSelectViewDTO.LocationCode = orderAddDTO1;
+ foreach (var entry in remarkEntries)
+ {
+ string[] keyValuePairs = entry.Split(
+ new[] { ',' },
+ StringSplitOptions.RemoveEmptyEntries
+ );
- GenerateOutboundTasks(oldOutboundOrder.Id, stockSelectViews);
+ foreach (var kvp in keyValuePairs)
+ {
+ int colonIndex = kvp.IndexOf(':');
+ if (colonIndex <= 0 || colonIndex >= kvp.Length - 1)
+ {
+ continue;
+ }
+
+ string key = kvp.Substring(0, colonIndex).Trim();
+ string value = kvp.Substring(colonIndex + 1).Trim();
+
+ switch (key)
+ {
+ case "鍒堕�犲崟鍙�":
+ production.ProductionNo = value;
+ break;
+ case "鍒堕�犻儴浠�":
+ production.ManufacturingCo = value;
+ break;
+ case "鍑哄簱鏁伴噺":
+ if (decimal.TryParse(value, out decimal outQuantity))
+ {
+ production.OutQuantity = outQuantity;
+ }
+ else
+ {
+ Console.WriteLine($"鍑哄簱鏁伴噺鏍煎紡閿欒锛歿value}锛堝簲涓烘暟鍊硷紝濡�14.0000锛�");
+ }
+ break;
+ default:
+ Console.WriteLine($"鏈煡閿悕锛歿key}锛堝搴斿�硷細{value}锛岃烦杩囪閿�煎锛�");
+ break;
+ }
+
+ }
+ production.Creater = "WMS";
+ production.OrderId = outboundOrderDetail.Id;
+ _productionRepository.AddData(production);
+ }
+ }
+ }
+ }
+ else
+ {
+ OutboundOrderAddDTO orderAddDTO1 = new OutboundOrderAddDTO();
+ orderAddDTO1.OrderNo = orderAddDTO.No;
+ orderAddDTO1.UpperOrderNo = orderAddDTO.No;
+ orderAddDTO1.OutWareHouse = orderAddDTO.OutWareHouse;
+ orderAddDTO1.TransactionCode = orderAddDTO.TransactionCode?? "宸ュ崟鍙戞枡";
+ orderAddDTO1.InoutType = orderAddDTO.OrderType ?? InoutTypeEnum.WorkFeed.ToString();
+ orderAddDTO1.OrderType = orderAddDTO.InoutType;
+ orderAddDTO1.System = orderAddDTO.System;
+ IEnumerable<int> inOrderTypes = Enum.GetValues<OrderTypeEmun>().Cast<int>();
+ orderAddDTO1.Details = orderAddDTO.DetailList.DicToIEnumerable<OutboundOrderDetailAddDTO>();
+ #region 楠岃瘉鏁版嵁
+ (bool, string, object?) result = CheckOutboundOrderAddData(orderAddDTO1);
+ if (!result.Item1) return content = WebResponseContent.Instance.Error(result.Item2);
+ #endregion
+ Dt_OutboundOrder inboundOrder = _mapper.Map<Dt_OutboundOrder>(orderAddDTO1);
+ inboundOrder.OrderStatus = InboundStatusEnum.鏈紑濮�.ObjToInt();
+ inboundOrder.Creater = "WMS";
+ inboundOrder.CreateDate = DateTime.Now;
+ inboundOrder.CreateType = CreateType.UpperSystemPush.ObjToInt();
+ _unitOfWorkManage.BeginTran();
+ bool a = BaseDal.Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
+
+ foreach (var item in orderAddDTO1.Details)
+ {
+ if (string.IsNullOrWhiteSpace(item.Remark))
+ {
+ continue;
+ }
+ string[] remarkEntries = item.Remark.Split(
+ new[] { ';' },
+ StringSplitOptions.RemoveEmptyEntries
+ );
+
+ foreach (var entry in remarkEntries)
+ {
+ string[] keyValuePairs = entry.Split(
+ new[] { ',' },
+ StringSplitOptions.RemoveEmptyEntries
+ );
+
+ foreach (var kvp in keyValuePairs)
+ {
+ int colonIndex = kvp.IndexOf(':');
+ if (colonIndex <= 0 || colonIndex >= kvp.Length - 1)
+ {
+ continue;
+ }
+
+ string key = kvp.Substring(0, colonIndex).Trim();
+ string value = kvp.Substring(colonIndex + 1).Trim();
+
+ switch (key)
+ {
+ case "鍒堕�犲崟鍙�":
+ production.ProductionNo = value;
+ break;
+ case "鍒堕�犻儴浠�":
+ production.ManufacturingCo = value;
+ break;
+ case "鍑哄簱鏁伴噺":
+ if (decimal.TryParse(value, out decimal outQuantity))
+ {
+ production.OutQuantity = outQuantity;
+ }
+ else
+ {
+ Console.WriteLine($"鍑哄簱鏁伴噺鏍煎紡閿欒锛歿value}锛堝簲涓烘暟鍊硷紝濡�14.0000锛�");
+ }
+ break;
+ default:
+ Console.WriteLine($"鏈煡閿悕锛歿key}锛堝搴斿�硷細{value}锛岃烦杩囪閿�煎锛�");
+ break;
+ }
+
+ }
+ production.Creater = "WMS";
+ production.OrderId = inboundOrder.Details.FirstOrDefault().Id;
+ _productionRepository.AddData(production);
+ }
+ }
+ _unitOfWorkManage.CommitTran();
+ }
+
+
content = WebResponseContent.Instance.OK();
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
content = WebResponseContent.Instance.Error(ex.Message);
- }
- finally
- {
-
}
return content;
}
/// <summary>
- /// 鐩樼偣鍑哄簱
+ /// 鐩樼偣浠诲姟涓婁紶绔嬪簱
/// </summary>
/// <returns></returns>
public WebResponseContent InventoryOut(HouseCancelOut houseInventoryOut)
@@ -201,6 +450,7 @@
{
OutboundOrderAddDTO orderAddDTO1 = new OutboundOrderAddDTO();
orderAddDTO1.OrderNo = houseInventoryOut.No;
+ orderAddDTO1.UpperOrderNo = houseInventoryOut.No;
orderAddDTO1.Details = houseInventoryOut.DetailList.DicToIEnumerable<OutboundOrderDetailAddDTO>();
#region 楠岃瘉鏁版嵁
(bool, string, object?) result = CheckOutboundOrderAddData(orderAddDTO1);
@@ -212,11 +462,29 @@
inboundOrder.OrderType = OutOrderTypeEnum.OutInventory.ObjToInt();
inboundOrder.Creater = "WMS";
inboundOrder.CreateDate = DateTime.Now;
+
+ Dt_OutboundOrder oldOutboundOrder = BaseDal.Db.Queryable<Dt_OutboundOrder>().Where(x => x.OrderNo == orderAddDTO1.OrderNo).Includes(x => x.Details).First();
+ Dt_OutboundOrderDetail outboundOrderDetail = _outboundService.OutboundOrderDetailService.Repository.QueryFirst(x => x.OrderId == oldOutboundOrder.Id);
+ List<StockSelectViewDTO> stockSelectViews = new List<StockSelectViewDTO>();
+ StockSelectViewDTO stockSelectViewDTO = new()
+ {
+ OrderNo = orderAddDTO1.OrderNo,
+ MaterielCode = outboundOrderDetail.MaterielCode,
+ MaterielName = outboundOrderDetail.MaterielName,
+ UseableQuantity = outboundOrderDetail.OrderQuantity,
+ BatchNo = outboundOrderDetail.BatchNo,
+ LinId = outboundOrderDetail.LinId,
+ };
+ _unitOfWorkManage.BeginTran();
bool a = BaseDal.Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
+ stockSelectViews.Add(stockSelectViewDTO);
+ GenerateOutboundTasks(oldOutboundOrder.Id, stockSelectViews);
+ _unitOfWorkManage.CommitTran();
content = WebResponseContent.Instance.OK();
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
content = WebResponseContent.Instance.Error(ex.Message);
}
finally
@@ -239,11 +507,11 @@
return (false, "鏈壘鍒拌鍗曟嵁绫诲瀷", outboundOrderAddDTO);
}
- List<string> materielCodes = outboundOrderAddDTO.Details.Select(x => x.MaterielCode).ToList();
- if (!_materielInfoService.ExsitMateriels(materielCodes))
- {
- return (false, "鏈夌墿鏂欎俊鎭湭褰曞叆锛岃褰曞叆鐗╂枡淇℃伅", outboundOrderAddDTO);
- }
+ //List<string> materielCodes = outboundOrderAddDTO.Details.Select(x => x.MaterielCode).ToList();
+ //if (!_materielInfoService.ExsitMateriels(materielCodes))
+ //{
+ // return (false, "鏈夌墿鏂欎俊鎭湭褰曞叆锛岃褰曞叆鐗╂枡淇℃伅", outboundOrderAddDTO);
+ //}
Dt_OutboundOrder dt_OutboundOrder = _outboundService.OutboundOrderService.Repository.QueryFirst(x => x.UpperOrderNo == outboundOrderAddDTO.UpperOrderNo && !string.IsNullOrEmpty(x.UpperOrderNo));
if (dt_OutboundOrder != null)
{
@@ -251,12 +519,7 @@
}
return (true, "鎴愬姛", outboundOrderAddDTO);
}
- /// <summary>
- /// 鐢熸垚鍑哄簱浠诲姟
- /// </summary>
- /// <param name="orderDetailId"></param>
- /// <param name="stockSelectViews"></param>
- /// <returns></returns>
+
public WebResponseContent GenerateOutboundTask(int orderDetailId, List<StockSelectViewDTO> stockSelectViews)
{
try
@@ -272,6 +535,12 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
+ /// <summary>
+ /// 鐢熸垚鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="orderDetailId"></param>
+ /// <param name="stockSelectViews"></param>
+ /// <returns></returns>
public WebResponseContent GenerateOutboundTasks(int orderDetailId, List<StockSelectViewDTO> stockSelectViews)
{
try
@@ -284,7 +553,7 @@
}
catch (Exception ex)
{
- return WebResponseContent.Instance.Error(ex.Message);
+ throw new Exception(ex.Message);
}
}
@@ -303,6 +572,8 @@
{
WebResponseContent content = new WebResponseContent();
_unitOfWorkManage.BeginTran();
+
+ BaseDal.AddData(tasks);
//鍒ゆ柇绉诲簱
//content = RelocationTasks(tasks.OrderBy(x => x.Depth).ToList());
//if (content.Status)
@@ -315,19 +586,19 @@
// return content;
//}
//BaseDal.AddData(tasks);
+
if (stockInfos != null && outboundOrderDetails != null && outStockLockInfos != null && locationInfos != null)
{
+ Dt_OutboundOrder outboundOrder = _outboundService.OutboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetails.FirstOrDefault().OrderId);
+ outboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱涓�.ObjToInt();
+ _outboundService.OutboundOrderService.Repository.UpdateData(outboundOrder);
content = _outboundService.OutboundOrderDetailService.LockOutboundStockDataUpdate(stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos, tasks: tasks);
- if (content.Status)
- {
- _unitOfWorkManage.CommitTran();
- }
- else
+ if (!content.Status)
{
_unitOfWorkManage.RollbackTran();
+ return content;
}
- return content;
}
else if (outboundOrderDetails != null && outboundOrderDetails.Count > 0)
{
@@ -339,6 +610,8 @@
_outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
}
_unitOfWorkManage.CommitTran();
+ //灏嗕换鍔℃帹閫佸埌WCS
+ PushTasksToWCS(tasks);
return WebResponseContent.Instance.OK();
}
catch (Exception ex)
@@ -347,168 +620,6 @@
return WebResponseContent.Instance.Error(ex.Message);
}
- }
- public WebResponseContent RelocationTasks(List<Dt_Task> task)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- _unitOfWorkManage.BeginTran();
- for (int i = 0; i < task.Count; i++)
- {
- Dt_LocationInfo location = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task[i].SourceAddress && x.RoadwayNo == task[i].Roadway);
- if (location != null)
- {
- //(Dt_LocationInfo?, int?) result = _basicService.LocationInfoService.isDepth(location);
- (Dt_LocationInfo?, int?) result = isDepth(location);
- if (result.Item1 != null && result.Item2 != LocationStatusEnum.Lock.ObjToInt() && result.Item2 != LocationStatusEnum.PalletLock.ObjToInt() && result.Item2 != LocationStatusEnum.Free.ObjToInt())
- {
- int sum = 0;
- for (int j = 0; j < task.Count; j++)
- {
- if (result.Item1.LocationCode == task[j].SourceAddress)
- {
- sum++;
- }
- }
- if (sum == 0)
- {
- return content = RelocationTask(task[i]);
- }
- else
- {
- BaseDal.AddData(task[i]);
- _basicService.LocationInfoService.UpdateLocationLock(location, task[i].TaskNum, StockChangeType.Outbound.ObjToInt(), true);
- }
- }
- else if (result.Item1 == null && result.Item2 == LocationStatusEnum.Free.ObjToInt())
- {
- BaseDal.AddData(task[i]);
- location.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
- _basicService.LocationInfoService.UpdateData(location);
- content = WebResponseContent.Instance.OK();
- }
- else if (result.Item1 != null && result.Item2 == LocationStatusEnum.Free.ObjToInt())
- {
- BaseDal.AddData(task[i]);
- location.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
- _basicService.LocationInfoService.UpdateData(location);
- _basicService.LocationInfoService.UpdateLocationLock(location, task[i].TaskNum, StockChangeType.Outbound.ObjToInt(), false);
- content = WebResponseContent.Instance.OK();
- }
- else if (result.Item1 != null && (result.Item2 == LocationStatusEnum.Lock.ObjToInt() || result.Item2 == LocationStatusEnum.PalletLock.ObjToInt()))
- {
- Dt_Task TaskInfo = BaseDal.QueryFirst(x => x.SourceAddress == result.Item1.LocationCode);
- if (TaskInfo == null)
- {
- return content = WebResponseContent.Instance.Error("璐т綅琚攣瀹氫笉鍙嚭搴�");
- }
- else
- {
- BaseDal.AddData(task[i]);
- location.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
- _basicService.LocationInfoService.UpdateData(location);
- content = WebResponseContent.Instance.OK();
- }
- }
- }
- else
- {
- return content = WebResponseContent.Instance.OK("浠诲姟寮傚父");
- }
- }
- _unitOfWorkManage.CommitTran();
- return content;
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return content = WebResponseContent.Instance.Error(ex.Message);
- }
- }
- /// <summary>
- /// 绉诲簱浠诲姟
- /// </summary>
- /// <param name="task"></param>
- /// <returns></returns>
- public WebResponseContent RelocationTask(Dt_Task task)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
- if (locationInfo != null)
- {
- int beforeStatus = locationInfo.LocationStatus;
- //(Dt_LocationInfo?,int?) Result = _basicService.LocationInfoService.isDepth(locationInfo);
- (Dt_LocationInfo?, int?) Result = isDepth(locationInfo);
- if (Result.Item1 != null && Result.Item2 == LocationStatusEnum.InStock.ObjToInt())
- {
- Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.LocationCode == Result.Item1.LocationCode);
- Dt_StockInfoDetail stockInfoDetail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == stockInfo.Id);
- if (stockInfo != null && stockInfoDetail != null)
- {
- (Dt_Task?, Dt_LocationInfo?) result = AddRelocationTask(Result.Item1, stockInfo, task);
- if (result.Item1 != null && result.Item2 != null)
- {
- _basicService.LocationInfoService.RelocationLock(Result.Item1, result.Item2, result.Item1.TaskNum);
- locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
- _basicService.LocationInfoService.UpdateData(locationInfo);
- _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Relocation.ObjToInt(), "", task.TaskNum);
- return content = WebResponseContent.Instance.OK();
- }
- else
- {
- return content = WebResponseContent.Instance.Error("绉诲簱浠诲姟鐢熸垚澶辫触");
- }
- }
- else
- {
- return content = WebResponseContent.Instance.Error("鏈壘鍒板簱瀛樹俊鎭�");
- }
- }
- else if (Result.Item1 != null && Result.Item2 == LocationStatusEnum.Pallet.ObjToInt())
- {
- Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.LocationCode == Result.Item1.LocationCode);
- if (stockInfo != null)
- {
- (Dt_Task?, Dt_LocationInfo?) result = AddRelocationTask(Result.Item1, stockInfo, task);
- if (result.Item1 != null && result.Item2 != null)
- {
- _basicService.LocationInfoService.RelocationLock(Result.Item1, result.Item2, result.Item1.TaskNum);
- locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
- _basicService.LocationInfoService.UpdateData(locationInfo);
- _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Relocation.ObjToInt(), "", task.TaskNum);
- return content = WebResponseContent.Instance.OK();
- }
- else
- {
- return content = WebResponseContent.Instance.Error("绉诲簱浠诲姟鐢熸垚澶辫触");
- }
- }
- else
- {
- return content = WebResponseContent.Instance.Error("鏈壘鍒板簱瀛樹俊鎭�");
- }
- }
- else
- {
- return content = WebResponseContent.Instance.Error("寮傚父");
- }
- }
- else
- {
- return content = WebResponseContent.Instance.Error("浠诲姟淇℃伅寮傚父");
- }
- }
- catch (Exception ex)
- {
- return content = WebResponseContent.Instance.Error(ex.Message);
- }
- finally
- {
-
- }
}
/// <summary>
@@ -578,19 +689,19 @@
{
Locationtype = 10;
}
- //newLocation = _basicService.LocationInfoService.GetLocation(locationInfos.RoadwayNo,Locationtype); //鎷垮埌浜嗙Щ搴撳悗鐨勮揣浣�
+ newLocation = _basicService.LocationInfoService.GetLocation(locationInfos.RoadwayNo, Locationtype); //鎷垮埌浜嗙Щ搴撳悗鐨勮揣浣�
if (dt_StockInfo.MaterialType == (int)InventoryMaterialType.鎴愬搧)
{
string[] targetCodesst = dt_StockInfo.PalletCode.Split("*");
- Dt_InboundOrder dt_Inbound = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.OrderName == targetCodesst[0]);
- if (dt_Inbound.Startingcolumn != 0 || dt_Inbound.Terminationcolumn != 0)
- {
- newLocation = _basicService.LocationInfoService.GetLocation2(locationInfos.RoadwayNo, Locationtype, dt_Inbound.Startingcolumn, dt_Inbound.Terminationcolumn);
- }
- else
- {
- newLocation = _basicService.LocationInfoService.GetLocation(locationInfos.RoadwayNo, Locationtype);
- }
+ //Dt_InboundOrder dt_Inbound = _inboundService.InbounOrderService.Repository.QueryFirst(x => x.OrderName == targetCodesst[0]);
+ //if (dt_Inbound.Startingcolumn != 0 || dt_Inbound.Terminationcolumn != 0)
+ //{
+ // newLocation = _basicService.LocationInfoService.GetLocation2(locationInfos.RoadwayNo, Locationtype, dt_Inbound.Startingcolumn, dt_Inbound.Terminationcolumn);
+ //}
+ //else
+ //{
+ // newLocation = _basicService.LocationInfoService.GetLocation(locationInfos.RoadwayNo, Locationtype);
+ //}
}
else
@@ -605,7 +716,7 @@
{
PalletCode = dt_StockInfo.PalletCode,
Roadway = locationInfos.RoadwayNo,
- TaskType = TaskTypeEnum.RelocationIn.ObjToInt(),
+ //TaskType = TaskTypeEnum.RelocationIn.ObjToInt(),
TaskStatus = OutTaskStatusEnum.OutNew.ObjToInt(),
SourceAddress = locationInfos.LocationCode,
TargetAddress = newLocation.LocationCode,
@@ -655,524 +766,12 @@
public string ReceiveWMSTask = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTask"];
-
- ///// <summary>
- ///// 鎺ユ敹璧风偣闇�瑕佺殑绌烘墭鐩樿繘琛屽嚭搴�
- ///// </summary>
- ///// <param name="SourceAddress"></param>
- ///// <returns></returns>
- //public WebResponseContent Empty_outbound(GenerateInv generate)
- //{
- // WebResponseContent content = new WebResponseContent();
- // try
- // {
- // Dt_Task task = BaseDal.QueryFirst(x => x.TargetAddress == generate.SourceAddress);
- // if (task == null)
- // {
- // string RoadwayNo = "1";
- // if (generate.SourceAddress != "R01-002-041-001-01")
- // {
- // RoadwayNo = "2";
- // }
- // Dt_LocationInfo locationInfos = _basicService.LocationInfoService.Repository.QueryFirst(x => x.RoadwayNo == RoadwayNo && x.EnableStatus != (int)EnableStatusEnum.Disable && x.Depth==1 && x.LocationStatus == LocationStatusEnum.Pallet.ObjToInt());
- // if(locationInfos == null)
- // {
- // locationInfos = _basicService.LocationInfoService.Repository.QueryFirst(x => x.RoadwayNo == RoadwayNo && x.Depth == 2 && x.EnableStatus != (int)EnableStatusEnum.Disable && x.LocationStatus == LocationStatusEnum.Pallet.ObjToInt());
- // }
-
- // if (locationInfos != null)
- // {
- // Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.LocationCode == locationInfos.LocationCode);
- // if (dt_StockInfo != null && dt_StockInfo.MaterialType == (int)InventoryMaterialType.绌烘墭)
- // {
-
-
- // Dt_LocationInfo newSourceAddress;
- // newSourceAddress = _basicService.LocationInfoService.GetLocationplatform(generate.SourceAddress);
- // if (newSourceAddress != null)
- // {
- // Dt_Task dt_Task = new()
- // {
- // PalletCode = dt_StockInfo.PalletCode,
- // TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
- // Roadway = locationInfos.RoadwayNo,
- // TaskType = TaskTypeEnum.PalletOutbound.ObjToInt(),
- // TaskStatus = InTaskStatusEnum.InNew.ObjToInt(),
- // SourceAddress = locationInfos.LocationCode,
- // TargetAddress = newSourceAddress.LocationCode,
- // CurrentAddress = locationInfos.LocationCode,
- // NextAddress = newSourceAddress.LocationCode,
- // Grade = 1,
- // Creater = "WMS",
- // Depth = locationInfos.Depth,
- // CreateDate = DateTime.Now,
- // PalletCodequantity = (int)dt_StockInfo.Materialweight,
- // MaterialType = dt_StockInfo.MaterialType
- // };
-
- // _unitOfWorkManage.BeginTran();
- // dt_StockInfo.StockStatus = (int)StockStatusEmun.鍑哄簱閿佸畾;
- // dt_StockInfo.Remark = "绛夊緟鍫嗗灈鏈哄畬鎴愬嚭搴撲换鍔�";
- // if (locationInfos.LocationStatus == LocationStatusEnum.Pallet.ObjToInt())
- // {
- // locationInfos.LocationStatus = LocationStatusEnum.PalletLock.ObjToInt();
- // }
- // BaseDal.AddData(dt_Task);
- // _basicService.LocationInfoService.UpdateData(locationInfos);
- // _stockService.StockInfoService.Repository.UpdateData(dt_StockInfo);
- // _unitOfWorkManage.CommitTran();
-
- // return content = WebResponseContent.Instance.OK(data: dt_Task);
- // }
- // else
- // {
- // return content = WebResponseContent.Instance.Error($"鏈壘鍒扮珯鍙扮紪鍙凤紝缂栧彿锛歿generate.SourceAddress}");
- // }
- // }
- // else
- // {
- // return content = WebResponseContent.Instance.Error($"鏃犺搴撲綅绌烘墭涓哄簱瀛樹俊鎭紝搴撲綅缂栧彿锛歿locationInfos.LocationCode}");
- // }
-
- // }
- // else
- // {
- // return content = WebResponseContent.Instance.Error($"璇ュ贩閬撳凡鏃犵┖鎵樼洏锛屽贩閬撳彿:{RoadwayNo}宸烽亾");
- // }
- // }
- // else
- // {
- // return content = WebResponseContent.Instance.Error($"宸叉湁璇ョ珯鍙扮殑绌烘墭鍑哄簱浠诲姟锛岀珯鍙扮紪鍙穥generate.SourceAddress}");
- // }
- // }
- // catch (Exception ex)
- // {
- // _unitOfWorkManage.RollbackTran();
- // return content = WebResponseContent.Instance.Error($"鍑哄簱澶辫触锛屾姤閿欎俊鎭細{ex.Message}");
- // throw;
- // }
- //}
-
-
- ///// <summary>
- ///// 鎺ユ敹璧风偣闇�瑕佺殑绌烘墭鐩樿繘琛屽嚭搴�
- ///// </summary>
- ///// <param name="SourceAddress"></param>
- ///// <returns></returns>
- //public WebResponseContent Rawmaterialout(GenerateInv3 generate)
- //{
- // WebResponseContent content = new WebResponseContent();
- // List<Dt_StockInfo> dt_StockInfo = _stockService.StockInfoService.Repository.QueryData(x => x.PalletCode.Contains(generate.PalletCode) && x.MaterialType== (int)InventoryMaterialType.鍘熸潗鏂�).OrderBy(x=>x.CreateDate).Take(generate.outCount).ToList();
-
- // if(dt_StockInfo.Count > 0)
- // {
- // for (int i = 0; i < dt_StockInfo.Count; i++)
- // {
- // Dt_LocationInfo locationinfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == dt_StockInfo[i].LocationCode); //纭璐т綅淇℃伅鏄惁瀵逛笂
- // if (locationinfo != null)
- // {
- // Dt_Task dt_Task = new()
- // {
- // PalletCode = dt_StockInfo[i].PalletCode,
- // TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
- // Roadway = locationinfo.RoadwayNo,
- // TaskType = TaskTypeEnum.Outbound.ObjToInt(),
- // TaskStatus = InTaskStatusEnum.InNew.ObjToInt(),
- // SourceAddress = locationinfo.LocationCode,
- // TargetAddress = locationinfo.RoadwayNo == "1" ? "R01-002-041-011-01" : "R02-002-027-011-01",
- // CurrentAddress = locationinfo.LocationCode,
- // NextAddress = locationinfo.RoadwayNo == "1" ? "R01-002-041-011-01" : "R02-002-027-011-01",
- // Grade = 1,
- // Creater = "WMS",
- // Depth = locationinfo.Depth,
- // CreateDate = DateTime.Now,
- // PalletCodequantity = (int)dt_StockInfo[i].Materialweight,
- // PLCTo = generate.TargetAddress == "R01-002-041-011-01" ? 1 : 2,
- // MaterialType = dt_StockInfo[i].MaterialType
- // };
-
- // _unitOfWorkManage.BeginTran();
- // dt_StockInfo[i].StockStatus = (int)StockStatusEmun.鍑哄簱閿佸畾;
- // dt_StockInfo[i].Remark = "绛夊緟鍫嗗灈鏈哄畬鎴愬嚭搴撲换鍔�";
- // if (locationinfo.LocationStatus == LocationStatusEnum.InStock.ObjToInt())
- // {
- // locationinfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
- // }
- // BaseDal.AddData(dt_Task);
- // _basicService.LocationInfoService.UpdateData(locationinfo);
- // _stockService.StockInfoService.Repository.UpdateData(dt_StockInfo);
- // _unitOfWorkManage.CommitTran();
-
- // content = WebResponseContent.Instance.OK(data: dt_Task);
- // }
- // else
- // {
- // content = WebResponseContent.Instance.Error($"鐗╂枡淇℃伅涓庤揣浣嶄俊鎭笉瀵癸紝鎵樼洏鍙凤細{dt_StockInfo[i].PalletCode}");
- // }
- // }
- // return content;
- // }
- // else
- // {
- // return content = WebResponseContent.Instance.Error($"鏈壘鍒板嚭搴撶殑搴撳瓨淇℃伅");
- // }
- //}
-
- /// <summary>
- /// 鎵嬪姩鐢熸垚鍑哄簱浠诲姟
- /// </summary>
- /// <param name="PalletCode"></param>
- /// <returns></returns>
- public WebResponseContent ManualOutbound(SaveModel saveModel)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- List<Dt_StockInfo> dtstockt = new List<Dt_StockInfo>();
- List<Dt_LocationInfo> locations = new List<Dt_LocationInfo>();
- List<Dt_Task> taskdt = new List<Dt_Task>();
- List<Dt_StockInfoDetail> dtstocktdetail = new List<Dt_StockInfoDetail>();
- for (int i = 0; i < saveModel.DelKeys.Count; i++)
- {
- Dt_StockInfo stockt = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == saveModel.DelKeys[i].ToString());
- if (stockt.StockStatus == (int)StockStatusEmun.宸插叆搴� && (stockt.Wlstatus == (int)InventoryMaterialStatus.鍚堟牸 || stockt.Wlstatus == (int)InventoryMaterialStatus.杩斿伐))
- {
- if (stockt.MaterialType != (int)InventoryMaterialType.鍘熸潗鏂�)
- {
- Dt_StockInfoDetail stocktdetail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == stockt.Id);
- stockt.StockStatus = (int)StockStatusEmun.鍑哄簱閿佸畾;
- if (stockt.MaterialType != (int)InventoryMaterialType.绌烘墭)
- {
- stocktdetail.Status = (int)StockStatusEmun.鍑哄簱閿佸畾;
- }
- Dt_LocationInfo locationinfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == stockt.LocationCode);
- if (locationinfo.RoadwayNo == "1")
- {
- if (locationinfo.LocationStatus == LocationStatusEnum.InStock.ObjToInt())
- {
- locationinfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
- }
- else if (locationinfo.LocationStatus == LocationStatusEnum.Pallet.ObjToInt())
- {
- locationinfo.LocationStatus = LocationStatusEnum.PalletLock.ObjToInt();
- }
- string LocationName = "R01-002-044-001-01";
- if (stockt.MaterialType == (int)InventoryMaterialType.绌烘墭)
- {
- LocationName = "R01-002-043-001-01";
- }
- Dt_LocationInfo newTargetAddress;
- newTargetAddress = _basicService.LocationInfoService.GetLocationplatform(LocationName);
- Dt_Task dt_Task = new()
- {
- PalletCode = stockt.PalletCode,
- TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
- Roadway = newTargetAddress.RoadwayNo,
- TaskType = TaskTypeEnum.Outbound.ObjToInt(),
- TaskStatus = InTaskStatusEnum.InNew.ObjToInt(),
- SourceAddress = locationinfo.LocationCode,
- TargetAddress = newTargetAddress.LocationCode,
- CurrentAddress = locationinfo.LocationCode,
- NextAddress = newTargetAddress.LocationCode,
- Grade = 1,
- Creater = "WMS",
- Depth = locationinfo.Depth,
- CreateDate = DateTime.Now,
- MaterialType = stockt.MaterialType
- };
- dtstockt.Add(stockt);
- locations.Add(locationinfo);
- taskdt.Add(dt_Task);
- if (stockt.MaterialType != (int)InventoryMaterialType.绌烘墭)
- {
- dtstocktdetail.Add(stocktdetail);
- }
- }
- else
- {
- return content = WebResponseContent.Instance.Error($"鍑哄簱澶辫触锛屽彧鍙嚭搴�1宸烽亾鐨勬墭鐩樺拰鎴愬搧锛屽嚭搴撴潯鐮侊細{saveModel.DelKeys[i].ToString()}");
- }
- }
- else
- {
- return content = WebResponseContent.Instance.Error($"鍑哄簱澶辫触锛岃涓嶈閫夋嫨鍘熸潗鏂欏嚭搴擄紝鍑哄簱鏉＄爜锛歿saveModel.DelKeys[i].ToString()}");
- }
- }
- else
- {
- return content = WebResponseContent.Instance.Error($"鍑哄簱澶辫触锛岃閫夋嫨宸插叆搴撲笖鍚堟牸鐨勭墿鏂欏嚭搴擄紒锛侊紒锛屽嚭搴撴潯鐮侊細{saveModel.DelKeys[i].ToString()}");
- }
-
- }
- var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTask, taskdt, "涓嬪彂浠诲姟鍏ュ簱");
- _unitOfWorkManage.BeginTran();
- if (dtstockt.Count > 0)
- {
- _stockService.StockInfoService.Repository.UpdateData(dtstockt);
- _stockService.StockInfoDetailService.Repository.UpdateData(dtstocktdetail);
- _basicService.LocationInfoService.Repository.UpdateData(locations);
- BaseDal.AddData(taskdt);
- }
- _unitOfWorkManage.CommitTran();
- content = WebResponseContent.Instance.OK();
- return content;
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return content = WebResponseContent.Instance.Error($"鍑哄簱澶辫触锛屾姤閿欎俊鎭細{ex.Message}");
- throw;
- }
- }
-
-
- public WebResponseContent ManualOutbound2(SaveModel saveModel)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- List<Dt_StockInfo> dtstockt = new List<Dt_StockInfo>();
- List<Dt_LocationInfo> locations = new List<Dt_LocationInfo>();
- List<Dt_Task> taskdt = new List<Dt_Task>();
- List<Dt_StockInfoDetail> dtstocktdetail = new List<Dt_StockInfoDetail>();
-
-
- List<Dt_StockInfo> stocktData = _stockService.StockInfoService.Repository.QueryData(x => x.StockStatus == (int)StockStatusEmun.宸插叆搴� && x.MaterialType == (int)InventoryMaterialType.鍘熸潗鏂�);
- List<Dt_LocationInfo> locationinfoData = _basicService.LocationInfoService.Repository.QueryData(x => x.LocationStatus == LocationStatusEnum.InStock.ObjToInt());
- List<Dt_StockInfoDetail> StockInfoDetailData = _stockService.StockInfoDetailService.Repository.QueryData(x => x.Status == (int)StockStatusEmun.宸插叆搴�);
-
-
- string json = saveModel.DelKeys[0].ToString();
- List<string> palletCodes = JsonConvert.DeserializeObject<List<string>>(json);
-
- foreach (var palletCode in palletCodes)
- {
- Dt_StockInfo stockt = stocktData.FirstOrDefault(x => x.PalletCode == palletCode);
- if (stockt != null)
- {
- if (stockt.StockStatus == (int)StockStatusEmun.宸插叆搴� && (stockt.Wlstatus == (int)InventoryMaterialStatus.鍚堟牸 || stockt.Wlstatus == (int)InventoryMaterialStatus.閫�璐� || stockt.Wlstatus == (int)InventoryMaterialStatus.鐗归噰))
- {
- Dt_StockInfoDetail stocktdetail = StockInfoDetailData.FirstOrDefault(x => x.StockId == stockt.Id);
- if (stocktdetail != null)
- {
- Dt_LocationInfo locationinfo = locationinfoData.FirstOrDefault(x => x.LocationCode == stockt.LocationCode);
- if (locationinfo != null)
- {
- stockt.StockStatus = (int)StockStatusEmun.鍑哄簱閿佸畾;
- if (locationinfo.LocationStatus == LocationStatusEnum.InStock.ObjToInt())
- {
- locationinfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
- }
-
- string TargetAdd = "";
- if (saveModel.DelKeys[1].ToString() == "20")
- {
- TargetAdd = "R02-001-021-001-02";
- }
- else if (saveModel.DelKeys[1].ToString() == "30")
- {
- TargetAdd = "R02-001-022-001-02";
- }
- else if (saveModel.DelKeys[1].ToString() == "40")
- {
- TargetAdd = "R01-002-044-001-01";
- }
- else
- {
- TargetAdd = locationinfo.RoadwayNo == "2" ? "R02-002-027-011-01" : "R01-002-041-011-01";
- }
-
-
- Dt_Task dt_Task = new()
- {
- PalletCode = stockt.PalletCode,
- TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
- Roadway = locationinfo.RoadwayNo,
- TaskType = TaskTypeEnum.Outbound.ObjToInt(),
- TaskStatus = InTaskStatusEnum.InNew.ObjToInt(),
- SourceAddress = locationinfo.LocationCode,
- TargetAddress = TargetAdd,
- CurrentAddress = locationinfo.LocationCode,
- NextAddress = TargetAdd,
- Grade = 1,
- Creater = "WMS",
- Depth = locationinfo.Depth,
- CreateDate = DateTime.Now,
- PLCTo = int.Parse(saveModel.DelKeys[1].ToString()),
- MaterialType = stockt.MaterialType
- };
- dtstockt.Add(stockt);
- locations.Add(locationinfo);
- taskdt.Add(dt_Task);
- dtstocktdetail.Add(stocktdetail);
- }
- else
- {
- return content = WebResponseContent.Instance.Error($"鍑哄簱澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫簱浣嶄俊鎭紝璇锋牳瀵癸紒锛侊紒锛屽嚭搴撴潯鐮侊細{palletCode}");
- }
- }
- else
- {
- return content = WebResponseContent.Instance.Error($"鍑哄簱澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫簱瀛樿鎯呬俊鎭紝璇锋牳瀵癸紒锛侊紒锛屽嚭搴撴潯鐮侊細{palletCode}");
- }
- }
- else
- {
- return content = WebResponseContent.Instance.Error($"鍑哄簱澶辫触锛岃閫夋嫨宸插叆搴撲笖锛堝悎鏍硷紝鐗归噰锛岄��璐э級鐨勭墿鏂欏嚭搴擄紒锛侊紒锛屽嚭搴撴潯鐮侊細{palletCode}");
- }
- }
- else
- {
- return content = WebResponseContent.Instance.Error($"鍑哄簱澶辫触锛屾湭鎵惧埌瀵瑰簲鏉＄爜鐨勫簱瀛樹俊鎭紝鍑哄簱鏉＄爜锛歿palletCode}");
-
- }
- }
- var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTask, taskdt, "涓嬪彂浠诲姟鍏ュ簱");
- _unitOfWorkManage.BeginTran();
- if (dtstockt.Count > 0)
- {
- _stockService.StockInfoService.Repository.UpdateData(dtstockt);
- _stockService.StockInfoDetailService.Repository.UpdateData(dtstocktdetail);
- _basicService.LocationInfoService.Repository.UpdateData(locations);
- BaseDal.AddData(taskdt);
- }
- _unitOfWorkManage.CommitTran();
- content = WebResponseContent.Instance.OK($"鍑哄簱鎴愬姛锛屽嚭搴撴�绘暟锛歿palletCodes.Count}锛屾垚鍔熸暟閲忥細{dtstockt.Count}");
- return content;
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return content = WebResponseContent.Instance.Error($"鍑哄簱澶辫触锛屾姤閿欎俊鎭細{ex.Message}");
- throw;
- }
- }
-
- public WebResponseContent ManualOutbound3(SaveModel saveModel)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- List<Dt_StockInfo> dtstockt = new List<Dt_StockInfo>();
-
-
- List<Dt_StockInfo> stocktData = _stockService.StockInfoService.Repository.QueryData(x => x.StockStatus == (int)StockStatusEmun.宸插叆搴�);
- string json = saveModel.DelKeys[0].ToString();
- List<int> palletCodes = JsonConvert.DeserializeObject<List<int>>(json);
-
- foreach (int pallid in palletCodes)
- {
- Dt_StockInfo stockt = stocktData.FirstOrDefault(x => x.Id == pallid);
- if (stockt != null)
- {
-
- stockt.Wlstatus = int.Parse(saveModel.DelKeys[1].ToString());
- dtstockt.Add(stockt);
- }
- else
- {
- return content = WebResponseContent.Instance.Error($"淇敼澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫簱瀛樹俊鎭紝搴撳瓨缂栧彿锛歿pallid}");
-
- }
- }
- _unitOfWorkManage.BeginTran();
- if (dtstockt.Count > 0)
- {
- _stockService.StockInfoService.Repository.UpdateData(dtstockt);
- }
- _unitOfWorkManage.CommitTran();
- content = WebResponseContent.Instance.OK($"淇敼鎴愬姛");
- return content;
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return content = WebResponseContent.Instance.Error($"淇敼澶辫触锛屾姤閿欎俊鎭細{ex.Message}");
- throw;
- }
- }
-
- public WebResponseContent ManualOutbound4(SaveModel saveModel)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- List<Dt_StockInfo> dtstockt = new List<Dt_StockInfo>();
-
-
- List<Dt_StockInfo> stocktData = _stockService.StockInfoService.Repository.QueryData(x => x.StockStatus == (int)StockStatusEmun.宸插叆搴�);
- string json = saveModel.DelKeys[0].ToString();
- List<int> palletCodes = JsonConvert.DeserializeObject<List<int>>(json);
-
- foreach (int pallid in palletCodes)
- {
- Dt_StockInfo stockt = stocktData.FirstOrDefault(x => x.Id == pallid);
- if (stockt != null)
- {
-
- stockt.Mgeneratetime = DateTime.Parse(saveModel.DelKeys[1].ToString());
- dtstockt.Add(stockt);
- }
- else
- {
- return content = WebResponseContent.Instance.Error($"淇敼澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫簱瀛樹俊鎭紝搴撳瓨缂栧彿锛歿pallid}");
-
- }
- }
- _unitOfWorkManage.BeginTran();
- if (dtstockt.Count > 0)
- {
- _stockService.StockInfoService.Repository.UpdateData(dtstockt);
- }
- _unitOfWorkManage.CommitTran();
- content = WebResponseContent.Instance.OK($"淇敼鎴愬姛");
- return content;
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return content = WebResponseContent.Instance.Error($"淇敼澶辫触锛屾姤閿欎俊鎭細{ex.Message}");
- throw;
- }
- }
-
- public class PalletCodeList
- {
- public string PalletCode { get; set; }
- }
-
-
- public (Dt_Task?, Dt_LocationInfo?) AddRelocationTask(Dt_LocationInfo location, Dt_StockInfo stockInfo, Dt_Task task)
- {
- Dt_LocationInfo? locationInfos = _basicService.LocationInfoService.AssignLocation(location.RoadwayNo);
- if (locationInfos != null)
- {
- Dt_Task tasks = new()
- {
- CurrentAddress = location.LocationCode,
- Grade = 0,
- PalletCode = stockInfo.PalletCode,
- NextAddress = locationInfos.LocationCode,
- Roadway = location.RoadwayNo,
- SourceAddress = location.LocationCode,
- TargetAddress = locationInfos.LocationCode,
- TaskStatus = InTaskStatusEnum.RelocationNew.ObjToInt(),
- TaskType = TaskTypeEnum.Relocation.ObjToInt(),
- TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum))
- };
- BaseDal.AddData(tasks);
- BaseDal.AddData(task);
- stockInfo.StockStatus = StockStatusEmun.绉诲簱閿佸畾.ObjToInt();
- _stockService.StockInfoService.UpdateData(stockInfo);
- }
- return (task, locationInfos);
- }
/// <summary>
/// 鐢熸垚鍑哄簱浠诲姟
/// </summary>
/// <param name="keys"></param>
/// <returns></returns>
- public WebResponseContent GenerateOutboundTask(int[] keys)
+ public WebResponseContent WMSGenerateOutboundTask(int[] keys)
{
try
{
@@ -1185,7 +784,7 @@
foreach (int key in keys)
{
- (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(key, stockSelectViews);
+ (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(keys);
if (result.Item2 != null && result.Item2.Count > 0)
{
stockInfos.AddRange(result.Item2);
@@ -1221,179 +820,6 @@
}
/// <summary>
- /// 绌烘墭鐩樺嚭搴撲换鍔�
- /// </summary>
- /// <param name="inTask"></param>
- /// <returns></returns>
- public WebResponseContent PalletOutboundTask(string roadwayNo, string endStation)
- {
- try
- {
- Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetPalletStockInfo(roadwayNo);
- if (stockInfo == null)
- {
- return WebResponseContent.Instance.Error("鏈壘鍒扮┖鎵樼洏搴撳瓨");
- }
- Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode && x.RoadwayNo == roadwayNo);
- if (locationInfo == null)
- {
- return WebResponseContent.Instance.Error("鏈壘鍒扮┖鎵樼洏搴撳瓨瀵瑰簲鐨勮揣浣嶄俊鎭�");
- }
- Dt_RoadwayInfo roadwayInfo = _basicService.RoadwayInfoService.Repository.QueryFirst(x => x.InStationCode == endStation && x.RoadwayNo == roadwayNo);
- if (roadwayInfo == null)
- {
- return WebResponseContent.Instance.Error("鏈壘鍒扮粓鐐瑰贩閬撲俊鎭�");
- }
- Dt_Task task = new Dt_Task()
- {
- CurrentAddress = stockInfo.LocationCode,
- Grade = 0,
- NextAddress = endStation,
- PalletCode = stockInfo.PalletCode,
- Roadway = roadwayNo,
- SourceAddress = stockInfo.LocationCode,
- TargetAddress = endStation,
- TaskStatus = OutTaskStatusEnum.OutNew.ObjToInt(),
- TaskType = TaskTypeEnum.PalletOutbound.ObjToInt(),
- Depth = locationInfo.Depth,
- TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum))
-
- };
- int beforeStatus = locationInfo.LocationStatus;
- _unitOfWorkManage.BeginTran();
- stockInfo.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
- locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
- BaseDal.AddData(task);
- _stockService.StockInfoService.UpdateData(stockInfo);
-
- _basicService.LocationInfoService.UpdateData(locationInfo);
-
- _basicService.LocationInfoService.UpdateLocationLock(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
- _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), "", task.TaskNum);
-
- _unitOfWorkManage.CommitTran();
- return WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
- public (Dt_LocationInfo?, int?) isDepth(Dt_LocationInfo locationInfo)
- {
- if (locationInfo.Depth == 2)
- {
- if (locationInfo.Row == 1 || locationInfo.Row == 5)
- {
- Dt_LocationInfo dt_LocationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.Row == locationInfo.Row + 1 && x.Layer == locationInfo.Layer && x.Column == locationInfo.Column && x.RoadwayNo == locationInfo.RoadwayNo);
-
- if (dt_LocationInfo != null && dt_LocationInfo.LocationStatus == LocationStatusEnum.InStock.ObjToInt())
- {
- return (dt_LocationInfo, LocationStatusEnum.InStock.ObjToInt());
- }
- if (dt_LocationInfo != null && dt_LocationInfo.LocationStatus == LocationStatusEnum.Free.ObjToInt())
- {
- return (dt_LocationInfo, LocationStatusEnum.Free.ObjToInt());
- }
- if (dt_LocationInfo != null && dt_LocationInfo.LocationStatus == LocationStatusEnum.Lock.ObjToInt())
- {
- return (dt_LocationInfo, LocationStatusEnum.Lock.ObjToInt());
- }
- if (dt_LocationInfo != null && dt_LocationInfo.LocationStatus == LocationStatusEnum.PalletLock.ObjToInt())
- {
- return (dt_LocationInfo, LocationStatusEnum.PalletLock.ObjToInt());
- }
- if (dt_LocationInfo != null && dt_LocationInfo.LocationStatus == LocationStatusEnum.Pallet.ObjToInt())
- {
- return (dt_LocationInfo, LocationStatusEnum.Pallet.ObjToInt());
- }
- }
- else if (locationInfo.Row == 4 || locationInfo.Row == 8)
- {
- Dt_LocationInfo dt_LocationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.Row == locationInfo.Row + 1 && x.Layer == locationInfo.Layer && x.Column == locationInfo.Column && x.RoadwayNo == locationInfo.RoadwayNo);
-
- if (dt_LocationInfo != null && dt_LocationInfo.LocationStatus == LocationStatusEnum.InStock.ObjToInt())
- {
- return (dt_LocationInfo, LocationStatusEnum.InStock.ObjToInt());
- }
- if (dt_LocationInfo != null && dt_LocationInfo.LocationStatus == LocationStatusEnum.Free.ObjToInt())
- {
- return (dt_LocationInfo, LocationStatusEnum.Free.ObjToInt());
- }
- if (dt_LocationInfo != null && dt_LocationInfo.LocationStatus == LocationStatusEnum.Lock.ObjToInt())
- {
- return (dt_LocationInfo, LocationStatusEnum.Lock.ObjToInt());
- }
- if (dt_LocationInfo != null && dt_LocationInfo.LocationStatus == LocationStatusEnum.PalletLock.ObjToInt())
- {
- return (dt_LocationInfo, LocationStatusEnum.PalletLock.ObjToInt());
- }
- if (dt_LocationInfo != null && dt_LocationInfo.LocationStatus == LocationStatusEnum.Pallet.ObjToInt())
- {
- return (dt_LocationInfo, LocationStatusEnum.Pallet.ObjToInt());
- }
- }
- }
- return (null, LocationStatusEnum.Free.ObjToInt());
- }
-
- /// <summary>
- /// 浜哄伐鎵嬪姩鍑哄簱锛堝垹闄ゅ簱瀛橈級
- /// </summary>
- /// <param name="saveModel"></param>
- /// <returns></returns>
- public WebResponseContent ManualOutboundDeleteinventory(SaveModel saveModel)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- List<Dt_StockInfo> dtstockt = new List<Dt_StockInfo>();
- List<Dt_LocationInfo> locations = new List<Dt_LocationInfo>();
- List<Dt_StockInfoDetail> dtstocktdetail = new List<Dt_StockInfoDetail>();
-
- for (int i = 0; i < saveModel.DelKeys.Count; i++)
- {
- Dt_StockInfo stockt = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == saveModel.DelKeys[i].ToString());
- if (stockt.StockStatus == (int)StockStatusEmun.宸插叆搴�)
- {
- Dt_StockInfoDetail stocktdetail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == stockt.Id);
- Dt_LocationInfo locationinfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == stockt.LocationCode);
- locationinfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
- dtstockt.Add(stockt);
- locations.Add(locationinfo);
- if (stockt.MaterialType == (int)InventoryMaterialType.绌烘墭)
- {
- dtstocktdetail.Add(stocktdetail);
- }
- WriteLog.GetLog("浜哄伐鎵嬪姩鍒犻櫎搴撳瓨淇℃伅").Write($"鎵樼洏鏉＄爜锛歿stockt.PalletCode},搴撲綅缂栧彿锛歿stockt.LocationCode}", $"浜哄伐鍑哄簱搴撳瓨");
- }
- else
- {
- return content = WebResponseContent.Instance.Error($"鍑哄簱澶辫触锛岃搴撳瓨淇℃伅涓嶅彲杩涜鍑哄簱");
- }
-
- }
- _unitOfWorkManage.BeginTran();
- _stockService.StockInfoService.Repository.DeleteData(dtstockt);
- if (dtstocktdetail.Count == 0)
- {
- _stockService.StockInfoDetailService.Repository.DeleteData(dtstocktdetail);
- }
- _basicService.LocationInfoService.Repository.UpdateData(locations);
- _unitOfWorkManage.CommitTran();
- content = WebResponseContent.Instance.OK();
- return content;
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return content = WebResponseContent.Instance.Error($"鎵嬪姩鍑哄簱淇℃伅澶辫触锛屾姤閿欎俊鎭細{ex.Message}");
- throw;
- }
- }
-
- /// <summary>
/// 浠诲姟鍙栨秷
/// </summary>
/// <param name="saveModel"></param>
@@ -1404,7 +830,7 @@
Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
if (task != null)
{
- if (task.TaskType == (int)TaskTypeEnum.Outbound || task.TaskType == (int)TaskTypeEnum.PalletOutbound)
+ if (task.TaskType == (int)TaskTypeEnum.Outbound || task.TaskType == (int)TaskTypeEnum.EmptyProductBack)
{
//澶勭悊鍑哄簱鐨勯�昏緫
Dt_LocationInfo locationinfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
@@ -1432,7 +858,7 @@
return content = WebResponseContent.Instance.Error($"鍑哄簱浠诲姟鍙栨秷鎴愬姛");
}
- else if (task.TaskType == (int)TaskTypeEnum.Inbound || task.TaskType == (int)TaskTypeEnum.PalletInbound)
+ else if (task.TaskType == (int)TaskTypeEnum.Inbound || task.TaskType == (int)TaskTypeEnum.Inbound)
{
//澶勭悊鍑哄簱鐨勯�昏緫
Dt_LocationInfo locationinfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
@@ -1463,5 +889,104 @@
return content = WebResponseContent.Instance.Error($"鏈壘鍒颁换鍔″彿");
}
}
+
+ /// <summary>
+ /// 閫夊畾搴撳瓨鐢熸垚鐩樼偣鍗曞嚭搴�
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
+ public WebResponseContent TakeOutbound(List<StockViewDTO> stockViews)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ if (stockViews.Select(x => x.WarehouseId).Distinct().Count() >= 2)
+ {
+ return content.Error($"璇烽�夋嫨鍚屼竴浠撳簱搴撳瓨杩涜鐩樼偣");
+ }
+ List<int> ids = stockViews.Select(x => x.StockId).ToList();
+ //鑾峰彇搴撳瓨
+ List<Dt_StockInfo> stockInfos = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => ids.Contains(x.Id)).Includes(x => x.Details).ToList();
+ if (stockInfos.Count != stockViews.Count)
+ {
+ StockViewDTO? stockViewDTO = stockViews.FirstOrDefault(x => !stockInfos.Select(x => x.PalletCode).ToList().Contains(x.PalletCode));
+ return content.Error($"鏈壘鍒皗stockViewDTO?.PalletCode}搴撳瓨");
+ }
+ //鑾峰彇璐т綅
+ List<string> locStrs = stockInfos.Select(x => x.LocationCode).ToList();
+ List<Dt_LocationInfo> locationInfos = _basicRepository.LocationInfoRepository.QueryData(x => locStrs.Contains(x.LocationCode));
+ if (stockInfos.Count != locationInfos.Count)
+ {
+ string? locStr = locStrs.FirstOrDefault(x => !locationInfos.Select(x => x.LocationCode).ToList().Contains(x));
+ return content.Error($"鏈壘鍒皗locStr}璐т綅鏁版嵁");
+ }
+ Dt_TakeStockOrder takeStockOrder = new Dt_TakeStockOrder()
+ {
+ WarehouseId = stockInfos.FirstOrDefault().WarehouseId,
+ TakeStockStatus = TakeStockStatusEnum.鐩樼偣涓�.ObjToInt(),
+ OrderNo = _outboundService.OutboundOrderService.CreateCodeByRule(nameof(RuleCode.PDCodeRule)),
+ Details = new List<Dt_TakeStockOrderDetail>()
+ };
+ foreach (var item in stockInfos)
+ {
+ if (item.Details.Count <= 0)
+ {
+ return content.Error($"鏈壘鍒皗item.PalletCode}搴撳瓨鏄庣粏鏁版嵁");
+ }
+ Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.LocationCode == item.LocationCode);
+ if (locationInfo != null && (locationInfo.EnableStatus == EnableStatusEnum.OnlyOut.ObjToInt() || locationInfo.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && locationInfo.LocationStatus == LocationStatusEnum.InStock.ObjToInt() && item.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt())
+ {
+ //鍒涘缓鏄庣粏
+ Dt_TakeStockOrderDetail takeStockOrderDetail = new Dt_TakeStockOrderDetail()
+ {
+ MaterielCode = item.Details.FirstOrDefault().MaterielCode,
+ MaterielName = item.Details.FirstOrDefault().MaterielName ?? "鏃犵墿鏂欏悕绉�",
+ BatchNo = item.Details.FirstOrDefault().BatchNo,
+ MaterielSpec = item.Details.FirstOrDefault().MaterieSpec ?? "鏃犵墿鏂欒鏍�",
+ LocationCode = item.LocationCode,
+ TakePalletCode = item.PalletCode,
+ TakeDetalStatus = TakeStockDetailStatusEnum.鐩樼偣鍑哄簱涓�.ObjToInt(),
+ SysQty = item.Details.Sum(x => x.StockQuantity),
+ Qty = 0
+ };
+ takeStockOrder.Details.Add(takeStockOrderDetail);
+ }
+ else
+ {
+ content.Error($"璐т綅鎴栧簱瀛樼姸鎬佷笉婊¤冻鍑哄簱鏉′欢");
+ }
+ }
+ List<Dt_Task> tasks = GetTasks(stockInfos, TaskTypeEnum.OutInventory);
+ if (tasks == null || tasks.Count <= 0)
+ {
+ return content.Error($"鐢熸垚浠诲姟澶辫触");
+ }
+ stockInfos.ForEach(x =>
+ {
+ x.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
+ });
+ tasks.ForEach(x =>
+ {
+ x.OrderNo = takeStockOrder.OrderNo;
+ });
+ LocationStatusEnum locationStatus = LocationStatusEnum.Lock;
+ _unitOfWorkManage.BeginTran();
+ //鏇存柊搴撳瓨鐘舵��
+ _stockRepository.StockInfoRepository.UpdateData(stockInfos);
+ BaseDal.Db.InsertNav(takeStockOrder).Include(x => x.Details).ExecuteCommand();
+ //鏂板缓浠诲姟
+ BaseDal.AddData(tasks);
+ _basicService.LocationInfoService.Repository.UpdateLocationStatus(locationInfos, locationStatus);
+ _unitOfWorkManage.CommitTran();
+ PushTasksToWCS(tasks);
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
+ }
+ return content;
+ }
}
}
--
Gitblit v1.9.3