From be3653460243b219abfe6952d5918d3a083e71b4 Mon Sep 17 00:00:00 2001
From: zhou keda <1315948824@qq.com>
Date: Wed, 25 Sep 2024 15:59:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=96=B7=E7=A0=81=E8=B4=B4=E6=A0=87=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tnb.ProductionMgr/PrdMoTaskService.cs     | 46 +------------------
 1 file changed, 1 insertion(+), 45 deletions(-)

diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
index aef226b5..4fbdafad 100644
--- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
@@ -4058,51 +4058,7 @@ namespace Tnb.ProductionMgr
                     //PrdMoTask parent = await _db.Queryable<PrdMoTask>().SingleAsync(x => x.id == prdMoTask.parent_id);
                     BasMaterial basMaterial = await _db.Queryable<BasMaterial>().SingleAsync(x=>x.id==prdMoTask.material_id);
                     PrdMo mo = await _db.Queryable<PrdMo>().SingleAsync(x => x.id == prdMoTask.mo_id);
-                    string batch = "";
-                    if (mo.mo_type == DictConst.PrdMoTypeZS)
-                    {
-                        EqpEquipment equipment = await _db.Queryable<EqpEquipment>().SingleAsync(x => x.id == prdMoTask.eqp_id);
-                        batch = $"{equipment.code.Substring(equipment.code.Length - 2, 2)}{DateTime.Now.ToString("yyMMdd")}";
-                    }else if (mo.mo_type == DictConst.PrdMoTypeJC)
-                    {
-                        EqpEquipment equipment = await _db.Queryable<EqpEquipment>().SingleAsync(x => x.id == prdMoTask.eqp_id);
-                        ToolMolds toolMolds = await _db.Queryable<ToolMolds>().SingleAsync(x => x.id == prdMoTask.mold_id);
-                        batch = $"{toolMolds.mold_code.Substring(toolMolds.mold_code.Length - 2, 2)}{equipment.code.Substring(equipment.code.Length - 2, 2)}{DateTime.Now.ToString("yyMMdd")}";
-                    }else
-                    {
-                        // LableRecord lableRecord = await _db.Queryable<LableRecord>().FirstAsync();
-                        // if (lableRecord == null)
-                        // {
-                        //     batch = $"{DateTime.Now.ToString("yyMMdd")}5{"1".PadLeft(3,'0')}";
-                        //     await _db.Insertable(new LableRecord()
-                        //     {
-                        //         id = SnowflakeIdHelper.NextId(),
-                        //         last_day = DateTime.Now.ToString("yyyyMMdd"),
-                        //         num = 1
-                        //     }).ExecuteCommandAsync();
-                        // }
-                        // else
-                        // {
-                        //     int num = 1;
-                        //     if(DateTime.Now.ToString("yyyyMMdd") == lableRecord.last_day)
-                        //     {
-                        //         num = lableRecord.num+1;
-                        //         batch = $"{DateTime.Now.ToString("yyMMdd")}5{(lableRecord.num+1).ToString().PadLeft(3,'0')}";
-                        //     }
-                        //     else
-                        //     {
-                        //         batch = $"{DateTime.Now.ToString("yyMMdd")}5{"1".PadLeft(3,'0')}";
-                        //     }
-                        //
-                        //     await _db.Updateable<LableRecord>()
-                        //         .SetColumns(x=>x.last_day==DateTime.Now.ToString("yyyyMMdd"))
-                        //         .SetColumns(x=>x.num==num)
-                        //         .Where(x=>x.id==lableRecord.id)
-                        //         .ExecuteCommandAsync();
-                        // }
-                        OrganizeEntity organizeEntity = await _db.Queryable<OrganizeEntity>().SingleAsync(x => x.Id == prdMoTask.workline_id);
-                        batch = $"{organizeEntity.EnCode.Substring(organizeEntity.EnCode.Length - 2, 2)}{DateTime.Now.ToString("yyMMdd")}";
-                    }
+                    string batch = prdMoTask.batch;
 
                     string code = $"(01){basMaterial.di ?? ""}*(11){prdMoTask.act_start_date.Value.ToString("yyMMdd")}*(17){prdMoTask.first_start_date.Value.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}*(10){batch}#{basMaterial.material_specification}*{batch}*{prdMoTask.act_start_date.Value.ToString("yyyyMMdd")}*{prdMoTask.first_start_date.Value.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.material_standard}";
                     return code;