修复bug

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

@@ -4198,9 +4198,9 @@
             箱号
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.MaterialResponse.SubStockId">
+        <member name="P:WMS.Web.Core.Dto.MaterialResponse.SubStockCode">
             <summary>
-            仓位Id(序列号不存在库存的话仓位是0)
+            仓位编码(序列号不存在库存的话仓位是"")
             </summary>
         </member>
         <member name="P:WMS.Web.Core.Dto.MaterialResponse.IsBoxInventory">

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

@@ -49,9 +49,9 @@
             仓库编码
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.BackRecord.SubStockId">
+        <member name="P:WMS.Web.Domain.Entitys.BackRecord.SubStockCode">
             <summary>
-            仓位ID
+            仓位编码
             </summary>
         </member>
         <member name="P:WMS.Web.Domain.Entitys.BackRecord.Details">
@@ -90,9 +90,9 @@
             所属箱号ID
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.BackRecordDetails.MaterialId">
+        <member name="P:WMS.Web.Domain.Entitys.BackRecordDetails.MaterialNumber">
             <summary>
-            物料ID
+            物料编码
             </summary>
         </member>
         <member name="P:WMS.Web.Domain.Entitys.BackRecordDetails.Qty">
@@ -160,27 +160,27 @@
             明细
             </summary>
         </member>
-        <member name="M:WMS.Web.Domain.Entitys.Box.BackRecordUp(System.Int32,System.Decimal)">
+        <member name="M:WMS.Web.Domain.Entitys.Box.BackRecordUp(System.String,System.Decimal)">
             <summary>
             出入库回退上架
             </summary>
-            <param name="materialId"></param>
+            <param name="materialNumber"></param>
             <param name="qty"></param>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Domain.Entitys.Box.BackRecordDown(System.Int32,System.Decimal)">
+        <member name="M:WMS.Web.Domain.Entitys.Box.BackRecordDown(System.String,System.Decimal)">
             <summary>
             出入库回退下架
             </summary>
-            <param name="materialId"></param>
+            <param name="materialNumber"></param>
             <param name="qty"></param>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Domain.Entitys.Box.OutStock(System.Int32,System.Decimal)">
+        <member name="M:WMS.Web.Domain.Entitys.Box.OutStock(System.String,System.Decimal)">
             <summary>
             出库
             </summary>
-            <param name="materialId"></param>
+            <param name="materialNumber"></param>
             <param name="qty"></param>
             <returns></returns>
         </member>
@@ -206,9 +206,9 @@
             单据头ID
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.BoxDetails.MaterialId">
+        <member name="P:WMS.Web.Domain.Entitys.BoxDetails.MaterialNumber">
             <summary>
-            物料ID
+            物料编码
             </summary>
         </member>
         <member name="P:WMS.Web.Domain.Entitys.BoxDetails.Qty">
@@ -241,9 +241,9 @@
             仓库编码
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.BoxInventory.SubStockId">
+        <member name="P:WMS.Web.Domain.Entitys.BoxInventory.SubStockCode">
             <summary>
-            仓库ID
+            仓位编码
             </summary>
         </member>
         <member name="P:WMS.Web.Domain.Entitys.BoxInventory.Details">
@@ -266,9 +266,9 @@
             上级ID
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.BoxInventoryDetails.MaterialId">
+        <member name="P:WMS.Web.Domain.Entitys.BoxInventoryDetails.MaterialNumber">
             <summary>
-            物料ID
+            物料编码
             </summary>
         </member>
         <member name="P:WMS.Web.Domain.Entitys.BoxInventoryDetails.SerialNumbers">
@@ -316,9 +316,9 @@
             订单编号
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.BoxMark.MaterialId">
+        <member name="P:WMS.Web.Domain.Entitys.BoxMark.MaterialNumber">
             <summary>
-            物料ID
+            物料编码
             </summary>
         </member>
         <member name="P:WMS.Web.Domain.Entitys.BoxMark.ProductQty">
