feat: 完善材料条码与焊接业务功能

SGGL/Model/CLGL/Tw_InOutDetailOutput.cs

@@ -27,7 +27,15 @@ namespace Model
         /// <summary>
         /// 材料描述
         /// </summary>
-        public string MaterialDef { get; set; }  
+        public string MaterialDef { get; set; }
+        /// <summary>
+        /// 材料单位
+        /// </summary>
+        public string MaterialUnit { get; set; }
+        /// <summary>
+        /// 已生成条码数量
+        /// </summary>
+        public int BarCodeCount { get; set; }
         public string InputMasterId { get; set; } 
         public string OutputMasterId { get; set; }
         public string CusBillCode { get; set; }

SGGL/Model/CLGL/Tw_InputDetailBarCodeOutput.cs

@@ -15,5 +15,6 @@ namespace Model
         public string MaterialSpec { get; set; }
         public string MaterialUnit { get; set; }
         public string BarCode { get; set; }
+        public decimal? Quantity { get; set; }
     }
 }

SGGL/Model/CLGL/Tw_PipeMatMatchOutput.cs

@@ -68,6 +68,10 @@ namespace Model
         public int UnweldedWeldJointCount { get; set; }
         /// <summary>未焊焊口的达因量。</summary>
         public decimal? UnweldedDin { get; set; }
+        /// <summary>组件材料对应的焊口号，多个焊口使用换行分隔。</summary>
+        public string WeldJointCode { get; set; }
+        /// <summary>与焊口号按顺序对应的焊口达因，多个焊口使用换行分隔。</summary>
+        public string WeldJointDin { get; set; }
         /// <summary>组件材料编码，多个编码使用换行分隔。</summary>
         public string MaterialCode { get; set; }
         /// <summary>与材料编码按顺序对应的组件材料数量。</summary>

SGGL/Model/HJGL/MaterialCodeLibBarCodeOutput.cs

@@ -10,5 +10,7 @@ namespace Model
         public string MaterialDef { get; set; }
         public string MaterialSpec { get; set; }
         public string MaterialUnit { get; set; }
+        public string BarCode { get; set; }
+        public decimal? Quantity { get; set; }
     }
 }

SGGL/Model/Model.cs

@@ -280322,6 +280322,8 @@ namespace Model
 		private string _MaterialCode;
 		
 		private string _BarCode;
+
+		private System.Nullable<decimal> _Quantity;
 		
     #region 可扩展性方法定义
     partial void OnLoaded();
@@ -280337,6 +280339,8 @@ namespace Model
     partial void OnMaterialCodeChanged();
     partial void OnBarCodeChanging(string value);
     partial void OnBarCodeChanged();
+    partial void OnQuantityChanging(System.Nullable<decimal> value);
+    partial void OnQuantityChanged();
     #endregion
 		
 		public Tw_InputDetailBarCode()
@@ -280443,6 +280447,26 @@ namespace Model
 				}
 			}
 		}
+
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Quantity", DbType="Decimal(18,4)")]
+		public System.Nullable<decimal> Quantity
+		{
+			get
+			{
+				return this._Quantity;
+			}
+			set
+			{
+				if ((this._Quantity != value))
+				{
+					this.OnQuantityChanging(value);
+					this.SendPropertyChanging();
+					this._Quantity = value;
+					this.SendPropertyChanged("Quantity");
+					this.OnQuantityChanged();
+				}
+			}
+		}
 		
 		public event PropertyChangingEventHandler PropertyChanging;