From 5e610f4c9d9870b393720bc5fcc856e97bc2ea4b Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周三, 27 11月 2024 09:36:26 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine

---
 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs |  313 +++++++++++++++++++++------------------------------
 1 files changed, 130 insertions(+), 183 deletions(-)

diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs
index 60db6c3..2dd31e9 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewInput.cs
@@ -129,6 +129,71 @@
         public virtual float? Info3 { get; set; }
         
         /// <summary>
+        /// 閿�鍞悎鍚屽崟鍙�
+        /// </summary>
+        public virtual string Info4 { get; set; }
+        
+        /// <summary>
+        /// 鐢熶骇鍗曞彿
+        /// </summary>
+        public virtual string Info5 { get; set; }
+        
+        /// <summary>
+        /// 绗嚑鍖�
+        /// </summary>
+        public virtual string Info6 { get; set; }
+        
+        /// <summary>
+        /// 缁忛攢搴楀悕绉�
+        /// </summary>
+        public virtual string Info7 { get; set; }
+        
+        /// <summary>
+        /// 浜у搧鍚嶇О
+        /// </summary>
+        public virtual string Info8 { get; set; }
+        
+        /// <summary>
+        /// 瀹㈡埛鍚嶇О
+        /// </summary>
+        public virtual string Info10 { get; set; }
+        
+        /// <summary>
+        /// 鍖呰缂栫爜
+        /// </summary>
+        public virtual string Info9 { get; set; }
+        
+        /// <summary>
+        /// 鑷彁or鍙戣揣
+        /// </summary>
+        public virtual string Info11 { get; set; }
+        
+        /// <summary>
+        /// 鍖呰閮ㄤ欢鎬绘暟閲�
+        /// </summary>
+        public virtual string Info12 { get; set; }
+        
+        /// <summary>
+        /// 鍖呰闈㈢Н
+        /// </summary>
+        public virtual string Info13 { get; set; }
+        
+        /// <summary>
+        /// 閮ㄤ欢鍚嶇О
+        /// </summary>
+        public virtual string Info14 { get; set; }
+        
+        /// <summary>
+        /// 閮ㄤ欢鏁伴噺
+        /// </summary>
+        public virtual int? Info15 { get; set; }
+        
+        /// <summary>
+        /// 閮ㄤ欢灏哄
+        /// </summary>
+        public virtual string Info16 { get; set; }
+        
+        /// <summary>
         /// 鍒涘缓鏃堕棿
         /// </summary>
         public virtual DateTime? CreateTime { get; set; }
@@ -295,6 +360,71 @@
         /// </summary>
         public float? Info3 { get; set; }
         
+        /// <summary>
+        /// 閿�鍞悎鍚屽崟鍙�
+        /// </summary>
+        public string? Info4 { get; set; }
+        
+        /// <summary>
+        /// 鐢熶骇鍗曞彿
+        /// </summary>
+        public string? Info5 { get; set; }
+        
+        /// <summary>
+        /// 绗嚑鍖�
+        /// </summary>
+        public string? Info6 { get; set; }
+        
+        /// <summary>
+        /// 缁忛攢搴楀悕绉�
+        /// </summary>
+        public string? Info7 { get; set; }
+        
+        /// <summary>
+        /// 浜у搧鍚嶇О
+        /// </summary>
+        public string? Info8 { get; set; }
+        
+        /// <summary>
+        /// 瀹㈡埛鍚嶇О
+        /// </summary>
+        public string? Info10 { get; set; }
+        
+        /// <summary>
+        /// 鍖呰缂栫爜
+        /// </summary>
+        public string? Info9 { get; set; }
+        
+        /// <summary>
+        /// 鑷彁or鍙戣揣
+        /// </summary>
+        public string? Info11 { get; set; }
+        
+        /// <summary>
+        /// 鍖呰閮ㄤ欢鎬绘暟閲�
+        /// </summary>
+        public string? Info12 { get; set; }
+        
+        /// <summary>
+        /// 鍖呰闈㈢Н
+        /// </summary>
+        public string? Info13 { get; set; }
+        
+        /// <summary>
+        /// 閮ㄤ欢鍚嶇О
+        /// </summary>
+        public string? Info14 { get; set; }
+        
+        /// <summary>
+        /// 閮ㄤ欢鏁伴噺
+        /// </summary>
+        public int? Info15 { get; set; }
+        
+        /// <summary>
+        /// 閮ㄤ欢灏哄
+        /// </summary>
+        public string? Info16 { get; set; }
+        
     }
 
     /// <summary>
