diff --git a/src/WMS.Web.Api/appsettings.json b/src/WMS.Web.Api/appsettings.json index e1d7dc71..d9ed492f 100644 --- a/src/WMS.Web.Api/appsettings.json +++ b/src/WMS.Web.Api/appsettings.json @@ -109,8 +109,8 @@ "EmailOptions": { "SmtpServer": "smtp.qiye.aliyun.com", "SmtpPort": 587, - "SenderName": "元创时代", - "SendTitle": "【元创时代】-产品入库通知", + "SenderName": "深圳市元创时代", + "SendTitle": "【深圳市元创时代】-产品入库通知", "SenderEmail": "info@f2b211.com", "SenderEmailPwd": "K4h6GgxZYGMYV1Bb" }, diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index a8ffe0f9..af0d4db4 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -1066,6 +1066,16 @@ 批号 + + + 批号 + + + + + 批号 + + 下推 diff --git a/src/WMS.Web.Core/Dto/Erp/ErpPurchaseInStockSaveDto.cs b/src/WMS.Web.Core/Dto/Erp/ErpPurchaseInStockSaveDto.cs index 85140c4c..b0c30582 100644 --- a/src/WMS.Web.Core/Dto/Erp/ErpPurchaseInStockSaveDto.cs +++ b/src/WMS.Web.Core/Dto/Erp/ErpPurchaseInStockSaveDto.cs @@ -54,6 +54,18 @@ namespace WMS.Web.Core.Dto.Erp /// 批号 /// [JsonProperty("FLot")] - public string Lot { get; set; } + public ErpLotSaveDto Lot { get; set; } + } + + /// + /// 批号 + /// + public class ErpLotSaveDto + { + /// + /// 批号 + /// + [JsonProperty("FNumber")] + public string Number { get; set; } } } diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs index 279b6b29..3d58941f 100644 --- a/src/WMS.Web.Domain/Services/InStockService.cs +++ b/src/WMS.Web.Domain/Services/InStockService.cs @@ -810,11 +810,17 @@ namespace WMS.Web.Domain.Services erpDetail.GenerateBatchBillNo(new_firstBillNo, new_lastBillNo, current_erp_material.IsBatchManage); _logger.LogInformation($"入库单->批号{erpDetail.BatchBillNo}"); if (!string.IsNullOrEmpty(erpDetail.BatchBillNo)) - purchaseInStock.Details[0].Lot = erpDetail.BatchBillNo; + { + purchaseInStock.Details[0].Lot = new ErpLotSaveDto(); + purchaseInStock.Details[0].Lot.Number = erpDetail.BatchBillNo; + } } } else - purchaseInStock.Details[0].Lot = erpDetail.BatchBillNo; + { + purchaseInStock.Details[0].Lot = new ErpLotSaveDto(); + purchaseInStock.Details[0].Lot.Number = erpDetail.BatchBillNo; + } string formId = dto.TargetFormId.ToString(); _logger.LogInformation($"入库单->开始同步金蝶 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId} 数据: {JsonConvert.SerializeObject(dto)}");