From fed352fbcaa38bc9b59e37f852556c3c1c801701 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 12 Jul 2023 16:03:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=87=BA=E5=BA=93=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dto/Inputs/MESCarrySignInput.cs | 2 +- .../Dto/Inputs/SignForDeliveryInput.cs | 1 + .../Tnb.WarehouseMgr.Entities/Mapper/Mapper.cs | 2 +- .../Tnb.WarehouseMgr/WmsOutStockService.cs | 17 ++++++++++------- .../WmsSignForDeliveryService.cs | 13 ++++++++++--- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MESCarrySignInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MESCarrySignInput.cs index 8c6ae151..f6b0af2f 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MESCarrySignInput.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MESCarrySignInput.cs @@ -12,7 +12,7 @@ /// /// 载具Id /// - public string? carry_id { get; set;} + public string? carry_code { get; set;} /// /// 创建热Id /// diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/SignForDeliveryInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/SignForDeliveryInput.cs index c4069841..6ab920ac 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/SignForDeliveryInput.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/SignForDeliveryInput.cs @@ -19,6 +19,7 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Inputs /// 载具ID /// public string carryId { get; set; } + public string carry_code { get; set; } public string new_carry_code { get; set; } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Mapper/Mapper.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Mapper/Mapper.cs index 8cffe67e..80715f36 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Mapper/Mapper.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Mapper/Mapper.cs @@ -14,7 +14,7 @@ namespace Tnb.WarehouseMgr.Entities.Mapper .Map(dest => dest.pretask_code, src => src.bill_code); config.ForType() - .Map(dest => dest.carryId, src => src.carry_id) + .Map(dest => dest.carryId, src => src.carry_code) ; } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs index 7a401299..c02d3280 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs @@ -120,15 +120,16 @@ namespace Tnb.WarehouseMgr } else if (os.pr_qty <= carryCodesPart[i].codeqty) { - carryCodesPart[i].codeqty = os.pr_qty; - curCarryCodes.Add(carryCodesPart[i]); + WmsCarryCode curCarryCode = DeepCopyHelper.DeepCopy(carryCodesPart[i]); + curCarryCode.codeqty = os.pr_qty; + curCarryCodes.Add(curCarryCode); break; } } var partCarryMats = curCarryCodes.Adapt>(); for (int i = 0; i < partCarryMats.Count; i++) { - partCarryMats[i].need_qty = carryCodesPart[i].codeqty; + partCarryMats[i].need_qty = curCarryCodes[i].codeqty; } carryMats.AddRange(partCarryMats); } @@ -361,15 +362,16 @@ namespace Tnb.WarehouseMgr } else if (os.pr_qty <= carryCodesPart[i].codeqty) { - carryCodesPart[i].codeqty = os.pr_qty; - curCarryCodes.Add(carryCodesPart[i]); + var tmp = DeepCopyHelper.DeepCopy(carryCodesPart[i]); + tmp.codeqty = os.pr_qty; + curCarryCodes.Add(tmp); break; } } var partCarryMats = curCarryCodes.Adapt>(); for (int i = 0; i < partCarryMats.Count; i++) { - partCarryMats[i].need_qty = carryCodesPart[i].codeqty; + partCarryMats[i].need_qty = curCarryCodes[i].codeqty; } carryMats.AddRange(partCarryMats); } @@ -407,6 +409,7 @@ namespace Tnb.WarehouseMgr carryIds = allOutIds.Concat(sortingOutIds).ToList(); await _db.Updateable().SetColumns(it => new WmsCarryH { out_status = ((int)EnumOutStatus.全部出).ToString() }).Where(it => allOutIds.Contains(it.id)).ExecuteCommandAsync(); await _db.Updateable().SetColumns(it => new WmsCarryH { out_status = ((int)EnumOutStatus.分拣出).ToString() }).Where(it => sortingOutIds.Contains(it.id)).ExecuteCommandAsync(); + } var carrys = await _db.Queryable().Where(it => carryIds.Contains(it.id)).ToListAsync(); if (carrys?.Count > 0) @@ -609,8 +612,8 @@ namespace Tnb.WarehouseMgr await _db.Updateable(curOutstockDetails).ExecuteCommandAsync(); if (otds.All(x => x.line_status == WmsWareHouseConst.BILLSTATUS_COMPLETE_ID)) { - await _db.Updateable().SetColumns(it => new WmsOutstockH { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID }).Where(it => it.id == input.requireId).ExecuteCommandAsync(); //如果是自动单据，需要回更上层系统 + await _db.Updateable().SetColumns(it => new WmsOutstockH { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID }).Where(it => it.id == input.requireId).ExecuteCommandAsync(); } else { diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs index f9cacdac..948343ed 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs @@ -65,8 +65,15 @@ namespace Tnb.WarehouseMgr try { await _db.Ado.BeginTranAsync(); - - var carry = await _db.Queryable().SingleAsync(it => it.id == input.carryId); + WmsCarryH? carry = null; + if (!input.carryId.IsNullOrWhiteSpace()) + { + carry = await _db.Queryable().SingleAsync(it => it.id == input.carryId); + } + else + { + carry = await _db.Queryable().SingleAsync(it => it.carry_code == input.carry_code); + } if (carry != null) { if (carry!.location_id!.IsNotEmptyOrNull()) @@ -119,7 +126,7 @@ namespace Tnb.WarehouseMgr /// /// [HttpPost] - public async Task MESCarrySign(MESCarrySignInput input) + public async Task MESCarrySign(MESCarrySignInput input) { if (input.IsNull()) throw new ArgumentNullException("input"); var signInput = input.Adapt(); From a3e6ba5bb5f20e9adeeb9d141ba183bb8954eea2 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 12 Jul 2023 16:11:55 +0800 Subject: [PATCH 2/4] 1 --- .../WmsSignForDeliveryService.cs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs index 948343ed..61e40c6f 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs @@ -125,14 +125,20 @@ namespace Tnb.WarehouseMgr /// /// /// - [HttpPost] - public async Task MESCarrySign(MESCarrySignInput input) + [HttpPost, NonUnify] + public async Task MESCarrySign(MESCarrySignInput input) { if (input.IsNull()) throw new ArgumentNullException("input"); var signInput = input.Adapt(); - await SignForDelivery(signInput); + try + { + await SignForDelivery(signInput); + } + catch (Exception) + { + return ToApiResult(HttpStatusCode.InternalServerError, "签收失败"); + } + return ToApiResult(); } - - } } From 010c7f34a80106b2950dfe9f801e3bc452c623ac Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 12 Jul 2023 16:14:24 +0800 Subject: [PATCH 3/4] 1 --- .../Tnb.WarehouseMgr.Interfaces/IWmsSignForDeliveryService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWmsSignForDeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWmsSignForDeliveryService.cs index 84fdc879..dd623785 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWmsSignForDeliveryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWmsSignForDeliveryService.cs @@ -16,6 +16,6 @@ namespace Tnb.WarehouseMgr.Interfaces /// /// /// - public Task MESCarrySign(MESCarrySignInput input); + public Task MESCarrySign(MESCarrySignInput input); } } From 3eb8b471b758b28cad40bd33b755b3fad79a534e Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 12 Jul 2023 17:24:50 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AEcarry=5Fcode?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs index 61e40c6f..366b22d5 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs @@ -94,6 +94,10 @@ namespace Tnb.WarehouseMgr { disTask = await _db.Queryable().FirstAsync(it => it.carry_id == input.carryId && it.is_sign == 0); } + else if (!input.carry_code.IsNullOrEmpty()) + { + disTask = await _db.Queryable().FirstAsync(it => it.carry_code == input.carry_code && it.is_sign == 0); + } if (disTask != null) { if (_dicBizType.ContainsKey(disTask.biz_type))