diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index 5879e267..0d1ecbf2 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -3168,9 +3168,9 @@ namespace Tnb.ProductionMgr //TODO 之后要改 Dictionary dic = new Dictionary() { - ["WBZX1"] = "30019971917589",//血路管自动生产线1线 - ["WBZX2"] = "123", - ["WBZX3"] = "123", + ["WBZ1"] = "30019971917589",//血路管自动生产线1线 + ["WBZ2"] = "123", + ["WBZ3"] = "123", }; if (dic.TryGetValue(input.result, out string worklineId)) { @@ -3208,7 +3208,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 = $"(01){basMaterial.di ?? ""}(11){DateTime.Now.ToString("yyMMdd")}(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}(10){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}*{DateTime.Now.ToString("yyyyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}"; return code; } }