From ad678d0d42f126e5c0d0e2f22f373d9727fb37a5 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期四, 19 六月 2025 17:23:54 +0800
Subject: [PATCH] 111

---
 HH.WCS.Mobox3.NongFuLinZhi/api/ApiHelper.cs |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/HH.WCS.Mobox3.NongFuLinZhi/api/ApiHelper.cs b/HH.WCS.Mobox3.NongFuLinZhi/api/ApiHelper.cs
index fb94dfa..83a590a 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/api/ApiHelper.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/api/ApiHelper.cs
@@ -294,17 +294,11 @@
             db.Updateable(task).UpdateColumns(it => new { it.S_NOTE }).ExecuteCommand();
         }
 
-
-        
-
-     
-
-        
         internal static WeiLiResult CancelOrder(CancelOrderModel model)
         {
             WeiLiResult result = new WeiLiResult();
             var db = new SqlHelper<object>().GetInstance();
-            var tasks = db.Queryable<WCSTask>().Where(a => a.S_OP_CODE == model.orderNo).ToList();
+            var tasks = db.Queryable<WCSTask>().Where(a => a.S_OP_CODE == model.task_no).ToList();
             if (tasks.Count >= 1)
             {
                 //娴佺▼浠诲姟鏁伴噺鎵ц瓒呰繃涓�潯 浠诲姟涓嶅厑璁稿彇娑�@@ -312,7 +306,7 @@
                 result.msg = "娴佺▼浠诲姟鎵ц涓�涓嶅厑璁稿彇娑�;
                 return result;
             }
-            var task = db.Queryable<WCSTask>().Where(a => a.S_OP_CODE == model.orderNo).OrderByDescending(a => a.T_CREATE).First();
+            var task = db.Queryable<WCSTask>().Where(a => a.S_OP_CODE == model.task_no).OrderByDescending(a => a.T_CREATE).First();
             if (task != null)
             {
                 if (WCSHelper.CheckActionRecordExist(task.S_CODE, 4))
@@ -324,7 +318,7 @@
                 if (task.N_B_STATE == 0)
                 {
                     //绛夊緟鐩存帴淇敼鐘舵�涓哄彇娑�-                    WCSHelper.UpdateStatus(model.orderNo, 5);
+                    WCSHelper.UpdateStatus(model.task_no, 5);
                     //result.msg = "浠诲姟绛夊緟锛岀洿鎺ュ彇娑�;
                 }
                 else if (task.N_B_STATE != 3 && task.N_B_STATE != 4)
@@ -336,7 +330,8 @@
                     else
                     {
                         //宸叉帹閫佷絾鏄病鏈夊畬鎴愭垨鑰呭彇娑堬紝閫氱煡hosttoagv
-                        NDCHelper.Cancel(task.S_CODE.Trim());
+                        //NDCHelper.Cancel(task.S_CODE.Trim());
+                        NDCApi.CancelOrder(task.S_CODE.Trim());
                         //result.msg = "浠诲姟鍙栨秷宸茬粡鍙戦�缁欏皬杞�;
                     }
                 }
@@ -379,7 +374,8 @@
                     else
                     {
                         //閫氱煡鏉弶淇敼浼樺厛绾�-                        NDCHelper.Cancel(task.S_CODE.Trim());
+                        //NDCHelper.Cancel(task.S_CODE.Trim());
+                        NDCApi.CancelOrder(task.S_CODE.Trim());
                         result.msg = "淇敼浼樺厛绾ф垚鍔�;
                     }
                 }

--
Gitblit v1.9.1