From 829eabf256e29392ca63f6da48829dba3b075dfe Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期五, 24 一月 2025 08:59:53 +0800
Subject: [PATCH] 资料，优化程序
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs | 122 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 114 insertions(+), 8 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs"
index a41b3b6..48b9dfe 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs"
@@ -404,7 +404,7 @@
}
targetCodes[4] = "01";
string LocationCode = string.Join("-", targetCodes); //缁勮娴呭簱浣嶅湴鍧�
- Dt_LocationInfo locationInfos = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
+ Dt_LocationInfo locationInfos = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode && (x.LocationStatus == (int)LocationStatusEnum.Free || x.LocationStatus == (int)LocationStatusEnum.InStock));
if (locationInfos == null)
{
return content = WebResponseContent.Instance.Error($"鏈壘鍒拌璐т綅淇℃伅,璐т綅缂栧彿:{locationInfos}");
@@ -417,7 +417,7 @@
}
else
{
- Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
+ Dt_StockInfo dt_StockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode && x.StockStatus== (int)StockStatusEmun.宸插叆搴�);
if (dt_StockInfo == null)
{
return content = WebResponseContent.Instance.Error($"鏈壘鍒拌璐т綅鐨勫簱瀛樹俊鎭�,璐т綅缂栧彿:{LocationCode}");
@@ -435,7 +435,27 @@
{
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);
+ }
+
+ }
+ else
+ {
+ newLocation = _basicService.LocationInfoService.GetLocation(locationInfos.RoadwayNo, Locationtype);
+ }
+
+
if (newLocation != null)
{
Dt_Task dt_Task = new()
@@ -469,6 +489,7 @@
loca.Add(newLocation);
loca.Add(locationInfos);
_basicService.LocationInfoService.UpdateData(loca);
+ BaseDal.AddData(dt_Task);
_unitOfWorkManage.CommitTran();
return content = WebResponseContent.Instance.OK(data: dt_Task);
}
@@ -804,10 +825,14 @@
string TargetAdd = "";
if (saveModel.DelKeys[1].ToString()=="20")
{
- TargetAdd = "R02-001-010-001-02";
+ TargetAdd = "R02-001-021-001-02";
}else if(saveModel.DelKeys[1].ToString() == "30")
{
- TargetAdd = "R02-001-011-001-02";
+ TargetAdd = "R02-001-022-001-02";
+ }
+ else if (saveModel.DelKeys[1].ToString() == "40")
+ {
+ TargetAdd = "R01-002-044-001-01";
}
else
{
@@ -859,7 +884,7 @@
}
}
- //var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTask, taskdt, "涓嬪彂浠诲姟鍏ュ簱");
+ var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTask, taskdt, "涓嬪彂浠诲姟鍏ュ簱");
_unitOfWorkManage.BeginTran();
if(dtstockt.Count > 0)
{
@@ -903,7 +928,7 @@
}
else
{
- return content = WebResponseContent.Instance.Error($"鍑哄簱澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫簱瀛樹俊鎭紝搴撳瓨缂栧彿锛歿pallid}");
+ return content = WebResponseContent.Instance.Error($"淇敼澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫簱瀛樹俊鎭紝搴撳瓨缂栧彿锛歿pallid}");
}
}
@@ -919,7 +944,51 @@
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
- return content = WebResponseContent.Instance.Error($"鍑哄簱澶辫触锛屾姤閿欎俊鎭細{ex.Message}");
+ 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;
}
}
@@ -1217,6 +1286,7 @@
BaseDal.DeleteData(task);
BaseDal.DeleteAndMoveIntoHty(task, OperateType.浜哄伐鍒犻櫎);
WriteLog.GetLog("浠诲姟鏃ュ織").Write($"鍑哄簱浠诲姟鍙栨秷鎴愬姛锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"浠诲姟鍙栨秷");
+ WebResponseContent webResponseContent = HttpHelper.Post<WebResponseContent>(ReceiveWCSTask, task.TaskNum, "浠诲姟鍒犻櫎");
return content = WebResponseContent.Instance.Error($"鍑哄簱浠诲姟鍙栨秷鎴愬姛");
}
@@ -1239,6 +1309,42 @@
BaseDal.DeleteData(task);
BaseDal.DeleteAndMoveIntoHty(task, OperateType.浜哄伐鍒犻櫎);
WriteLog.GetLog("浠诲姟鏃ュ織").Write($"鍏ュ簱浠诲姟鍙栨秷鎴愬姛锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"浠诲姟鍙栨秷");
+ WebResponseContent webResponseContent = HttpHelper.Post<WebResponseContent>(ReceiveWCSTask, task.TaskNum, "浠诲姟鍒犻櫎");
+ return content = WebResponseContent.Instance.Error($"鍏ュ簱浠诲姟鍙栨秷鎴愬姛");
+ }
+ else if (task.TaskType == (int)TaskTypeEnum.RelocationIn) //搴撳唴绉诲簱
+ {
+ //澶勭悊鍑哄簱鐨勯�昏緫
+ Dt_LocationInfo locationinfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
+ if (locationinfo.LocationStatus == LocationStatusEnum.Lock.ObjToInt() || locationinfo.LocationStatus == LocationStatusEnum.PalletLock.ObjToInt())
+ {
+ locationinfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+ }
+ _basicService.LocationInfoService.Repository.UpdateData(locationinfo);
+
+ Dt_LocationInfo locationinfo2 = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
+ if (locationinfo2.LocationStatus == LocationStatusEnum.Lock.ObjToInt())
+ {
+ locationinfo2.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
+ }
+ if (locationinfo2.LocationStatus == LocationStatusEnum.PalletLock.ObjToInt())
+ {
+ locationinfo2.LocationStatus = LocationStatusEnum.Pallet.ObjToInt();
+ }
+ _basicService.LocationInfoService.Repository.UpdateData(locationinfo2);
+ Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == task.PalletCode);
+ stockInfo.StockStatus = (int)StockStatusEmun.宸插叆搴�;
+ _stockService.StockInfoService.Repository.UpdateData(stockInfo);
+ Dt_StockInfoDetail stocktdetail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == stockInfo.Id);
+ if (stocktdetail != null)
+ {
+ stocktdetail.Status = (int)StockStatusEmun.宸插叆搴�;
+ _stockService.StockInfoDetailService.Repository.UpdateData(stocktdetail);
+ }
+ BaseDal.DeleteData(task);
+ BaseDal.DeleteAndMoveIntoHty(task, OperateType.浜哄伐鍒犻櫎);
+ WriteLog.GetLog("浠诲姟鏃ュ織").Write($"鍏ュ簱浠诲姟鍙栨秷鎴愬姛锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"浠诲姟鍙栨秷");
+ WebResponseContent webResponseContent = HttpHelper.Post<WebResponseContent>(ReceiveWCSTask, task.TaskNum, "浠诲姟鍒犻櫎");
return content = WebResponseContent.Instance.Error($"鍏ュ簱浠诲姟鍙栨秷鎴愬姛");
}
else
--
Gitblit v1.9.3