From e706134e749e778649efd59a0e1b6cb8a82112c4 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Sat, 14 Sep 2024 11:07:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/MES/product/ProWorkorderController.cs       | 6 +++---
 DOAN.Service/MES/product/ProWorkorderService.cs             | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs b/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs
index 6c8cc4c..2866d51 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs
@@ -82,7 +82,7 @@ namespace DOAN.Admin.WebApi.Controllers
         }
 
         /// <summary>
-        /// 更新生产工单
+        /// 更新生产工单 启用（9/14）
         /// </summary>
         /// <returns></returns>
         [HttpPut]
@@ -97,7 +97,7 @@ namespace DOAN.Admin.WebApi.Controllers
         }
 
         /// <summary>
-        /// 删除生产工单
+        /// 删除生产工单 启用（9/14）
         /// </summary>
         /// <returns></returns>
         [HttpDelete("{ids}")]
@@ -133,7 +133,7 @@ namespace DOAN.Admin.WebApi.Controllers
 
 
         /// <summary>
-        /// 插入工单/或者新增工单
+        /// 插入工单/或者新增工单 启用（9/14）
         /// </summary>
         /// <param name="parm"></param>
         /// <returns>1成功 0失败</returns>
diff --git a/DOAN.Service/MES/product/ProWorkorderService.cs b/DOAN.Service/MES/product/ProWorkorderService.cs
index 387f1b2..6467fd5 100644
--- a/DOAN.Service/MES/product/ProWorkorderService.cs
+++ b/DOAN.Service/MES/product/ProWorkorderService.cs
@@ -267,12 +267,13 @@ namespace DOAN.Service.MES.product
             }
             else
             {
+                // 新增工单
                 int sortNum = Context.Queryable<ProWorkorder>().Where(it => it.WorkorderDate == handleDate).Max(it => it.Sort.Value);
 
                 ProWorkorder maxWorkorder = Context.Queryable<ProWorkorder>().Where(it => it.WorkorderDate == handleDate).OrderBy(it => it.Sort).First();
                 string maxs = maxWorkorder.Workorder;
                 int index = Convert.ToInt32(maxs.Substring(maxs.Length - 3)) + 1;
-                proWorkorder.Workorder = handleDate.ToString("yyyyMMdd") + index.ToString("000");
+                proWorkorder.Workorder = handleDate.ToString("yyyyMMdd") + "_" + proWorkorder.GroupCode + "_" + proWorkorder.LineCode + "_" + index.ToString("000") + "H";
                 proWorkorder.Sort = maxWorkorder.Sort + 10;
 
                 proWorkorder.Status = 1;