@@ -451,9 +451,9 @@
             单据编号
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.MaterialId">
+        <member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.MaterialNumber">
             <summary>
-            物料ID  
+            物料编码
             </summary>
         </member>
         <member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.SerialNumbers">
@@ -476,11 +476,6 @@
             目标箱子ID
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.SrcSubStockId">
-             <summary>
-             原箱仓位
-            </summary> 
-        </member>
         <member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.SrcSubStockCode">
              <summary>
              原箱仓位
@@ -491,11 +486,6 @@
             目标箱的仓库或重新上架选择仓位对应的仓库
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.DestSubStockId">
-             <summary>
-             目标箱仓位或重新上架选择仓位
-            </summary> 
-        </member>
         <member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.DestSubStockCode">
              <summary>
              目标箱仓位或重新上架选择仓位
@@ -516,13 +506,13 @@
             操作时间
             </summary>
         </member>
-        <member name="M:WMS.Web.Domain.Entitys.ChangeBoxRecord.Create(System.Int32,System.Decimal,System.Int32,System.Collections.Generic.List{System.String},System.Int32,System.Int32)">
+        <member name="M:WMS.Web.Domain.Entitys.ChangeBoxRecord.Create(System.Int32,System.Decimal,System.String,System.Collections.Generic.List{System.String},System.Int32,System.Int32)">
             <summary>
             创建
             </summary>
             <param name="creatorId"></param>
             <param name="qty"></param>
-            <param name="materialId"></param>
+            <param name="materialNumber"></param>
             <param name="serialNumbers"></param>
         </member>
         <member name="M:WMS.Web.Domain.Entitys.ChangeBoxRecord.GenerateNo">
@@ -737,9 +727,9 @@
             仓库编码
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.InStock.SubStockId">
+        <member name="P:WMS.Web.Domain.Entitys.InStock.SubStockCode">
             <summary>
-            仓位ID
+            仓位编码
             </summary>
         </member>
         <member name="P:WMS.Web.Domain.Entitys.InStock.ErpDetails">
@@ -833,9 +823,9 @@
             供应商ID
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.InStockDetails.MaterialId">
+        <member name="P:WMS.Web.Domain.Entitys.InStockDetails.MaterialNumber">
             <summary>
-            物料ID
+            物料编码
             </summary>
         </member>
         <member name="P:WMS.Web.Domain.Entitys.InStockDetails.Qty">
@@ -873,9 +863,9 @@
             来源单号
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.InStockErpDetails.MaterialId">
+        <member name="P:WMS.Web.Domain.Entitys.InStockErpDetails.MaterialNumber">
             <summary>
-            物料ID
+            物料编码
             </summary>
         </member>
         <member name="P:WMS.Web.Domain.Entitys.InStockErpDetails.Qty">
@@ -1056,9 +1046,9 @@
             对应金蝶的明细ID
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.InStockTaskBoxDetails.MaterialId">
+        <member name="P:WMS.Web.Domain.Entitys.InStockTaskBoxDetails.MaterialNumber">
             <summary>
-            物料ID
+            物料编码
             </summary>
         </member>
         <member name="P:WMS.Web.Domain.Entitys.InStockTaskBoxDetails.ReceiveQty">
@@ -1101,9 +1091,9 @@
             组织编码
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.InStockTaskDetails.MaterialId">
+        <member name="P:WMS.Web.Domain.Entitys.InStockTaskDetails.MaterialNumber">
             <summary>
-            物料ID
+            物料编码
             </summary>
         </member>
         <member name="P:WMS.Web.Domain.Entitys.InStockTaskDetails.StockCode">
@@ -1176,6 +1166,11 @@
             物料ID
             </summary>
         </member>
+        <member name="P:WMS.Web.Domain.Entitys.InStockTotalDetails.MaterialNumber">
+            <summary>
+            物料编码
+            </summary>
+        </member>
         <member name="P:WMS.Web.Domain.Entitys.InStockTotalDetails.Qty">
             <summary>
             数量
