From f3c8f980269b7f8fd9556c9076e06ca1461796e8 Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期二, 15 七月 2025 17:30:55 +0800
Subject: [PATCH] 1111
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/MoboxController.cs | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 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 09fa173..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>
@@ -43,13 +40,14 @@
{
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 = 5;
+ 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