From d5fe80c5cb7dc0b209d8fea9faa84c7ca5b20324 Mon Sep 17 00:00:00 2001
From: Admin <Admin@ADMIN>
Date: 星期五, 16 一月 2026 16:07:18 +0800
Subject: [PATCH] 出入库移库完成
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MESTaskService.cs | 208 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 187 insertions(+), 21 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MESTaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MESTaskService.cs"
index 966532b..712c319 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MESTaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MESTaskService.cs"
@@ -45,21 +45,41 @@
if (string.IsNullOrWhiteSpace(mES_In.endPosition)) return apiResponse.Error("鐩爣浣嶇疆涓嶈兘涓虹┖");
if (string.IsNullOrWhiteSpace(mES_In.containerType)) return apiResponse.Error("杞藉叿绫诲瀷涓嶈兘涓虹┖"); //杞藉叿绫诲瀷锛屽竷鏂�-1锛屾澗甯冨嵎-2锛屾垚鍝�-1
+ Dt_Task setask = BaseDal.QueryData(x => x.PalletCode == mES_In.containerNo).FirstOrDefault();
+ if (setask != null) return apiResponse.Error($"WMS宸叉湁褰撳墠浠诲姟锛屼笉鍙噸澶嶄笅鍙戯紝鎵樼洏缂栧彿锛歿mES_In.containerNo}");
+
Dt_Warehouse dt_Warehouse = _warehouseService.QueryWarehouse(mES_In.warehouseNo);
- if (dt_Warehouse == null) return apiResponse.Error($"WMS鏈兘鏌ヨ閬撳搴斾粨搴擄紝浠撳簱缂栫爜锛歿mES_In.warehouseNo}");
int LocationType = 1;
- if (dt_Warehouse.WarehouseType == (int)WarehouseEnum.YMYL)
+ string Roadway = "0";
+
+ string SourceAddress = mES_In.startPosition;
+ string TargetAddress = "";
+ string CurrentAddress = mES_In.startPosition;
+ string NextAddress = "";
+ int WarehouseId = 0;
+
+ if (dt_Warehouse != null)
{
- if (mES_In.containerType == "2") LocationType = 2;
+ if (dt_Warehouse.WarehouseType == (int)WarehouseEnum.YMYL)
+ {
+ if (mES_In.containerType == "2") LocationType = 2;
+ }
+ else if (dt_Warehouse.WarehouseType == (int)WarehouseEnum.YMCP)
+ {
+ LocationType = 3;
+ }
+ Roadway = _locationInfoService.AccessingTunnel(dt_Warehouse.WarehouseId, LocationType);
+ if (Roadway == "0") return apiResponse.Error($"WMS鏈兘鏌ヨ閬撳搴斿贩閬撶紪鍙凤紝浠撳簱缂栫爜锛歿mES_In.warehouseNo}");
+ //鑾峰彇瀵瑰簲PLC绔欏彴淇℃伅
+ Dt_roadwayinfo _Roadwayinfo = _roadWayinfoService.QbtainPlatform(Roadway);
+ NextAddress = _Roadwayinfo.InStationCode;
+ WarehouseId = dt_Warehouse.WarehouseId;
}
-
- string Roadway = _locationInfoService.AccessingTunnel(dt_Warehouse.WarehouseId, LocationType);
- if (Roadway == "") return apiResponse.Error($"WMS鏈兘鏌ヨ閬撳搴斿贩閬撶紪鍙凤紝浠撳簱缂栫爜锛歿mES_In.warehouseNo}");
-
- //鑾峰彇瀵瑰簲PLC绔欏彴淇℃伅
- Dt_roadwayinfo _Roadwayinfo = _roadWayinfoService.QbtainPlatform(Roadway);
-
-
+ else
+ {
+ TargetAddress = mES_In.endPosition;
+ NextAddress = mES_In.endPosition;
+ }
Dt_Task task = new Dt_Task();
task.TaskNum = mES_In.transNo;
task.PalletCode = mES_In.containerNo;
@@ -67,27 +87,27 @@
task.Roadway = Roadway;
task.TaskType = (int)TaskTypeEnum.Inbound;
task.TaskStatus = (int)InTaskStatusEnum.InNew;
- task.SourceAddress = mES_In.startPosition;
- task.TargetAddress = "";
- task.CurrentAddress = mES_In.startPosition;
- task.NextAddress = _Roadwayinfo.InStationCode;
- task.WarehouseId = dt_Warehouse.WarehouseId;
+ task.SourceAddress = SourceAddress;
+ task.TargetAddress = TargetAddress;
+ task.CurrentAddress = CurrentAddress;
+ task.NextAddress = NextAddress;
+ task.WarehouseId = WarehouseId;
task.OrderNo = mES_In.transDate.ToString();
task.Grade = 1;
task.Creater = "MES";
task.CreateDate = DateTime.Now;
- Dt_StockInfo dt_StockInfo = new Dt_StockInfo();
+ /*Dt_StockInfo dt_StockInfo = new Dt_StockInfo();
dt_StockInfo.PalletCode = task.PalletCode;
dt_StockInfo.PalletType = task.PalletType;
dt_StockInfo.WarehouseId = task.WarehouseId;
dt_StockInfo.StockStatus = (int)StockStatusEmun.鍏ュ簱涓�;
dt_StockInfo.Creater = "MWS";
- dt_StockInfo.CreateDate = DateTime.Now;
+ dt_StockInfo.CreateDate = DateTime.Now;*/
_unitOfWorkManage.BeginTran();
BaseDal.AddData(task);
- _stockInfoService.Repository.AddData(dt_StockInfo);
+ //_stockInfoService.Repository.AddData(dt_StockInfo);
_unitOfWorkManage.CommitTran();
WriteLog.GetLog("鎺ユ敹MES鍏ュ簱浠诲姟涓嬪彂").Write($"鍙傛暟锛歿mES_In.containerNo}", $"鍏ュ簱浠诲姟娣诲姞鎴愬姛");
return apiResponse.OK();
@@ -125,6 +145,9 @@
if (dt_LocationInfo == null) return apiResponse.Error($"WMS鏈兘鏌ユ壘閬撹鎵樼洏鏉＄爜鐨勫簱瀛樿揣浣嶄俊鎭紝鏉＄爜锛歿mES_In.containerNo}锛屾湭鎵惧埌璐т綅鍙凤細{dt_Stock.LocationCode}");
Dt_roadwayinfo _Roadwayinfo = _roadWayinfoService.QbtainPlatform(dt_LocationInfo.RoadwayNo);
+
+ Dt_Task setask = BaseDal.QueryData(x => x.PalletCode == mES_In.containerNo).FirstOrDefault();
+ if (setask != null) return apiResponse.Error($"WMS宸叉湁褰撳墠浠诲姟锛屼笉鍙噸澶嶄笅鍙戯紝鎵樼洏缂栧彿锛歿mES_In.containerNo}");
Dt_Task task = new Dt_Task();
task.TaskNum = mES_In.transNo;
@@ -166,11 +189,12 @@
//鍌ㄤ綅鏌ヨ鎺ュ彛
public ApiResponse GetLocationByContainer(MES_InTask mES_In)
{
+ WriteLog.GetLog("鍌ㄤ綅鏌ヨ鎺ュ彛").Write($"鍙傛暟锛歿mES_In.ToJson()}", $"浠诲姟鎺ユ敹鍙傛暟");
ApiResponse apiResponse = new ApiResponse();
try
{
if (string.IsNullOrWhiteSpace(mES_In.containerNo)) return apiResponse.Error("鎵樼洏鐮佷笉鑳戒负绌�");
- Dt_StockInfo dt_Stock = _stockInfoService.Repository.QueryData(x => x.PalletCode == mES_In.containerNo).FirstOrDefault();
+ Dt_StockInfo dt_Stock = _stockInfoService.Repository.QueryData(x => x.PalletCode == mES_In.containerNo &&x.StockStatus==(int)StockStatusEmun.宸插叆搴�).FirstOrDefault();
if (dt_Stock == null) return apiResponse.Error($"WMS鏈兘鏌ユ壘閬撹鎵樼洏鏉＄爜鐨勫簱瀛樿揣浣嶄俊鎭紝鏉＄爜锛歿mES_In.containerNo}");
Dt_LocationInfo dt_LocationInfo = _locationInfoService.Repository.QueryData(x => x.LocationCode == dt_Stock.LocationCode).FirstOrDefault();
if (dt_LocationInfo == null) return apiResponse.Error($"WMS鏈兘鏌ユ壘閬撹鎵樼洏鏉＄爜鐨勫簱瀛樿揣浣嶄俊鎭紝鏉＄爜锛歿mES_In.containerNo}锛屾湭鎵惧埌璐т綅鍙凤細{dt_Stock.LocationCode}");
@@ -244,8 +268,22 @@
if (string.IsNullOrWhiteSpace(mES_In.transNo)) return apiResponse.Error("鍗曟嵁缂栧彿涓嶈兘涓虹┖");
Dt_Task dt_Task = BaseDal.QueryData(x => x.TaskNum == mES_In.transNo).FirstOrDefault();
if (dt_Task == null) return apiResponse.Error($"WMS鏈兘鏌ユ壘閬撳搴斿崟鎹换鍔★紝鏉＄爜锛歿mES_In.transNo}");
- if(dt_Task.TaskStatus== (int)InTaskStatusEnum.InNew || dt_Task.TaskStatus == (int)OutTaskStatusEnum.OutNew)
+ if(dt_Task.TaskStatus== (int)InTaskStatusEnum.InNew)
{
+ Dt_StockInfo dt_StockInfo=_stockInfoService.Repository.QueryData(x=>x.PalletCode==dt_Task.PalletCode).FirstOrDefault();
+ if (dt_StockInfo == null) return apiResponse.Error("鍙栨秷澶辫触锛學MS璁板綍鐨勬墭鐩樺簱瀛樻煡鎵惧け璐�");
+ _stockInfoService.Repository.DeleteData(dt_StockInfo);
+ BaseDal.DeleteData(dt_Task);
+ return apiResponse.OK();
+ }else if(dt_Task.TaskStatus == (int)OutTaskStatusEnum.OutNew)
+ {
+ Dt_StockInfo dt_StockInfo = _stockInfoService.Repository.QueryData(x => x.PalletCode == dt_Task.PalletCode).FirstOrDefault();
+ Dt_LocationInfo dt_LocationInfo= _locationInfoService.Repository.QueryData(x=>x.LocationCode== dt_StockInfo.LocationCode).FirstOrDefault();
+ dt_StockInfo.StockStatus = (int)StockStatusEmun.宸插叆搴�;
+ dt_LocationInfo.LocationStatus = (int)LocationStatusEnum.InStock;
+
+ _stockInfoService.Repository.UpdateData(dt_StockInfo);
+ _locationInfoService.Repository.UpdateData(dt_LocationInfo);
BaseDal.DeleteData(dt_Task);
return apiResponse.OK();
}
@@ -261,5 +299,133 @@
return apiResponse.Error($"WMS浠诲姟鍙栨秷鎺ュ彛閿欒锛屽師鍥狅細{ex.Message}");
}
}
+
+ //鍏ュ簱浠诲姟鍙嶉鎺ュ彛
+ public MES_parameter InStoreDocCallback(string TransNo, string Result, string ResultMsg, string ContainerNo, string LocationCode)
+ {
+ MES_parameter mES_Parame= new MES_parameter();
+ try
+ {
+ MesInResultResponse mesInResult = new MesInResultResponse();
+ mesInResult.TransNo = TransNo;
+ mesInResult.Result = Result;
+ mesInResult.ResultMsg = ResultMsg;
+ mesInResult.ContainerNo = ContainerNo;
+ mesInResult.LocationCode = LocationCode;
+ mES_Parame = HttpHelper.Post<MES_parameter>(MES_InReporttask, mesInResult, "鍏ュ簱浠诲姟姹囨姤");
+ WriteLog.GetLog("鍏ュ簱浠诲姟鍙嶉鎺ュ彛").Write($"璁㈠崟缂栧彿锛歿TransNo}锛屾墽琛岀粨鏋滐細{Result}锛屾墽琛岀粨鏋滄弿杩帮細{ResultMsg}锛屾墭鐩樻潯鐮侊細{ContainerNo}锛屽簱浣嶇紪鍙凤細{LocationCode}锛屾帴鏀跺埌鐨勫洖鍙傦細{mesInResult.ToJson()}", $"浠诲姟涓婃姤淇℃伅");
+ return mES_Parame;
+ }
+ catch (Exception ex)
+ {
+ mES_Parame.Result = "N";
+ mES_Parame.ResultMsg= $"鍏ュ簱锛歐MS绯荤粺涓婁紶澶辫触,鍘熷洜锛歿ex.Message}";
+ return mES_Parame;
+ }
+
+ }
+ //鍑哄簱浠诲姟鍙嶉鎺ュ彛
+ public MES_parameter OutStoreDocCallback(string TransNo,string Result,string ResultMsg)
+ {
+ MES_parameter mES_Parame = new MES_parameter();
+ try
+ {
+ MesOutResultResponse mesInResult = new MesOutResultResponse();
+ mesInResult.TransNo = TransNo;
+ mesInResult.Result = Result;
+ mesInResult.ResultMsg = ResultMsg;
+ mES_Parame = HttpHelper.Post<MES_parameter>(MES_OutReporttask, mesInResult, "鍑哄簱浠诲姟姹囨姤");
+ WriteLog.GetLog("鍑哄簱浠诲姟鍙嶉鎺ュ彛").Write($"璁㈠崟缂栧彿锛歿TransNo}锛屾墽琛岀粨鏋滐細{Result}锛屾墽琛岀粨鏋滄弿杩帮細{ResultMsg}锛屾帴鏀跺埌鐨勫洖鍙傦細{mesInResult.ToJson()}", $"浠诲姟涓婃姤淇℃伅");
+ return mES_Parame;
+ }
+ catch (Exception ex)
+ {
+ mES_Parame.Result = "N";
+ mES_Parame.ResultMsg = $"鍑哄簱锛歐MS绯荤粺涓婁紶澶辫触,鍘熷洜锛歿ex.Message}";
+ return mES_Parame;
+ }
+ }
+
+ /// <summary>
+ /// 鍌ㄤ綅寮傚姩鐢宠
+ /// </summary>
+ /// <param name="ContainerNo">鎵樼洏鏉＄爜</param>
+ /// <param name="OriginalLocationCode">鍘熷偍浣�</param>
+ /// <param name="NewLocationCode">鏂板偍浣�</param>
+ /// <returns></returns>
+ public MES_parameter ApplicationChangeStorageLocation(string ContainerNo,string OriginalLocationCode,string NewLocationCode)
+ {
+ MES_parameter mES_Parame = new MES_parameter();
+ try
+ {
+ MES_Storagelocation Storagelocation = new MES_Storagelocation();
+ Storagelocation.ContainerNo = ContainerNo;
+ Storagelocation.OriginalLocationCode = OriginalLocationCode;
+ Storagelocation.NewLocationCode = NewLocationCode;
+ mES_Parame = HttpHelper.Post<MES_parameter>(MES_InventoryUpdateApply, Storagelocation, "鍌ㄤ綅寮傚姩鐢宠");
+ return mES_Parame;
+ }
+ catch (Exception ex)
+ {
+ mES_Parame.Result = "N";
+ mES_Parame.ResultMsg = $"鍌ㄤ綅寮傚姩鐢宠锛歐MS绯荤粺璋冨彇澶辫触,鍘熷洜锛歿ex.Message}";
+ return mES_Parame;
+ }
+ }
+
+ /// <summary>
+ /// 鍌ㄤ綅寮傚姩
+ /// </summary>
+ /// <param name="ContainerNo">鎵樼洏鏉＄爜</param>
+ /// <param name="OriginalLocationCode">鍘熷偍浣�</param>
+ /// <param name="NewLocationCode">鏂板偍浣�</param>
+ /// <returns></returns>
+ public MES_parameter AbnormalStorageLocation(string ContainerNo, string OriginalLocationCode, string NewLocationCode)
+ {
+ MES_parameter mES_Parame = new MES_parameter();
+ try
+ {
+ MES_Storagelocation Storagelocation = new MES_Storagelocation();
+ Storagelocation.ContainerNo = ContainerNo;
+ Storagelocation.OriginalLocationCode = OriginalLocationCode;
+ Storagelocation.NewLocationCode = NewLocationCode;
+ mES_Parame = HttpHelper.Post<MES_parameter>(MES_InventoryUpdateCallback, Storagelocation, "鍌ㄤ綅寮傚姩");
+ return mES_Parame;
+ }
+ catch (Exception ex)
+ {
+ mES_Parame.Result = "N";
+ mES_Parame.ResultMsg = $"鍌ㄤ綅寮傚姩锛歐MS绯荤粺璋冨彇澶辫触,鍘熷洜锛歿ex.Message}";
+ return mES_Parame;
+ }
+ }
+ /// <summary>
+ /// 浠诲姟寮傚父
+ /// </summary>
+ /// <param name="TransNo">鍗曟嵁缂栧彿</param>
+ /// <param name="EquipmentType">璁惧绫诲瀷</param>
+ /// <param name="EquipmentNumber">璁惧缂栫爜</param>
+ /// <param name="ErrorInfo">寮傚父鎶ユ枃</param>MES_TaskErrorInfoCallback
+ /// <returns></returns>
+ public MES_parameter ToMES_TaskException(string TransNo,string EquipmentType,string EquipmentNumber,string ErrorInfo)
+ {
+ MES_parameter mES_Parame = new MES_parameter();
+ try
+ {
+ MES_TaskException Storagelocation = new MES_TaskException();
+ Storagelocation.TransNo = TransNo;
+ Storagelocation.EquipmentType = EquipmentType;
+ Storagelocation.EquipmentNumber = EquipmentNumber;
+ Storagelocation.ErrorInfo = ErrorInfo;
+ mES_Parame = HttpHelper.Post<MES_parameter>(MES_TaskErrorInfoCallback, Storagelocation, "浠诲姟寮傚父");
+ return mES_Parame;
+ }
+ catch (Exception ex)
+ {
+ mES_Parame.Result = "N";
+ mES_Parame.ResultMsg = $"浠诲姟寮傚父锛歐MS绯荤粺璋冨彇澶辫触,鍘熷洜锛歿ex.Message}";
+ return mES_Parame;
+ }
+ }
}
}
--
Gitblit v1.9.3