From a93b0e99036c24b9bd58c79bf5e7364b1ba28bae Mon Sep 17 00:00:00 2001
From: 杨前锦 <1010338399@qq.com>
Date: 星期二, 01 七月 2025 16:02:33 +0800
Subject: [PATCH] 福建佳通-流程优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/api/MoboxController.cs | 91 +++++++++++++++++++--------------------------
1 files changed, 39 insertions(+), 52 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/api/MoboxController.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/api/MoboxController.cs
index ae356b5..bb67ca0 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/api/MoboxController.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/api/MoboxController.cs
@@ -9,12 +9,29 @@
using System.Web.Http;
using static HH.WCS.Mobox3.YNJT_PT.api.ApiModel;
using static HH.WCS.Mobox3.YNJT_PT.api.OtherModel;
+using static HH.WCS.Mobox3.YNJT_PT.api.WmsController;
namespace HH.WCS.Mobox3.YNJT_PT.api {
/// <summary>
/// mobox3璋冪敤锛岃剼鏈腑璋冪敤
/// </summary>
public class MoboxController : System.Web.Http.ApiController {
+
+ /// <summary>
+ /// 1.鑳庤儦绔嬪簱鎶芥鍑哄簱銆佷汉宸ュ嚭搴撹儙鑳�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public SimpleResult embryoCheckOutStock(EmbryoCheckOutStockModel model)
+ {
+ LogHelper.Info("銆�.鑳庤儦绔嬪簱鎶芥鍑哄簱銆慹mbryoCheckOutStock 鍏ュ弬锛� + JsonConvert.SerializeObject(model), "WMS");
+ SimpleResult result = new SimpleResult();
+ result = ApiHelper.embryoCheckOutStock(model);
+ LogHelper.Info("銆�.鑳庤儦绔嬪簱鎶芥鍑哄簱銆慹mbryoCheckOutStock 鍑哄弬锛� + JsonConvert.SerializeObject(result), "WMS");
+ return result;
+ }
+
+
/// <summary>
/// 浠诲姟鍙栨秷锛堢洰鍓嶆敮鎸乶dc锛� /// </summary>
@@ -26,7 +43,9 @@
var result = new SimpleResult();
var task = WCSHelper.GetTask(model.TaskNo);
if (task != null) {
- if (task.N_B_STATE == 0) {
+
+ if (task.N_B_STATE == 0)
+ {
//绛夊緟鐩存帴淇敼鐘舵�涓哄彇娑� WCSHelper.UpdateStatus(model.TaskNo, "鍙栨秷");
LocationHelper.UnLockLoc(task.S_START_LOC);
@@ -35,15 +54,27 @@
/*LocationHelper.UnBindingLoc(task.S_START_LOC, new List<string> { task.S_CNTR_CODE });*/
result.resultMsg = "浠诲姟绛夊緟锛岀洿鎺ュ彇娑�;
}
- else if (task.N_B_STATE < 3) {
- //宸叉帹閫佷絾鏄病鏈夊畬鎴愭垨鑰呭彇娑堬紝閫氱煡hosttoagv
- NDCHelper.Cancel(task.S_CODE);
- result.resultMsg = "浠诲姟鍙栨秷宸茬粡鍙戦�缁欏皬杞�;
+ else if (task.N_B_STATE < 3)
+ {
+ if (task.S_SCHEDULE_TYPE == "AGV")
+ {
+ //宸叉帹閫佷絾鏄病鏈夊畬鎴愭垨鑰呭彇娑堬紝閫氱煡hosttoagv
+ NDCHelper.Cancel(task.S_CODE);
+ result.resultMsg = "浠诲姟鍙栨秷宸茬粡鍙戦�缁欏皬杞�;
+ }
+ else if (task.S_SCHEDULE_TYPE == "WCS")
+ {
+
+ }
+
}
- else {
+ else
+ {
result.resultCode = 1;
result.resultMsg = "浠诲姟宸茬粨鏉�;
}
+
+
}
else {
result.resultCode = 1;
@@ -130,53 +161,9 @@
}
- /// <summary>
- /// 鏁存帓瑙ｇ粦
- /// </summary>
- /// <returns></returns>
- public SimpleResult RowUnbind(RowUnbindInfo model) {
- LogHelper.Info("RowUnbind Request锛� + JsonConvert.SerializeObject(model), "TSSG");
- SimpleResult result = new SimpleResult();
- List<Location> locations = WMSHelper.GetLocationList(model.area, model.row);
- foreach (var item in locations)
- {
- //璐т綅瑙ｉ攣
- LocationHelper.UnLockLoc(item.S_CODE);
+
- //璐т綅瀹瑰櫒瑙ｇ粦
- var db = new SqlHelper<object>().GetInstance();
- var lcrList = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == item.S_CODE).Select(s => s.S_CNTR_CODE).ToList();
- LocationHelper.UnBindingLoc(item.S_CODE, lcrList);
-
- }
- LogHelper.Info("RowUnbind response锛� + JsonConvert.SerializeObject(model), "TSSG");
- return result;
- }
-
- /// <summary>
- /// pda鍏ュ簱鐢宠
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- public SimpleResult Instock(InstockInfo model) {
- var result = new SimpleResult();
- LogHelper.Info("Instock Request锛� + JsonConvert.SerializeObject(model), "TSSG");
- result = ApiHelper.Instock(model);
- LogHelper.Info("Instock response锛� + JsonConvert.SerializeObject(result), "TSSG");
- return result;
- }
-
- /// <summary>
- /// pda绉诲簱鐢宠
- /// </summary>
- /// <returns></returns>
- public SimpleResult shiftStock(ShiftStockInfo model) {
- var result = new SimpleResult();
- LogHelper.Info("shiftStock Request锛� + JsonConvert.SerializeObject(model), "TSSG");
- result = ApiHelper.shiftStock(model);
- LogHelper.Info("shiftStock response锛� + JsonConvert.SerializeObject(result), "TSSG");
- return result;
- }
+
}
}
--
Gitblit v1.9.1