From b8180d941fe002b3364c11a66fb8b68bda8d2f81 Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Mon, 24 Jul 2023 13:52:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8F=90=E6=8A=A5?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=A4=A7=E4=BA=8E=E7=AD=89=E4=BA=8E=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=95=B0=E6=94=B9=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.ProductionMgr/PrdMoTaskService.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index 0d2f713d..8b8af35d 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -1330,11 +1330,11 @@ namespace Tnb.ProductionMgr } - bool flag = (prdMoTask.reported_work_qty ?? 0) + (prdMoTask.scrap_qty ?? 0) + input.reported_qty == prdMoTask.scheduled_qty; - if ((prdMoTask.reported_work_qty ?? 0) + (prdMoTask.scrap_qty ?? 0) + input.reported_qty > prdMoTask.scheduled_qty) - { - throw Oops.Bah("已完成数量不能大于任务单数量"); - } + // bool flag = (prdMoTask.reported_work_qty ?? 0) + (prdMoTask.scrap_qty ?? 0) + input.reported_qty == prdMoTask.scheduled_qty; + // if ((prdMoTask.reported_work_qty ?? 0) + (prdMoTask.scrap_qty ?? 0) + input.reported_qty > prdMoTask.scheduled_qty) + // { + // throw Oops.Bah("已完成数量不能大于任务单数量"); + // } report = input.Adapt(); report.id = SnowflakeIdHelper.NextId(); @@ -1369,7 +1369,7 @@ namespace Tnb.ProductionMgr await db.Updateable() // .SetColumns(x => x.complete_qty == x.complete_qty + input.reported_qty) .SetColumns(x => x.reported_work_qty == input.reported_qty) - .SetColumnsIF(flag,x=>x.mo_task_status==DictConst.ComplatedEnCode) + // .SetColumnsIF(flag,x=>x.mo_task_status==DictConst.ComplatedEnCode) .Where(x => x.id == input.mo_task_id).ExecuteCommandAsync(); } else @@ -1377,7 +1377,7 @@ namespace Tnb.ProductionMgr await db.Updateable() // .SetColumns(x => x.complete_qty == x.complete_qty + input.reported_qty) .SetColumns(x => x.reported_work_qty == x.reported_work_qty + input.reported_qty) - .SetColumnsIF(flag,x=>x.mo_task_status==DictConst.ComplatedEnCode) + // .SetColumnsIF(flag,x=>x.mo_task_status==DictConst.ComplatedEnCode) .Where(x => x.id == input.mo_task_id).ExecuteCommandAsync(); } @@ -1391,13 +1391,13 @@ namespace Tnb.ProductionMgr { await db.Updateable() .SetColumns(x => x.last_process_complete_qty == input.reported_qty) - .SetColumnsIF(flag,x=>x.mo_task_status==DictConst.ComplatedEnCode) + // .SetColumnsIF(flag,x=>x.mo_task_status==DictConst.ComplatedEnCode) .Where(x => x.id == prdMoTask.parent_id).ExecuteCommandAsync(); }else if (parentMoTask?.last_process_complete_qty != null) { await db.Updateable() .SetColumns(x => x.last_process_complete_qty == x.last_process_complete_qty + input.reported_qty) - .SetColumnsIF(flag,x=>x.mo_task_status==DictConst.ComplatedEnCode) + // .SetColumnsIF(flag,x=>x.mo_task_status==DictConst.ComplatedEnCode) .Where(x => x.id == prdMoTask.parent_id).ExecuteCommandAsync(); } } From 9872642cc1d3676dc8e0ac318777a576f2fb62c3 Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Tue, 25 Jul 2023 09:08:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=9F=E4=BA=A7bom=E6=8A=95=E5=85=A5?= =?UTF-8?q?=E4=BA=A7=E5=87=BA=E7=89=A9=E6=96=99=E6=B7=BB=E5=8A=A0=E5=8D=95?= =?UTF-8?q?=E4=BD=8Did?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BasicData/Tnb.BasicData.Entities/Entity/BasMbomInput.cs | 5 +++++ BasicData/Tnb.BasicData.Entities/Entity/BasMbomOutput.cs | 5 +++++ BasicData/Tnb.BasicData/BasMbomService.cs | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasMbomInput.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasMbomInput.cs index 59d51e10..ba4adbed 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasMbomInput.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasMbomInput.cs @@ -43,5 +43,10 @@ public partial class BasMbomInput : BaseEntity /// 数量 /// public decimal num { get; set; } + + /// + /// 单位id + /// + public string? unit_id { get; set; } } diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasMbomOutput.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasMbomOutput.cs index 745edbe4..8dfa838f 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasMbomOutput.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasMbomOutput.cs @@ -43,5 +43,10 @@ public partial class BasMbomOutput : BaseEntity /// 产出数量(可小数分数) /// public string num { get; set; } = string.Empty; + + /// + /// 单位id + /// + public string? unit_id { get; set; } } diff --git a/BasicData/Tnb.BasicData/BasMbomService.cs b/BasicData/Tnb.BasicData/BasMbomService.cs index 4183e0d3..dbf68bd7 100644 --- a/BasicData/Tnb.BasicData/BasMbomService.cs +++ b/BasicData/Tnb.BasicData/BasMbomService.cs @@ -598,6 +598,7 @@ namespace Tnb.BasicData material_id = input.material_id, num = input.num, org_id = orgId, + unit_id = input.unit_id, }); } } @@ -616,6 +617,7 @@ namespace Tnb.BasicData material_id = output.material_id, num = output.num, org_id = orgId, + unit_id = output.unit_id, }); } } @@ -713,6 +715,7 @@ namespace Tnb.BasicData material_id = input.material_id, num = input.num, org_id = orgId, + unit_id = input.unit_id, }); } } @@ -731,6 +734,7 @@ namespace Tnb.BasicData material_id = output.material_id, num = output.num, org_id = orgId, + unit_id = output.unit_id }); } }