From aff4845905dd17fb2eca2780f46ab6294b3f9dc1 Mon Sep 17 00:00:00 2001
From: Admin <Admin@ADMIN>
Date: 星期二, 20 一月 2026 13:53:59 +0800
Subject: [PATCH] '联调'
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 286 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 168 insertions(+), 118 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index bd79fea..482a45b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -140,97 +140,121 @@
if (string.IsNullOrEmpty(task.TargetAddress))
{
- int loctype = 0;
- if (task.Roadway == "1" || task.Roadway == "2")
+ if(task.TaskStatus == (int)InTaskStatusEnum.PLC_InExecuting)
{
- if (task.PalletType == "1") loctype = (int)LocationTypeEnum.SmallPallet;
- else if (task.PalletType == "2") loctype = (int)LocationTypeEnum.MediumPallet;
+ int loctype = 0;
+ if (task.Roadway == "1" || task.Roadway == "2")
+ {
+ if (task.PalletType == "1") loctype = (int)LocationTypeEnum.SmallPallet;
+ else if (task.PalletType == "2") loctype = (int)LocationTypeEnum.MediumPallet;
+ }
+ else
+ {
+ loctype = (int)LocationTypeEnum.LargePallet;
+ }
+
+ //鏌ユ壘璐т綅锛屾洿鏂颁换鍔�
+ Dt_LocationInfo dt_Location = _locationInfoService.GetLocation(task.Roadway, loctype);
+ Dt_LocationInfo ShallowCargoHold = _locationInfoService.ShallowGetLocation(dt_Location.RoadwayNo, dt_Location.LocationType, dt_Location.Row, dt_Location.Layer, dt_Location.Column);
+ if (ShallowCargoHold == null) return content.Error($"鏈壘鍒拌璐т綅淇℃伅,璐т綅缂栧彿:{dt_Location.LocationCode}鐨勬祬璐т綅");
+ if (ShallowCargoHold.LocationStatus != (int)LocationStatusEnum.Free) return content.Error($"浠诲姟鍙凤細{task.TaskId},鎵樼洏缂栧彿锛歿task.PalletCode},鏌ユ壘鐨勮揣浣嶆祬璐т綅鏈夎揣锛岃揣浣嶇紪鍙凤細{ShallowCargoHold.LocationCode}");
+
+ if (task.PalletCode[0] == 1 && (dt_Location.RoadwayNo == "1" || dt_Location.RoadwayNo == "2") && dt_Location.Column < 4)
+ {
+ return content.Error($"鏉＄爜涓洪珮鎵樼洏锛屼絾鏄煡鎵剧殑璐т綅瑕佸叆鍦ㄤ綆鎵樼洏涓嬶紝鏁呴殰,鎵樼洏鏉＄爜锛歿task.PalletCode},璐т綅缂栧彿:{dt_Location.LocationCode}");
+ }
+
+
+ Dt_roadwayinfo _Roadwayinfo = _roadWayinfoService.QbtainPlatform(task.Roadway);
+
+ task.TargetAddress = dt_Location.LocationCode;
+ task.CurrentAddress = _Roadwayinfo.InSCStationCode;
+ task.NextAddress = dt_Location.LocationCode;
+ task.TaskStatus = (int)InTaskStatusEnum.PLC_InFinish;
+
+ dt_Location.LocationStatus = (int)LocationStatusEnum.Lock;
+
+ Dt_StockInfo dt_StockInfo = new Dt_StockInfo();
+ dt_StockInfo.PalletCode = task.PalletCode;
+ dt_StockInfo.PalletType = task.PalletType;
+ dt_StockInfo.WarehouseId = task.WarehouseId;
+ dt_StockInfo.LocationCode = dt_Location.LocationCode;
+ dt_StockInfo.StockStatus = (int)StockStatusEmun.鍏ュ簱涓�;
+ dt_StockInfo.Creater = "MWS";
+ dt_StockInfo.CreateDate = DateTime.Now;
+
+ _unitOfWorkManage.BeginTran();
+ _stockInfoService.AddData(dt_StockInfo);
+ _locationInfoService.UpdateData(dt_Location);
+ BaseDal.UpdateData(task);
+ _unitOfWorkManage.CommitTran();
+ return content.OK($"宸叉帴鏀跺叆搴撹緭閫佺嚎瀹屾垚淇℃伅锛屼换鍔″彿锛歿task.TaskId},鎵樼洏缂栧彿锛歿task.PalletCode}");
}
else
{
- loctype = (int)LocationTypeEnum.LargePallet;
+ return content.Error("涓婃姤澶辫触锛屽綋鍓嶄换鍔′笉鏄緭閫佺嚎鎵ц涓紝WCS涓婃姤瀹屾垚澶辫触");
}
- //鏌ユ壘璐т綅锛屾洿鏂颁换鍔�
- Dt_LocationInfo dt_Location = _locationInfoService.GetLocation(task.Roadway, loctype);
- Dt_LocationInfo ShallowCargoHold = _locationInfoService.ShallowGetLocation(dt_Location.RoadwayNo, dt_Location.LocationType, dt_Location.Row, dt_Location.Layer, dt_Location.Column);
- if (ShallowCargoHold == null) return content.Error($"鏈壘鍒拌璐т綅淇℃伅,璐т綅缂栧彿:{dt_Location.LocationCode}鐨勬祬璐т綅");
- if (ShallowCargoHold.LocationStatus != (int)LocationStatusEnum.Free) return content.Error($"浠诲姟鍙凤細{task.TaskId},鎵樼洏缂栧彿锛歿task.PalletCode},鏌ユ壘鐨勮揣浣嶆祬璐т綅鏈夎揣锛岃揣浣嶇紪鍙凤細{ShallowCargoHold.LocationCode}");
-
- if (task.PalletCode[0] == 1 && (dt_Location.RoadwayNo == "1" || dt_Location.RoadwayNo == "2") && dt_Location.Column < 4)
- {
- return content.Error($"鏉＄爜涓洪珮鎵樼洏锛屼絾鏄煡鎵剧殑璐т綅瑕佸叆鍦ㄤ綆鎵樼洏涓嬶紝鏁呴殰,鎵樼洏鏉＄爜锛歿task.PalletCode},璐т綅缂栧彿:{dt_Location.LocationCode}");
- }
-
-
- Dt_roadwayinfo _Roadwayinfo = _roadWayinfoService.QbtainPlatform(task.Roadway);
-
- task.TargetAddress = dt_Location.LocationCode;
- task.CurrentAddress = _Roadwayinfo.InSCStationCode;
- task.NextAddress = dt_Location.LocationCode;
- task.TaskStatus = (int)InTaskStatusEnum.PLC_InFinish;
-
- dt_Location.LocationStatus = (int)LocationStatusEnum.Lock;
-
- Dt_StockInfo dt_StockInfo = new Dt_StockInfo();
- dt_StockInfo.PalletCode = task.PalletCode;
- dt_StockInfo.PalletType = task.PalletType;
- dt_StockInfo.WarehouseId = task.WarehouseId;
- dt_StockInfo.LocationCode = dt_Location.LocationCode;
- dt_StockInfo.StockStatus = (int)StockStatusEmun.鍏ュ簱涓�;
- dt_StockInfo.Creater = "MWS";
- dt_StockInfo.CreateDate = DateTime.Now;
-
- _unitOfWorkManage.BeginTran();
- _stockInfoService.AddData(dt_StockInfo);
- _locationInfoService.UpdateData(dt_Location);
- BaseDal.UpdateData(task);
- _unitOfWorkManage.CommitTran();
- return content.OK($"宸叉帴鏀跺叆搴撹緭閫佺嚎瀹屾垚淇℃伅锛屼换鍔″彿锛歿task.TaskId},鎵樼洏缂栧彿锛歿task.PalletCode}");
+
}
else
{
//鍒ゆ柇鏄惁鏈夎绔欏彴
-
- string Resultplc = MesInTaskStatusEnum.鍏ュ簱瀹屾垚.GetDescription();
- MES_parameter mES_PCLParameter = InStoreDocCallback(task.TaskNum, Resultplc, "鎿嶄綔鎴愬姛", task.PalletCode, task.TargetAddress);
- if (mES_PCLParameter.Result == "Y")
+ if (task.TaskStatus == (int)InTaskStatusEnum.PLC_InExecuting)
{
- task.TaskStatus = (int)InTaskStatusEnum.PLC_InFinish;
- _unitOfWorkManage.BeginTran();
- BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
- _unitOfWorkManage.CommitTran();
- return content.OK($"杈撻�佺嚎浠诲姟宸插弽棣堣嚦涓婃父锛屼换鍔″彿锛歿task.TaskId},鎵樼洏缂栧彿锛歿task.PalletCode}");
+ string Resultplc = MesInTaskStatusEnum.Finish.GetDescription();
+ MES_parameter mES_PCLParameter = InStoreDocCallback(task.TaskNum, Resultplc, "鎿嶄綔鎴愬姛", task.PalletCode, task.TargetAddress);
+ if (mES_PCLParameter.Result == "Y")
+ {
+ task.TaskStatus = (int)InTaskStatusEnum.PLC_InFinish;
+ _unitOfWorkManage.BeginTran();
+ BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
+ _unitOfWorkManage.CommitTran();
+ return content.OK($"杈撻�佺嚎浠诲姟宸插弽棣堣嚦涓婃父锛屼换鍔″彿锛歿task.TaskId},鎵樼洏缂栧彿锛歿task.PalletCode}");
+ }
+ else
+ {
+ return content.Error("涓婁紶MES澶辫触锛屽師鍥狅細" + mES_PCLParameter.ResultMsg);
+ }
}
else
{
- return content.Error("涓婁紶MES澶辫触锛屽師鍥狅細" + mES_PCLParameter.ResultMsg);
+ return content.Error($"涓婃姤澶辫触锛屽綋鍓嶄换鍔′笉鏄緭閫佺嚎鎵ц涓紝WCS涓婃姤瀹屾垚澶辫触锛屼换鍔″彿锛歿task.TaskId},鎵樼洏缂栧彿锛歿task.PalletCode}");
}
+
}
case 2:
- string Resultsc = MesInTaskStatusEnum.鍏ュ簱瀹屾垚.GetDescription();
- //涓婃姤MES浠诲姟瀹屾垚
- MES_parameter mES_Parameter = InStoreDocCallback(task.TaskNum, Resultsc, "鎿嶄綔鎴愬姛", task.PalletCode, task.TargetAddress);
- if (mES_Parameter.Result != "Y")
+ if (task.TaskStatus == (int)InTaskStatusEnum.SC_IntExecuting)
{
- Dt_StockInfo dt_Stockowc = _stockInfoService.Repository.QueryData(x => x.PalletCode == task.PalletCode).FirstOrDefault();
- Dt_LocationInfo dt_LocationInfo=_locationInfoService.Repository.QueryData(x => x.LocationCode == dt_Stockowc.LocationCode).FirstOrDefault();
+ string Resultsc = MesInTaskStatusEnum.Finish.GetDescription();
+ //涓婃姤MES浠诲姟瀹屾垚
+ MES_parameter mES_Parameter = InStoreDocCallback(task.TaskNum, Resultsc, "鎿嶄綔鎴愬姛", task.PalletCode, task.TargetAddress);
+ if (mES_Parameter.Result == "Y")
+ {
+ Dt_StockInfo dt_Stockowc = _stockInfoService.Repository.QueryData(x => x.PalletCode == task.PalletCode).FirstOrDefault();
+ Dt_LocationInfo dt_LocationInfo = _locationInfoService.Repository.QueryData(x => x.LocationCode == dt_Stockowc.LocationCode).FirstOrDefault();
- dt_Stockowc.StockStatus = (int)StockStatusEmun.宸插叆搴�;
- dt_LocationInfo.LocationStatus = (int)LocationStatusEnum.InStock;
- task.TaskStatus = (int)InTaskStatusEnum.InFinish;
+ dt_Stockowc.StockStatus = (int)StockStatusEmun.宸插叆搴�;
+ dt_LocationInfo.LocationStatus = (int)LocationStatusEnum.InStock;
+ task.TaskStatus = (int)InTaskStatusEnum.InFinish;
- _unitOfWorkManage.BeginTran();
- _stockInfoService.UpdateData(dt_Stockowc);
- _locationInfoService.UpdateData(dt_LocationInfo);
- BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
- _unitOfWorkManage.CommitTran();
- return content.OK($"宸叉帴鏀跺叆搴撳爢鍨涙満瀹屾垚淇℃伅锛屼换鍔″彿锛歿task.TaskId},鎵樼洏缂栧彿锛歿task.PalletCode}");
+ _unitOfWorkManage.BeginTran();
+ _stockInfoService.UpdateData(dt_Stockowc);
+ _locationInfoService.UpdateData(dt_LocationInfo);
+ BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
+ _unitOfWorkManage.CommitTran();
+ return content.OK($"宸叉帴鏀跺叆搴撳爢鍨涙満瀹屾垚淇℃伅锛屼换鍔″彿锛歿task.TaskId},鎵樼洏缂栧彿锛歿task.PalletCode}");
+ }
+ else
+ {
+ return content.Error("涓婁紶MES澶辫触锛屽師鍥狅細" + mES_Parameter.ResultMsg);
+ }
}
else
{
- return content.Error("涓婁紶MES澶辫触锛屽師鍥狅細" + mES_Parameter.ResultMsg);
+ return content.Error($"涓婃姤澶辫触锛屽綋鍓嶄换鍔′笉鏄爢鍨涙満鎵ц涓紝WCS涓婃姤瀹屾垚澶辫触锛屼换鍔″彿锛歿task.TaskId},鎵樼洏缂栧彿锛歿task.PalletCode}");
}
+
default:
return content.Error($"WCS涓婃姤绫诲瀷閿欒锛歿wcsTaskType}");
}
@@ -250,46 +274,64 @@
switch (wcsTaskType)
{
case 1:
- string Resultplc = MesOutTaskStatusEnum.鍒拌揪鐩殑鍦�.GetDescription();
- //涓婃姤MES浠诲姟瀹屾垚
- MES_parameter mES_Parameter = OutStoreDocCallback(task.TaskNum, Resultplc, "鎿嶄綔鎴愬姛");
- if (mES_Parameter.Result != "Y")
+ if(task.TaskStatus == (int)OutTaskStatusEnum.PLC_OutExecuting)
{
- task.TaskStatus = (int)OutTaskStatusEnum.PLC_OutFinish;
- BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
- return content.OK($"宸叉帴鏀跺嚭搴撹緭閫佺嚎瀹屾垚淇℃伅锛屼换鍔″彿锛歿task.TaskId},鎵樼洏缂栧彿锛歿task.PalletCode}");
+ string Resultplc = MesOutTaskStatusEnum.Finish.GetDescription();
+ //涓婃姤MES浠诲姟瀹屾垚
+ MES_parameter mES_Parameter = OutStoreDocCallback(task.TaskNum, Resultplc, "鎿嶄綔鎴愬姛");
+ if (mES_Parameter.Result == "Y")
+ {
+ task.TaskStatus = (int)OutTaskStatusEnum.PLC_OutFinish;
+ BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
+ return content.OK($"宸叉帴鏀跺嚭搴撹緭閫佺嚎瀹屾垚淇℃伅锛屼换鍔″彿锛歿task.TaskId},鎵樼洏缂栧彿锛歿task.PalletCode}");
+ }
+ else
+ {
+ return content.Error("涓婁紶MES澶辫触锛屽師鍥狅細" + mES_Parameter.ResultMsg);
+ }
+
}
else
{
- return content.Error("涓婁紶MES澶辫触锛屽師鍥狅細" + mES_Parameter.ResultMsg);
+ return content.Error($"涓婃姤澶辫触锛學MS褰撳墠浠诲姟涓嶆槸杈撻�佺嚎鎵ц涓紝WCS涓婃姤瀹屾垚澶辫触锛屼换鍔″彿锛歿task.TaskId},鎵樼洏缂栧彿锛歿task.PalletCode}");
}
+
case 2:
- //鑾峰彇瀵瑰簲PLC绔欏彴淇℃伅
- Dt_roadwayinfo _Roadwayinfo = _roadWayinfoService.QbtainPlatform(task.Roadway);
- task.CurrentAddress = _Roadwayinfo.OutStationCode;
- task.NextAddress = task.TargetAddress;
- task.TaskStatus = (int)OutTaskStatusEnum.SC_OutFinish;
- Dt_StockInfo dt_Stockowc = _stockInfoService.Repository.QueryData(x => x.PalletCode == task.PalletCode).FirstOrDefault();
- Dt_LocationInfo dt_LocationInfo = _locationInfoService.Repository.QueryData(x => x.LocationCode == dt_Stockowc.LocationCode).FirstOrDefault();
- dt_LocationInfo.LocationStatus = (int)LocationStatusEnum.Free;
-
- string Result = MesOutTaskStatusEnum.鍑哄簱瀹屾垚.GetDescription();
- //璋冨彇涓婃父绯荤粺鍙嶉寮�濮嬩换鍔�
- MES_parameter mES_SCParameter = OutStoreDocCallback(task.TaskNum, Result, "鎿嶄綔鎴愬姛");
- if (mES_SCParameter.Result != "Y")
+ if (task.TaskStatus == (int)OutTaskStatusEnum.SC_OutExecuting)
{
- _unitOfWorkManage.BeginTran();
- _stockInfoService.DeleteData(dt_Stockowc);
- _locationInfoService.UpdateData(dt_LocationInfo);
- BaseDal.UpdateData(task);
- _unitOfWorkManage.CommitTran();
- return content.OK($"宸叉帴鏀跺嚭搴撳爢鍨涙満瀹屾垚淇℃伅锛屼换鍔″彿锛歿task.TaskId},鎵樼洏缂栧彿锛歿task.PalletCode}");
+ //鑾峰彇瀵瑰簲PLC绔欏彴淇℃伅
+ Dt_roadwayinfo _Roadwayinfo = _roadWayinfoService.QbtainPlatform(task.Roadway);
+ task.CurrentAddress = _Roadwayinfo.OutStationCode;
+ task.NextAddress = task.TargetAddress;
+ task.TaskStatus = (int)OutTaskStatusEnum.SC_OutFinish;
+
+ Dt_StockInfo dt_Stockowc = _stockInfoService.Repository.QueryData(x => x.PalletCode == task.PalletCode).FirstOrDefault();
+ Dt_LocationInfo dt_LocationInfo = _locationInfoService.Repository.QueryData(x => x.LocationCode == dt_Stockowc.LocationCode).FirstOrDefault();
+ dt_LocationInfo.LocationStatus = (int)LocationStatusEnum.Free;
+
+ string Result = MesOutTaskStatusEnum.Outstore.GetDescription();
+ //璋冨彇涓婃父绯荤粺鍙嶉寮�濮嬩换鍔�
+ MES_parameter mES_SCParameter = OutStoreDocCallback(task.TaskNum, Result, "鎿嶄綔鎴愬姛");
+ if (mES_SCParameter.Result == "Y")
+ {
+ _unitOfWorkManage.BeginTran();
+ _stockInfoService.DeleteData(dt_Stockowc);
+ _locationInfoService.UpdateData(dt_LocationInfo);
+ BaseDal.UpdateData(task);
+ _unitOfWorkManage.CommitTran();
+ return content.OK($"宸叉帴鏀跺嚭搴撳爢鍨涙満瀹屾垚淇℃伅锛屼换鍔″彿锛歿task.TaskId},鎵樼洏缂栧彿锛歿task.PalletCode}");
+ }
+ else
+ {
+ return content.Error("涓婁紶MES澶辫触锛屽師鍥狅細" + mES_SCParameter.ResultMsg);
+ }
}
else
{
- return content.Error("涓婁紶MES澶辫触锛屽師鍥狅細" + mES_SCParameter.ResultMsg);
+ return content.Error($"涓婃姤澶辫触锛學MS褰撳墠浠诲姟涓嶆槸鍫嗗灈鏈烘墽琛屼腑锛學CS涓婃姤瀹屾垚澶辫触锛屼换鍔″彿锛歿task.TaskId},鎵樼洏缂栧彿锛歿task.PalletCode}");
}
+
default:
return content.Error($"WCS涓婃姤绫诲瀷閿欒锛歿wcsTaskType}");
}
@@ -308,47 +350,55 @@
{
if (wcsTaskType == 2)
{
- //涓婃姤MES浠诲姟瀹屾垚
- MES_parameter mES_Parameter = AbnormalStorageLocation(task.PalletCode, task.SourceAddress, task.TargetAddress);
- if (mES_Parameter.Result == "Y")
+ if(task.TaskStatus == (int)RelocationTaskStatusEnum.RelocationExecuting)
{
- Dt_LocationInfo OriginalLocation = _locationInfoService.Repository.QueryData(x => x.LocationCode == task.SourceAddress).FirstOrDefault();
- Dt_LocationInfo NewLocation = _locationInfoService.Repository.QueryData(x => x.LocationCode == task.TargetAddress).FirstOrDefault();
- Dt_StockInfo dt_StockInfo = _stockInfoService.Repository.QueryData(x => x.LocationCode == task.TargetAddress).FirstOrDefault();
+ //涓婃姤MES浠诲姟瀹屾垚
+ MES_parameter mES_Parameter = AbnormalStorageLocation(task.PalletCode, task.SourceAddress, task.TargetAddress);
+ if (mES_Parameter.Result == "Y")
+ {
+ Dt_LocationInfo OriginalLocation = _locationInfoService.Repository.QueryData(x => x.LocationCode == task.SourceAddress).FirstOrDefault();
+ Dt_LocationInfo NewLocation = _locationInfoService.Repository.QueryData(x => x.LocationCode == task.TargetAddress).FirstOrDefault();
+ Dt_StockInfo dt_StockInfo = _stockInfoService.Repository.QueryData(x => x.LocationCode == task.SourceAddress).FirstOrDefault();
- List<Dt_LocationInfo> dt_Locations = new List<Dt_LocationInfo>();
+ List<Dt_LocationInfo> dt_Locations = new List<Dt_LocationInfo>();
- OriginalLocation.LocationStatus = (int)LocationStatusEnum.Free;
- NewLocation.LocationStatus = (int)LocationStatusEnum.InStock;
- dt_StockInfo.LocationCode = NewLocation.LocationCode;
- dt_StockInfo.StockStatus = (int)StockStatusEmun.宸插叆搴�;
- task.TaskStatus = (int)RelocationTaskStatusEnum.RelocationFinish;
+ OriginalLocation.LocationStatus = (int)LocationStatusEnum.Free;
+ NewLocation.LocationStatus = (int)LocationStatusEnum.InStock;
+ dt_StockInfo.LocationCode = NewLocation.LocationCode;
+ dt_StockInfo.StockStatus = (int)StockStatusEmun.宸插叆搴�;
+ task.TaskStatus = (int)RelocationTaskStatusEnum.RelocationFinish;
- dt_Locations.Add(OriginalLocation);
- dt_Locations.Add(NewLocation);
+ dt_Locations.Add(OriginalLocation);
+ dt_Locations.Add(NewLocation);
- _unitOfWorkManage.BeginTran();
- _locationInfoService.UpdateData(dt_Locations);
- _stockInfoService.UpdateData(dt_StockInfo);
- BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
- _unitOfWorkManage.CommitTran();
+ _unitOfWorkManage.BeginTran();
+ _locationInfoService.UpdateData(dt_Locations);
+ _stockInfoService.UpdateData(dt_StockInfo);
+ BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
+ _unitOfWorkManage.CommitTran();
- return WebResponseContent.Instance.OK($"宸叉帴鏀剁Щ搴撳爢鍨涙満瀹屾垚淇℃伅锛屼换鍔″彿锛歿task.TaskId},鎵樼洏缂栧彿锛歿task.PalletCode}");
+ return responseContent.OK($"宸叉帴鏀剁Щ搴撳爢鍨涙満瀹屾垚淇℃伅锛屼换鍔″彿锛歿task.TaskId},鎵樼洏缂栧彿锛歿task.PalletCode}");
+ }
+ else
+ {
+ return responseContent.Error("涓婁紶MES澶辫触锛屽師鍥狅細" + mES_Parameter.ResultMsg);
+ }
}
else
{
- return responseContent.Error("涓婁紶MES澶辫触锛屽師鍥狅細" + mES_Parameter.ResultMsg);
+ return responseContent.Error($"涓婃姤澶辫触锛學MS褰撳墠浠诲姟涓嶆槸鍫嗗灈鏈烘墽琛屼腑锛學CS涓婃姤瀹屾垚澶辫触锛屼换鍔″彿锛歿task.TaskId},鎵樼洏缂栧彿锛歿task.PalletCode}");
}
+
}
else
{
- return WebResponseContent.Instance.Error($"WCS涓婃姤绫诲瀷閿欒锛歿wcsTaskType}");
+ return responseContent.Error($"WCS涓婃姤绫诲瀷閿欒锛歿wcsTaskType}");
}
}
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
- return WebResponseContent.Instance.Error($"WMS绯荤粺閿欒锛屽師鍥狅細{ex.Message}");
+ return responseContent.Error($"WMS绯荤粺閿欒锛屽師鍥狅細{ex.Message}");
}
}
--
Gitblit v1.9.3