From a8be8f9371b6fc03b66d212b2902d08f93b087dd Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 02 七月 2025 13:55:55 +0800
Subject: [PATCH] 新增任务查询方法并优化逻辑在 `ITaskService.cs` 中添加了新的 `QueryExecutingConveyorLineTask` 方法，支持根据托盘号和下一地址查询任务，同时调整了原有方法的参数以保留旧功能。在 `TaskService.cs` 中新增重载方法，允许根据下一地址和条形码查询任务。在 `CommonConveyorLine_GWJob.cs` 中更新了 `ConveyorLineOutFinish` 方法，简化了任务查询逻辑并删除了多余的注释代码。同时，增加了对 `taskNext` 的处理逻辑，确保在任务未找到时的相应处理，并更新在途数据的逻辑，提升数据一致性和准确性。
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/Dt_EquipmentProcess.cs | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 118 insertions(+), 0 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/Dt_EquipmentProcess.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/Dt_EquipmentProcess.cs
index f43691d..15c9ae6 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/Dt_EquipmentProcess.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/Dt_EquipmentProcess.cs
@@ -2,6 +2,7 @@
using SqlSugar;
using System;
using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -36,6 +37,22 @@
public string EquipmentType { get; set; }
/// <summary>
+ /// 宸ュ崟缂栧彿
+ /// </summary>
+ [ImporterHeader(Name = "宸ュ崟缂栧彿")]
+ [ExporterHeader(DisplayName = "宸ュ崟缂栧彿")]
+ [SugarColumn(IsNullable = false, Length = 100, ColumnDescription = "宸ュ崟缂栧彿")]
+ public string WipOrderNo { get; set; }
+
+ /// <summary>
+ /// 宸ヨ壓鍨嬪彿
+ /// </summary>
+ [ImporterHeader(Name = "宸ヨ壓鍨嬪彿")]
+ [ExporterHeader(DisplayName = "宸ヨ壓鍨嬪彿")]
+ [SugarColumn(IsNullable = false, Length = 100, ColumnDescription = "宸ヨ壓鍨嬪彿")]
+ public string ProductDesc { get; set; }
+
+ /// <summary>
/// 宸ヨ壓鍙傛暟鍊�
/// </summary>
[ImporterHeader(Name = "宸ヨ壓鍙傛暟鍊�")]
@@ -43,4 +60,105 @@
[SugarColumn(IsNullable = false, Length = int.MaxValue, ColumnDescription = "宸ヨ壓鍙傛暟鍊�")]
public string ProcessValue { get; set; }
}
+
+ /// <summary>
+ /// 琛ㄧず宸ヨ壓璺嚎涓婅澶囧弬鏁颁俊鎭殑妯″瀷銆�
+ /// </summary>
+ public class EBParameterInfo
+ {
+ /// <summary>
+ /// 鍙傛暟缂栫爜銆�
+ /// </summary>
+ [Required(ErrorMessage = "鍙傛暟缂栫爜鏄繀濉」銆�")]
+ [StringLength(50, ErrorMessage = "鍙傛暟缂栫爜闀垮害涓嶈兘瓒呰繃50涓瓧绗︺��")]
+ public string ParameterCode { get; set; }
+
+ /// <summary>
+ /// 鍙傛暟绫诲瀷銆�
+ /// </summary>
+ [Required(ErrorMessage = "鍙傛暟绫诲瀷鏄繀濉」銆�")]
+ [StringLength(50, ErrorMessage = "鍙傛暟绫诲瀷闀垮害涓嶈兘瓒呰繃50涓瓧绗︺��")]
+ public string ParameterType { get; set; }
+
+ /// <summary>
+ /// 鎺ㄨ崘鍊笺��
+ /// </summary>
+ [StringLength(50, ErrorMessage = "鎺ㄨ崘鍊奸暱搴︿笉鑳借秴杩�50涓瓧绗︺��")]
+ public string TargetValue { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅銆�
+ /// </summary>
+ public string UOMCode { get; set; }
+
+ /// <summary>
+ /// 鎺у埗涓婇檺鍊笺��
+ /// </summary>
+ [StringLength(50, ErrorMessage = "鎺у埗涓婇檺鍊奸暱搴︿笉鑳借秴杩�50涓瓧绗︺��")]
+ public string UpperControlLimit { get; set; }
+
+ /// <summary>
+ /// 鎺у埗涓嬮檺鍊笺��
+ /// </summary>
+ [StringLength(50, ErrorMessage = "鎺у埗涓嬮檺鍊奸暱搴︿笉鑳借秴杩�50涓瓧绗︺��")]
+ public string LowerControlLimit { get; set; }
+
+ /// <summary>
+ /// 瑙勬牸涓婇檺鍊笺��
+ /// </summary>
+ [StringLength(50, ErrorMessage = "瑙勬牸涓婇檺鍊奸暱搴︿笉鑳借秴杩�50涓瓧绗︺��")]
+ public string UpperSpecificationsLimit { get; set; }
+
+ /// <summary>
+ /// 瑙勬牸涓嬮檺鍊笺��
+ /// </summary>
+ [StringLength(50, ErrorMessage = "瑙勬牸涓嬮檺鍊奸暱搴︿笉鑳借秴杩�50涓瓧绗︺��")]
+ public string LowerSpecificationsLimit { get; set; }
+
+ /// <summary>
+ /// 鍙傛暟鎻忚堪銆�
+ /// </summary>
+ public string Description { get; set; }
+
+ /// <summary>
+ /// 宸ヨ壓璺嚎涓婂綋鍓嶈澶囧弬鏁颁俊鎭槸鍚﹀彲鐢ㄣ��
+ /// TRUE 琛ㄧず鍙敤锛孎ALSE 琛ㄧず涓嶅彲鐢ㄣ��
+ /// </summary>
+ [Required(ErrorMessage = "璁惧鍙傛暟淇℃伅鏄惁鍙敤鏄繀濉」銆�")]
+ public string EquipmentAvailabilityFlag { get; set; }
+ }
+
+
+ public class ResponseEqptRunDto : BasicResult
+ {
+ /// <summary>
+ /// 浜у搧鍚嶇О
+ /// </summary>
+ public string ProductDesc { get; set; }
+
+ /// <summary>
+ /// 棣栦欢鏁伴噺
+ /// </summary>
+ public string FirstArticleNum { get; set; }
+
+ /// <summary>
+ /// 璋冩満鏁伴噺
+ /// </summary>
+ public string DebugNum { get; set; }
+
+ /// <summary>
+ /// 鍙傛暟鐗堟湰淇℃伅
+ /// </summary>
+ public string ParamVersion { get; set; }
+
+ /// <summary>
+ /// 鏄惁闇�瑕佽鍙栧弬鏁�
+ /// </summary>
+ public bool ParamRefreshFlag { get; set; }
+
+ /// <summary>
+ /// 鍙傛暟淇℃伅
+ /// </summary>
+ public List<EBParameterInfo> ParameterInfo { get; set; }
+ }
}
--
Gitblit v1.9.3