@@ -391,186 +521,3 @@
     {
 
     }
-
-public class GetBatchOrderUPIInput
-{
-    [Required]
-    [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "鎵规鍙�", Length = 50)]
-    public string PlanNo { get; set; }
-
-    [Required]
-    [SugarColumn(ColumnName = "OrderId", ColumnDescription = "璁㈠崟鍙�", Length = 50)]
-    public string OrderId { get; set; }
-
-    [Required]
-    [SugarColumn(ColumnName = "UPI", ColumnDescription = "閮ㄤ欢鏉＄爜", Length = 50)]
-    public string UPI { get; set; }
-
-    [Required]
-    [SugarColumn(ColumnName = "DetailName", ColumnDescription = "閮ㄤ欢鍚嶇О", Length = 50)]
-    public string DetailName { get; set; }
-
-
-    [SugarColumn(ColumnName = "Length", ColumnDescription = "闀�")]
-    public float Length { get; set; }
-
-    [SugarColumn(ColumnName = "Width", ColumnDescription = "瀹�")]
-    public float Width { get; set; }
-
-    [SugarColumn(ColumnName = "Thk", ColumnDescription = "鍘�")]
-    public float Thk { get; set; }
-
-    [SugarColumn(ColumnName = "Matgrid", ColumnDescription = "閮ㄤ欢绾圭悊", Length = 50)]
-    public string? Matgrid { get; set; }
-
-    [SugarColumn(ColumnName = "IsEB", ColumnDescription = "鏄惁灏佽竟")]
-    public int? IsEB { get; set; }
-
-    /// <summary>
-    /// 鎵撳瓟璁惧缂栧彿 銆怑ditBy shaocx,2022-05-28銆�
-    /// 0锛氫笉鎵撳瓟
-    /// 1锛氬洓闈㈤捇
-    /// 2锛氳豹杩堝叚闈㈤捇
-    /// 5锛氬崡鍏村叚闈㈤捇
-    /// </summary>
-    [SugarColumn(ColumnName = "DRNum", ColumnDescription = "鎵撳瓟璁惧缂栧彿")]
-    public int? DRNum { get; set; }
-
-    [SugarColumn(ColumnName = "IsPA", ColumnDescription = "鏄惁浼樺寲鍖呰")]
-    public int? IsPA { get; set; }
-
-    /// <summary>
-    /// 閿垏鍥惧彿
-    /// </summary>
-    [SugarColumn(ColumnName = "MaterialIndeX", ColumnDescription = "閿垏鍥惧彿")]
-    public int? MaterialIndeX { get; set; }
-
-
-    #region 鍖呰绾挎湁鍏�
-
-    [Required]
-    [SugarColumn(ColumnName = "PackageCode", ColumnDescription = "鍖呰鍙�", Length = 50)]
-    public string PackageCode { get; set; }
-
-    [Required]
-    [SugarColumn(ColumnName = "MachineXCenter", ColumnDescription = "鍖呰X鍧愭爣", Length = 50)]
-    public float? MachineXCenter { get; set; }
-
-    [Required]
-    [SugarColumn(ColumnName = "MachineYCenter", ColumnDescription = "鍖呰Y鍧愭爣", Length = 50)]
-    public float? MachineYCenter { get; set; }
-
-    [Required]
-    [SugarColumn(ColumnName = "MachineZCenter", ColumnDescription = "鍖呰Z鍧愭爣", Length = 50)]
-    public float? MachineZCenter { get; set; }
-
-    [Required]
-    [SugarColumn(ColumnName = "Sequence", ColumnDescription = "灞傛暟", Length = 50)]
-    public int? Sequence { get; set; }
-
-    [Required]
-    [SugarColumn(ColumnName = "Shelf", ColumnDescription = "娆″簭", Length = 50)]
-    public int? Shelf { get; set; }
-
-    #endregion
-
-
-    /// <summary>
-    /// 鏄惁杞悜
-    /// 0锛氫笉杞悜
-    /// 1锛氳浆鍚�
-    /// 鐩墠鍙湁鍥涢潰閽绘墠鑳借浆鍚�
-    /// </summary>
-    [Required]
-    [SugarColumn(ColumnName = "Rotation", ColumnDescription = "杞悜瑙掑害", Length = 50)]
-    public float? Rotation { get; set; }
-
-
-
-    [SugarColumn(ColumnName = "Info1", ColumnDescription = "绾哥闀�", Length = 50)]
-    public float? Info1 { get; set; }
-
-    [SugarColumn(ColumnName = "Info2", ColumnDescription = "绾哥瀹�", Length = 50)]
-    public float? Info2 { get; set; }
-
-    [SugarColumn(ColumnName = "Info3", ColumnDescription = "绾哥楂�", Length = 50)]
-    public float? Info3 { get; set; }
-    /// <summary>
-    /// 閿�鍞悎鍚屽崟鍙�
-    /// </summary>
-    [SugarColumn(ColumnName = "Info4", ColumnDescription = "閿�鍞悎鍚屽崟鍙�", Length = 60)]
-    public string? Info4 { get; set; }
-
-    /// <summary>
-    /// 鐢熶骇鍗曞彿
-    /// </summary>
-    [SugarColumn(ColumnName = "Info5", ColumnDescription = "鐢熶骇鍗曞彿", Length = 60)]
-    public string? Info5 { get; set; }
-
-    /// <summary>
-    /// 绗嚑鍖�
-    /// </summary>
-    [SugarColumn(ColumnName = "Info6", ColumnDescription = "绗嚑鍖�", Length = 60)]
-    public string? Info6 { get; set; }
-
-    /// <summary>
-    /// 缁忛攢搴楀悕绉�
-    /// </summary>
-    [SugarColumn(ColumnName = "Info7", ColumnDescription = "缁忛攢搴楀悕绉�", Length = 60)]
-    public string? Info7 { get; set; }
-
-    /// <summary>
-    /// 浜у搧鍚嶇О
-    /// </summary>
-    [SugarColumn(ColumnName = "Info8", ColumnDescription = "浜у搧鍚嶇О", Length = 60)]
-    public string? Info8 { get; set; }
-
-    /// <summary>
-    /// 瀹㈡埛鍚嶇О
-    /// </summary>
-    [SugarColumn(ColumnName = "Info10", ColumnDescription = "瀹㈡埛鍚嶇О", Length = 60)]
-    public string? Info10 { get; set; }
-
-    /// <summary>
-    /// 鍖呰缂栫爜
-    /// </summary>
-    [SugarColumn(ColumnName = "Info9", ColumnDescription = "鍖呰缂栫爜", Length = 60)]
-    public string? Info9 { get; set; }
-
-    /// <summary>
-    /// 鑷彁or鍙戣揣
-    /// </summary>
-    [SugarColumn(ColumnName = "Info11", ColumnDescription = "鑷彁or鍙戣揣", Length = 60)]
-    public string? Info11 { get; set; }
-
-    /// <summary>
-    /// 鍖呰閮ㄤ欢鎬绘暟閲�
-    /// </summary>
-    [SugarColumn(ColumnName = "Info12", ColumnDescription = "鍖呰閮ㄤ欢鎬绘暟閲�", Length = 60)]
-    public string? Info12 { get; set; }
-
-    /// <summary>
-    /// 鍖呰闈㈢Н
-    /// </summary>
-    [SugarColumn(ColumnName = "Info13", ColumnDescription = "鍖呰闈㈢Н", Length = 60)]
-    public string? Info13 { get; set; }
-
-    /// <summary>
-    /// 閮ㄤ欢鍚嶇О
-    /// </summary>
-    [SugarColumn(ColumnName = "Info14", ColumnDescription = "閮ㄤ欢鍚嶇О", Length = 60)]
-    public string? Info14 { get; set; }
-
-    /// <summary>
-    /// 閮ㄤ欢鏁伴噺
-    /// </summary>
-    [SugarColumn(ColumnName = "Info15", ColumnDescription = "閮ㄤ欢鏁伴噺")]
-    public int? Info15 { get; set; }
-
-    /// <summary>
-    /// 閮ㄤ欢灏哄
-    /// </summary>
-    [SugarColumn(ColumnName = "Info16", ColumnDescription = "閮ㄤ欢灏哄", Length = 60)]
-    public string? Info16 { get; set; }
-}
-

--
Gitblit v1.9.3