@@ -1201,6 +1196,11 @@
             物料ID
             </summary>
         </member>
+        <member name="P:WMS.Web.Domain.Entitys.InventoryDetails.MaterialNumber">
+            <summary>
+            物料编码
+            </summary>
+        </member>
         <member name="P:WMS.Web.Domain.Entitys.InventoryDetails.OrgCode">
             <summary>
             组织编码
@@ -1216,6 +1216,11 @@
             仓位ID
             </summary>
         </member>
+        <member name="P:WMS.Web.Domain.Entitys.InventoryDetails.SubStockCode">
+            <summary>
+            仓位编码
+            </summary>
+        </member>
         <member name="P:WMS.Web.Domain.Entitys.InventoryDetails.Qty">
             <summary>
             库存量
@@ -1236,6 +1241,11 @@
             物料ID
             </summary>
         </member>
+        <member name="P:WMS.Web.Domain.Entitys.InventoryInOutDetails.MaterialNumber">
+            <summary>
+            物料编码
+            </summary>
+        </member>
         <member name="P:WMS.Web.Domain.Entitys.InventoryInOutDetails.Type">
             <summary>
             类型：1为入库，2为出库
@@ -1256,6 +1266,11 @@
             仓位ID
             </summary>
         </member>
+        <member name="P:WMS.Web.Domain.Entitys.InventoryInOutDetails.SubStockCode">
+            <summary>
+            仓位编码
+            </summary>
+        </member>
         <member name="P:WMS.Web.Domain.Entitys.InventoryInOutDetails.BoxId">
             <summary>
             箱ID
@@ -1386,16 +1401,6 @@
              仓库
             </summary> 
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.SrcSubStockId">
-            <summary>
-            原仓位Id
-            </summary>
-        </member>
-        <member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.DestSubStockId">
-            <summary>
-            目标仓位Id
-            </summary>
-        </member>
         <member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.SrcSubStockCode">
             <summary>
             原仓位编码
@@ -1431,7 +1436,7 @@
             明细信息
             </summary>
         </member>
-        <member name="M:WMS.Web.Domain.Entitys.MoveBoxRecord.Create(WMS.Web.Domain.Values.MoveBoxType,System.Int32,System.Decimal,System.String,System.String,System.Int32,System.Int32,System.String)">
+        <member name="M:WMS.Web.Domain.Entitys.MoveBoxRecord.Create(WMS.Web.Domain.Values.MoveBoxType,System.Int32,System.Decimal,System.String,System.String,System.Int32,System.String)">
             <summary>
             创建
             </summary>
@@ -1457,9 +1462,9 @@
             单据头Id
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.MoveBoxRecordDetails.MaterialId">
+        <member name="P:WMS.Web.Domain.Entitys.MoveBoxRecordDetails.MaterialNumber">
-             <summary>
+            <summary>
-             物料Id
+            物料编码
             </summary>
         </member>
         <member name="P:WMS.Web.Domain.Entitys.MoveBoxRecordDetails.Qty">
@@ -1610,9 +1615,9 @@
             序列号  
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.OutStockBoxsDetails.SubStockId">
+        <member name="P:WMS.Web.Domain.Entitys.OutStockBoxsDetails.SubStockCode">
-             <summary>
+            <summary>
-             仓位
+            仓位
             </summary>
         </member>
         <member name="P:WMS.Web.Domain.Entitys.OutStockBoxsDetails.Qty">
@@ -1635,9 +1640,9 @@
             单据头Id
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.OutStockDetails.MaterialId">
+        <member name="P:WMS.Web.Domain.Entitys.OutStockDetails.MaterialNumber">
-             <summary>
+            <summary>
-             物料Id
+            物料编码
             </summary>
         </member>
         <member name="P:WMS.Web.Domain.Entitys.OutStockDetails.SerialNumbers">
