拆箱拼箱功能优化，标签解析功能优化

ZR.Model/MES/wms/Dto/ResultionPackageCodeDto.cs

@@ -39,7 +39,9 @@
         /// </summary>
         public string ProductionDescribe { get; set; }
 
-
-
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
     }
 }

ZR.Model/MES/wms/Dto/WmGoodsActionDto.cs

@@ -20,6 +20,45 @@ namespace ZR.Model.MES.wms.Dto
 
     }
 
+    /// <summary>
+    /// 拼箱操作Json记录
+    /// </summary>
+    public class WmGoodsConsolidationJSON
+    {
+        /// <summary>
+        /// 拼箱涉及箱数据
+        /// </summary>
+        public List<ResultionPackageCodeDto> PackageList { get; set; }
+        /// <summary>
+        /// 拼箱最终工单号
+        /// </summary>
+        public string WorkOrderId { get; set; }
+        /// <summary>
+        /// 拼箱最终零件号
+        /// </summary>
+        public string NewPartnumber { get; set; }
+        /// <summary>
+        /// 拼箱最终生成的批次号
+        /// </summary>
+        public string NewPatchCode { get; set; }
+        /// <summary>
+        /// 拼箱最终生成的流水号
+        /// </summary>
+        public string SerialNumber { get; set; }
+        /// <summary>
+        /// 拼箱最终数量
+        /// </summary>
+        public int NewQuantityCount { get; set; }
+        /// <summary>
+        /// 拼箱班组
+        /// </summary>
+        public string Team { get; set; }
+        /// <summary>
+        /// 拼箱时间
+        /// </summary>
+        public DateTime? Time { get; set; }
+    }
+
     /// <summary>
     /// 拆箱操作
     /// </summary>
@@ -31,4 +70,50 @@ namespace ZR.Model.MES.wms.Dto
         public string CreateBy { get; set; }
 
     }
+    /// <summary>
+    /// 拆箱操作Json记录
+    /// </summary>
+    public class WmGoodsUnpackingJSON
+    {
+        /// <summary>
+        /// 拆箱主箱信息
+        /// </summary>
+        public ResultionPackageCodeDto MainPackage { get; set; }
+        /// <summary>
+        /// 零件号
+        /// </summary>
+        public string NewPartnumber { get; set; }
+        /// <summary>
+        /// 新标签1
+        /// </summary>
+        public string NewPatchCode1 { get; set; }
+        /// <summary>
+        /// 新标签2
+        /// </summary>
+        public string NewPatchCode2 { get; set; }
+        /// <summary>
+        /// 新流水号1
+        /// </summary>
+        public string SerialNumber1 { get; set; }
+        /// <summary>
+        /// 新流水号2
+        /// </summary>
+        public string SerialNumber2 { get; set; }
+        /// <summary>
+        /// 拆箱数量1
+        /// </summary>
+        public int FirstNum { get; set; }
+        /// <summary>
+        /// 拆箱数量2
+        /// </summary>
+        public int SecondNum { get; set; }
+        /// <summary>
+        /// 班组
+        /// </summary>
+        public string Team { get; set; }
+        /// <summary>
+        /// 时间
+        /// </summary>
+        public DateTime? Time { get; set; }
+    }
 }