From 6e191140e9fe874d64df01b71bb312b49affee3d Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Fri, 3 Nov 2023 15:34:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=87=BA=E5=BA=93=E5=92=8C?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E4=BB=BB=E5=8A=A1=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 75 +++++++++++++++++ src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 40 ++++----- .../Dto/Erp/OutStock/ErpOutStockSaveDto.cs | 83 ++++++++++++++++++- src/WMS.Web.Domain/Entitys/OutStock.cs | 11 ++- src/WMS.Web.Domain/Entitys/OutStockDetails.cs | 11 +-- src/WMS.Web.Domain/Entitys/OutStockTask.cs | 15 +++- .../Entitys/OutStockTaskDetails.cs | 10 --- .../OutStockRepositories.cs | 4 +- .../OutStockTaskRepositories.cs | 4 +- 9 files changed, 205 insertions(+), 48 deletions(-) diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 53cb1610..33e7b922 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -575,6 +575,81 @@ 出库单同步金蝶 + + + 单据编号 + + + + + 单据类型 + + + + + 发货组织 + + + + + 收货客户 + + + + + 创建时间（出库时间） + + + + + 结算币别默认为: 人民币 + + + + + 销售组织取对应发货通知单的销售组织 + + + + + 销售部门取对应发货通知单的销售部门 + + + + + 物料Id + + + + + 仓库ID + + + + + 出库数量 + + + + + 出库数量 + + + + + 应发数量，取对应发货通知单的销售数量 + + + + + 单价 取对应发货通知单对应物料编码行的 单价 + + + + + 含税单价 取对应发货通知单对应物料编码行的 含税单价 + + erp-采购入库-返回数据源 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 1100658b..0a6212e6 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -680,6 +680,16 @@ 单据类型 + + + 发货组织 + + + + + 收货客户 + + 创建人 @@ -736,16 +746,6 @@ 销售订单号 - - - 发货组织 - - - - - 收货客户 - - 物料Id @@ -786,6 +786,16 @@ 来源单号 + + + 发货组织 + + + + + 收货客户 + + 单据状态 @@ -849,16 +859,6 @@ 销售订单号 - - - 发货组织 - - - - - 收货客户 - - 物料Id diff --git a/src/WMS.Web.Core/Dto/Erp/OutStock/ErpOutStockSaveDto.cs b/src/WMS.Web.Core/Dto/Erp/OutStock/ErpOutStockSaveDto.cs index 067ffbf8..52994d25 100644 --- a/src/WMS.Web.Core/Dto/Erp/OutStock/ErpOutStockSaveDto.cs +++ b/src/WMS.Web.Core/Dto/Erp/OutStock/ErpOutStockSaveDto.cs @@ -1,4 +1,5 @@ -using System; +using Newtonsoft.Json; +using System; using System.Collections.Generic; using System.Text; @@ -9,5 +10,85 @@ namespace WMS.Web.Core.Dto.Erp.OutStock /// public class ErpOutStockSaveDto { + /// + /// 单据编号 + /// + [JsonProperty("BillNo")] + public string BillNo { get; set; } + /// + /// 单据类型 + /// + [JsonProperty("BillNo")] + public string Type { get; set; } + /// + /// 发货组织 + /// + [JsonProperty("DeliveryOrgId")] + public int DeliveryOrgId { get; set; } + /// + /// 收货客户 + /// + [JsonProperty("ReceiptCustomerId")] + public int ReceiptCustomerId { get; set; } + /// + /// 创建时间（出库时间） + /// + [JsonProperty("CreateTime")] + public DateTime CreateTime { get; set; } = DateTime.Now; + /// + /// 结算币别默认为: 人民币 + /// + [JsonProperty("Currency")] + public string Currency { get; set; } + /// + /// 销售组织取对应发货通知单的销售组织 + /// + [JsonProperty("Currency")] + public string SalOrg { get; set; } + /// + /// 销售部门取对应发货通知单的销售部门 + /// + [JsonProperty("Currency")] + public string SalDept { get; set; } + + } + + public class ErpOutStockSaveDetailsDto + { + /// + /// 物料Id + /// + [JsonProperty("MaterialId")] + public string MaterialId { get; set; } + /// + /// 仓库ID + /// + [JsonProperty("StockId")] + public string StockId { get; set; } + /// + /// 出库数量 + /// + [JsonProperty("UnitId")] + public string UnitId { get; set; } + /// + /// 出库数量 + /// + [JsonProperty("Qty")] + public decimal Qty { get; set; } + /// + /// 应发数量，取对应发货通知单的销售数量 + /// + [JsonProperty("YFQty")] + public string YFQty { get; set; } + /// + /// 单价 取对应发货通知单对应物料编码行的 单价 + /// + [JsonProperty("Price")] + public string Price { get; set; } + /// + ///含税单价 取对应发货通知单对应物料编码行的 含税单价 + /// + [JsonProperty("HSPrice")] + public string HSPrice { get; set; } } } diff --git a/src/WMS.Web.Domain/Entitys/OutStock.cs b/src/WMS.Web.Domain/Entitys/OutStock.cs index 89c8edb3..dc622e66 100644 --- a/src/WMS.Web.Domain/Entitys/OutStock.cs +++ b/src/WMS.Web.Domain/Entitys/OutStock.cs @@ -40,7 +40,16 @@ namespace WMS.Web.Domain.Entitys /// [Column("Type")] public OrderType Type { get; set; } = OrderType.Sal_Out; - + /// + /// 发货组织 + /// + [Column("DeliveryOrgId")] + public int DeliveryOrgId { get; set; } + /// + /// 收货客户 + /// + [Column("ReceiptCustomerId")] + public int ReceiptCustomerId { get; set; } /// /// 创建人 /// diff --git a/src/WMS.Web.Domain/Entitys/OutStockDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockDetails.cs index 14d9aec8..145167c9 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockDetails.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockDetails.cs @@ -35,16 +35,7 @@ namespace WMS.Web.Domain.Entitys /// [Column("SaleBillNo")] public string SaleBillNo { get; set; } - /// - /// 发货组织 - /// - [Column("DeliveryOrgId")] - public int DeliveryOrgId { get; set; } - /// - /// 收货客户 - /// - [Column("ReceiptCustomerId")] - public int ReceiptCustomerId { get; set; } + /// /// 物料Id /// diff --git a/src/WMS.Web.Domain/Entitys/OutStockTask.cs b/src/WMS.Web.Domain/Entitys/OutStockTask.cs index e0f92dec..5909e22a 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockTask.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockTask.cs @@ -33,6 +33,16 @@ namespace WMS.Web.Domain.Entitys [Column("SourceBillNo")] public string SourceBillNo { get; set; } /// + /// 发货组织 + /// + [Column("DeliveryOrgId")] + public int DeliveryOrgId { get; set; } + /// + /// 收货客户 + /// + [Column("ReceiptCustomerId")] + public int ReceiptCustomerId { get; set; } + /// /// 单据状态 /// [Column("Status")] @@ -100,10 +110,11 @@ namespace WMS.Web.Domain.Entitys // 符合合并数据逻辑:出库状态为”待拣货”+出库类型为:销售出库+发货组织一致+收货客户一致+发货仓库一致 if (list.Where(w => w.Status != OutStockStatus.Wait).Any()) return Result.ReFailure(ResultCodes.MergeStatusError); if (list.Where(w => w.Type != OrderType.Sal_Out).Any()) return Result.ReFailure(ResultCodes.MergeStatusError); + if (list.GroupBy(g => g.DeliveryOrgId).Count() > 1) return Result.ReFailure(ResultCodes.MergeStatusError); + if (list.GroupBy(g => g.ReceiptCustomerId).Count() > 1) return Result.ReFailure(ResultCodes.MergeStatusError); var details = list.SelectMany(s => s.Details).ToList(); - if (details.GroupBy(g => g.DeliveryOrgId).Count() > 1) return Result.ReFailure(ResultCodes.MergeStatusError); - if (details.GroupBy(g => g.ReceiptCustomerId).Count() > 1) return Result.ReFailure(ResultCodes.MergeStatusError); + if (details.GroupBy(g => g.StockId).Count() > 1) return Result.ReFailure(ResultCodes.MergeStatusError); //清空数据绑定 diff --git a/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs index ec2294aa..d9da6d54 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs @@ -32,16 +32,6 @@ namespace WMS.Web.Domain.Entitys [Column("SaleBillNo")] public string SaleBillNo { get; set; } /// - /// 发货组织 - /// - [Column("DeliveryOrgId")] - public int DeliveryOrgId { get; set; } - /// - /// 收货客户 - /// - [Column("ReceiptCustomerId")] - public int ReceiptCustomerId { get; set; } - /// /// 物料Id /// [Column("MaterialId")] diff --git a/src/WMS.Web.Repositories/OutStockRepositories.cs b/src/WMS.Web.Repositories/OutStockRepositories.cs index 1b9c107f..727eba7e 100644 --- a/src/WMS.Web.Repositories/OutStockRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockRepositories.cs @@ -103,7 +103,7 @@ namespace WMS.Web.Repositories if (dto.SuccessSync != null) query = query.Where(w => w.order.SuccessSync == dto.SuccessSync); if (dto.DeliveryOrgId != null) - query = query.Where(w => w.detail.DeliveryOrgId == dto.DeliveryOrgId); + query = query.Where(w => w.order.DeliveryOrgId == dto.DeliveryOrgId); if (dto.StockId != null) query = query.Where(w => w.detail.StockId == dto.StockId); if (dto.CreateBeginDate != null) @@ -126,7 +126,7 @@ namespace WMS.Web.Repositories SourceBillNo = s.detail.SourceBillNo, SaleBillNo = s.detail.SaleBillNo, DeliveryOrg = "", - ReceiptCustomer = _singleDataService.GetSingleData(SingleAction.Customers, _loginRepositories.CompanyId, s.detail.ReceiptCustomerId), + ReceiptCustomer = _singleDataService.GetSingleData(SingleAction.Customers, _loginRepositories.CompanyId, s.order.ReceiptCustomerId), MaterialName = "", MaterialNumber = "", Specifications = "", diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs index 47fd5754..d37eb6f3 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -229,7 +229,7 @@ namespace WMS.Web.Repositories if (dto.Status != null) query = query.Where(w => w.order.Status == (OutStockStatus)dto.Status); if (dto.DeliveryOrgId != null) - query = query.Where(w => w.detail.DeliveryOrgId == dto.DeliveryOrgId); + query = query.Where(w => w.order.DeliveryOrgId == dto.DeliveryOrgId); if (dto.StockId != null) query = query.Where(w => w.detail.StockId == dto.StockId); if (dto.CreateBeginDate != null) @@ -251,7 +251,7 @@ namespace WMS.Web.Repositories SourceBillNo = s.order.SourceBillNo, SaleBillNo = s.detail.SaleBillNo, DeliveryOrg = "", - ReceiptCustomer = _singleDataService.GetSingleData(SingleAction.Customers, _loginRepositories.CompanyId, s.detail.ReceiptCustomerId), + ReceiptCustomer = _singleDataService.GetSingleData(SingleAction.Customers, _loginRepositories.CompanyId, s.order.ReceiptCustomerId), MaterialName = "", MaterialNumber = "", Specifications = ""