@@ -1780,11 +1785,11 @@
             明细
             </summary>
         </member>
-        <member name="M:WMS.Web.Domain.Entitys.OutStockTask.OutStock(System.Int32,System.Decimal,System.Int32)">
+        <member name="M:WMS.Web.Domain.Entitys.OutStockTask.OutStock(System.String,System.Decimal,System.Int32)">
             <summary>
             出库 反写 任务单(返回 这个物料下面的来源单号出了多少数量)
             </summary>
-            <param name="materialId"></param>
+            <param name="materialNumber"></param>
             <param name="qty"></param>
             <returns></returns>
         </member>
@@ -1826,9 +1831,9 @@
             单据头Id
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.OutStockTaskDetails.MaterialId">
+        <member name="P:WMS.Web.Domain.Entitys.OutStockTaskDetails.MaterialNumber">
-             <summary>
+            <summary>
-             物料Id
+            物料编码
             </summary>
         </member>
         <member name="P:WMS.Web.Domain.Entitys.OutStockTaskDetails.AccruedQty">
@@ -1921,9 +1926,9 @@
             序列号操作类型
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.SerialNumberOperate.MaterialId">
+        <member name="P:WMS.Web.Domain.Entitys.SerialNumberOperate.MaterialNumber">
             <summary>
-            物料ID
+            物料编码
             </summary>
         </member>
         <member name="P:WMS.Web.Domain.Entitys.SerialNumberOperate.SupplierId">
@@ -1956,12 +1961,12 @@
             备注
             </summary>
         </member>
-        <member name="M:WMS.Web.Domain.Entitys.SerialNumberOperate.CompleteCartonBox(System.String,System.Int32,WMS.Web.Domain.Entitys.Box)">
+        <member name="M:WMS.Web.Domain.Entitys.SerialNumberOperate.CompleteCartonBox(System.String,System.String,WMS.Web.Domain.Entitys.Box)">
             <summary>
             装箱(记录)
             </summary>
-            <param name="SerialNumber"></param>
+            <param name="serialNumber"></param>
-            <param name="MaterialId"></param>
+            <param name="materialNumber"></param>
             <param name="box"></param>
         </member>
         <member name="T:WMS.Web.Domain.Entitys.SerialNumbers">
@@ -1979,9 +1984,9 @@
             序列号
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.SerialNumbers.MaterialId">
+        <member name="P:WMS.Web.Domain.Entitys.SerialNumbers.MaterialNumber">
             <summary>
-            物料ID
+            物料编码
             </summary>
         </member>
         <member name="P:WMS.Web.Domain.Entitys.SerialNumbers.BoxId">
@@ -2045,7 +2050,7 @@
             解绑
             </summary>
         </member>
-        <member name="M:WMS.Web.Domain.Entitys.SerialNumbers.OutStock(WMS.Web.Domain.Entitys.OutStock,System.Int32)">
+        <member name="M:WMS.Web.Domain.Entitys.SerialNumbers.OutStock(WMS.Web.Domain.Entitys.OutStock,System.String)">
             <summary>
             出库
             </summary>
@@ -2151,9 +2156,9 @@
             箱Id
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.TakeStockDetails.MaterialId">
+        <member name="P:WMS.Web.Domain.Entitys.TakeStockDetails.MaterialNumber">
             <summary>
-            物料ID
+            物料编码
             </summary>
         </member>
         <member name="P:WMS.Web.Domain.Entitys.TakeStockDetails.OrgCode">
@@ -2166,11 +2171,6 @@
             仓库
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.TakeStockDetails.SubStockId">
-            <summary>
-            仓位
-            </summary>
-        </member>
         <member name="P:WMS.Web.Domain.Entitys.TakeStockDetails.SubStockCode">
             <summary>
             仓位
