From 6abc355aeb4e6f7960c11795dbbcc26396b0c888 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 16 五月 2025 17:20:45 +0800
Subject: [PATCH] 博实物料下发同步接口开发，满箱入库、出库逻辑测试与优化
---
Controllers/MoboxController.cs | 36 +++++++++++-------------------------
1 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/Controllers/MoboxController.cs b/Controllers/MoboxController.cs
index 4bb42eb..e50687c 100644
--- a/Controllers/MoboxController.cs
+++ b/Controllers/MoboxController.cs
@@ -9,7 +9,6 @@
using static HH.WCS.Mobox3.DSZSH.Dtos.Request.MoboxRequest;
using static HH.WCS.Mobox3.DSZSH.Dtos.Response.MoboxResponse;
-using static HH.WCS.Mobox3.DSZSH.Helpers.ResultHelper;
namespace HH.WCS.Mobox3.DSZSH.Controllers {
/// <summary>
@@ -62,30 +61,14 @@
public SimpleResult EmptyInbound(EmptyInboundInfo model) {
LogHelper.InfoApi("绌烘墭/绌虹鍏ュ簱", model);
- var db = DbHelper.GetDbClient();
- var locCntrRel = db.Queryable<TN_Loc_Container>()
- .Where(lc => lc.S_CNTR_CODE == model.CntrCode).First();
-
- if (locCntrRel == null) {
- return BuildSimpleResult(-1, $"涓嶅瓨鍦ㄥ凡缁戝畾瀹瑰櫒鐨勮揣浣嶅彿锛�{model.CnteType}'");
+ if (model.CntrType == "鎵樼洏") {
+ return MoboxService.EmptyInboundPallet(model);
}
-
- if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") {
-
- return MoboxService.EmptyInboundPallet(new EmptyInboundDetailInfo {
- StartLoc = locCntrRel.S_LOC_CODE,
- CntId = locCntrRel.S_CNTR_TYPE
- });
- }
- else if (locCntrRel.S_CNTR_TYPE == "濂借繍绠�) {
-
- return MoboxService.EmptyInboundGoodpack(new EmptyInboundDetailInfo {
- StartLoc = locCntrRel.S_LOC_CODE,
- CntId = locCntrRel.S_CNTR_TYPE
- });
+ else if (model.CntrType == "濂借繍绠�) {
+ return MoboxService.EmptyInboundGoodpack(model);
}
else {
- return BuildSimpleResult(-2, $"涓嶅悎娉曠殑瀹瑰櫒绫诲瀷锛�{locCntrRel.S_CNTR_CODE}'");
+ return BuildSimpleResult(-1, $"瀹瑰櫒绫诲瀷 '{model.CntrType}' 涓嶅悎娉曪細搴斾负 '鎵樼洏' 鎴�'濂借繍绠�");
}
}
@@ -191,9 +174,7 @@
public SimpleResult RestBack(RestBackInfo model) {
return MoboxService.RestBack(model);
}
- #endregion
- #region Mobox 鎺ュ彛
/// <summary>
/// 鎴愬搧鑳跺嚭搴�PDA)
/// </summary>
@@ -203,12 +184,17 @@
[Route("finished-outbound")]
public SimpleResult FinishedOutbound(FinishedOutboundInfo model) {
LogHelper.InfoApi("鎴愬搧鑳跺嚭搴�PDA)", model);
+
if (model.ForcedOut) {
return MoboxService.FinishedOutboundForce(model);
}
- return MoboxService.FinishedOutbound(model);
+ else {
+ return MoboxService.FinishedOutbound(model);
+ }
}
+ #endregion
+ #region Mobox 鎺ュ彛
/// <summary>
/// 鎶芥-鍒涘缓鎶芥鍗�WMS)
/// </summary>
--
Gitblit v1.9.1