From b6129ee8077e6e66ba371282527d55cea93b6e33 Mon Sep 17 00:00:00 2001 From: hlb <894797954@qq.com> Date: Wed, 8 Nov 2023 16:41:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A9=BA=E8=BD=BD?= =?UTF-8?q?=E5=85=B7=E5=87=BA=E5=BA=93=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs index 3f81c037..ba4fcd7d 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs @@ -208,6 +208,9 @@ namespace Tnb.WarehouseMgr } } } + else { + throw new AppFriendlyException("没有匹配的空载具可以出库", 500); + } await _db.Ado.CommitTranAsync(); } From e9b33e1bd62c67db898b2df7029546675ed43dcf Mon Sep 17 00:00:00 2001 From: "yang.lee" Date: Wed, 8 Nov 2023 16:47:58 +0800 Subject: [PATCH 2/4] +1 --- .../Constraints/InOutCheckStatusUpdateEntity.cs | 2 +- .../WmsPurchaseAndSaleCommonService.cs | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/InOutCheckStatusUpdateEntity.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/InOutCheckStatusUpdateEntity.cs index a6e7ca67..cd5ab147 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/InOutCheckStatusUpdateEntity.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/InOutCheckStatusUpdateEntity.cs @@ -18,6 +18,6 @@ namespace Tnb.WarehouseMgr.Entities.Entity.Constraints /// /// 是否检验 /// - public int? is_check { get;} + public int? is_check { get; get; } } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseAndSaleCommonService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseAndSaleCommonService.cs index af848234..1ced5f17 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseAndSaleCommonService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseAndSaleCommonService.cs @@ -122,7 +122,21 @@ namespace Tnb.WarehouseMgr protected async Task UpdateChackStatus(MesCheckdCallbackUpinput input) where TEntity : BaseEntity, InOutCheckStatusUpdateEntity, new() { - var isOk = await _db.Updateable().SetColumns(it => it.check_conclusion == input.check_conclusion).Where(it => it.id == input.maintableid).ExecuteCommandHasChangeAsync(); + var stock = await _db.Queryable().SingleAsync(it => it.id == input.maintableid); + stock.check_conclusion = input.check_conclusion; + stock.is_check = 1; + var isOk = await _db.Updateable(stock).UpdateColumns(it => new { it.check_conclusion, it.is_check }).ExecuteCommandHasChangeAsync(); + var preTask = await _db.Queryable().FirstAsync(it => it.require_id == input.maintableid); + if (preTask != null) + { + var carry = await _db.Queryable().SingleAsync(it => it.id == preTask.carry_id); + if (carry != null) + { + carry.check_conclusion = input.check_conclusion; + carry.is_check = 1; + isOk = await _db.Updateable(carry).UpdateColumns(it => new { it.check_conclusion, it.is_check }).ExecuteCommandHasChangeAsync(); + } + } return isOk; } From 6bb3db57aa68821d7c5e172508e586012b855e1d Mon Sep 17 00:00:00 2001 From: "yang.lee" Date: Wed, 8 Nov 2023 16:48:15 +0800 Subject: [PATCH 3/4] +1 --- .../Entity/Constraints/InOutCheckStatusUpdateEntity.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/InOutCheckStatusUpdateEntity.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/InOutCheckStatusUpdateEntity.cs index cd5ab147..c5a3935b 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/InOutCheckStatusUpdateEntity.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/Constraints/InOutCheckStatusUpdateEntity.cs @@ -18,6 +18,6 @@ namespace Tnb.WarehouseMgr.Entities.Entity.Constraints /// /// 是否检验 /// - public int? is_check { get; get; } + public int? is_check { get; set; } } } From ee0663aaaa0e3ba722fba431bcd81b5f2afa3429 Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Wed, 8 Nov 2023 16:49:52 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A4=96=E5=8C=85=E8=A3=85=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dto/PrdManage/InstockInput.cs | 1 - .../IPrdInstockService.cs | 7 +++++++ ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs | 11 ++++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/InstockInput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/InstockInput.cs index 66479a8a..73363b30 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/InstockInput.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/InstockInput.cs @@ -4,6 +4,5 @@ namespace Tnb.ProductionMgr.Entities.Dto { public string equip_code { get; set; } public string label_code { get; set; } - public string as_location_code { get; set; } } } \ No newline at end of file diff --git a/ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdInstockService.cs b/ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdInstockService.cs index 82f82e86..68a697ea 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdInstockService.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdInstockService.cs @@ -43,5 +43,12 @@ namespace Tnb.ProductionMgr.Interfaces /// /// public Task InstockTubeThree(PrdReport prdReport); + + /// + /// 外包装入库申请 + /// + /// + /// + public Task InstockOutPack(InstockInput inut); } } \ No newline at end of file diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs index 80cc8a35..abbf5355 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs @@ -263,7 +263,6 @@ namespace Tnb.ProductionMgr { string equip_code = inut.equip_code; string label_code = inut.label_code; - string as_location_code = inut.as_location_code; string warehouse_id = "2"; if (!string.IsNullOrEmpty(equip_code)) { @@ -621,5 +620,15 @@ namespace Tnb.ProductionMgr return result2.IsSuccess ? "true" : "false"; } + + /// + /// 外包装入库申请 + /// + /// + /// + public Task InstockOutPack(InstockInput inut) + { + throw new NotImplementedException(); + } } } \ No newline at end of file