@@ -2278,6 +2278,22 @@
             <param name="companyId"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.IBasicsRepositories.GetSubUcStockAsync(System.String,System.Int32)">
+            <summary>
+             获取仓位详情：根据仓位ID和公司ID
+            </summary>
+            <param name="code"></param>
+            <param name="companyId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.IBasicsRepositories.GetSubUcStockAsync(System.Collections.Generic.List{System.String},System.Int32)">
+            <summary>
+            获取仓位集合：根据仓位编码集合和公司ID
+            </summary>
+            <param name="codes"></param>
+            <param name="companyId"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Infrastructure.IBasicsRepositories.GetUcStockAsync(System.String,System.String,System.Int32)">
             <summary>
             获取仓库
@@ -2687,21 +2703,21 @@
             <param name="isTransaction"></param>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Domain.Infrastructure.IInventoryDetailsRepositories.GetListBy(System.Collections.Generic.List{System.Int32},System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.Int32},System.Collections.Generic.List{System.String})">
+        <member name="M:WMS.Web.Domain.Infrastructure.IInventoryDetailsRepositories.GetListBy(System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.String})">
             <summary>
             列表-根据物料和仓库和仓位
             </summary>
-            <param name="materialIds"></param>
+            <param name="materialNumbers"></param>
             <param name="stockCodes"></param>
-            <param name="subStockIds"></param>
+            <param name="subStockCodes"></param>
             <param name="orgCodes"></param>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Domain.Infrastructure.IInventoryDetailsRepositories.GetListBy(System.Collections.Generic.List{System.Int32},System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.String})">
+        <member name="M:WMS.Web.Domain.Infrastructure.IInventoryDetailsRepositories.GetListBy(System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.String})">
             <summary>
             列表-根据物料和仓库
             </summary>
-            <param name="materialIds"></param>
+            <param name="materialNumbers"></param>
             <param name="stockCodes"></param>
             <param name="orgCodes"></param>
             <returns></returns>
@@ -3169,11 +3185,11 @@
             <param name="isTransaction"></param>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Domain.IService.IInventoryDetailsService.GetInventoryDetailsSummary(System.Collections.Generic.List{System.Int32},System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.String})">
+        <member name="M:WMS.Web.Domain.IService.IInventoryDetailsService.GetInventoryDetailsSummary(System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.String})">
             <summary>
             获取即时库存明细汇总
             </summary>
-            <param name="mids"></param>
+            <param name="materialNumbers"></param>
             <param name="stockCodes"></param>
             <param name="orgCodes"></param>
             <returns></returns>
@@ -3191,15 +3207,15 @@
             <param name="isTransaction"></param>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Domain.IService.IInventoryInOutDetailsService.GenerateDto(System.Int32,System.Int32,System.String,System.String,System.Int32,WMS.Web.Domain.Values.OrderType,System.String,System.Decimal,WMS.Web.Domain.Values.InventoryInOutType)">
+        <member name="M:WMS.Web.Domain.IService.IInventoryInOutDetailsService.GenerateDto(System.Int32,System.String,System.String,System.String,System.String,WMS.Web.Domain.Values.OrderType,System.String,System.Decimal,WMS.Web.Domain.Values.InventoryInOutType)">
             <summary>
             生成dto
             </summary>
             <param name="boxId"></param>
-            <param name="materialId"></param>
+            <param name="materialNumber"></param>
             <param name="orgCode"></param>
             <param name="stockCode"></param>
-            <param name="subStockId"></param>
+            <param name="subStockCode"></param>
             <param name="orderType"></param>
             <param name="billNo"></param>
             <param name="qty"></param>
@@ -3284,6 +3300,21 @@
             <param name="materialId"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetMaterialName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.String)">
+            <summary>
+            获取物料名称
+            </summary>
+            <param name="erpMaterials"></param>
+            <param name="materialNumber"></param>
+        </member>
+        <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetMaterialSpecifications(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.String)">
+            <summary>
+            获取物料规格型号
+            </summary>
+            <param name="erpMaterials"></param>
+            <param name="materialNumber"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetMaterialUnitName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.Int32)">
             <summary>
             获取物料基本单位名称
