From 081df17b8cc4a6e7e4f4e1e1887f24810e3ec2f9 Mon Sep 17 00:00:00 2001
From: zhao
Date: 星期五, 02 七月 2021 09:25:37 +0800
Subject: [PATCH] 成型机出入库

---
 HH.WMS.BLL/Interface/OtherSysApi.cs |   46 ++++++++++++++++++++++++++++++++++------------
 1 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/HH.WMS.BLL/Interface/OtherSysApi.cs b/HH.WMS.BLL/Interface/OtherSysApi.cs
index 4ae6407..2875ced 100644
--- a/HH.WMS.BLL/Interface/OtherSysApi.cs
+++ b/HH.WMS.BLL/Interface/OtherSysApi.cs
@@ -462,22 +462,39 @@
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
-        public OperateResult SendWcsCreateTask(TN_WM_TASKEntity model, ConnectBitDto bit)
+        public OperateResult SendWcsCreateTask(TN_WM_TASKEntity model)
         {
             List<JObject> sendParams = new List<JObject>();
             JObject sendParam = new JObject();
-            sendParam.Add("taskNo", model.CN_S_TASK_NO);
-            sendParam.Add("lpnNo", model.CN_S_TRAY_CODE);
-            sendParam.Add("taskType", model.CN_S_TASK_TYPE == Constants.In?"10": model.CN_S_TASK_TYPE == Constants.Out?"20":"");
-            sendParam.Add("taskPrty", model.CN_N_PRIORITY);
-            sendParam.Add("laneNo", bit.tunnel);
-            sendParam.Add("frmLocate", model.CN_S_START_BIT);
-            sendParam.Add("toLocate", model.CN_S_END_BIT);
-            sendParam.Add("wmsOrdeNO", "");
-            sendParam.Add("createTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+
+            JObject sendData = new JObject();
+            // 鎵樼洏缂栫爜
+            sendData.Add("PalletCode", model.CN_S_TRAY_CODE);
+            // 浠诲姟缂栫爜
+            sendData.Add("TaskCode", model.CN_S_TASK_NO);
+            // 璧峰璁惧鍙�+            sendData.Add("EquipmentS_Id", "");
+            // 鐩殑璁惧鍙�+            sendData.Add("EquipmentE_Id", "");
+            // 璧峰璐т綅缂栫爜
+            sendData.Add("PositionS_Id", model.CN_S_START_BIT);
+            // 鐩殑璐т綅缂栫爜
+            sendData.Add("PositionE_Id", model.CN_S_END_BIT);
+            // 璧峰娣卞害
+            sendData.Add("StartDepth", "");
+            // 鐩殑娣卞害
+            sendData.Add("EndDepth", "1");
+            sendData.Add("Remarks", "");
+            sendData.Add("Description", "");
+            //璇锋眰绫诲瀷
+            sendParam.Add("request_type", model.CN_S_TASK_TYPE == Constants.In ? "10" : model.CN_S_TASK_TYPE == Constants.Out ? "20" : "");
+            //璇锋眰鏁版嵁闆嗗悎
+            sendParam.Add("request_data", sendData);
+            
             sendParams.Add(sendParam);
-            string sendData = JsonConvert.SerializeObject(sendParams);
-            Log.Info("===>鍙戦�浠诲姟缁橶CS", sendData);
+
+            string sendDatas = JsonConvert.SerializeObject(sendParams);
+            Log.Info("===>鍙戦�浠诲姟缁橶CS", sendDatas);
             string postOmsData = JsonConvert.SerializeObject(sendParams);
             string result = WebApiManager.HttpWcs_Post("api/InformWcs/SendTask", postOmsData);
             Log.Info("===>WCS杩斿洖缁撴灉", result);
@@ -504,4 +521,9 @@
             }
         }
     }
+
+    public class WcsCreateTaskParam
+    {
+        public string PalletCode;
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.1