fix

UAS_MES_HYSX/FunctionCode/Make/Make_HandFeedRegistration.Designer.cs

@@ -294,6 +294,7 @@
             // 
             // dataGridViewTextBoxColumn10
             // 
+            this.dataGridViewTextBoxColumn10.DataPropertyName = "ReelRemark";
             this.dataGridViewTextBoxColumn10.HeaderText = "元件信息备注";
             this.dataGridViewTextBoxColumn10.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
@@ -301,6 +302,7 @@
             // 
             // dataGridViewTextBoxColumn11
             // 
+            this.dataGridViewTextBoxColumn11.DataPropertyName = "ReelNum";
             this.dataGridViewTextBoxColumn11.HeaderText = "补料数量";
             this.dataGridViewTextBoxColumn11.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
@@ -438,14 +440,14 @@
             this.rn.HeaderText = "序号";
             this.rn.MinimumWidth = 8;
             this.rn.Name = "rn";
-            this.rn.Width = 60;
+            this.rn.Width = 50;
             // 
             // isHandReel
             // 
             this.isHandReel.HeaderText = "是否手补料";
             this.isHandReel.MinimumWidth = 8;
             this.isHandReel.Name = "isHandReel";
-            this.isHandReel.Width = 80;
+            this.isHandReel.Width = 50;
             // 
             // ms_sncode
             // 
@@ -463,7 +465,6 @@
             this.ps_linecode.MinimumWidth = 8;
             this.ps_linecode.Name = "ps_linecode";
             this.ps_linecode.ReadOnly = true;
-            this.ps_linecode.Width = 150;
             // 
             // ps_processcode
             // 
@@ -481,7 +482,7 @@
             this.ps_table.MinimumWidth = 8;
             this.ps_table.Name = "ps_table";
             this.ps_table.ReadOnly = true;
-            this.ps_table.Width = 80;
+            this.ps_table.Width = 50;
             // 
             // psl_location
             // 
@@ -490,7 +491,7 @@
             this.psl_location.MinimumWidth = 8;
             this.psl_location.Name = "psl_location";
             this.psl_location.ReadOnly = true;
-            this.psl_location.Width = 90;
+            this.psl_location.Width = 80;
             // 
             // psl_bomlocation
             // 
@@ -517,7 +518,7 @@
             this.psl_baseqty.MinimumWidth = 8;
             this.psl_baseqty.Name = "psl_baseqty";
             this.psl_baseqty.ReadOnly = true;
-            this.psl_baseqty.Width = 80;
+            this.psl_baseqty.Width = 60;
             // 
             // ReelRemark
             // 
@@ -581,18 +582,6 @@
         private System.Windows.Forms.Button query;
         private System.Windows.Forms.Button submit;
         private System.Windows.Forms.Label handCount;
-        private System.Windows.Forms.DataGridViewTextBoxColumn rn;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn isHandReel;
-        private System.Windows.Forms.DataGridViewTextBoxColumn ms_sncode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn ps_linecode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn ps_processcode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn ps_table;
-        private System.Windows.Forms.DataGridViewTextBoxColumn psl_location;
-        private System.Windows.Forms.DataGridViewTextBoxColumn psl_bomlocation;
-        private System.Windows.Forms.DataGridViewTextBoxColumn psl_prodcode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn psl_baseqty;
-        private System.Windows.Forms.DataGridViewTextBoxColumn ReelRemark;
-        private System.Windows.Forms.DataGridViewTextBoxColumn ReelNum;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
         private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn1;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
@@ -605,5 +594,17 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11;
+        private System.Windows.Forms.DataGridViewTextBoxColumn rn;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn isHandReel;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ms_sncode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ps_linecode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ps_processcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ps_table;
+        private System.Windows.Forms.DataGridViewTextBoxColumn psl_location;
+        private System.Windows.Forms.DataGridViewTextBoxColumn psl_bomlocation;
+        private System.Windows.Forms.DataGridViewTextBoxColumn psl_prodcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn psl_baseqty;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ReelRemark;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ReelNum;
     }
 }

UAS_MES_HYSX/FunctionCode/Make/Make_ThruputLog.cs

@@ -64,7 +64,7 @@ namespace UAS_MES_NEW.Make
                     if (SNArr.IndexOf(sn) > 0)  continue;
 
                     SQL.Clear();
-                    SQL.Append($@"SELECT ms_sncode,ma_code,pr_code,pr_spec FROM makeserial,make,product WHERE ms_sncode = '{sn.Replace("；", ";")}' AND ms_makecode = ma_code AND ms_prodcode = pr_code");
+                    SQL.Append($@"SELECT ms_sncode,ma_code,pr_code,pr_spec FROM makeserial,make,product WHERE ms_sncode = '{sn.Replace("；", ";")}' AND ms_makecode = ma_code AND ms_prodcode = pr_code order by MS_ID desc");
                     dt = (DataTable)dh.ExecuteSql(SQL.ToString(), "select");
                     if (dt.Rows.Count == 0)
                     {
@@ -118,7 +118,7 @@ namespace UAS_MES_NEW.Make
                     if (SNArr.IndexOf(sn) > 0)  continue;
 
                     SQL.Clear();
-                    SQL.Append($@"SELECT ms_sncode,ma_code,pr_code,pr_spec FROM makeserial,make,product WHERE ms_sncode = '{sn.Replace("；", ";")}' AND ms_makecode = ma_code AND ms_prodcode = pr_code");
+                    SQL.Append($@"SELECT ms_sncode,ma_code,pr_code,pr_spec FROM makeserial,make,product WHERE ms_sncode = '{sn.Replace("；", ";")}' AND ms_makecode = ma_code AND ms_prodcode = pr_code order by MS_ID desc");
                     dt = (DataTable)dh.ExecuteSql(SQL.ToString(), "select");
                     if (dt.Rows.Count == 0)
                     {