From b522a27ee9b46708dccbb64353e3331f8d0b44a0 Mon Sep 17 00:00:00 2001
From: zhou keda <1315948824@qq.com>
Date: Fri, 21 Jun 2024 14:52:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=96=B7=E7=A0=81=E8=B4=B4=E6=A0=87=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
index 5c1f10ec..f40d69df 100644
--- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
@@ -1436,20 +1436,21 @@ namespace Tnb.ProductionMgr
                                 BasMbom basMbom = await _db.Queryable<BasMbom>().SingleAsync(x => x.id == item.bom_id);
                                 
                                 //string code = $"(01){basMaterial.di ?? ""}(11){DateTime.Now.ToString("yyMMdd")}(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}(10){batch}#{basMaterial.material_specification}*{batch}*{DateTime.Now.ToString("yyyyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}";
-                                string code = $"(01){basMaterial.di ?? ""}*(11){DateTime.Now.ToString("yyMMdd")}*(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}*(10){batch}#{basMaterial.material_specification}*{batch}*{DateTime.Now.ToString("yyyyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}";
+                                string code1 = $"(01){basMaterial.di ?? ""}*(11){DateTime.Now.ToString("yyMMdd")}*(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}*(10){batch}";
+                                string code2 = $"{basMaterial.material_specification}*{batch}*{DateTime.Now.ToString("yyyyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}";
                                 Dictionary<string, string> dicCommand1 = new(StringComparer.OrdinalIgnoreCase)
                                 {
                                     ["DevName"] = "外包装箱码垛线",
                                     ["token"] = _eleCtlCfg.token,
                                     ["TagName"] = "WBZX_tb_cs",
-                                    ["Value"] = code,
+                                    ["Value"] = code1,
                                 };
                                 Dictionary<string, string> dicCommand2 = new(StringComparer.OrdinalIgnoreCase)
                                 {
                                     ["DevName"] = "外包装箱码垛线",
                                     ["token"] = _eleCtlCfg.token,
                                     ["TagName"] = "WBZX_pm_cs",
-                                    ["Value"] = code,
+                                    ["Value"] = code2,
                                 };
                                 Dictionary<String, String> workLineDic = new Dictionary<string, string>()
                                 {