@@ -3292,6 +3323,14 @@
             <param name="materialId"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetMaterialUnitName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.String)">
+            <summary>
+            获取物料基本单位名称
+            </summary>
+            <param name="erpMaterials"></param>
+            <param name="materialnumber"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetMaterialBarCode(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.Int32)">
             <summary>
             获取物料的条码
@@ -3300,6 +3339,14 @@
             <param name="materialId"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetMaterialBarCode(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.String)">
+            <summary>
+            获取物料的条码
+            </summary>
+            <param name="erpMaterials"></param>
+            <param name="materialNumber"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetMaterialUnitId(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.Int32)">
             <summary>
             获取物料基本单位id
@@ -3316,6 +3363,14 @@
             <param name="materialId"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetMaterialUnitNumber(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.String)">
+            <summary>
+            获取物料基本单位编码
+            </summary>
+            <param name="erpMaterials"></param>
+            <param name="materialNumber"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetOrgName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.Org.ErpOrgDto},System.Int32)">
             <summary>
             获取组织名称
@@ -3503,6 +3558,13 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForMaterial(System.String)">
+            <summary>
+            erp:基础数据-物料信息
+            </summary>
+            <param name="number"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForOrg">
             <summary>
             
@@ -4600,11 +4662,11 @@
             <param name="isTransaction"></param>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Domain.Services.InventoryDetailsService.GetInventoryDetailsSummary(System.Collections.Generic.List{System.Int32},System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.String})">
+        <member name="M:WMS.Web.Domain.Services.InventoryDetailsService.GetInventoryDetailsSummary(System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.String})">
             <summary>
             获取即时库存明细汇总
             </summary>
-            <param name="mids"></param>
+            <param name="materialNumbers"></param>
             <param name="stockCodes"></param>
             <param name="orgCodes"></param>
             <returns></returns>
@@ -4622,15 +4684,15 @@
             <param name="isTransaction"></param>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Domain.Services.InventoryInOutDetailsService.GenerateDto(System.Int32,System.Int32,System.String,System.String,System.Int32,WMS.Web.Domain.Values.OrderType,System.String,System.Decimal,WMS.Web.Domain.Values.InventoryInOutType)">
+        <member name="M:WMS.Web.Domain.Services.InventoryInOutDetailsService.GenerateDto(System.Int32,System.String,System.String,System.String,System.String,WMS.Web.Domain.Values.OrderType,System.String,System.Decimal,WMS.Web.Domain.Values.InventoryInOutType)">
             <summary>
              生成dto
             </summary>
             <param name="boxId"></param>
-            <param name="materialId"></param>
+            <param name="materialNumber"></param>
             <param name="orgCode"></param>
             <param name="stockCode"></param>
-            <param name="subStockId"></param>
+            <param name="subStockCode"></param>
             <param name="orderType"></param>
             <param name="billNo"></param>
             <param name="qty"></param>
@@ -4793,6 +4855,22 @@
             <param name="materialId"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetMaterialName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.String)">
+            <summary>
+            获取物料名称
+            </summary>
+            <param name="erpMaterials"></param>
+            <param name="materialNumber"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetMaterialSpecifications(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.String)">
+            <summary>
+            获取物料编码
+            </summary>
+            <param name="erpMaterials"></param>
+            <param name="materialNumber"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetMaterialUnitName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.Int32)">
             <summary>
             获取物料基本单位名称
@@ -4801,6 +4879,14 @@
             <param name="materialId"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetMaterialUnitName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.String)">
+            <summary>
+            获取物料基本单位名称
+            </summary>
+            <param name="erpMaterials"></param>
+            <param name="materialNumber"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetMaterialBarCode(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.Int32)">
             <summary>
             获取物料的条码
