From 2046dbcbb6e69a2460c2c37ca9e25b7ffe1d1d29 Mon Sep 17 00:00:00 2001
From: Admin <Admin@ADMIN>
Date: 星期一, 26 一月 2026 12:38:33 +0800
Subject: [PATCH] 出库
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WCSTaskService.cs | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WCSTaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WCSTaskService.cs"
index fbd9267..5174a4a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WCSTaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WCSTaskService.cs"
@@ -88,7 +88,7 @@
public WebResponseContent PalletInboundTask(WCSTaskDTO wCSTask)
{
- WriteLog.Write_Log("杈撻�佺嚎璇锋眰鍏ュ簱", $"浠诲姟淇℃伅", "鎺ユ敹鍙傛暟", $"鍙傛暟锛歿wCSTask.ToJson()}");
+ WriteLog.Write_Log("WCS_杈撻�佺嚎璇锋眰鍏ュ簱", $"浠诲姟淇℃伅", "鎺ユ敹鍙傛暟", $"鍙傛暟锛歿wCSTask.ToJson()}");
WebResponseContent webResponse = new WebResponseContent();
try
{
@@ -100,7 +100,21 @@
{
return webResponse.Error($"鎵樼洏绫诲瀷涓嶅尮閰嶏紝褰撳墠浠诲姟涓墭鐩樼被鍨嬩负:{task.PalletType}锛學CS涓婃姤绫诲瀷涓猴細{wCSTask.ContainerType}锛屾墭鐩樻潯鐮侊細{wCSTask.PalletCode}");
}
-
+ // 浠诲姟閲嶅彂
+ if (task.TaskStatus == (int)InTaskStatusEnum.PLC_InExecuting)
+ {
+ WCStask wcstaskinfo = new WCStask();
+ wcstaskinfo.TaskId = task.TaskId;
+ wcstaskinfo.AreaNo = int.Parse(task.Roadway);
+ wcstaskinfo.TransNo = task.TaskNum;
+ wcstaskinfo.ContainerNo = task.PalletCode;
+ wcstaskinfo.ContainerType = int.Parse(task.PalletType);
+ wcstaskinfo.FromPoint = wCSTask.FromPoint;
+ wcstaskinfo.ToPoint = task.NextAddress;
+ wcstaskinfo.ToStation = "";
+ WriteLog.Write_Log("WCS_杈撻�佺嚎璇锋眰鍏ュ簱", $"浠诲姟淇℃伅", "杩斿洖杈撻�佺嚎浠诲姟淇℃伅", $"杩斿洖缁欒緭閫佺嚎鐨勪换鍔′俊鎭細{wcstaskinfo.ToJson()}");
+ return webResponse.OK(data: wcstaskinfo);
+ }
if (task.TargetAddress!="" && task.TargetAddress!=null)
{
int taskcount = BaseDal.QueryData(x => x.TargetAddress == task.TargetAddress && x.PalletCode != task.PalletCode).Count();
@@ -108,8 +122,8 @@
return webResponse.Error($"褰撳墠宸叉湁鍘昏鐩爣浣嶇疆鐨勪换鍔′簡锛屼笉鍙笅鍙戯紒锛侊紒");
}
-
- if (task.TaskStatus == (int)InTaskStatusEnum.InNew)
+ // 涓婁紶EMS
+ if (task.TaskStatus == (int)InTaskStatusEnum.InNew)
{
task.TaskStatus = (int)InTaskStatusEnum.PLC_InExecuting;
MES_parameter mES_Parameter = InStoreDocCallback(task.TaskNum, "Start", "鎿嶄綔鎴愬姛", task.PalletCode, "");
@@ -127,11 +141,12 @@
//杩涜淇敼鏁版嵁搴�
BaseDal.UpdateData(task);
- WriteLog.Write_Log("杈撻�佺嚎璇锋眰鍏ュ簱", $"浠诲姟淇℃伅", "杩斿洖杈撻�佺嚎浠诲姟淇℃伅", $"杩斿洖缁欒緭閫佺嚎鐨勪换鍔′俊鎭細{wcstaskinfo.ToJson()}");
+ WriteLog.Write_Log("WCS_杈撻�佺嚎璇锋眰鍏ュ簱", $"浠诲姟淇℃伅", "杩斿洖杈撻�佺嚎浠诲姟淇℃伅", $"杩斿洖缁欒緭閫佺嚎鐨勪换鍔′俊鎭細{wcstaskinfo.ToJson()}");
return webResponse.OK(data: wcstaskinfo);
}
else
{
+
return webResponse.Error("涓婁紶MES澶辫触锛屽師鍥狅細" + mES_Parameter.ResultMsg);
}
}
@@ -142,7 +157,7 @@
}
catch (Exception ex)
{
- WriteLog.Write_Log("杈撻�佺嚎璇锋眰鍏ュ簱", $"浠诲姟淇℃伅", "澶辫触", $"浠诲姟鑾峰彇澶辫触锛寃ms绯荤粺鏁呴殰锛屽師鍥狅細{ex.Message}");
+ WriteLog.Write_Log("WCS_杈撻�佺嚎璇锋眰鍏ュ簱", $"浠诲姟淇℃伅", "澶辫触", $"浠诲姟鑾峰彇澶辫触锛寃ms绯荤粺鏁呴殰锛屽師鍥狅細{ex.Message}");
return webResponse.Error("浠诲姟鑾峰彇澶辫触锛寃ms绯荤粺鏁呴殰锛屽師鍥狅細" + ex.Message);
}
}
--
Gitblit v1.9.3