Merge repos.ubtob.net:usoft/mes-client

UAS_MES_YTDZ/FunctionCode/Make/Make_HandFeedRegistration.Designer.cs

@@ -31,6 +31,8 @@
             this.containerBox = new System.Windows.Forms.Panel();
             this.dgv = new System.Windows.Forms.DataGridView();
             this.executeBox = new System.Windows.Forms.Panel();
+            this.lineVal = new System.Windows.Forms.ComboBox();
+            this.label5 = new System.Windows.Forms.Label();
             this.handCount = new System.Windows.Forms.Label();
             this.submit = new System.Windows.Forms.Button();
             this.query = new System.Windows.Forms.Button();
@@ -51,6 +53,16 @@
             this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SNDetails = new UAS_MES_NEW.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.productName = new System.Windows.Forms.Label();
+            this.productCode = new System.Windows.Forms.Label();
+            this.workOrder = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.serialNumber = new System.Windows.Forms.Label();
             this.rn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.isHandReel = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.ms_sncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -64,18 +76,6 @@
             this.psl_baseqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ReelRemark = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ReelNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.SNDetails = new UAS_MES_NEW.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.productName = new System.Windows.Forms.Label();
-            this.productCode = new System.Windows.Forms.Label();
-            this.workOrder = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.serialNumber = new System.Windows.Forms.Label();
-            this.lineVal = new System.Windows.Forms.ComboBox();
-            this.label5 = new System.Windows.Forms.Label();
             this.containerBox.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgv)).BeginInit();
             this.executeBox.SuspendLayout();
@@ -142,6 +142,28 @@
             this.executeBox.Size = new System.Drawing.Size(1280, 130);
             this.executeBox.TabIndex = 0;
             // 
+            // lineVal
+            // 
+            this.lineVal.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.lineVal.FormattingEnabled = true;
+            this.lineVal.Items.AddRange(new object[] {
+            "A",
+            "B"});
+            this.lineVal.Location = new System.Drawing.Point(464, 19);
+            this.lineVal.Name = "lineVal";
+            this.lineVal.Size = new System.Drawing.Size(146, 32);
+            this.lineVal.TabIndex = 16;
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label5.Location = new System.Drawing.Point(411, 18);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(57, 30);
+            this.label5.TabIndex = 15;
+            this.label5.Text = "线体";
+            // 
             // handCount
             // 
             this.handCount.AutoSize = true;
@@ -329,119 +351,6 @@
             this.dataGridViewTextBoxColumn12.Visible = false;
             this.dataGridViewTextBoxColumn12.Width = 80;
             // 
