From 41dc9ab807859220314e8989b1f778728c2391e2 Mon Sep 17 00:00:00 2001 From: chenwenkai <1084072318@qq.com> Date: Wed, 13 Nov 2024 15:41:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.WarehouseMgr/WmsPrdInstockHService.cs | 85 +++++++++++-------- 1 file changed, 50 insertions(+), 35 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs index fe96679b..566cac83 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs @@ -339,7 +339,7 @@ namespace Tnb.WarehouseMgr public override async Task ModifyAsync(WareHouseUpInput input) { - Log.Information($"【WmsPrdInstockHService ModifyAsync】开始执行产成品入库对接bip {JsonConvert.SerializeObject(input)}"); + Logger.LogInformation($"【WmsPrdInstockHService ModifyAsync】开始执行产成品入库对接bip {JsonConvert.SerializeObject(input)}"); if (input == null) { throw new ArgumentNullException(nameof(input)); @@ -369,41 +369,56 @@ namespace Tnb.WarehouseMgr var prdInstockH = new PrdInstockH(); - prdInstockH = await _db.Queryable().Where(r => r.mo_task_id == prdReport.mo_task_id).FirstAsync(); - if (prdInstockH != null) - { - prdInstockH.bill_type = instock.type; - prdInstockH.warehouse_id = wmsPrdInstockD.warehouse_id; - prdInstockH.carry_code = wmsPrdInstockD.carry_id; - prdInstockH.location_code = wmsPrdInstockD.startlocation_id; - prdInstockH.create_id = prdReport?.create_id ?? wmsPrdInstockD.create_id; - prdInstockH.org_id = instock.org_id; - prdInstockH.station_id = prdMoTask?.workstation_id; - prdInstockH.workline_id = prdMoTask?.workline_id; - prdInstockH.mo_task_id = prdReport?.mo_task_id; - prdInstockH.code = instock.bill_code; - prdInstockH.is_sync_bip = 0; - await _db.Updateable(prdInstockH).ExecuteCommandAsync(); - Log.Information($"【WmsPrdInstockHService ModifyAsync】更新生产入库记录，id：{prdInstockH.id}"); - } - else - { - prdInstockH.id = SnowflakeIdHelper.NextId(); - prdInstockH.bill_type = instock.type; - prdInstockH.warehouse_id = wmsPrdInstockD.warehouse_id; - prdInstockH.carry_code = wmsPrdInstockD.carry_id; - prdInstockH.location_code = wmsPrdInstockD.startlocation_id; - prdInstockH.create_id = prdReport?.create_id ?? wmsPrdInstockD.create_id; - prdInstockH.org_id = instock.org_id; - prdInstockH.station_id = prdMoTask?.workstation_id; - prdInstockH.workline_id = prdMoTask?.workline_id; - prdInstockH.mo_task_id = prdReport?.mo_task_id; - prdInstockH.code = instock.bill_code; - prdInstockH.is_sync_bip = 0; + prdInstockH.id = SnowflakeIdHelper.NextId(); + prdInstockH.bill_type = instock.type; + prdInstockH.warehouse_id = wmsPrdInstockD.warehouse_id; + prdInstockH.carry_code = wmsPrdInstockD.carry_id; + prdInstockH.location_code = wmsPrdInstockD.startlocation_id; + prdInstockH.create_id = prdReport?.create_id ?? wmsPrdInstockD.create_id; + prdInstockH.org_id = instock.org_id; + prdInstockH.station_id = prdMoTask?.workstation_id; + prdInstockH.workline_id = prdMoTask?.workline_id; + prdInstockH.mo_task_id = prdReport?.mo_task_id; + prdInstockH.code = instock.bill_code; + prdInstockH.is_sync_bip = 0; - await _db.Insertable(prdInstockH).ExecuteCommandAsync(); - Log.Information($"【WmsPrdInstockHService ModifyAsync】新增生产入库记录，id：{prdInstockH.id}"); - } + await _db.Insertable(prdInstockH).ExecuteCommandAsync(); + + //prdInstockH = await _db.Queryable().Where(r => r.mo_task_id == prdReport.mo_task_id).FirstAsync(); + //if (prdInstockH != null) + //{ + // prdInstockH.bill_type = instock.type; + // prdInstockH.warehouse_id = wmsPrdInstockD.warehouse_id; + // prdInstockH.carry_code = wmsPrdInstockD.carry_id; + // prdInstockH.location_code = wmsPrdInstockD.startlocation_id; + // prdInstockH.create_id = prdReport?.create_id ?? wmsPrdInstockD.create_id; + // prdInstockH.org_id = instock.org_id; + // prdInstockH.station_id = prdMoTask?.workstation_id; + // prdInstockH.workline_id = prdMoTask?.workline_id; + // prdInstockH.mo_task_id = prdReport?.mo_task_id; + // prdInstockH.code = instock.bill_code; + // prdInstockH.is_sync_bip = 0; + // await _db.Updateable(prdInstockH).ExecuteCommandAsync(); + // Logger.LogInformation($"【WmsPrdInstockHService ModifyAsync】更新生产入库记录，id：{prdInstockH.id}"); + //} + //else + //{ + // prdInstockH.id = SnowflakeIdHelper.NextId(); + // prdInstockH.bill_type = instock.type; + // prdInstockH.warehouse_id = wmsPrdInstockD.warehouse_id; + // prdInstockH.carry_code = wmsPrdInstockD.carry_id; + // prdInstockH.location_code = wmsPrdInstockD.startlocation_id; + // prdInstockH.create_id = prdReport?.create_id ?? wmsPrdInstockD.create_id; + // prdInstockH.org_id = instock.org_id; + // prdInstockH.station_id = prdMoTask?.workstation_id; + // prdInstockH.workline_id = prdMoTask?.workline_id; + // prdInstockH.mo_task_id = prdReport?.mo_task_id; + // prdInstockH.code = instock.bill_code; + // prdInstockH.is_sync_bip = 0; + + // await _db.Insertable(prdInstockH).ExecuteCommandAsync(); + // Logger.LogInformation($"【WmsPrdInstockHService ModifyAsync】新增生产入库记录，id：{prdInstockH.id}"); + //} #endregion //来源erp才产成品入库