入库单-接口优化

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

@@ -155,7 +155,7 @@
             仓库
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.SerialNumber">
+        <member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.SerialNumbers">
             <summary>
             序列号  
             </summary>
@@ -245,6 +245,11 @@
             盘点结果类型
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.EnumStatusResponse.InstockType">
+            <summary>
+            入库单类型
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.Erp.ErpBillQueryDto">
             <summary>
             ERP：单据查询-dto
@@ -395,6 +400,51 @@
             来源单号
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.InStockQueryRequest.Type">
+            <summary>
+            入库类型
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockQueryRequest.Creator">
+            <summary>
+            创建人
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockQueryRequest.CreateBeginDate">
+            <summary>
+            创建时间（入库时间）
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockQueryRequest.CreateEndDate">
+            <summary>
+            创建时间（入库时间）
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockQueryRequest.SuccessSync">
+            <summary>
+            同步成功或者失败 null 就是未同步
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockQueryRequest.SupplierId">
+            <summary>
+            供应商ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockQueryRequest.OrgId">
+            <summary>
+            组织ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockQueryRequest.MaterialNumber">
+             <summary>
+             物料编码
+            </summary> 
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockQueryRequest.StockId">
+            <summary>
+            仓库ID
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.InStockQueryResponse">
             <summary>
             入库单查询响应对象
@@ -907,7 +957,7 @@
         </member>
         <member name="P:WMS.Web.Core.Dto.MoveBoxRecord.MoveBoxRecordQueryInfoResponse.Specifications">
             <summary>
-            物料规格型号
+            规格型号
             </summary>
         </member>
         <member name="P:WMS.Web.Core.Dto.MoveBoxRecord.MoveBoxRecordQueryInfoResponse.Box">

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

@@ -219,7 +219,7 @@
             仓库Id  
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.SerialNumber">
+        <member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.SerialNumbers">
             <summary>
             序列号  
             </summary>
@@ -2382,6 +2382,11 @@
             菜单集合
             </summary>
         </member>
+        <member name="F:WMS.Web.Domain.Values.Single.SingleAction.SubStocks">
+            <summary>
+            仓位集合
+            </summary>
+        </member>
         <member name="T:WMS.Web.Domain.Values.Single.SingleControllerType">
             <summary>
             单点-控制器枚举

src/WMS.Web.Core/Dto/InStock/InStockQueryRequest.cs

@@ -13,5 +13,43 @@ namespace WMS.Web.Core.Dto
         /// 来源单号
         /// </summary>
         public string SourceBillNo { get; set; }
+
+        /// <summary>
+        /// 入库类型
+        /// </summary>
+        public int? Type { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string Creator { get; set; }
+        /// <summary>
+        /// 创建时间（入库时间）
+        /// </summary>
+        public DateTime? CreateBeginDate { get; set; } = null;
+        /// <summary>
+        /// 创建时间（入库时间）
+        /// </summary>
+        public DateTime? CreateEndDate { get; set; } = null;
+        /// <summary>
+        /// 同步成功或者失败 null 就是未同步
+        /// </summary>
+        public bool? SuccessSync { get; set; }
+        /// <summary>
+        /// 供应商ID
+        /// </summary>
+        public int? SupplierId { get; set; }
+        /// <summary>
+        /// 组织ID
+        /// </summary>
+        public int? OrgId { get; set; }
+        /// <summary>
+        /// 物料编码
+        ///</summary> 
+        public string MaterialNumber { get; set; }
+        /// <summary>
+        /// 仓库ID
+        /// </summary>
+        public int? StockId { get; set; }
     }
 }

src/WMS.Web.Repositories/InStockRepositories.cs

@@ -53,6 +53,26 @@ namespace WMS.Web.Repositories
             if (!string.IsNullOrEmpty(dto.SourceBillNo))
                 query = query.Where(w => EF.Functions.Like(w.detail.SourceBillNo, "%" + dto.SourceBillNo + "%"));
 
+            //if (!string.IsNullOrEmpty(dto.MaterialNumber))
+            //    query = query.Where(w => EF.Functions.Like(w.detail.BillNo, "%" + dto.BillNo + "%"));
+
+            if(dto.SupplierId.HasValue)
+                query = query.Where(w => w.detail.SupplierId == dto.SupplierId.Value);
+
+            if (dto.OrgId.HasValue)
+                query = query.Where(w => w.detail.OrgId == dto.OrgId.Value);
+
+            if (dto.StockId.HasValue)
+                query = query.Where(w => w.detail.StockId == dto.StockId.Value);
+
+            if (dto.Type.HasValue)
+                query = query.Where(w => (int)w.order.Type == dto.Type);
+
+            if (dto.CreateBeginDate != null)
+                query = query.Where(w => w.order.CreateTime >= dto.CreateBeginDate);
+            if (dto.CreateEndDate != null)
+                query = query.Where(w => w.order.CreateTime <= dto.CreateEndDate);
+
             var response = new ResultPagedList<InStockQueryResponse>();
             int total = await query.CountAsync();
             response.TotalCount = total;