-            // rn
-            // 
-            this.rn.DataPropertyName = "rn";
-            this.rn.HeaderText = "序号";
-            this.rn.MinimumWidth = 8;
-            this.rn.Name = "rn";
-            this.rn.Width = 50;
-            // 
-            // isHandReel
-            // 
-            this.isHandReel.HeaderText = "是否手补料";
-            this.isHandReel.MinimumWidth = 8;
-            this.isHandReel.Name = "isHandReel";
-            this.isHandReel.Width = 50;
-            // 
-            // ms_sncode
-            // 
-            this.ms_sncode.DataPropertyName = "ms_sncode";
-            this.ms_sncode.HeaderText = "序列号";
-            this.ms_sncode.MinimumWidth = 8;
-            this.ms_sncode.Name = "ms_sncode";
-            this.ms_sncode.ReadOnly = true;
-            this.ms_sncode.Width = 160;
-            // 
-            // ps_linecode
-            // 
-            this.ps_linecode.DataPropertyName = "ps_linecode";
-            this.ps_linecode.HeaderText = "线体";
-            this.ps_linecode.MinimumWidth = 8;
-            this.ps_linecode.Name = "ps_linecode";
-            this.ps_linecode.ReadOnly = true;
-            this.ps_linecode.Width = 150;
-            // 
-            // ps_processcode
-            // 
-            this.ps_processcode.DataPropertyName = "ps_processcode";
-            this.ps_processcode.HeaderText = "机台名称";
-            this.ps_processcode.MinimumWidth = 8;
-            this.ps_processcode.Name = "ps_processcode";
-            this.ps_processcode.ReadOnly = true;
-            this.ps_processcode.Visible = false;
-            this.ps_processcode.Width = 190;
-            // 
-            // ps_table
-            // 
-            this.ps_table.DataPropertyName = "ps_table";
-            this.ps_table.HeaderText = "面别";
-            this.ps_table.MinimumWidth = 8;
-            this.ps_table.Name = "ps_table";
-            this.ps_table.ReadOnly = true;
-            this.ps_table.Width = 50;
-            // 
-            // psl_location
-            // 
-            this.psl_location.DataPropertyName = "psl_location";
-            this.psl_location.HeaderText = "站位编号";
-            this.psl_location.MinimumWidth = 8;
-            this.psl_location.Name = "psl_location";
-            this.psl_location.ReadOnly = true;
-            this.psl_location.Width = 120;
-            // 
-            // psl_devlocation
-            // 
-            this.psl_devlocation.DataPropertyName = "psl_devlocation";
-            this.psl_devlocation.HeaderText = "元件位置";
-            this.psl_devlocation.MinimumWidth = 8;
-            this.psl_devlocation.Name = "psl_devlocation";
-            this.psl_devlocation.ReadOnly = true;
-            this.psl_devlocation.Width = 220;
-            // 
-            // psl_prodcode
-            // 
-            this.psl_prodcode.DataPropertyName = "psl_prodcode";
-            this.psl_prodcode.HeaderText = "物料编号";
-            this.psl_prodcode.MinimumWidth = 8;
-            this.psl_prodcode.Name = "psl_prodcode";
-            this.psl_prodcode.ReadOnly = true;
-            this.psl_prodcode.Width = 140;
-            // 
-            // pr_detail
-            // 
-            this.pr_detail.DataPropertyName = "pr_detail";
-            this.pr_detail.HeaderText = "物料名称";
-            this.pr_detail.MinimumWidth = 8;
-            this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Width = 150;
-            // 
-            // psl_baseqty
-            // 
-            this.psl_baseqty.DataPropertyName = "psl_baseqty";
-            this.psl_baseqty.HeaderText = "单位用量";
-            this.psl_baseqty.MinimumWidth = 8;
-            this.psl_baseqty.Name = "psl_baseqty";
-            this.psl_baseqty.ReadOnly = true;
-            this.psl_baseqty.Width = 60;
-            // 
-            // ReelRemark
-            // 
-            this.ReelRemark.DataPropertyName = "ReelRemark";
-            this.ReelRemark.HeaderText = "元件信息备注";
-            this.ReelRemark.MinimumWidth = 8;
-            this.ReelRemark.Name = "ReelRemark";
-            this.ReelRemark.Width = 150;
-            // 
-            // ReelNum
-            // 
-            this.ReelNum.DataPropertyName = "ReelNum";
-            this.ReelNum.HeaderText = "补料数量";
-            this.ReelNum.MinimumWidth = 8;
-            this.ReelNum.Name = "ReelNum";
-            this.ReelNum.Visible = false;
-            this.ReelNum.Width = 80;
-            // 
             // SNDetails
             // 
             this.SNDetails.BorderColor = System.Drawing.Color.Black;
@@ -568,27 +477,117 @@
             this.serialNumber.TabIndex = 4;
             this.serialNumber.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // lineVal
+            // rn
             // 
-            this.lineVal.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.lineVal.FormattingEnabled = true;
-            this.lineVal.Items.AddRange(new object[] {
-            "A",
-            "B"});
-            this.lineVal.Location = new System.Drawing.Point(464, 19);
-            this.lineVal.Name = "lineVal";
-            this.lineVal.Size = new System.Drawing.Size(146, 32);
-            this.lineVal.TabIndex = 16;
+            this.rn.DataPropertyName = "rn";
+            this.rn.HeaderText = "序号";
+            this.rn.MinimumWidth = 8;
+            this.rn.Name = "rn";
+            this.rn.Width = 50;
             // 
-            // label5
+            // isHandReel
             // 
