From a93b0e99036c24b9bd58c79bf5e7364b1ba28bae Mon Sep 17 00:00:00 2001
From: 杨前锦 <1010338399@qq.com>
Date: 星期二, 01 七月 2025 16:02:33 +0800
Subject: [PATCH] 福建佳通-流程优化

---
 HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/process/TaskProcess.cs |   70 +++++++++++++++++++++++++++++------
 1 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/process/TaskProcess.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/process/TaskProcess.cs
index 95fb466..0cbfa0f 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/process/TaskProcess.cs
@@ -9,6 +9,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Security.Cryptography;
+using static HH.WCS.Mobox3.YNJT_PT.dispatch.WCSDispatch;
 
 namespace HH.WCS.Mobox3.YNJT_PT.process {
     internal class TaskProcess {
@@ -243,22 +244,67 @@
                 var startLoc = LocationHelper.GetLocation(mst.S_START_LOC);
                 var endLoc = LocationHelper.GetLocation(mst.S_END_LOC);
 
-                if (mst.S_SCHEDULE_TYPE == "NDC") {
-                 
-                }
-                else if (mst.S_SCHEDULE_TYPE == "鏉ゥ") {
-                    //璋冪涓夋柟鎺ュ彛
-                    var model = new HanAo.TaskInfoModel
+                if (mst.S_SCHEDULE_TYPE == "AGV")
+                {
+                    AddOrderNewModel model = new AddOrderNewModel()
                     {
-                        requestPk = mst.S_CODE,
-                        frmPos = mst.S_START_LOC,
-                        toPos = mst.S_END_LOC,
-                        trkType = mst.S_OP_NAME == "鍏ュ簱" ? "1" : "2",
-                        contNo = mst.S_CNTR_CODE
+                        ts_no = 1,
+                        pri = 1,
+                        task_no = mst.S_CODE
                     };
-                    if (HanAo.CreateOrder(model)) {
+                    List<Param> paramList = new List<Param>();
+                    var dic = new Dictionary<string, string>();
+                    dic.Add("IKey", mst.S_CODE);
+                    dic.Add("From", startLoc.S_CODE);
+                    dic.Add("To", endLoc.S_CODE);
+                    dic.Add("FUNC", "0");
+                    if (mst.S_TYPE.Contains("鍏ュ簱"))
+                    {
+                        dic.Add("DATA", "300");
+                    }
+                    else
+                    {
+                        dic.Add("DATA", "0");
+                    }
+                    dic.Add("Ctype", "0");
+                    foreach (var item in dic)
+                    {
+                        Param param = new Param
+                        {
+                            name = item.Key,
+                            value = item.Value,
+                        };
+                        paramList.Add(param);
+                    }
+                    model.param = paramList;
+                    LogHelper.Info($"鍚慉GV涓嬪彂浠诲姟锛屼换鍔″弬鏁帮細{model}", "WMS");
+                    var res = NDCApi.AddOrderNew(model);
+                    if (res != null && res.err_code == 0 || true)
+                    {
+                        //鎺ㄩ�鎴愬姛锛屼慨鏀逛换鍔′紭鍏堢骇
                         mst.N_B_STATE = 1;
                         WCSHelper.UpdateStatus(mst);
+                        result = true;
+                    }
+                }
+                else if (mst.S_SCHEDULE_TYPE == "WCS")
+                {
+                    SendTaskModel sendTask = new SendTaskModel()
+                    {
+                        taskNo = mst.S_CODE,
+                        taskType = mst.S_TYPE.Contains("鍏ュ簱") ? "1" : "2",
+                        from = mst.S_START_LOC,
+                        to = mst.S_END_LOC,
+                        cntrNo = mst.S_CNTR_CODE,
+                    };
+                    LogHelper.Info($"鍚慦CS涓嬪彂浠诲姟锛屼换鍔″弬鏁帮細{sendTask}", "WMS");
+                    var bo = WCSDispatch.sendTask(sendTask);
+                    if (true || bo)
+                    {
+                        //鎺ㄩ�鎴愬姛锛屼慨鏀逛换鍔′紭鍏堢骇
+                        mst.N_B_STATE = 1;
+                        WCSHelper.UpdateStatus(mst);
+                        result = true;
                     }
                 }
             }

--
Gitblit v1.9.1