From 6de76299988e801694cf9b8df588ac11d0cc724e Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Sat, 25 Nov 2023 16:59:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs | 2 +-
 src/WMS.Web.Domain/Mappers/TakeStockMapper.cs          | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs b/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs
index ea277685..355cc2c0 100644
--- a/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs
+++ b/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs
@@ -28,7 +28,7 @@ namespace WMS.Web.Core.Dto.TakeStock
         /// <summary>
         /// 子仓库(跟金蝶交互字段)
         /// </summary>
-        public int Erp_SubStockId { get; set; }
+        public int? Erp_SubStockId { get; set; } = 0;
         /// <summary>
         /// 系统库存
         /// </summary>
diff --git a/src/WMS.Web.Domain/Mappers/TakeStockMapper.cs b/src/WMS.Web.Domain/Mappers/TakeStockMapper.cs
index 79c4343a..db68b2c4 100644
--- a/src/WMS.Web.Domain/Mappers/TakeStockMapper.cs
+++ b/src/WMS.Web.Domain/Mappers/TakeStockMapper.cs
@@ -8,16 +8,17 @@ using WMS.Web.Domain.Values;
 
 namespace WMS.Web.Domain.Mappers
 {
-   public class TakeStockMapper:Profile
+    public class TakeStockMapper : Profile
     {
         public TakeStockMapper()
         {
             CreateMap<SaveTakeStockRequest, TakeStockDetails>()
-                 .ForMember(x => x.ResultType, ops => ops.MapFrom(x => (x.AfterQty  - x.BeforeQty) >0? TakeStockType.Profit: TakeStockType.Loss))
+                 .ForMember(x => x.ResultType, ops => ops.MapFrom(x => (x.AfterQty - x.BeforeQty) > 0 ? TakeStockType.Profit : TakeStockType.Loss))
              .ForMember(x => x.FinalQty, ops => ops.MapFrom(x => Math.Abs(x.AfterQty - x.BeforeQty)));
             CreateMap<SaveTakeStockRequest, TakeStock>()
                 .ForMember(x => x.ResultType, ops => ops.MapFrom(x => (x.AfterQty - x.BeforeQty) > 0 ? TakeStockType.Profit : TakeStockType.Loss))
-                .ForMember(x => x.FinalQty, ops => ops.MapFrom(x => Math.Abs(x.AfterQty - x.BeforeQty)));
+                .ForMember(x => x.FinalQty, ops => ops.MapFrom(x => Math.Abs(x.AfterQty - x.BeforeQty)))
+                .ForMember(x => x.Erp_SubStockId, ops => ops.MapFrom(x => x.Erp_SubStockId ?? 0));
         }
     }
 }

From 0b21e0b035cdeffc130c6d5a40d258ee188f4987 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Sat, 25 Nov 2023 17:15:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=90=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/SysConfigController.cs        | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs
index 4b96d126..aa14e25c 100644
--- a/src/WMS.Web.Api/Controllers/SysConfigController.cs
+++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs
@@ -199,28 +199,26 @@ namespace WMS.Web.Api.Controllers
         /// <returns></returns>
         [HttpGet]
         [Route("GetErp_SubUcStock/{number}/{orgCode}")]
-        public async Task<Result<List<UcStockResponse>>> GetErp_SubUcStock([FromRoute] string number,[FromRoute] string orgCode, [FromQuery] string name)
+        public async Task<Result<List<UcStockResponse>>> GetErp_SubUcStock([FromRoute] string number, [FromRoute] string orgCode, [FromQuery] string name)
         {
             var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
             if (loginInfo == null || loginInfo.UserInfo == null)
                 return Result<List<UcStockResponse>>.ReFailure(ResultCodes.Token_Invalid_Error);
 
             List<UcStockResponse> list = new List<UcStockResponse>();
-            //if (number.Substring(0, 2).Equals("HD") || number.Substring(0, 2).Equals("GD"))
-            //{
-            //var subs = await _erpService.BillQueryForSubStock(number,orgCode);
-            var subs = await _erpService.BillQueryForSubStock(null, null);
-            foreach (var s in subs.Data.Skip(0).Take(10))//.Where(w => w.Name.Contains(name)
+            if (number.Substring(0, 2).Equals("HD") || number.Substring(0, 2).Equals("GD"))
+                return Result<List<UcStockResponse>>.ReSuccess(list);
+
+            var subs = await _erpService.BillQueryForSubStock(number, orgCode);
+            //var subs = await _erpService.BillQueryForSubStock(null, null);
+            list = subs.Data.Where(w => w.Name.Contains(name)).Select(s => new UcStockResponse()
             {
-                    list.Add(new UcStockResponse()
-                    {
-                        Id = s.Id,
-                        Code = s.Code,
-                        Name = s.Name,
-                        Disable = false
-                    });
-                }
-            //}
+                Id = s.Id,
+                Code = s.Code,
+                Name = s.Name,
+                Disable = false
+            }).ToList();//.Skip(0).Take(10)
+
             return Result<List<UcStockResponse>>.ReSuccess(list);
         }
 
@@ -330,7 +328,7 @@ namespace WMS.Web.Api.Controllers
                 return Result<BoxResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
 
             var result = await _boxInventoryRepositories.GetInfoBy(boxBillNo);
-            BoxResponse boxResponse= _mapper.Map<BoxResponse>(result);
+            BoxResponse boxResponse = _mapper.Map<BoxResponse>(result);
             if (boxResponse != null)
             {
                 var materials_result = await _erpService.BillQueryForMaterial();