@@ -4809,6 +4895,14 @@
             <param name="materialId"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetMaterialBarCode(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.String)">
+            <summary>
+            获取物料的条码
+            </summary>
+            <param name="erpMaterials"></param>
+            <param name="materialNumber"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetMaterialUnitId(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.Int32)">
             <summary>
             获取物料基本单位Id
@@ -4825,6 +4919,14 @@
             <param name="materialId"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetMaterialUnitNumber(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.String)">
+            <summary>
+            获取物料基本单位编码
+            </summary>
+            <param name="erpMaterials"></param>
+            <param name="materialNumber"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetOrgName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.Org.ErpOrgDto},System.Int32)">
             <summary>
             获取组织名称
@@ -4970,6 +5072,13 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForMaterial(System.String)">
+            <summary>
+            erp:基础数据-物料信息
+            </summary>
+            <param name="number"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForMaterialPagedList">
             <summary>
             erp:基础数据-物料-分页查询
@@ -4983,6 +5092,13 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForMaterialByNumber(System.String)">
+            <summary>
+            erp:基础数据-物料-number查询
+            </summary>
+            <param name="number"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForOrg">
             <summary>
             erp:单据查询-组织数据

src/WMS.Web.Core/Dto/MaterialResponse.cs

@@ -17,10 +17,14 @@ namespace WMS.Web.Core.Dto
         /// 箱号
         /// </summary>
         public string BoxBillNo { get; set; }
+        ///// <summary>
+        ///// 仓位Id(序列号不存在库存的话仓位是0)
+        ///// </summary>
+        //public int SubStockId { get; set; } = 0;
         /// <summary>
-        /// 仓位Id(序列号不存在库存的话仓位是0)
+        /// 仓位编码(序列号不存在库存的话仓位是"")
         /// </summary>
-        public int SubStockId { get; set; } = 0;
+        public string SubStockCode { get; set; } = "";
         /// <summary>
         /// 是否存在于箱库存中
         /// </summary>

src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs

@@ -58,6 +58,13 @@ namespace WMS.Web.Domain.IService.Public
         /// <param name="materialId"></param>
         /// <returns></returns>
         string GetMaterialUnitName(List<ErpMaterialDto> erpMaterials, int materialId);
+        /// <summary>
+        /// 获取物料基本单位名称
+        /// </summary>
+        /// <param name="erpMaterials"></param>
+        /// <param name="materialnumber"></param>
+        /// <returns></returns>
+        string GetMaterialUnitName(List<ErpMaterialDto> erpMaterials, string materialnumber);
 
         /// <summary>
         /// 获取物料的条码

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

