From 656f90b301ba307c909de4ee94b88af817adf0d8 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 14 七月 2025 16:18:22 +0800
Subject: [PATCH] 添加CgDetail信息同步字段和锁状态字段，修改相关逻辑
---
api/MoboxController.cs | 74 +++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 28 deletions(-)
diff --git a/api/MoboxController.cs b/api/MoboxController.cs
index 153da7a..dacb5a9 100644
--- a/api/MoboxController.cs
+++ b/api/MoboxController.cs
@@ -1,5 +1,8 @@
锘縰sing System.Web.Http;
+using HH.WCS.Mobox3.AnGang.util;
+using HH.WCS.Mobox3.AnGang.wms;
+
using Newtonsoft.Json;
using static HH.WCS.Mobox3.AnGang.api.ApiModel;
@@ -24,19 +27,31 @@
}
/// <summary>
+ /// 璐у搧鍏ュ簱-鎵嬪姩娣诲姞鏁版嵁
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("InboundData")]
+ public SimpleResult InboundData(InboundDataInfo model) {
+ LogHelper.Info("瑙﹀彂API锛氫骇鍝佸叆搴�鎵嬪姩娣诲姞鏁版嵁" + JsonConvert.SerializeObject(model), "API");
+ return ApiHelper.InboundData(model);
+ }
+
+ /// <summary>
/// PDA閫夋嫨缁堢偣璐т綅
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- [Route("SelectLocation")]
+ [Route("PDAFullInArea")]
public SimpleResult SelectLocation(SelectLocationInfo model) {
LogHelper.Info("瑙﹀彂API锛歅DA閫夋嫨缁堢偣璐т綅" + JsonConvert.SerializeObject(model), "API");
return ApiHelper.SelectLocation(model);
}
/// <summary>
- /// 浜у搧閮ㄥ垎鍑哄簱(WMS)
+ /// 浜у搧閮ㄥ垎鍑哄簱
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -48,7 +63,7 @@
}
/// <summary>
- /// 浜у搧閮ㄥ垎鍥炲簱(WMS)
+ /// 浜у搧閮ㄥ垎鍥炲簱
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -60,62 +75,65 @@
}
/// <summary>
- /// 鍒涘缓鐩樼偣璁″垝鍗�WMS)
+ /// 鍙栨秷浠诲姟
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- [Route("CreateCountPlan")]
- public SimpleResult CreateCountPlan(CreateCountPlanInfo model) {
- LogHelper.Info("瑙﹀彂API锛氬垱寤虹洏鐐硅鍒掑崟(WMS)" + JsonConvert.SerializeObject(model), "API");
- return ApiHelper.CreateCountPlan(model);
+ [Route("CancelTask")]
+ public SimpleResult CancelTask(CancelTaskInfo model) {
+ LogHelper.Info("瑙﹀彂API锛氬彇娑堜换鍔� + JsonConvert.SerializeObject(model), "API");
+ return ApiHelper.CancelTask(model);
}
+ // 鐩樼偣鍔熻兘锛堟柊锛�-----------------------------------
+
/// <summary>
- /// 鍒涘缓鐩樼偣鍗�PDA)
+ /// 鐩樼偣鐞嗚揣鍑哄簱
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- [Route("CreateCountOrder")]
- public SimpleResult CreateCountOrder(CreateCountOrderInfo model) {
- LogHelper.Info("瑙﹀彂API锛氬垱寤虹洏鐐瑰崟(PDA)" + JsonConvert.SerializeObject(model), "API");
- return ApiHelper.CreateCountOrder(model);
+ [Route("CheckOutboundOnce")]
+ public SimpleResult CheckOutboundOnce(CheckOutboundOnceInfo model) {
+ LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐у嚭搴� + JsonConvert.SerializeObject(model), "API");
+
+ return ApiHelper.CheckOutboundOnce(model);
}
/// <summary>
- /// 鐩樼偣鐞嗚揣(PDA)
+ /// 鐩樼偣鐞嗚揣
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
[Route("CountProduct")]
public SimpleResult CountProduct(CountProductInfo model) {
- LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐�PDA)" + JsonConvert.SerializeObject(model), "API");
+ LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐� + JsonConvert.SerializeObject(model), "API");
return ApiHelper.CountProduct(model);
}
- ///// <summary>
- ///// 鐩樼偣鐞嗚揣鍑哄簱(WMS)
- ///// </summary>
- ///// <param name="model"></param>
- ///// <returns></returns>
- //[HttpPost]
- //[Route("CheckOutbound")]
- //public SimpleResult CheckOutbound(CheckOutboundInfo model) {
- // LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐у嚭搴�WMS)" + JsonConvert.SerializeObject(model), "API");
- // return ApiHelper.CheckOutbound(model);
- //}
+ /// <summary>
+ /// 鐩樼偣鐞嗚揣鍑哄簱-澶囩敤
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("CheckOutbound")]
+ public SimpleResult CheckOutbound(CheckOutboundInfo model) {
+ LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐у嚭搴� + JsonConvert.SerializeObject(model), "API");
+ return ApiHelper.CheckOutbound(model);
+ }
/// <summary>
- /// 鐩樼偣鐞嗚揣鍥炲簱(WMS)
+ /// 鐩樼偣鐞嗚揣鍥炲簱-澶囩敤
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
[Route("CheckInbound")]
public SimpleResult CheckInbound(CheckInboundInfo model) {
- LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐у洖搴�WMS)" + JsonConvert.SerializeObject(model), "API");
+ LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐у洖搴� + JsonConvert.SerializeObject(model), "API");
return ApiHelper.CheckInbound(model);
}
}
--
Gitblit v1.9.1