Merge branch 'master' of http://git.dongkesoft.com:9001/hg5020/dk.hg5020.wcf

DK.Client/ReportModule/R01/M01/F_RPT_010101_1.Designer.cs

@@ -94,6 +94,8 @@
             this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Slurry_Weight = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.COOL1_WEIGHT = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.BAKEOUT1_WEIGHT = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.DELIVER_WEIGHT = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GLAZE1_WEIGHT = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GLAZE2_WEIGHT = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -160,6 +162,8 @@
             this.GoodsCode,
             this.GoodsName,
             this.Slurry_Weight,
+            this.COOL1_WEIGHT,
+            this.BAKEOUT1_WEIGHT,
             this.DELIVER_WEIGHT,
             this.GLAZE1_WEIGHT,
             this.GLAZE2_WEIGHT,
@@ -897,6 +901,20 @@
             this.Slurry_Weight.Name = "Slurry_Weight";
             this.Slurry_Weight.ReadOnly = true;
             // 
+            // COOL1_WEIGHT
+            // 
+            this.COOL1_WEIGHT.DataPropertyName = "COOL1_WEIGHT";
+            this.COOL1_WEIGHT.HeaderText = "阴干入重量";
+            this.COOL1_WEIGHT.Name = "COOL1_WEIGHT";
+            this.COOL1_WEIGHT.ReadOnly = true;
+            // 
+            // BAKEOUT1_WEIGHT
+            // 
+            this.BAKEOUT1_WEIGHT.DataPropertyName = "BAKEOUT1_WEIGHT";
+            this.BAKEOUT1_WEIGHT.HeaderText = "烘干前重量";
+            this.BAKEOUT1_WEIGHT.Name = "BAKEOUT1_WEIGHT";
+            this.BAKEOUT1_WEIGHT.ReadOnly = true;
+            // 
             // DELIVER_WEIGHT
             // 
             this.DELIVER_WEIGHT.DataPropertyName = "DELIVER_WEIGHT";
@@ -1145,6 +1163,8 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
         private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
         private System.Windows.Forms.DataGridViewTextBoxColumn Slurry_Weight;
+        private System.Windows.Forms.DataGridViewTextBoxColumn COOL1_WEIGHT;
+        private System.Windows.Forms.DataGridViewTextBoxColumn BAKEOUT1_WEIGHT;
         private System.Windows.Forms.DataGridViewTextBoxColumn DELIVER_WEIGHT;
         private System.Windows.Forms.DataGridViewTextBoxColumn GLAZE1_WEIGHT;
         private System.Windows.Forms.DataGridViewTextBoxColumn GLAZE2_WEIGHT;

DK.Client/ReportModule/R01/M01/F_RPT_010101_1.resx

@@ -150,6 +150,12 @@
   <metadata name="Slurry_Weight.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="COOL1_WEIGHT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="BAKEOUT1_WEIGHT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="DELIVER_WEIGHT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Client/ReportModule/R01/M04/F_RPT_010402.Designer.cs

@@ -82,6 +82,8 @@
             this.GMouldTypeID = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GMouldTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.SLURRY_WEIGHT = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.COOL1_WEIGHT = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.BAKEOUT1_WEIGHT = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.DELIVER_WEIGHT = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GLAZE1_WEIGHT = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GLAZE2_WEIGHT = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -474,6 +476,8 @@
             this.GMouldTypeID,
             this.GMouldTypeName,
             this.SLURRY_WEIGHT,
+            this.COOL1_WEIGHT,
+            this.BAKEOUT1_WEIGHT,
             this.DELIVER_WEIGHT,
             this.GLAZE1_WEIGHT,
             this.GLAZE2_WEIGHT,
@@ -685,6 +689,20 @@
             this.SLURRY_WEIGHT.Name = "SLURRY_WEIGHT";
             this.SLURRY_WEIGHT.ReadOnly = true;
             // 
+            // COOL1_WEIGHT
+            // 
+            this.COOL1_WEIGHT.DataPropertyName = "COOL1_WEIGHT";
+            this.COOL1_WEIGHT.HeaderText = "阴干入重量";
+            this.COOL1_WEIGHT.Name = "COOL1_WEIGHT";
+            this.COOL1_WEIGHT.ReadOnly = true;
+            // 
+            // BAKEOUT1_WEIGHT
+            // 
+            this.BAKEOUT1_WEIGHT.DataPropertyName = "BAKEOUT1_WEIGHT";
+            this.BAKEOUT1_WEIGHT.HeaderText = "烘干前重量";
+            this.BAKEOUT1_WEIGHT.Name = "BAKEOUT1_WEIGHT";
+            this.BAKEOUT1_WEIGHT.ReadOnly = true;
+            // 
             // DELIVER_WEIGHT
             // 
             this.DELIVER_WEIGHT.DataPropertyName = "DELIVER_WEIGHT";
@@ -1031,6 +1049,8 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn GMouldTypeID;
         private System.Windows.Forms.DataGridViewTextBoxColumn GMouldTypeName;
         private System.Windows.Forms.DataGridViewTextBoxColumn SLURRY_WEIGHT;
+        private System.Windows.Forms.DataGridViewTextBoxColumn COOL1_WEIGHT;
+        private System.Windows.Forms.DataGridViewTextBoxColumn BAKEOUT1_WEIGHT;
         private System.Windows.Forms.DataGridViewTextBoxColumn DELIVER_WEIGHT;
         private System.Windows.Forms.DataGridViewTextBoxColumn GLAZE1_WEIGHT;
         private System.Windows.Forms.DataGridViewTextBoxColumn GLAZE2_WEIGHT;

DK.Client/ReportModule/R01/M04/F_RPT_010402.resx

@@ -251,6 +251,12 @@
   <metadata name="SLURRY_WEIGHT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="COOL1_WEIGHT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="BAKEOUT1_WEIGHT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="DELIVER_WEIGHT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

WCF.Service/WCF.Ex_HGS3_QRS/Ex_HGS3_QR.cs

@@ -151,7 +151,8 @@ namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
                 #endregion
 
                 #region 通用：procedure_in = 1 计件处理，支持多条码
-                if (procedure_in == 1)
+                //二车间这个节点不计件处理
+                if (procedure_in == 1 && procedure_no != "2_1_1")
                 {
                     DataTable addWorkPiece = doAddWorkPiece(barCodes, smartDevicePoint);
                     string out_msg = addWorkPiece?.Rows[0]["out_errMsg"].ToString();