From ba528c7a15058967ee3af7364035209aa0048025 Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期一, 07 七月 2025 17:30:14 +0800
Subject: [PATCH] 测试优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/MoboxController.cs | 199 +++++++++++++++++++++++++++++--------------------
1 files changed, 119 insertions(+), 80 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/MoboxController.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/MoboxController.cs
index 4ccede2..2436c5c 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/MoboxController.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/MoboxController.cs
@@ -1,16 +1,21 @@
锘縰sing HH.WCS.DaYang.dispatch;
using HH.WCS.DaYang.process;
+using HH.WCS.DaYang.util;
using HH.WCS.DaYang.wms;
+using Newtonsoft.Json;
using System.Collections.Generic;
using System.Web.Http;
using static HH.WCS.DaYang.api.ApiModel;
using static HH.WCS.DaYang.api.OtherModel;
+using static System.Net.WebRequestMethods;
-namespace HH.WCS.DaYang.api {
+namespace HH.WCS.DaYang.api
+{
/// <summary>
/// mobox3璋冪敤锛岃剼鏈腑璋冪敤
/// </summary>
- public class MoboxController : System.Web.Http.ApiController {
+ public class MoboxController : System.Web.Http.ApiController
+ {
/// <summary>
/// 浠诲姟鏆傚仠鐨勮姹�@@ -18,7 +23,8 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public SimpleResult PauseTask() {
+ public SimpleResult PauseTask()
+ {
var result = new SimpleResult();
//ManualTaskSwitch [{"Area":"AAA","State":0}]
//鍑嗗涓�釜鏁版嵁妯″瀷锛屼綔涓哄紑鍏筹紝鏀跺埌鏆傚仠璇锋眰鍚庯紝鎵撳紑锛屽悗缁浉鍏虫祦绋嬬殑浠诲姟涓嶅啀鎺ㄩ�
@@ -26,10 +32,11 @@
//鏀跺埌鏆傚仠璇锋眰鍚庯紝
return result;
}
- public SimpleResult RecoverTask() {
+ public SimpleResult RecoverTask()
+ {
var result = new SimpleResult();
//ManualTaskSwitch [{"Area":"AAA","State":0}]
-
+
return result;
}
@@ -39,107 +46,139 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public SimpleResult CancelTask(MoboxTaskBase model) {
+ public SimpleResult CancelTask(MoboxTaskBase model)
+ {
var result = new SimpleResult();
var task = WCSHelper.GetTask(model.TaskNo);
- if (task != null) {
- if (task.N_B_STATE == 0) {
+ if (task != null)
+ {
+ if (task.N_B_STATE == 0)
+ {
//绛夊緟鐩存帴淇敼鐘舵�涓哄彇娑� WCSHelper.UpdateStatus(model.TaskNo, 4);
result.resultMsg = "浠诲姟绛夊緟锛岀洿鎺ュ彇娑�;
}
- else if (task.N_B_STATE != 3 && task.N_B_STATE != 4) {
- //宸叉帹閫佷絾鏄病鏈夊畬鎴愭垨鑰呭彇娑堬紝閫氱煡hosttoagv
- NDCHelper.Cancel(task.S_CODE.Trim());
- result.resultMsg = "浠诲姟鍙栨秷宸茬粡鍙戦�缁欏皬杞�;
+ else if (task.N_B_STATE != 3 && task.N_B_STATE != 4)
+ {
+ var url = Settings.tableUrls.Find(a => a.id == 2);
+ if (url != null)
+ {
+ HttpHelper http = new HttpHelper();
+ var CancelResult = http.CancelTask(task, url.url);
+ if (CancelResult != null && CancelResult.Code == 200)
+ {
+ WCSHelper.UpdateStatus(model.TaskNo, 4);
+ result.resultMsg = "浠诲姟鍙栨秷宸蹭笅鍙�;
+ }
+ else
+ {
+ result.resultMsg = "浠诲姟鍙栨秷澶辫触";
+ }
+ }
+ else
+ {
+ LogHelper.Info($"浠诲姟鍙栨秷锛屾湭鎵惧埌瀵瑰簲鍙栨秷浠诲姟鎺ュ彛锛岃妫�煡閰嶇疆鏂囦欢");
+ }
+
}
- else {
+ else
+ {
result.resultCode = 1;
result.resultMsg = "浠诲姟宸茬粨鏉�;
}
}
- else {
+ else
+ {
result.resultCode = 1;
result.resultMsg = "浠诲姟涓嶅瓨鍦�;
}
return result;
}
+
/// <summary>
- /// 浠诲姟寮哄埗瀹屾垚锛堢洰鍓嶆敮鎸乶dc锛�+ /// 鍙犵洏鏈虹姸鎬佸垏鎹� /// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public SimpleResult CompleteTask(MoboxTaskBase model) {
+ public SimpleResult MoboxChangeStatus(MoboxChangeStatus model)
+ {
var result = new SimpleResult();
+ //鍒囨崲鍙犵洏鏈虹姸鎬侊紝鍘昏皟鐢╳cs鎺ュ彛
+ HttpHelper http = new HttpHelper();
+ var url = Settings.tableUrls.Find(a => a.id == 5);
+ if (url != null)
+ {
+ var changeResult = http.ChangeStatus(model.Type, url.url);
+ if (changeResult.Code == 200)
+ {
+ result.resultCode = 0;
+ result.resultMsg = "鍒囨崲鎴愬姛";
+ }
+ else
+ {
+ result.resultCode = changeResult.Code;
+ result.resultMsg = "鍒囨崲澶辫触锛� + result.resultMsg;
+ }
+ }
+ else
+ {
+ result.resultCode = 1;
+ result.resultMsg = "鏍规嵁閰嶇疆鏂囦欢鏈幏鍙栧埌鍙犵洏鏈虹姸鎬佸垏鎹㈡帴鍙ｏ紝璇锋鏌ラ厤缃枃浠�;
+ }
+ return result;
+ }
+ /// <summary>
+ /// 浠诲姟寮哄埗瀹屾垚
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public SimpleResult CompleteTask(MoboxTaskBase model)
+ {
+ var result = new SimpleResult();
+
+ return result;
+ }
+
+ /// <summary>
+ /// 淇敼浠诲姟浼樺厛绾�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public SimpleResult changePriority(ChangePriorityModel model)
+ {
+
+ LogHelper.Info("changePriority 鎺ユ敹锛� + JsonConvert.SerializeObject(model), "API");
+ var result = new SimpleResult();
+ //鍒囨崲鍙犵洏鏈虹姸鎬侊紝鍘昏皟鐢╳cs鎺ュ彛
+ HttpHelper http = new HttpHelper();
+ var url = Settings.tableUrls.Find(a => a.id == 6);
+ if (url != null)
+ {
+ var changeResult = http.ChangePriority(model.TaskNo,model.Priority, url.url);
+ if (changeResult.Code == 200)
+ {
+ result.resultCode = 0;
+ result.resultMsg = "淇敼鎴愬姛";
+ }
+ else
+ {
+ result.resultCode = changeResult.Code;
+ result.resultMsg = "淇敼澶辫触锛� + result.resultMsg;
+ }
+ }
+ else
+ {
+ result.resultCode = 1;
+ result.resultMsg = "鏍规嵁閰嶇疆鏂囦欢鏈幏鍙栧埌淇敼浠诲姟浼樺厛绾ф帴鍙ｏ紝璇锋鏌ラ厤缃枃浠�;
+ }
+
+ LogHelper.Info("changePriority 杩斿洖锛� + JsonConvert.SerializeObject(result), "API");
return result;
}
- /// <summary>
- /// 鐮佺洏鏍￠獙
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost]
- public SimpleResult PalletSorting(PalletSorting model) {
- return ApiHelper.PalletSorting(model);
- }
- /// <summary>
- /// 鐮佺洏鏍￠獙涓嶅甫涓婃灦(鍏ュ簱)鍗曞彿
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost]
- public SimpleResult PalletSorting1(PalletSorting1 model) {
- return ApiHelper.PalletSorting1(model);
- }
- /// <summary>
- /// pda鍏ュ簱鐢宠
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- public SimpleResult Instock(InstockInfo model) {
- return ApiHelper.Instock(model);
- }
-
- /// <summary>
- /// 鍙戣揣鍗曟墽琛�- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost]
- public SimpleResult ShippingOrderExecute(ShippingOrderCheck model) {
- return ApiHelper.ShippingOrderExecute(model);
-
- }
- /// <summary>
- /// 鍒嗘嫞鍗曟墽琛�- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost]
- public SimpleResult SortingOrderExecute(SortingOrderCheck model) {
- return ApiHelper.SortingOrderExecute(model);
-
- }
- /// <summary>
- /// 鍒嗘嫞缁撴灉纭锛堝墠绔嫤鎴暟閲忎笉鍙互瓒呰繃鍒嗘嫞鏄庣粏涓�F_QTY-F_ACC_SR_QTY鐨勬暟閲忥級
- /// </summary>
- /// <returns></returns>
- public SimpleResult SortingResultCheck(List<SortingResultCheck> models) {
- return ApiHelper.SortingResultCheck(models);
-
- }
- /// <summary>
- /// 鍒ゆ柇鏄惁鏄暣鎵樺垎鎷�- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- public SimpleResult CheckSortingWholeCntr(CheckSortingWholeCntr model) {
- return ApiHelper.CheckSortingWholeCntr(model);
-
- }
}
}
--
Gitblit v1.9.1