From b593c2d4ada3244f4a256ca18a23c3fef609f234 Mon Sep 17 00:00:00 2001
From: Admin <Admin@ADMIN>
Date: 星期日, 18 一月 2026 17:31:48 +0800
Subject: [PATCH] 最新

---
 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WCSTaskService.cs |   61 ++++++++++++++++++++++++++++++
 1 files changed, 61 insertions(+), 0 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 3f78208..1c18ff5 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"
@@ -10,6 +10,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using WIDESEA_Common.Log;
+using WIDESEA_Common.TaskEnum;
 using WIDESEA_Core;
 using WIDESEA_Core.Enums;
 using WIDESEA_Core.Helper;
@@ -64,6 +65,7 @@
                 wcstaskinfo.FromPoint = FromPoint;
                 wcstaskinfo.ToPoint = ToPoint;
                 wcstaskinfo.ToStation = ToStation;
+                Console.WriteLine(wcstaskinfo.ToJson());
                 WCS_Parame = HttpHelper.Post<WCSginseng>(WCS_SendStackerTask, wcstaskinfo, "鍫嗗灈鏈轰换鍔′笅鍙�");
                 return WCS_Parame;
             }
@@ -75,5 +77,64 @@
                 return WCS_Parame;
             }
         }
+
+        //WCS鑾峰彇浠诲姟杩涜鍙嶉
+        public WebResponseContent PalletInboundTask(WCSTaskDTO wCSTask)
+        {
+            WebResponseContent webResponse = new WebResponseContent();
+            try
+            {
+                Dt_Task task = BaseDal.QueryData(x => x.PalletCode == wCSTask.PalletCode).FirstOrDefault();
+                if (task == null)
+                    return WebResponseContent.Instance.Error($"鏈壘鍒颁换鍔′俊鎭紝鎵樼洏鏉$爜锛歿wCSTask.PalletCode}");
+
+                if (task.PalletType != wCSTask.ContainerType.ToString())
+                {
+                    return WebResponseContent.Instance.Error($"鎵樼洏绫诲瀷涓嶅尮閰嶏紝褰撳墠浠诲姟涓墭鐩樼被鍨嬩负:{task.PalletType}锛學CS涓婃姤绫诲瀷涓猴細{wCSTask.ContainerType}锛屾墭鐩樻潯鐮侊細{wCSTask.PalletCode}");
+                }
+
+                if (task.TargetAddress!="" && task.TargetAddress!=null)
+                {
+                    int taskcount = BaseDal.QueryData(x => x.TargetAddress == task.TargetAddress && x.PalletType != task.PalletCode).Count();
+                    if (taskcount > 0)
+                        return WebResponseContent.Instance.Error($"褰撳墠宸叉湁鍘昏鐩爣浣嶇疆鐨勪换鍔′簡锛屼笉鍙笅鍙戯紒锛侊紒");
+                }
+                
+
+                if (task.TaskStatus == (int)InTaskStatusEnum.InNew)
+                {
+                    task.TaskStatus = (int)InTaskStatusEnum.PLC_InExecuting;
+                    MES_parameter mES_Parameter = InStoreDocCallback(task.TaskNum, "Start", "鎿嶄綔鎴愬姛", task.PalletCode, "");
+                    if (mES_Parameter.Result != "Y")    //璁板緱鏀瑰洖鏉�
+                    {
+                        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 = "";
+                        //杩涜淇敼鏁版嵁搴�
+                        BaseDal.UpdateData(task);
+                        return webResponse.OK(data: wcstaskinfo);
+                    }
+                    else
+                    {
+                        return webResponse.Error("涓婁紶MES澶辫触锛屽師鍥狅細" + mES_Parameter.ResultMsg);
+                    }
+                }
+                else
+                {
+                    return webResponse.Error($"涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛屽綋鍓嶆墭鐩樻潯鐮侊細{task.PalletCode},涓嶅湪鏂板缓涓紝涓嶅彲閲嶅涓嬪彂");
+                }
+            }
+            catch (Exception ex)
+            {
+                return webResponse.Error("浠诲姟鑾峰彇澶辫触锛寃ms绯荤粺鏁呴殰锛屽師鍥狅細" + ex.Message);
+            }
+        }
+
     }
 }

--
Gitblit v1.9.3