This commit is contained in:
tongfei
2024-04-09 15:52:12 +08:00
parent 0d3f14372e
commit 1d42183b3c
4 changed files with 33 additions and 5 deletions

View File

@@ -109,8 +109,8 @@
"EmailOptions": { "EmailOptions": {
"SmtpServer": "smtp.qiye.aliyun.com", "SmtpServer": "smtp.qiye.aliyun.com",
"SmtpPort": 587, "SmtpPort": 587,
"SenderName": "元创时代", "SenderName": "深圳市元创时代",
"SendTitle": "【元创时代】-产品入库通知", "SendTitle": "【深圳市元创时代】-产品入库通知",
"SenderEmail": "info@f2b211.com", "SenderEmail": "info@f2b211.com",
"SenderEmailPwd": "K4h6GgxZYGMYV1Bb" "SenderEmailPwd": "K4h6GgxZYGMYV1Bb"
}, },

View File

@@ -1066,6 +1066,16 @@
批号 批号
</summary> </summary>
</member> </member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpLotSaveDto">
<summary>
批号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpLotSaveDto.Number">
<summary>
批号
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpPushDto"> <member name="T:WMS.Web.Core.Dto.Erp.ErpPushDto">
<summary> <summary>
下推 下推

View File

@@ -54,6 +54,18 @@ namespace WMS.Web.Core.Dto.Erp
/// 批号 /// 批号
/// </summary> /// </summary>
[JsonProperty("FLot")] [JsonProperty("FLot")]
public string Lot { get; set; } public ErpLotSaveDto Lot { get; set; }
}
/// <summary>
/// 批号
/// </summary>
public class ErpLotSaveDto
{
/// <summary>
/// 批号
/// </summary>
[JsonProperty("FNumber")]
public string Number { get; set; }
} }
} }

View File

@@ -810,11 +810,17 @@ namespace WMS.Web.Domain.Services
erpDetail.GenerateBatchBillNo(new_firstBillNo, new_lastBillNo, current_erp_material.IsBatchManage); erpDetail.GenerateBatchBillNo(new_firstBillNo, new_lastBillNo, current_erp_material.IsBatchManage);
_logger.LogInformation($"入库单->批号{erpDetail.BatchBillNo}"); _logger.LogInformation($"入库单->批号{erpDetail.BatchBillNo}");
if (!string.IsNullOrEmpty(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 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(); string formId = dto.TargetFormId.ToString();
_logger.LogInformation($"入库单->开始同步金蝶 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId} 数据: {JsonConvert.SerializeObject(dto)}"); _logger.LogInformation($"入库单->开始同步金蝶 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId} 数据: {JsonConvert.SerializeObject(dto)}");