@@ -114,7 +114,7 @@ namespace WMS.Web.Domain.Services
                 {
                     foreach (var bd in box.Details)
                     {
-                        var bDe = box.Details.FirstOrDefault(f => f.MaterialId == bd.MaterialId);
+                        var bDe = box.Details.FirstOrDefault(f => f.MaterialNumber == bd.MaterialNumber);
                         if (bDe == null)
                             return Result.ReFailure(ResultCodes.BoxMateriaNoData);
                         var ex = bd.SerialNumbers.Except(bDe.SerialNumbers).ToList();
@@ -158,12 +158,12 @@ namespace WMS.Web.Domain.Services
             var subIds = dto.Select(s => s.SubStockCode).ToList();
             var subStocks = await _basbicsRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId);
 
-            var subStocks_s = await _basbicsRepositories.GetSubUcStockAsync(boxs.Select(s => s.SubStockId).ToList(), loginInfo.UserInfo.CompanyId);
+            var subStocks_s = await _basbicsRepositories.GetSubUcStockAsync(boxs.Select(s => s.SubStockCode).ToList(), loginInfo.UserInfo.CompanyId);
             foreach (var dt in dto)
             {
                 var subStock = subStocks.FirstOrDefault(f => f.Code == dt.SubStockCode);
                 var boxi = boxs.FirstOrDefault(f => f.BoxId == dt.SrcBoxId);
-                var subStock_s = subStocks_s.FirstOrDefault(f => f.Id == (boxi?.SubStockId ?? 0));
+                var subStock_s = subStocks_s.FirstOrDefault(f => f.Code == (boxi?.SubStockCode ?? ""));
                 foreach (var d in dt.Details)
                 {
                     ChangeBoxRecord entity = new ChangeBoxRecord();

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

@@ -133,7 +133,7 @@ namespace WMS.Web.Domain.Services
                 var boxInventoryDetails = boxInventoryList.SelectMany(s => s.Details).ToList();
                 foreach (var b in boxInventoryDetails)
                 {
-                    var num = boxInventoryDetails.Where(w => w.MaterialId == b.MaterialId).Sum(s => s.Qty);
+                    var num = boxInventoryDetails.Where(w => w.MaterialNumber == b.MaterialNumber).Sum(s => s.Qty);
                     var taskDetail = outStockTask.Details.FirstOrDefault(f => f.MaterialNumber == b.MaterialNumber);
                     if (taskDetail == null) return Result.ReFailure(ResultCodes.BoxOutStockTaskMaterialError);
                     //箱子里该物料的总数量大于出库单(应出库数量-已出库数量) 不能出库

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

@@ -145,7 +145,7 @@ namespace WMS.Web.Domain.Services
                 };
                 if (moveBoxRecord.Type == MoveBoxType.Up)
                 {
-                    var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, moveBoxRecord.DestSubStockId);
+                    var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, moveBoxRecord.DestSubStockCode);
                     op.Remark += "\r\n" + "仓位:" + srcSubStock;
                 }
                 sList.Add(op);
@@ -322,7 +322,7 @@ namespace WMS.Web.Domain.Services
                 var boxId = inStock.Details.FirstOrDefault(s => s.SerialNumbers.Contains(entity.SerialNumber))?.BoxId ?? 0;
                 var box = boxList.FirstOrDefault(f => f.Id == boxId);
                 var instockDetail = inStock.Details.FirstOrDefault(f => f.MaterialNumber == entity.MaterialNumber);
-                var subStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, inStock.SubStockId);
+                var subStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, inStock.SubStockCode);
                 //修改序列号和箱绑定关系
                 entity.InStock(instockDetail.SourceBillNo, inStock.Type);
                 entity.Bind(boxId, box?.CompleteCartonTime ?? DateTime.Now);
@@ -410,7 +410,7 @@ namespace WMS.Web.Domain.Services
                 };
                 if (backRecord.Type == BackRecordType.OutstockOn)
                 {
-                    var subStockId = backRecord?.SubStockId ?? 0;
+                    var subStockId = backRecord?.SubStockCode ?? "";
                     var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, subStockId);
                     op.Remark += "\r\n" + "仓位:" + srcSubStock;
                 }

src/WMS.Web.Repositories/OutStockTaskRepositories.cs

@@ -327,7 +327,7 @@ namespace WMS.Web.Repositories
                 MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialNumber),
                 MaterialNumber = s.detail.MaterialNumber,
                 Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialNumber),
-                Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialId),
+                Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialNumber),
                 Remark = s.detail.Remark
                 #endregion
 

src/WMS.Web.Repositories/SerialNumbersRepositories.cs

@@ -207,7 +207,7 @@ namespace WMS.Web.Repositories
             if (entity == null || entity.serial == null) return null;
             response.BoxId = entity.serial.BoxId;
             response.BoxBillNo = entity?.box?.BoxBillNo ?? "";
-            response.SubStockId = entity?.boxInventory?.SubStockId ?? 0;
+            response.SubStockCode = entity?.boxInventory?.SubStockCode ?? "";
             response.SerialNumber = entity.serial.SerialNumber;
             response.MaterialId = 0;
             response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber);