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
/// 生产计划对象
///
[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().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
+{
+ ///
+ /// 生产工单DTO
+ ///
+ public class ProWorkorderV2Dto
+ {
+ ///
+ /// 工单号WO20240301001
+ ///
+ public string Id { get; set; }
+
+ ///
+ /// 毛坯号
+ ///
+ public string BlankNumber { get; set; }
+
+ ///
+ /// 成品零件号
+ ///
+ public string FinishedPartNumber { get; set; }
+
+ ///
+ /// 产品描述
+ ///
+ public string ProductDescription { get; set; }
+
+ ///
+ /// 颜色
+ ///
+ public string Colour { get; set; }
+
+ ///
+ /// 规格
+ ///
+ public string Specifications { get; set; }
+
+ ///
+ /// 编码号
+ ///
+ public string CodeNumber { get; set; }
+
+ ///
+ /// 车数
+ ///
+ public int VehicleNumber { get; set; }
+
+ ///
+ /// 挂具摆放
+ ///
+ public int hangNumber { get; set; }
+
+ ///
+ /// 上件数
+ ///
+ public int PreviousNumber { get; set; }
+
+ ///
+ /// 预计合格数
+ ///
+ public int PQqualifiedNum { get; set; }
+
+ ///
+ /// 预计合格率
+ ///
+ public string PQqualifiedRate { get; set; }
+
+ ///
+ /// 双组号缸号
+ ///
+ public string CylinderNumber { get; set; }
+
+ ///
+ /// 备注1
+ ///
+ public string Remark1 { get; set; }
+
+ ///
+ /// 备注2
+ ///
+ public string Remark2 { get; set; }
+
+ ///
+ /// 备注3,识别是否需要工单
+ ///
+ public string Remark3 { get; set; }
+
+ ///
+ /// 备注4 :来源
+ ///
+ public string Remark4 { get; set; }
+
+ ///
+ /// 序号
+ ///
+ public int Sort { get; set; }
+
+ ///
+ /// 客户工单号
+ ///
+ public string ClientWorkorder { get; set; }
+
+ ///
+ /// 状态:0初态 1上线
+ ///
+ public int Status { get; set; }
+
+ ///
+ /// 年
+ ///
+ public int Year { get; set; }
+
+ ///
+ /// 周
+ ///
+ public int Week { get; set; }
+
+ ///
+ /// 日
+ ///
+ public int Date { get; set; }
+
+ ///
+ /// 创建人
+ ///
+ public string CreatedBy { get; set; }
+
+ ///
+ /// 创建时间
+ ///
+ public DateTime CreatedTime { get; set; }
+
+ ///
+ /// 更新人
+ ///
+ public string UpdatedBy { get; set; }
+
+ ///
+ /// 更新时间
+ ///
+ 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; }
}
}