From 4efafd2f34d22c52fb898f8075e27d295495d036 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 21 Jun 2023 16:17:51 +0800 Subject: [PATCH] =?UTF-8?q?wms=5Ftemp=5Fcode=20codeqty=E6=94=B9=E4=B8=BAba?= =?UTF-8?q?rcode=5Fqty?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entity/WmsTempCode.cs | 2 +- .../Tnb.WarehouseMgr/WmsInStockService.cs | 17 ++------- .../Tnb.WarehouseMgr/WmsPDAInStockService.cs | 37 +++++++++---------- 3 files changed, 23 insertions(+), 33 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTempCode.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTempCode.cs index d67d38c8..70821dd2 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTempCode.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTempCode.cs @@ -42,7 +42,7 @@ public partial class WmsTempCode : BaseEntity /// /// 条码数量 /// - public decimal? codeqty { get; set; } + public decimal? barcode_qty { get; set; } /// /// 单位ID diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs index f2bf728a..4a2da847 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs @@ -96,12 +96,12 @@ namespace Tnb.WarehouseMgr { if (index < codeNum) { - barCode.codeqty = minPacking; + barCode.barcode_qty = minPacking; } else { - if (mod > 0) barCode.codeqty = mod; - else barCode.codeqty = minPacking; + if (mod > 0) barCode.barcode_qty = mod; + else barCode.barcode_qty = minPacking; } } wmsTempCodes.Add(barCode); @@ -144,7 +144,7 @@ namespace Tnb.WarehouseMgr var code = $"{detail.material_code}{detail.code_batch}{no.ToString().PadLeft(4, '0')}"; barCode.barcode = code; barCode.code_batch = detail.code_batch; - barCode.codeqty = detail.pr_qty!.Value; + barCode.barcode_qty = detail.pr_qty!.Value; barCode.unit_id = detail.unit_id; barCode.is_lock = 0; barCode.is_end = "0"; @@ -155,14 +155,5 @@ namespace Tnb.WarehouseMgr return barCode; } - /// - /// 扫码入库 - /// - /// - [HttpPost] - public async Task SacnBarCodeInStock() - { - - } } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs index 56611f96..c0f03c6e 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs @@ -21,6 +21,7 @@ using Newtonsoft.Json.Linq; using NPOI.OpenXmlFormats.Vml; using SqlSugar; using Tnb.BasicData.Entities; +using Tnb.Common.Utils; using Tnb.WarehouseMgr.Entities; using Tnb.WarehouseMgr.Entities.Attributes; using Tnb.WarehouseMgr.Entities.Consts; @@ -63,7 +64,13 @@ namespace Tnb.WarehouseMgr OverideFuncs.CreateAsync = ScanCodeInStock; } - private async Task ScanCodeInStock(VisualDevModelDataCrInput input) + /// + /// 扫码入库功能 + /// + /// + /// + [HttpPost] + public async Task ScanCodeInStock(VisualDevModelDataCrInput input) { try { @@ -138,6 +145,7 @@ namespace Tnb.WarehouseMgr ptc.barcode = jo.Value(nameof(WmsPretaskCode.barcode)); ptc.codeqty = jo.Value(nameof(WmsPretaskCode.codeqty)); ptc.unit_id = jo.Value(nameof(WmsPretaskCode.unit_id)); + ptc.code_batch = jo.Value(nameof(WmsPretaskCode.code_batch)); pretaskCodes.Add(ptc); } } @@ -191,27 +199,17 @@ namespace Tnb.WarehouseMgr } //生成载具条码记录 var carryCodes = preTaskUpInput.PreTaskHandleCodes.Adapt>(); + carryCodes.ForEach(x => { x.id = SnowflakeIdHelper.NextId(); x.is_out = 0; + x.carry_id = input.data[nameof(WmsCarryCode.carry_id)]?.ToString(); }); //生成入库申请条码 var instockDetails = await _db.Queryable() .Where(b => b.bill_id == input.data[requireIdField].ToString()) .ToListAsync(); - //var instockProps = typeof(WmsInstockD).GetProperties().Select(p => p.Name).ToList(); - //var instockCodeProps = typeof(WmsInstockCode).GetProperties().Select(p => p.Name).ToList(); - //var ssss = instockCodeProps.Intersect(instockProps).ToList(); - //var instockTypes = typeof(WmsInstockD).GetProperties().Where(p => ssss.Contains(p.Name)).Select(p => p.PropertyType.Name).ToList(); - //var instockCodeTypes = typeof(WmsInstockCode).GetProperties().Where(p => ssss.Contains(p.Name)).Select(p => p.PropertyType.Name).ToList(); - //var dddf = instockTypes.Except(instockCodeTypes).ToList(); - //var ddd = instockDetails[0].Adapt(); - - //org_id,bill_id,line_status,material_id,material_code,code_batch,unit_id,unit_code,source_id, - // source_code,source_type,source_line,source_detail_id,remark,extras,time_stamp,create_id, - // create_time,modify_id,modify_time,mo_code,mo_line,mo_bom_detail_id,id - var items = instockDetails.Adapt>(); @@ -228,11 +226,12 @@ namespace Tnb.WarehouseMgr var b = items.Find(x => x.material_code == materialCode && x.code_batch == codeBatch); if (b != null) { - b.id = SnowflakeIdHelper.NextId(); - b.bill_d_id = instockDetails.Find(x => x.material_code == materialCode && x.code_batch == codeBatch)?.id!; - b.barcode = jo.Value(nameof(WmsInstockCode.barcode))!; - b.barcode_qty = jo.Value(nameof(WmsInstockCode.barcode_qty)); - instockCOdes.Add(b); + var c = DeepCopyHelper.DeepCopy(b); + c.id = SnowflakeIdHelper.NextId(); + c.bill_d_id = instockDetails.Find(x => x.material_code == materialCode && x.code_batch == codeBatch)?.id!; + c.barcode = jo.Value(nameof(WmsInstockCode.barcode))!; + c.barcode_qty = jo.Value(nameof(WmsInstockCode.barcode_qty)); + instockCOdes.Add(c); } } } @@ -240,7 +239,7 @@ namespace Tnb.WarehouseMgr await _db.Insertable(carryCodes).ExecuteCommandAsync(); await _db.Insertable(instockCOdes).CallEntityMethod(it => it.Create(orgId)).ExecuteCommandAsync(); await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput, - it => new WmsCarryH { carry_code = input.data[nameof(WmsCarryH.carry_code)].ToString()!, is_lock = 1, status = (int)EnumCarryStatus.占用, location_id = preTaskUpInput.CarryStartLocationId, location_code = preTaskUpInput.CarryStartLocationCode }, + it => new WmsCarryH { carry_code = input.data[nameof(WmsCarryH.carry_code)].ToString()!, is_lock = 1, carry_status = ((int)EnumCarryStatus.占用).ToString(), location_id = preTaskUpInput.CarryStartLocationId, location_code = preTaskUpInput.CarryStartLocationCode }, it => new BasLocation { is_lock = 1, is_use = "1" }); if (instockCOdes?.Count > 0) {