-            this.label5.AutoSize = true;
-            this.label5.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(411, 18);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(57, 30);
-            this.label5.TabIndex = 15;
-            this.label5.Text = "线体";
+            this.isHandReel.HeaderText = "是否手补料";
+            this.isHandReel.MinimumWidth = 8;
+            this.isHandReel.Name = "isHandReel";
+            this.isHandReel.Width = 50;
+            // 
+            // ms_sncode
+            // 
+            this.ms_sncode.DataPropertyName = "ms_sncode";
+            this.ms_sncode.HeaderText = "序列号";
+            this.ms_sncode.MinimumWidth = 8;
+            this.ms_sncode.Name = "ms_sncode";
+            this.ms_sncode.ReadOnly = true;
+            this.ms_sncode.Width = 160;
+            // 
+            // ps_linecode
+            // 
+            this.ps_linecode.DataPropertyName = "ps_linecode";
+            this.ps_linecode.HeaderText = "线体";
+            this.ps_linecode.MinimumWidth = 8;
+            this.ps_linecode.Name = "ps_linecode";
+            this.ps_linecode.ReadOnly = true;
+            this.ps_linecode.Width = 150;
+            // 
+            // ps_processcode
+            // 
+            this.ps_processcode.DataPropertyName = "ps_processcode";
+            this.ps_processcode.HeaderText = "机台名称";
+            this.ps_processcode.MinimumWidth = 8;
+            this.ps_processcode.Name = "ps_processcode";
+            this.ps_processcode.ReadOnly = true;
+            this.ps_processcode.Visible = false;
+            this.ps_processcode.Width = 190;
+            // 
+            // ps_table
+            // 
+            this.ps_table.DataPropertyName = "ps_table";
+            this.ps_table.HeaderText = "面别";
+            this.ps_table.MinimumWidth = 8;
+            this.ps_table.Name = "ps_table";
+            this.ps_table.ReadOnly = true;
+            this.ps_table.Width = 50;
+            // 
+            // psl_location
+            // 
+            this.psl_location.DataPropertyName = "psl_location";
+            this.psl_location.HeaderText = "站位编号";
+            this.psl_location.MinimumWidth = 8;
+            this.psl_location.Name = "psl_location";
+            this.psl_location.ReadOnly = true;
+            this.psl_location.Width = 120;
+            // 
+            // psl_devlocation
+            // 
+            this.psl_devlocation.DataPropertyName = "psl_devlocation";
+            this.psl_devlocation.HeaderText = "元件位置";
+            this.psl_devlocation.MinimumWidth = 8;
+            this.psl_devlocation.Name = "psl_devlocation";
+            this.psl_devlocation.ReadOnly = true;
+            this.psl_devlocation.Width = 220;
+            // 
+            // psl_prodcode
+            // 
+            this.psl_prodcode.DataPropertyName = "psl_prodcode";
+            this.psl_prodcode.HeaderText = "物料编号";
+            this.psl_prodcode.MinimumWidth = 8;
+            this.psl_prodcode.Name = "psl_prodcode";
+            this.psl_prodcode.ReadOnly = true;
+            this.psl_prodcode.Width = 140;
+            // 
+            // pr_detail
+            // 
+            this.pr_detail.DataPropertyName = "pr_detail";
+            this.pr_detail.HeaderText = "物料名称";
+            this.pr_detail.MinimumWidth = 8;
+            this.pr_detail.Name = "pr_detail";
+            this.pr_detail.Width = 150;
+            // 
+            // psl_baseqty
+            // 
+            this.psl_baseqty.DataPropertyName = "psl_baseqty";
+            this.psl_baseqty.HeaderText = "单位用量";
+            this.psl_baseqty.MinimumWidth = 8;
+            this.psl_baseqty.Name = "psl_baseqty";
+            this.psl_baseqty.ReadOnly = true;
+            this.psl_baseqty.Width = 60;
+            // 
+            // ReelRemark
+            // 
+            this.ReelRemark.DataPropertyName = "ReelRemark";
+            this.ReelRemark.HeaderText = "元件信息备注";
+            this.ReelRemark.MinimumWidth = 8;
+            this.ReelRemark.Name = "ReelRemark";
+            this.ReelRemark.Width = 150;
+            // 
+            // ReelNum
+            // 
+            this.ReelNum.DataPropertyName = "ReelNum";
+            this.ReelNum.HeaderText = "补料数量";
+            this.ReelNum.MinimumWidth = 8;
+            this.ReelNum.Name = "ReelNum";
+            this.ReelNum.Width = 80;
             // 
             // Make_HandFeedRegistration
             // 
