From e638b99adf48183d173dec500c9cf29020947354 Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期五, 06 六月 2025 17:23:26 +0800
Subject: [PATCH] 大洋原材料开发
---
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/api/MoboxController.cs | 81 +++++++++++++++++++++++++++++-----------
1 files changed, 59 insertions(+), 22 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..c489f0b 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,20 @@
锘縰sing HH.WCS.DaYang.dispatch;
using HH.WCS.DaYang.process;
+using HH.WCS.DaYang.util;
using HH.WCS.DaYang.wms;
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 +22,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 +31,11 @@
//鏀跺埌鏆傚仠璇锋眰鍚庯紝
return result;
}
- public SimpleResult RecoverTask() {
+ public SimpleResult RecoverTask()
+ {
var result = new SimpleResult();
//ManualTaskSwitch [{"Area":"AAA","State":0}]
-
+
return result;
}
@@ -39,26 +45,49 @@
/// <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 = "浠诲姟涓嶅瓨鍦�;
}
@@ -70,7 +99,8 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public SimpleResult CompleteTask(MoboxTaskBase model) {
+ public SimpleResult CompleteTask(MoboxTaskBase model)
+ {
var result = new SimpleResult();
return result;
}
@@ -82,7 +112,8 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public SimpleResult PalletSorting(PalletSorting model) {
+ public SimpleResult PalletSorting(PalletSorting model)
+ {
return ApiHelper.PalletSorting(model);
}
/// <summary>
@@ -91,7 +122,8 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public SimpleResult PalletSorting1(PalletSorting1 model) {
+ public SimpleResult PalletSorting1(PalletSorting1 model)
+ {
return ApiHelper.PalletSorting1(model);
}
/// <summary>
@@ -99,7 +131,8 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- public SimpleResult Instock(InstockInfo model) {
+ public SimpleResult Instock(InstockInfo model)
+ {
return ApiHelper.Instock(model);
}
@@ -110,7 +143,8 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public SimpleResult ShippingOrderExecute(ShippingOrderCheck model) {
+ public SimpleResult ShippingOrderExecute(ShippingOrderCheck model)
+ {
return ApiHelper.ShippingOrderExecute(model);
}
@@ -120,7 +154,8 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public SimpleResult SortingOrderExecute(SortingOrderCheck model) {
+ public SimpleResult SortingOrderExecute(SortingOrderCheck model)
+ {
return ApiHelper.SortingOrderExecute(model);
}
@@ -128,7 +163,8 @@
/// 鍒嗘嫞缁撴灉纭锛堝墠绔嫤鎴暟閲忎笉鍙互瓒呰繃鍒嗘嫞鏄庣粏涓�F_QTY-F_ACC_SR_QTY鐨勬暟閲忥級
/// </summary>
/// <returns></returns>
- public SimpleResult SortingResultCheck(List<SortingResultCheck> models) {
+ public SimpleResult SortingResultCheck(List<SortingResultCheck> models)
+ {
return ApiHelper.SortingResultCheck(models);
}
@@ -137,7 +173,8 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- public SimpleResult CheckSortingWholeCntr(CheckSortingWholeCntr model) {
+ public SimpleResult CheckSortingWholeCntr(CheckSortingWholeCntr model)
+ {
return ApiHelper.CheckSortingWholeCntr(model);
}
--
Gitblit v1.9.1