From 3b076e09f7f7d10197cba78c719dc7ea25082d6c Mon Sep 17 00:00:00 2001 From: FanLian Date: Sun, 25 Jun 2023 13:30:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=BD=BD=E5=85=B7?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=92=8CPDA=E6=8A=95=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs index f032da98..d7c079df 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs @@ -98,12 +98,14 @@ namespace Tnb.WarehouseMgr var row = await _db.Updateable(newCarry).ExecuteCommandAsync(); WmsCarryReplaceH wmsCarryReplaceH = oldCarry.Adapt(); wmsCarryReplaceH.id = SnowflakeIdHelper.NextId(); - wmsCarryReplaceH.org_id = oldCarry.org_id; + wmsCarryReplaceH.org_id = _userManager.User.OrganizeId; wmsCarryReplaceH.bill_code = await _billRullService.GetBillNumber(WmsCarryConst.WMS_CARRY_REPLACE_ENCODE); wmsCarryReplaceH.carry_id = oldCarry.id; wmsCarryReplaceH.carry_code = oldCarry.carry_code; wmsCarryReplaceH.newcarry_id = newCarry.id; wmsCarryReplaceH.newcarry_code = newCarry.carry_code; + wmsCarryReplaceH.create_id = _userManager.UserId; + wmsCarryReplaceH.create_time = DateTime.Now; wmsCarryReplaceH.modify_id = null; wmsCarryReplaceH.modify_time = null; row = await _db.Insertable(wmsCarryReplaceH).ExecuteCommandAsync(); From f7db1bbde09a3c650450b0f38f7c5c2a28cfde0b Mon Sep 17 00:00:00 2001 From: FanLian Date: Sun, 25 Jun 2023 13:30:28 +0800 Subject: [PATCH 2/3] 1 --- WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs index 1ecf696c..8dec4e17 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs @@ -75,10 +75,10 @@ namespace Tnb.WarehouseMgr var carryId = input.data.ContainsKey("carry_id") ? input.data["carry_id"]?.ToString() : ""; var feedBoxCode = input.data.ContainsKey("feedbox_code") ? input.data["feedbox_code"]?.ToString() : ""; - var carry = await _db.Queryable().FirstAsync(it => it.id == carryId); - var feedBox = await _db.Queryable().FirstAsync(it => it.id == feedBoxCode); + var carry = await _db.Queryable().SingleAsync(it => it.id == carryId); + var feedBox = await _db.Queryable().SingleAsync(it => it.feedbox_code == feedBoxCode); var carryMaterial = await _db.Queryable().FirstAsync(it => it.carry_id == carryId); - var carryCodes = await _db.Queryable().Where(it=>it.carry_id == carryId).ToListAsync(); + var carryCodes = await _db.Queryable().Where(it => it.carry_id == carryId).ToListAsync(); if (carry != null && feedBox != null) { feedBox.material_id = carryMaterial.material_id; @@ -89,7 +89,7 @@ namespace Tnb.WarehouseMgr feedBox.create_id = _userManager.UserId; feedBox.create_time = DateTime.Now; var row = await _db.Updateable(feedBox).ExecuteCommandAsync(); - foreach(var carryCode in carryCodes) + foreach (var carryCode in carryCodes) { WmsFeedingrecordCode wmsFeedingrecordCode = new(); wmsFeedingrecordCode.id = SnowflakeIdHelper.NextId(); @@ -97,7 +97,7 @@ namespace Tnb.WarehouseMgr wmsFeedingrecordCode.record_id = input.data["ReturnIdentity"]?.ToString()!; wmsFeedingrecordCode.material_id = carryCode.material_id; wmsFeedingrecordCode.material_code = carryCode.material_code; - wmsFeedingrecordCode.barcode = carryCode.barcode; + wmsFeedingrecordCode.barcode = carryCode.barcode; wmsFeedingrecordCode.code_batch = carryCode.code_batch; wmsFeedingrecordCode.codeqty = carryCode.codeqty; wmsFeedingrecordCode.unit_id = carryCode.unit_id; From 12744e4e7183e0e4ef19b8350a5bb1797381df7e Mon Sep 17 00:00:00 2001 From: FanLian Date: Sun, 25 Jun 2023 14:15:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.WarehouseMgr/WmsCarryBindService.cs | 5 ++-- .../Tnb.WarehouseMgr/WmsCarryUnbindService.cs | 1 + .../WmsPDACarryBindService.cs | 27 ++++++++++--------- .../WmsPDACarryMoveOutStockService.cs | 3 +-- .../WmsPDACarryUnbindService .cs | 2 +- .../WmsPDAEmptyOutstockService .cs | 3 --- .../Tnb.WarehouseMgr/WmsPDAFeedingService.cs | 3 +++ 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs index bb1412d5..377f2f6d 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs @@ -67,15 +67,13 @@ namespace Tnb.WarehouseMgr var subCarryId = input.data.ContainsKey("membercarry_id") ? input.data["membercarry_id"]?.ToString() : ""; var carry = await _db.Queryable().SingleAsync(it => it.id == carryId); var subCarry = await _db.Queryable().SingleAsync(it => it.id == subCarryId); - - //WmsCarrybindH wmsCarrybindH = carry?.Adapt()!; if (carry != null && subCarry != null) { - carry.carry_status = "1"; var row = await _db.Updateable(carry).ExecuteCommandAsync(); subCarry.carry_status = "1"; row = await _db.Updateable(subCarry).ExecuteCommandAsync(); + //更新载具明细表 WmsCarryD wmsCarryD = new() { id = SnowflakeIdHelper.NextId(), @@ -89,6 +87,7 @@ namespace Tnb.WarehouseMgr }; row = await _db.Insertable(wmsCarryD).ExecuteCommandAsync(); var items = await _db.Queryable().Where(it => it.carry_id == subCarryId).ToListAsync(); + //更新载具绑定条码表 for (int i = 0; i < items.Count; i++) { WmsCarrybindCode wmsCarrybindCode = new(); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs index 92bacdd8..739d972f 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs @@ -71,6 +71,7 @@ namespace Tnb.WarehouseMgr { var row = await _db.Deleteable().Where(it => it.carry_id == carryId && it.membercarry_id == subCarryId).ExecuteCommandAsync(); var items = await _db.Queryable().Where(it => it.carry_id == subCarryId).ToListAsync(); + //更新载具解绑记录条码表 WmsCarryunbindCode wmsCarryUnbindCode = new(); for (int i = 0; i < items.Count; i++) { diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs index 8f9f52cd..eecedd09 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs @@ -51,7 +51,7 @@ namespace Tnb.WarehouseMgr _billRullService = billRullService; OverideFuncs.CreateAsync = PDACarryBind; } - + private async Task PDACarryBind(VisualDevModelDataCrInput input) { var isOk = false; @@ -67,27 +67,28 @@ namespace Tnb.WarehouseMgr var subCarryId = input.data.ContainsKey("membercarry_id") ? input.data["membercarry_id"]?.ToString() : ""; var carry = await _db.Queryable().SingleAsync(it => it.id == carryId); var subCarry = await _db.Queryable().SingleAsync(it => it.id == subCarryId); - WmsCarryD wmsCarryD = new() - { - id = SnowflakeIdHelper.NextId(), - carry_id = carry.id, - org_id = carry?.org_id!, - membercarry_id = subCarry.id, - membercarry_code = subCarry.carry_code, - loc = input.data[nameof(WmsCarrybindH.loc)].ParseToInt(1), - create_id = _userManager.UserId, - create_time = DateTime.Now - }; - //WmsCarrybindH wmsCarrybindH = carry?.Adapt()!; if (carry != null && subCarry != null) { + //更新载具明细 + WmsCarryD wmsCarryD = new() + { + id = SnowflakeIdHelper.NextId(), + carry_id = carry.id, + org_id = carry?.org_id!, + membercarry_id = subCarry.id, + membercarry_code = subCarry.carry_code, + loc = input.data[nameof(WmsCarrybindH.loc)].ParseToInt(1), + create_id = _userManager.UserId, + create_time = DateTime.Now + }; var row = await _db.Insertable(wmsCarryD).ExecuteCommandAsync(); carry.carry_status = "1"; row = await _db.Updateable(carry).ExecuteCommandAsync(); subCarry.carry_status = "1"; row = await _db.Updateable(subCarry).ExecuteCommandAsync(); var items = await _db.Queryable().Where(it => it.carry_id == subCarryId).ToListAsync(); + //更新载具绑定条码表 for (int i = 0; i < items.Count; i++) { WmsCarrybindCode wmsCarrybindCode = new(); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs index 3193b41b..2cd84bfc 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs @@ -65,8 +65,7 @@ namespace Tnb.WarehouseMgr VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYMOOUTSTKPDA_ID, true); await _runService.Create(templateEntity, input); - //入库取终点 - //var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString(), Size = 1 }; + //出库取起点 var carry = await _db.Queryable().FirstAsync(it => it.id == input.data[nameof(WmsMoveOutstock.carry_id)].ToString()); WmsPointH sPoint = null; WmsPointH ePoint = null; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryUnbindService .cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryUnbindService .cs index 113907a3..37b39ebf 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryUnbindService .cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryUnbindService .cs @@ -66,11 +66,11 @@ namespace Tnb.WarehouseMgr var subCarryId = input.data.ContainsKey("membercarry_id") ? input.data["membercarry_id"]?.ToString() : ""; var carry = await _db.Queryable().FirstAsync(it => it.id == carryId); var subCarry = await _db.Queryable().FirstAsync(it => it.id == subCarryId); - //WmsCarryunbindH wmsCarryUnbindH = carry.Adapt(); if (carry != null && subCarry != null) { var row = await _db.Deleteable().Where(it => it.carry_id == carryId && it.membercarry_id == subCarryId).ExecuteCommandAsync(); var items = await _db.Queryable().Where(it => it.carry_id == subCarryId).ToListAsync(); + //更新载具解绑记录 WmsCarryunbindCode wmsCarryUnbindCode = new(); for (int i = 0; i < items.Count; i++) { diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs index 91abdd0c..0f4dbfda 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs @@ -68,9 +68,6 @@ namespace Tnb.WarehouseMgr VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSEMPTYOUTSTKPDA_ID, true); await _runService.Create(templateEntity, input); - /*//入库取终点 - var inStockStrategyInput = new InStockStrategyQuery { warehouse_id = input.data[nameof(InStockStrategyQuery.warehouse_id)].ToString(), Size = 1 }; - var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput);*/ //判断目标库位是否自动签收 var loc = await _db.Queryable().SingleAsync(it => it.id == input.data[nameof(WmsPointH.location_id)].ToString()); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs index 8dec4e17..45fbce7b 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs @@ -81,6 +81,7 @@ namespace Tnb.WarehouseMgr var carryCodes = await _db.Queryable().Where(it => it.carry_id == carryId).ToListAsync(); if (carry != null && feedBox != null) { + //更新投料箱 feedBox.material_id = carryMaterial.material_id; feedBox.material_code = carryMaterial.material_code; feedBox.qty = carryMaterial.qty; @@ -89,6 +90,7 @@ namespace Tnb.WarehouseMgr feedBox.create_id = _userManager.UserId; feedBox.create_time = DateTime.Now; var row = await _db.Updateable(feedBox).ExecuteCommandAsync(); + //更新投料记录条码表 foreach (var carryCode in carryCodes) { WmsFeedingrecordCode wmsFeedingrecordCode = new(); @@ -106,6 +108,7 @@ namespace Tnb.WarehouseMgr wmsFeedingrecordCode.create_time = DateTime.Now; row = await _db.Insertable(wmsFeedingrecordCode).ExecuteCommandAsync(); } + //更新载具 row = await UpdateNullCarry(carry); isOk = (row > 0); if (!isOk) throw Oops.Oh(ErrorCode.COM1001);