From e9d17dcae76ff91db356b59a0436bbcf85aa2216 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Fri, 29 Dec 2023 09:22:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/Controllers/SysConfigController.cs  |  6 ++++--
 src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml             |  3 ++-
 src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs | 11 ++---------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs
index f358b3db..12112e89 100644
--- a/src/WMS.Web.Api/Controllers/SysConfigController.cs
+++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs
@@ -227,7 +227,7 @@ namespace WMS.Web.Api.Controllers
                 return Result<List<UcStockResponse>>.ReSuccess(list);
 
             var subs = await _erpService.BillQueryForSubStock();
-            var res = subs.Data.Where(w => w.OrgCode.Equals(orgCode)&&w.StockCode.Equals(number));
+            var res = subs.Data.Where(w => w.OrgCode.Equals(orgCode) && w.StockCode.Equals(number));
             if (!string.IsNullOrEmpty(name))
                 res = res.Where(w => w.Name.Contains(name));
             list = res.Select(s => new UcStockResponse()
@@ -338,10 +338,11 @@ namespace WMS.Web.Api.Controllers
         /// 根据箱号获取箱信息(综合)
         /// </summary>
         /// <param name="boxBillNo">必填</param>
+        /// <param name="isReminder">没有箱时是否提示 false 返回数据 true或者不传 弹出提示</param>
         /// <returns></returns>
         [HttpGet]
         [Route("GetBoxSynthesis")]
-        public async Task<Result<BoxResponse>> GetBoxSynthesis([FromQuery] string boxBillNo)
+        public async Task<Result<BoxResponse>> GetBoxSynthesis([FromQuery] string boxBillNo, [FromQuery] bool? isReminder = true)
         {
             var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
             if (loginInfo == null || loginInfo.UserInfo == null)
@@ -367,6 +368,7 @@ namespace WMS.Web.Api.Controllers
             }
 
             var res = await _boxRepositories.GetBox(new List<string>() { boxBillNo });
+            if (res.Count() <= 0 && isReminder == false) return Result<BoxResponse>.ReSuccess(new BoxResponse());
             if (res.Count() <= 0) return Result<BoxResponse>.ReFailure(ResultCodes.BoxNoData);
             return Result<BoxResponse>.ReSuccess(res.First());
         }
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
index 40389350..e2e539ad 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
@@ -517,11 +517,12 @@
             <param name="boxBillNos">必填</param>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetBoxSynthesis(System.String)">
+        <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetBoxSynthesis(System.String,System.Nullable{System.Boolean})">
             <summary>
             根据箱号获取箱信息(综合)
             </summary>
             <param name="boxBillNo">必填</param>
+            <param name="isReminder">没有箱时是否提示 false 返回数据 true或者不传 弹出提示</param>
             <returns></returns>
         </member>
         <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetBox_OutStock(System.String)">
diff --git a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
index 0a3aeb46..33b647cc 100644
--- a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
+++ b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
@@ -68,21 +68,14 @@ namespace WMS.Web.Domain.Services
             if (IsPDA)
             {
                 var d = dto.First();
-                var dBox = await _boxRepositories.GetByNo(d.DestBoxBillNo);
-                if (dBox == null)
+                if (d.DestBoxId == 0)
                 {
+                    var dBox = await _boxRepositories.GetByNo(d.DestBoxBillNo);
                     var res = await CreateBox(d);
                     if (!res.IsSuccess) return res;
                     dBox = await _boxRepositories.GetByNo(d.DestBoxBillNo);
                     dto.First().DestBoxId = dBox.Id;
                 }
-                else
-                {
-                    var destInventoryBoxs = await _boxInventoryRepositories.Get(dBox.Id);
-                    dto.First().DestBoxId = dBox.Id;
-                    if (destInventoryBoxs != null)
-                        dto.First().SubStockId = destInventoryBoxs.SubStockId;
-                }
             }
             //1.有原箱时 需要判断 物料对应的序列号是否存在
             var srcIds = dto.Select(s => s.SrcBoxId).Distinct().ToList();