From 3865194441f1e1da34c0be9034d86c8d0d68706c Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期五, 04 七月 2025 17:26:23 +0800
Subject: [PATCH] 接口调用中间表开发

---
 HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/MoboxController.cs |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/MoboxController.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/MoboxController.cs
index 9b97e0e..c09e9be 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/MoboxController.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/MoboxController.cs
@@ -16,9 +16,6 @@
     /// </summary>
     public class MoboxController : System.Web.Http.ApiController
     {
-
-
-
         /// <summary>
         /// 浠诲姟鍙栨秷锛堢洰鍓嶆敮鎸乶dc锛�         /// </summary>
@@ -39,17 +36,18 @@
                     LogHelper.Info(result.msg);
                     return result;
                 }
-                if (taskWCS.N_B_STATE == 2)
+                if (taskWCS.N_B_STATE == 3)
                 {
                     result.code = "2";
                     result.msg = $"璇ヤ换鍔″彿锛歿model.TaskNo}锛屽凡瀹屾垚鏃犻渶鍙栨秷";
+            
                     LogHelper.Info(result.msg);
                     return result;
                 }
                 var res = NDCApi.CancelOrder(model.TaskNo);//鍙栨秷鍛戒护锛岄粯璁ゅ己鍒跺彇娑�                 if (res.err_code == 0)
                 {
-                    taskWCS.N_B_STATE = 7;
+                    taskWCS.N_B_STATE = 4;
                     taskWCS.S_B_STATE = "鍙栨秷";
                     taskWCS.T_MODIFY = System.DateTime.Now;
                     db.Updateable<WCSTask>(taskWCS).ExecuteCommand();
@@ -62,6 +60,11 @@
                 else
                 {
                     LogHelper.Info($"璇ヤ换鍔″彿锛歿model.TaskNo}锛屽彇娑堝懡浠ゅ凡鍙戦�锛岀粨鏋滐細{JsonConvert.SerializeObject(res)}");
+                    //浠诲姟灏忚溅宸茬粡鍙栨秷锛屽崟鏂归潰澶勭悊鍙栨秷
+                    taskWCS.N_B_STATE = 4;
+                    taskWCS.S_B_STATE = "鍙栨秷";
+                    taskWCS.T_MODIFY = System.DateTime.Now;
+                    db.Updateable<WCSTask>(taskWCS).ExecuteCommand();
                     result.code = res.err_code.ToString();
                     result.msg = res.err_msg;
                     return result;
@@ -102,6 +105,20 @@
             return result;
         }
 
-       
+        /// <summary>
+        /// 璁惧鐘舵�涓婃姤
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public DeviceInfoModel DeviceInfo()
+        {
+            DeviceInfoModel result = new DeviceInfoModel();
+            //LogHelper.Info("UploadLoc 鎺ユ敹锛� + JsonConvert.SerializeObject(model));
+           
+            result = ApiHelper.Device();
+            LogHelper.Info("DeviceInfo 杩斿洖锛� + JsonConvert.SerializeObject(result));
+            return result;
+        }
     }
 }

--
Gitblit v1.9.1