修复bug

src/WMS.Web.Api/Controllers/TestController.cs

@@ -57,8 +57,9 @@ namespace WMS.Web.Api.Controllers
         public async Task<string> TestHJ()
         {
             OperateRequest dto = new OperateRequest();
-            dto.Ids.Add(65);
+            dto.Ids.Add(54);
-            await _outStockService.Sync(dto, null);
+            //await _outStockService.Sync(dto, null);
+            var b = await _takeStockService.Sync(dto);
             // List<ErpCustomerDto> list = null;
             //var b= list.FirstOrDefault(f => f.Id == 123);
             //var entity=await  _takeStockRepositories.GetEntityList(new List<int>() {2 });

src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml

@@ -4672,7 +4672,7 @@
             仓位ID
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest.Erp_SubStockId">
+        <member name="P:WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest.Erp_SubStockCode">
             <summary>
             子仓库(跟金蝶交互字段)
             </summary>

src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml

@@ -1850,7 +1850,7 @@
             仓位
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.TakeStockDetails.Erp_SubStockId">
+        <member name="P:WMS.Web.Domain.Entitys.TakeStockDetails.Erp_SubStockCode">
             <summary>
             子仓库(跟金蝶交互字段)
             </summary>

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; } = 0;
+        public string Erp_SubStockCode { get; set; }
         /// <summary>
         /// 系统库存
         /// </summary>

src/WMS.Web.Domain/Entitys/TakeStockDetails.cs

@@ -53,8 +53,8 @@ namespace WMS.Web.Domain.Entitys
         /// <summary>
         /// 子仓库(跟金蝶交互字段)
         /// </summary>
-        [Column("Erp_SubStockId")]
+        [Column("Erp_SubStockCode")]
-        public int Erp_SubStockId { get; set; }
+        public string Erp_SubStockCode { get; set; }
         /// <summary>
         /// 系统库存
         /// </summary>

src/WMS.Web.Domain/Mappers/TakeStockMapper.cs

@@ -18,7 +18,7 @@ namespace WMS.Web.Domain.Mappers
 
             CreateMap<SaveTakeStockRequest, TakeStockDetails>()
              .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));
+              .ForMember(x => x.Erp_SubStockCode, ops => ops.MapFrom(x => x.Erp_SubStockCode));
             CreateMap<SaveTakeStockRequest, TakeStock>();
         }
     }

src/WMS.Web.Domain/Services/TakeStockService.cs

@@ -183,7 +183,7 @@ namespace WMS.Web.Domain.Services
                 foreach (var d in entity.Details)
                 {
                     var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, d.SubStockId);
-                    //var subStock = resSub.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索
+                    //var subStock = resSub.Data.FirstOrDefault(f => f.Id == d.Erp_SubStockId);//需要根据单点code搜索
                     var unitNumber = _erpBasicDataExtendService.GetMaterialUnitNumber(materials, d.MaterialId);
                     detils.Add(new ErpTakeStockDetailsSaveDto()
                     {
@@ -192,7 +192,7 @@ namespace WMS.Web.Domain.Services
                         MaterialId = new ErpNumberDto(_erpBasicDataExtendService.GetMaterialNumber(materials, d.MaterialId)),
                         UnitId = new ErpNumberDto(unitNumber), //物料带出来
                         StockId = new ErpNumberDto(stock.Code),
-                        SubStockId = new ErpSubStockDto(stock.Code, resSub.Data.FirstOrDefault(f => f.Id == d.Erp_SubStockId)?.Code),
+                        SubStockId = new ErpSubStockDto(stock.Code, d.Erp_SubStockCode),
                         BeforeQty = d.BeforeQty,
                         AfterQty = d.AfterQty,
                         FinalQty = entity.ResultType == TakeStockType.Profit ? d.FinalQty : 0,

src/WMS.Web.Repositories/TakeStockRepositories.cs

@@ -202,7 +202,7 @@ namespace WMS.Web.Repositories
                 Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialId),
                 Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.detail.StockCode + s.detail.OrgCode),
                 SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.detail.SubStockId),
-                Erp_SubStock= _erpBasicDataExtendService.GetStockName(subStocks, s.detail.Erp_SubStockId),
+                Erp_SubStock= _erpBasicDataExtendService.GetStockName(subStocks, s.detail.Erp_SubStockCode),
                 MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
                 MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
                 Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),