调整出库单查询

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

@@ -7,6 +7,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using WMS.Web.Core;
 using WMS.Web.Core.Dto;
+using WMS.Web.Core.Dto.Erp;
 using WMS.Web.Core.Dto.SingleData;
 using WMS.Web.Core.Internal.Results;
 using WMS.Web.Domain.Infrastructure;
@@ -148,6 +149,42 @@ namespace WMS.Web.Api.Controllers
             return Result<List<UcStockResponse>>.ReSuccess(list);
         }
 
+        /// <summary>
+        /// 获取出库单客户下拉列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("GetCustomers")]
+        public async Task<Result<List<PullDownStrResponse>>> GetCustomers()
+        {
+            var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
+            if (loginInfo == null || loginInfo.UserInfo == null)
+                return Result<List<PullDownStrResponse>>.ReFailure(ResultCodes.Token_Invalid_Error);
+            var customers = await _erpService.BillQueryForCustomer();
+            var orgs = await _erpService.BillQueryForOrg();
+            List<PullDownStrResponse> pullList = new List<PullDownStrResponse>();
+            foreach (var c in customers.Data)
+            {
+                pullList.Add(new PullDownStrResponse()
+                {
+                    Id = "c_" + c.Id,
+                    Name = c.Name,
+                    Code = c.Number
+                });
+            }
+            foreach (var o in orgs.Data)
+            {
+                pullList.Add(new PullDownStrResponse()
+                {
+                    Id = "o_" + o.Id,
+                    Name = o.Name,
+                    Code = o.Number
+                });
+            }
+
+            return Result<List<PullDownStrResponse>>.ReSuccess(pullList);
+        }
+
         /// <summary>
         /// 获取仓位：模糊名称
         /// </summary>

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

@@ -290,6 +290,12 @@
             <param name="id">仓库id</param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetCustomers">
+            <summary>
+            获取出库单客户下拉列表
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetSubUcStockByName(System.String)">
             <summary>
             获取仓位：模糊名称

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

@@ -465,6 +465,26 @@
             单据类型
             </summary>
         </member>
+        <member name="T:WMS.Web.Core.Dto.Erp.Customer.ErpCustomerDto">
+            <summary>
+            客户
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.Customer.ErpCustomerDto.Id">
+            <summary>
+            ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.Customer.ErpCustomerDto.Number">
+            <summary>
+            编码
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.Customer.ErpCustomerDto.Name">
+            <summary>
+            名称
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.Erp.ErpBillQueryDto">
             <summary>
             ERP：单据查询-dto
@@ -775,6 +795,26 @@
             含税单价 取对应发货通知单对应物料编码行的 含税单价
             </summary> 
         </member>
+        <member name="T:WMS.Web.Core.Dto.Erp.PullDownStrResponse">
+            <summary>
+            key为string 下拉列表对象
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.PullDownStrResponse.Id">
+            <summary>
+            id
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.PullDownStrResponse.Code">
+            <summary>
+            编码
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.PullDownStrResponse.Name">
+            <summary>
+            名字
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto">
             <summary>
             erp-采购入库-返回数据源
@@ -1572,7 +1612,7 @@
         </member>
         <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.StockCode">
              <summary>
-             仓库ID
+             仓库编码
             </summary> 
         </member>
         <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.SubStockId">
@@ -2350,12 +2390,7 @@
             完成装箱时间
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.OpsBoxResponse.cartonCreateTime">
+        <member name="P:WMS.Web.Core.Dto.OpsBoxResponse.CreateUser">
-            <summary>
-            箱子的创建时间
-            </summary>
-        </member>
-        <member name="P:WMS.Web.Core.Dto.OpsBoxResponse.BoxUser">
             <summary>
             箱子创建用户
             </summary>
@@ -2365,7 +2400,7 @@
             创建时间（对应老OPS的创建时间）
             </summary>
         </member>
-        <member name="F:WMS.Web.Core.Dto.OpsBoxResponse.Details">
+        <member name="P:WMS.Web.Core.Dto.OpsBoxResponse.Details">
             <summary>
             明细
             </summary>
@@ -2375,14 +2410,14 @@
             序列号
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.SerialNumbersResponse.barCreateTime">
+        <member name="P:WMS.Web.Core.Dto.SerialNumbersResponse.BarCreateTime">
             <summary>
-            条码生成时间
+            序列号生成时间
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.SerialNumbersResponse.barCereateUser">
+        <member name="P:WMS.Web.Core.Dto.SerialNumbersResponse.BarCereateUser">
             <summary>
-            条码生成用户
+            序列号生成用户
             </summary>
         </member>
         <member name="P:WMS.Web.Core.Dto.OpsBoxDetailsResponse.MaterialId">

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

@@ -110,6 +110,16 @@
             组织Id
             </summary>
         </member>
+        <member name="P:WMS.Web.Domain.Entitys.Box.CompleteCartonTime">
+            <summary>
+            完成装箱时间
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.Box.CreateUser">
+            <summary>
+            箱子创建用户
+            </summary>
+        </member>
         <member name="P:WMS.Web.Domain.Entitys.Box.CreateTime">
             <summary>
             创建时间（对应老OPS的创建时间）