@@ -648,6 +647,9 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12;
+        private System.Windows.Forms.ComboBox lineVal;
+        private System.Windows.Forms.Label label5;
         private System.Windows.Forms.DataGridViewTextBoxColumn rn;
         private System.Windows.Forms.DataGridViewCheckBoxColumn isHandReel;
         private System.Windows.Forms.DataGridViewTextBoxColumn ms_sncode;
@@ -661,8 +663,5 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn psl_baseqty;
         private System.Windows.Forms.DataGridViewTextBoxColumn ReelRemark;
         private System.Windows.Forms.DataGridViewTextBoxColumn ReelNum;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12;
-        private System.Windows.Forms.ComboBox lineVal;
-        private System.Windows.Forms.Label label5;
     }
 }

UAS_MES_YTDZ/FunctionCode/Make/Make_HandFeedRegistration.cs

@@ -173,7 +173,7 @@ namespace UAS_MES_NEW.Make
             upLoadDatas.Columns.Add(new DataColumn("ps_processcode"));
             upLoadDatas.Columns.Add(new DataColumn("ps_table"));
             upLoadDatas.Columns.Add(new DataColumn("psl_location"));
-            upLoadDatas.Columns.Add(new DataColumn("psl_bomlocation"));
+            upLoadDatas.Columns.Add(new DataColumn("psl_devlocation"));
             upLoadDatas.Columns.Add(new DataColumn("psl_prodcode"));
             upLoadDatas.Columns.Add(new DataColumn("psl_baseqty"));
 
@@ -189,7 +189,7 @@ namespace UAS_MES_NEW.Make
                     string remark = string.IsNullOrEmpty(item.Cells["ReelRemark"].Value.ToString()) ? "" : item.Cells["ReelRemark"].Value.ToString().ToUpper();
                     if (!string.IsNullOrEmpty(remark))
                     {
-                        string[] positonArr = item.Cells["psl_bomlocation"].Value.ToString().Split(',');
+                        string[] positonArr = item.Cells["psl_devlocation"].Value.ToString().Split(',');
                         foreach(string str in positonArr)
                         {
                             if (remark.Contains(str.Trim()))
@@ -213,7 +213,7 @@ namespace UAS_MES_NEW.Make
 
                     upLoadDatas.Rows.Add(item.Cells["rn"].Value, item.Cells["ms_sncode"].Value, item.Cells["ps_linecode"].Value, 
                         item.Cells["ps_processcode"].Value, item.Cells["ps_table"].Value, item.Cells["psl_location"].Value,
-                        item.Cells["psl_bomlocation"].Value, item.Cells["psl_prodcode"].Value, item.Cells["psl_baseqty"].Value,
+                        item.Cells["psl_devlocation"].Value, item.Cells["psl_prodcode"].Value, item.Cells["psl_baseqty"].Value,
                         remark, item.Cells["ReelNum"].Value);
                 }
             }
@@ -231,7 +231,7 @@ namespace UAS_MES_NEW.Make
                     position,reel_position, part_no, reel_qty, 
                     update_time, update_name,REELREMARK,REELNUM) VALUES 
                     ( '{rw.Cells["ms_sncode"].Value}','{rw.Cells["ps_linecode"].Value}','{rw.Cells["ps_processcode"].Value}','{rw.Cells["ps_table"].Value}',
-                    '{rw.Cells["psl_location"].Value}','{rw.Cells["psl_bomlocation"].Value}','{rw.Cells["psl_prodcode"].Value}','{rw.Cells["psl_baseqty"].Value}',
+                    '{rw.Cells["psl_location"].Value}','{rw.Cells["psl_devlocation"].Value}','{rw.Cells["psl_prodcode"].Value}','{rw.Cells["psl_baseqty"].Value}',
                     sysdate,'{User.UserName}','{rw.Cells["ReelRemark"].Value}','{rw.Cells["ReelNum"].Value}' )");
                     dh.ExecuteSql(SQL.ToString(), "insert");
                 }

UAS_MES_YTDZ/FunctionCode/Make/Make_HandFeedRegistration.resx

@@ -156,43 +156,4 @@
   <metadata name="ReelNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="rn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="isHandReel.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ms_sncode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ps_linecode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ps_processcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ps_table.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="psl_location.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="psl_devlocation.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="psl_prodcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pr_detail.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="psl_baseqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ReelRemark.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ReelNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>