From b1f545cf7de71198167b682bc7ea468c0caf2f10 Mon Sep 17 00:00:00 2001
From: quowingwang <guoqingwang.ruizhiao>
Date: Tue, 16 Dec 2025 08:58:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=98=9F=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/pro/ProWorkorderV2Controller.cs       |  23 +--
 ZR.Model/MES/pro/DTO/ProWorkorderV2Dto.cs     | 149 ++++++++++++++++++
 ZR.Model/MES/pro/ProWorkorder_v2.cs           |   2 +-
 3 files changed, 163 insertions(+), 11 deletions(-)
 create mode 100644 ZR.Model/MES/pro/DTO/ProWorkorderV2Dto.cs

diff --git a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs
index 91208a0d..6fc955ad 100644
--- a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs
@@ -1,9 +1,11 @@
-using Microsoft.AspNetCore.Mvc;
+using Aliyun.OSS;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.IdentityModel.Tokens;
 using MiniExcelLibs;
 using SqlSugar;
 using ZR.Admin.WebApi.Extensions;
-
+using ZR.Model.DTO.MES.pro;
+using ZR.Model.MES.andon;
 using ZR.Model.MES.pro;
 using ZR.Model.MES.pro.DTO;
 using ZR.Service.mes.pro.IService;
@@ -11,6 +13,7 @@ using ZR.Service.mes.pro.IService;
 namespace ZR.Admin.WebApi.Controllers.mes.pro
 {
     [Route("mes/pro/workorder_v2")]
+    [AllowAnonymous]
     public class ProWorkorderV2Controller : BaseController
     {
 
@@ -239,28 +242,28 @@ namespace ZR.Admin.WebApi.Controllers.mes.pro
         /// <param name="proWorkplan">生产计划对象</param>
         /// <returns></returns>
         [HttpPost("updateworkorder")]
-        public IActionResult UpdateWorkOrder([FromBody] ProWorkorder_v2 proWorkorder)
+        public IActionResult UpdateWorkOrder([FromBody] ProWorkorderV2Dto parm)
         {
             int data = 0;
-            if (proWorkorder != null)
+            if (parm != null)
             {
-                proWorkorder.PQqualifiedRate = 0;
-                if (!string.IsNullOrEmpty(proWorkorder.PQqualifiedRate2))
+                var modal = parm.Adapt<ProWorkorder_v2>().ToUpdate(HttpContext);
+                modal.PQqualifiedRate = 0;
+                if (!string.IsNullOrEmpty(parm.PQqualifiedRate))
                 {
                     try
                     {
                     {
-                        proWorkorder.PQqualifiedRate = decimal.Parse(proWorkorder.PQqualifiedRate2.Trim());
+                            modal.PQqualifiedRate = decimal.Parse(parm.PQqualifiedRate.Trim());
                     }
                     }
                     catch
                     {
-                        proWorkorder.PQqualifiedRate = 0;
+                        modal.PQqualifiedRate = 0;
                     }
                     
                 }
-                proWorkorder.ToUpdate(HttpContext);
-                data = proWorkorderService.UpdateWorkOrder(proWorkorder);
+                data = proWorkorderService.UpdateWorkOrder(modal);
 
             }
 
diff --git a/ZR.Model/MES/pro/DTO/ProWorkorderV2Dto.cs b/ZR.Model/MES/pro/DTO/ProWorkorderV2Dto.cs
new file mode 100644
index 00000000..e9fd3642
--- /dev/null
+++ b/ZR.Model/MES/pro/DTO/ProWorkorderV2Dto.cs
@@ -0,0 +1,149 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ZR.Model.DTO.MES.pro
+{
+    /// <summary>
+    /// 生产工单DTO
+    /// </summary>
+    public class ProWorkorderV2Dto
+    {
+        /// <summary>
+        /// 工单号WO20240301001
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 毛坯号
+        /// </summary>
+        public string BlankNumber { get; set; }
+
+        /// <summary>
+        /// 成品零件号
+        /// </summary>
+        public string FinishedPartNumber { get; set; }
+
+        /// <summary>
+        /// 产品描述
+        /// </summary>
+        public string ProductDescription { get; set; }
+
+        /// <summary>
+        /// 颜色
+        /// </summary>
+        public string Colour { get; set; }
+
+        /// <summary>
+        /// 规格
+        /// </summary>
+        public string Specifications { get; set; }
+
+        /// <summary>
+        /// 编码号
+        /// </summary>
+        public string CodeNumber { get; set; }
+
+        /// <summary>
+        /// 车数
+        /// </summary>
+        public int VehicleNumber { get; set; }
+
+        /// <summary>
+        /// 挂具摆放
+        /// </summary>
+        public int hangNumber { get; set; }
+
+        /// <summary>
+        /// 上件数
+        /// </summary>
+        public int PreviousNumber { get; set; }
+
+        /// <summary>
+        /// 预计合格数
+        /// </summary>
+        public int PQqualifiedNum { get; set; }
+
+        /// <summary>
+        /// 预计合格率
+        /// </summary>
+        public string PQqualifiedRate { get; set; }
+
+        /// <summary>
+        /// 双组号缸号
+        /// </summary>
+        public string CylinderNumber { get; set; }
+
+        /// <summary>
+        /// 备注1
+        /// </summary>
+        public string Remark1 { get; set; }
+
+        /// <summary>
+        /// 备注2
+        /// </summary>
+        public string Remark2 { get; set; }
+
+        /// <summary>
+        /// 备注3，识别是否需要工单
+        /// </summary>
+        public string Remark3 { get; set; }
+
+        /// <summary>
+        /// 备注4 :来源
+        /// </summary>
+        public string Remark4 { get; set; }
+
+        /// <summary>
+        /// 序号
+        /// </summary>
+        public int Sort { get; set; }
+
+        /// <summary>
+        /// 客户工单号
+        /// </summary>
+        public string ClientWorkorder { get; set; }
+
+        /// <summary>
+        /// 状态：0初态 1上线
+        /// </summary>
+        public int Status { get; set; }
+
+        /// <summary>
+        /// 年
+        /// </summary>
+        public int Year { get; set; }
+
+        /// <summary>
+        /// 周
+        /// </summary>
+        public int Week { get; set; }
+
+        /// <summary>
+        /// 日
+        /// </summary>
+        public int Date { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreatedTime { get; set; }
+
+        /// <summary>
+        /// 更新人
+        /// </summary>
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime UpdatedTime { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/ZR.Model/MES/pro/ProWorkorder_v2.cs b/ZR.Model/MES/pro/ProWorkorder_v2.cs
index db1212e5..a005b807 100644
--- a/ZR.Model/MES/pro/ProWorkorder_v2.cs
+++ b/ZR.Model/MES/pro/ProWorkorder_v2.cs
@@ -200,7 +200,7 @@ namespace ZR.Model.MES.pro
         [ExcelIgnore]
         public DateTime UpdatedTime { get; set; }
 
-        public string PQqualifiedRate2 { get; set; }
+        //public string PQqualifiedRate2 { get; set; }
 
     }
 }