@@ -741,7 +751,7 @@
             明细
             </summary>
         </member>
-        <member name="M:WMS.Web.Domain.Entitys.OutStock.Create(System.Int32,System.Int32,WMS.Web.Domain.Values.OutStockType)">
+        <member name="M:WMS.Web.Domain.Entitys.OutStock.Create(System.Int32,WMS.Web.Domain.Entitys.OutStockTask)">
             <summary>
             创建
             </summary>
@@ -938,6 +948,56 @@
              出库结束时间
             </summary> 
         </member>
+        <member name="T:WMS.Web.Domain.Entitys.SerialNumberOperate">
+            <summary>
+            序列号操作记录表
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.SerialNumberOperate.Id">
+            <summary>
+            ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.SerialNumberOperate.SerialNumber">
+            <summary>
+            序列号
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.SerialNumberOperate.OperateType">
+            <summary>
+            序列号操作类型
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.SerialNumberOperate.SupplierId">
+            <summary>
+            供应商Id
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.SerialNumberOperate.OrgId">
+            <summary>
+            组织Id
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.SerialNumberOperate.StockId">
+            <summary>
+            仓库Id
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.SerialNumberOperate.OperateTime">
+            <summary>
+            操作时间
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.SerialNumberOperate.OperateUser">
+            <summary>
+            操作人
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.SerialNumberOperate.Remark">
+            <summary>
+            备注
+            </summary>
+        </member>
         <member name="T:WMS.Web.Domain.Entitys.TakeStock">
             <summary>
             wms盘点单
@@ -1393,6 +1453,14 @@
         <member name="M:WMS.Web.Domain.Infrastructure.IOutStockTaskRepositories.DeleteEntityList(System.Collections.Generic.List{System.Int32},System.Boolean)">
             删除实体集合
         </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.ISerialNumberOperateRepositories.AddRange(System.Collections.Generic.List{WMS.Web.Domain.Entitys.SerialNumberOperate},System.Boolean)">
+            <summary>
+            批量添加
+            </summary>
+            <param name="entitys"></param>
+            <param name="isTransaction"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Infrastructure.ITakeStockRepositories.AddRange(System.Collections.Generic.List{WMS.Web.Domain.Entitys.TakeStock},System.Boolean)">
             <summary>
             批量添加
@@ -1570,6 +1638,14 @@
             <param name="supplierId"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetCustomerName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.Customer.ErpCustomerDto},System.Int32)">
+            <summary>
+            获取客户名称
+            </summary>
+            <param name="erpCustomers"></param>
+            <param name="customerId"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetStockName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpStockDto},System.Int32)">
             <summary>
             获取仓库名称
@@ -1654,6 +1730,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForCustomer">
+            <summary>
+            客户
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForStock">
             <summary>
             获取仓库信息
@@ -2199,6 +2281,14 @@
             箱服务信息
             </summary>
         </member>
+        <member name="M:WMS.Web.Domain.Services.BoxService.SerialNumberOperate(System.Collections.Generic.List{WMS.Web.Domain.Entitys.SerialNumberOperate},System.Boolean)">
+            <summary>
+            序列号操作记录日志
+            </summary>
+            <param name="list"></param>
+            <param name="isTransaction"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.Services.ChangeMoveBoxService">
             改箱 移箱服务
         </member>
@@ -2440,6 +2530,14 @@
             <param name="supplierId"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetCustomerName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.Customer.ErpCustomerDto},System.Int32)">
+            <summary>
+            获取客户名称
+            </summary>
+            <param name="erpCustomers"></param>
+            <param name="customerId"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetStockName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpStockDto},System.Int32)">
             <summary>
             获取仓库名称
@@ -2499,6 +2597,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForCustomer">
+            <summary>
+            客户
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForStock">
             <summary>
             erp:仓库
@@ -3039,6 +3143,11 @@
             分布式调出单
             </summary>
         </member>
+        <member name="F:WMS.Web.Domain.Values.Erp.FormIdParam.BD_Customer">
+            <summary>
+            客户
+            </summary>
+        </member>
         <member name="T:WMS.Web.Domain.Values.InstockStatus">
             <summary>
             入库状态
@@ -3259,6 +3368,11 @@
             数据操作失败
             </summary>
         </member>
+        <member name="T:WMS.Web.Domain.Values.SerialNumberOperateType">
+            <summary>
+            序列号操作类型
+            </summary>
+        </member>
         <member name="T:WMS.Web.Domain.Values.Single.SingleAction">
             <summary>
             对接单点的接口方法-枚举

src/WMS.Web.Core/Dto/Erp/PullDownStrResponse.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WMS.Web.Core.Dto.Erp
+{
+    /// <summary>
+    /// key为string 下拉列表对象
+    /// </summary>
+   public class PullDownStrResponse
+    {
+        /// <summary>
+        /// id
+        /// </summary>
+        public string Id { get; set; }
+        /// <summary>
+        /// 编码
+        /// </summary>
+        public string Code { get; set; }
+        /// <summary>
+        /// 名字
+        /// </summary>
+        public string Name { get; set; }
+    }
+}

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

