From d66f9389e7b624d2b30a9c8254025e3618d98e6f Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Mon, 3 Jun 2024 12:18:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=96=B7=E7=A0=81=E8=BF=94=E5=9B=9E=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index 48a508ae..8d449da8 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -3197,12 +3197,13 @@ namespace Tnb.ProductionMgr } else { + BasMaterial bm = await _db.Queryable().SingleAsync(x => x.id == prdMoTask.material_id); PrdOutPackMarkLabel prdOutPackMarkLabel = new PrdOutPackMarkLabel() { is_mark = null, is_label = 0, mo_task_code = prdMoTask.mo_task_code, - material_code = prdMoTask.material_code, + material_code = bm.code, create_time = DateTime.Now, }; @@ -3212,7 +3213,7 @@ namespace Tnb.ProductionMgr PrdMoTask parent = await _db.Queryable().SingleAsync(x => x.id == prdMoTask.parent_id); BasMaterial basMaterial = await _db.Queryable().SingleAsync(x=>x.id==parent.material_id); - string code = $"{basMaterial.di ?? ""}*{DateTime.Now.ToString("yyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}*{parent.batch??""}#{basMaterial.material_standard}*{DateTime.Now.ToString("yyyyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}"; + string code = $"{basMaterial.di ?? ""}*{DateTime.Now.ToString("yyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}*{parent.batch??""}#{basMaterial.material_standard}*{parent.batch??""}*{DateTime.Now.ToString("yyyyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}"; return code; } }