@@ -73,10 +73,12 @@ namespace WMS.Web.Domain.Entitys
         /// 创建
         /// </summary>
         /// <param name="creatorId"></param>
-        public void Create(int creatorId,int taskId, OutStockType type)
+        public void Create(int creatorId, OutStockTask task)
         {
-            this.TaskId = taskId;
+            this.TaskId = task.Id;
-            this.Type = type;
+            this.Type = task.Type;
+            this.DeliveryOrgId = task.DeliveryOrgId;
+            this.ReceiptCustomerId = task.ReceiptCustomerId;
             this.CreatorId = creatorId;
             this.CreateTime = DateTime.Now;
         }

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

@@ -50,7 +50,7 @@ namespace WMS.Web.Domain.Services
             //OutStock entity = await _outStockRepositories.GetByTaskId(dto.TaskId);
 
             OutStock entity = new OutStock();
-            entity.Create(loginInfo.UserInfo.StaffId, outStockTask.Id, outStockTask.Type);
+            entity.Create(loginInfo.UserInfo.StaffId, outStockTask);
             foreach (var d in dto.Details)
             {
                 //任务单明细

src/WMS.Web.Repositories/OutStockRepositories.cs

@@ -114,7 +114,12 @@ namespace WMS.Web.Repositories
             //物料集合；模糊查询后的物料集合
             if (!string.IsNullOrEmpty(dto.ReceiptCustomer))
             {
-                cIds = customers.Where(w => EF.Functions.Like(w.Name, "%" + dto.ReceiptCustomer + "%")).Select(s => s.MaterialId).ToList();
+                var q = dto.ReceiptCustomer.Substring(0, 1);
+                var h = dto.ReceiptCustomer.Substring(2, dto.ReceiptCustomer.Length - 1);
+                if (q.Equals("c"))
+                    cIds = customers.Where(w => EF.Functions.Like(w.Name, "%" + dto.ReceiptCustomer + "%")).Select(s => s.Id).ToList();
+                else
+                    cIds = orgs.Where(w => EF.Functions.Like(w.Name, "%" + dto.ReceiptCustomer + "%")).Select(s => s.Id).ToList();
             }
             #endregion
 
@@ -124,7 +129,14 @@ namespace WMS.Web.Repositories
                .OrderByDescending(o => o.order.Id)
                .Where(adv => 1 == 1);
 
-            //if (!string.IsNullOrEmpty(dto.ReceiptCustomer))
+            if (cIds.Count() != 0)
+            {
+                var q = dto.ReceiptCustomer.Substring(0, 1);
+                if (q.Equals("c"))//差销售出库单(客户)
+                    query = query.Where(w => cIds.Contains(w.order.ReceiptCustomerId) && w.order.Type == OutStockType.Sal);
+                else//查其他单据(组织)
+                    query = query.Where(w => cIds.Contains(w.order.ReceiptCustomerId) && w.order.Type != OutStockType.Sal);
+            }
             if (mIds.Count() != 0)
                 query = query.Where(w => mIds.Contains(w.detail.MaterialId));
             if (ids.Count() > 0)

src/WMS.Web.Repositories/OutStockTaskRepositories.cs

@@ -240,7 +240,12 @@ namespace WMS.Web.Repositories
             //物料集合；模糊查询后的物料集合
             if (!string.IsNullOrEmpty(dto.ReceiptCustomer))
             {
-                cIds = customers.Where(w => EF.Functions.Like(w.Name, "%" + dto.ReceiptCustomer + "%")).Select(s => s.MaterialId).ToList();
+                var q = dto.ReceiptCustomer.Substring(0, 1);
+                var h = dto.ReceiptCustomer.Substring(2, dto.ReceiptCustomer.Length - 1);
+                if (q.Equals("c"))
+                    cIds = customers.Where(w => EF.Functions.Like(w.Name, "%" + dto.ReceiptCustomer + "%")).Select(s => s.Id).ToList();
+                else
+                    cIds = orgs.Where(w => EF.Functions.Like(w.Name, "%" + dto.ReceiptCustomer + "%")).Select(s => s.Id).ToList();
             }
             #endregion
 
@@ -251,7 +256,13 @@ namespace WMS.Web.Repositories
                .Where(adv => 1 == 1);
 
             if (cIds.Count() != 0)
-                query = query.Where(w => cIds.Contains(w.order.ReceiptCustomerId));
+            {
+                var q = dto.ReceiptCustomer.Substring(0, 1);
+                if (q.Equals("c"))//差销售出库单(客户)
+                    query = query.Where(w => cIds.Contains(w.order.ReceiptCustomerId) && w.order.Type == OutStockType.Sal);
+                else//查其他单据(组织)
+                    query = query.Where(w => cIds.Contains(w.order.ReceiptCustomerId) && w.order.Type != OutStockType.Sal);
+            }
             if (mIds.Count() != 0)
                 query = query.Where(w => mIds.Contains(w.detail.MaterialId));
             if (dto.Ids.Count() > 0)