ソースを参照

添加记录车牌号字段

callm 2 週間 前
コミット
145df18fcc

+ 117 - 81
UAS_MES_YDCY/FunctionCode/Make/Make_SNLabelCheckPalletPassStep.Designer.cs

@@ -28,7 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_SNLabelCheckPallet));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_SNLabelCheckPalletPassStep));
             this.ma_qty_label = new System.Windows.Forms.Label();
             this.ms_makecode_label = new System.Windows.Forms.Label();
             this.pr_detail_label = new System.Windows.Forms.Label();
@@ -42,6 +42,14 @@
             this.ma_craftcode = new System.Windows.Forms.Label();
             this.NoteForChange = new System.Windows.Forms.CheckBox();
             this.LabelDataGridView = new System.Windows.Forms.DataGridView();
+            this.lcd_detno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lcd_labeltype = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lcd_prefix = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lcd_suffix = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lcd_alllength = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lcd_length = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lcd_content = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lcd_sql = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.sir_remark_label = new System.Windows.Forms.CheckBox();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -51,14 +59,6 @@
             this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.lcd_detno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.lcd_labeltype = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.lcd_prefix = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.lcd_suffix = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.lcd_alllength = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.lcd_length = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.lcd_content = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.lcd_sql = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.sir_remark = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.StepCount = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
@@ -71,6 +71,8 @@
             this.Confirm = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.sn_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.pa_car = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.label1 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).BeginInit();
             this.SuspendLayout();
@@ -241,6 +243,75 @@
             this.LabelDataGridView.Size = new System.Drawing.Size(1282, 454);
             this.LabelDataGridView.TabIndex = 193;
             // 
+            // lcd_detno
+            // 
+            this.lcd_detno.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.lcd_detno.DataPropertyName = "lcd_detno";
+            this.lcd_detno.HeaderText = "序号";
+            this.lcd_detno.MinimumWidth = 30;
+            this.lcd_detno.Name = "lcd_detno";
+            this.lcd_detno.Width = 30;
+            // 
+            // lcd_labeltype
+            // 
+            this.lcd_labeltype.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
+            this.lcd_labeltype.DataPropertyName = "lcd_labeltype";
+            this.lcd_labeltype.HeaderText = "标签类型";
+            this.lcd_labeltype.MinimumWidth = 100;
+            this.lcd_labeltype.Name = "lcd_labeltype";
+            this.lcd_labeltype.ReadOnly = true;
+            // 
+            // lcd_prefix
+            // 
+            this.lcd_prefix.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCellsExceptHeader;
+            this.lcd_prefix.DataPropertyName = "lcd_prefix";
+            this.lcd_prefix.HeaderText = "前缀";
+            this.lcd_prefix.MinimumWidth = 100;
+            this.lcd_prefix.Name = "lcd_prefix";
+            this.lcd_prefix.ReadOnly = true;
+            this.lcd_prefix.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // lcd_suffix
+            // 
+            this.lcd_suffix.DataPropertyName = "lcd_suffix";
+            this.lcd_suffix.HeaderText = "后缀";
+            this.lcd_suffix.MinimumWidth = 100;
+            this.lcd_suffix.Name = "lcd_suffix";
+            this.lcd_suffix.Width = 200;
+            // 
+            // lcd_alllength
+            // 
+            this.lcd_alllength.DataPropertyName = "lcd_alllength";
+            this.lcd_alllength.HeaderText = "总长度";
+            this.lcd_alllength.MinimumWidth = 10;
+            this.lcd_alllength.Name = "lcd_alllength";
+            this.lcd_alllength.Width = 200;
+            // 
+            // lcd_length
+            // 
+            this.lcd_length.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCellsExceptHeader;
+            this.lcd_length.DataPropertyName = "lcd_length";
+            this.lcd_length.HeaderText = "截取长度";
+            this.lcd_length.MinimumWidth = 100;
+            this.lcd_length.Name = "lcd_length";
+            this.lcd_length.ReadOnly = true;
+            // 
+            // lcd_content
+            // 
+            this.lcd_content.DataPropertyName = "lcd_content";
+            this.lcd_content.HeaderText = "核对内容";
+            this.lcd_content.MinimumWidth = 10;
+            this.lcd_content.Name = "lcd_content";
+            this.lcd_content.Width = 200;
+            // 
+            // lcd_sql
+            // 
+            this.lcd_sql.DataPropertyName = "lcd_sql";
+            this.lcd_sql.HeaderText = "SQL";
+            this.lcd_sql.MinimumWidth = 10;
+            this.lcd_sql.Name = "lcd_sql";
+            this.lcd_sql.Width = 200;
+            // 
             // sir_remark_label
             // 
             this.sir_remark_label.AutoSize = true;
@@ -275,6 +346,7 @@
             this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
             this.dataGridViewTextBoxColumn2.ReadOnly = true;
             this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn2.Width = 200;
             // 
             // dataGridViewTextBoxColumn3
             // 
@@ -285,6 +357,7 @@
             this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
             this.dataGridViewTextBoxColumn3.ReadOnly = true;
             this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn3.Width = 200;
             // 
             // dataGridViewTextBoxColumn4
             // 
@@ -317,6 +390,7 @@
             this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
             this.dataGridViewTextBoxColumn6.ReadOnly = true;
             this.dataGridViewTextBoxColumn6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn6.Width = 200;
             // 
             // dataGridViewTextBoxColumn7
             // 
@@ -334,75 +408,6 @@
             this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
             this.dataGridViewTextBoxColumn8.Width = 200;
             // 
-            // lcd_detno
-            // 
-            this.lcd_detno.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.lcd_detno.DataPropertyName = "lcd_detno";
-            this.lcd_detno.HeaderText = "序号";
-            this.lcd_detno.MinimumWidth = 30;
-            this.lcd_detno.Name = "lcd_detno";
-            this.lcd_detno.Width = 30;
-            // 
-            // lcd_labeltype
-            // 
-            this.lcd_labeltype.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
-            this.lcd_labeltype.DataPropertyName = "lcd_labeltype";
-            this.lcd_labeltype.HeaderText = "标签类型";
-            this.lcd_labeltype.MinimumWidth = 100;
-            this.lcd_labeltype.Name = "lcd_labeltype";
-            this.lcd_labeltype.ReadOnly = true;
-            // 
-            // lcd_prefix
-            // 
-            this.lcd_prefix.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCellsExceptHeader;
-            this.lcd_prefix.DataPropertyName = "lcd_prefix";
-            this.lcd_prefix.HeaderText = "前缀";
-            this.lcd_prefix.MinimumWidth = 100;
-            this.lcd_prefix.Name = "lcd_prefix";
-            this.lcd_prefix.ReadOnly = true;
-            this.lcd_prefix.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // lcd_suffix
-            // 
-            this.lcd_suffix.DataPropertyName = "lcd_suffix";
-            this.lcd_suffix.HeaderText = "后缀";
-            this.lcd_suffix.MinimumWidth = 100;
-            this.lcd_suffix.Name = "lcd_suffix";
-            this.lcd_suffix.Width = 200;
-            // 
-            // lcd_alllength
-            // 
-            this.lcd_alllength.DataPropertyName = "lcd_alllength";
-            this.lcd_alllength.HeaderText = "总长度";
-            this.lcd_alllength.MinimumWidth = 10;
-            this.lcd_alllength.Name = "lcd_alllength";
-            this.lcd_alllength.Width = 200;
-            // 
-            // lcd_length
-            // 
-            this.lcd_length.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCellsExceptHeader;
-            this.lcd_length.DataPropertyName = "lcd_length";
-            this.lcd_length.HeaderText = "截取长度";
-            this.lcd_length.MinimumWidth = 100;
-            this.lcd_length.Name = "lcd_length";
-            this.lcd_length.ReadOnly = true;
-            // 
-            // lcd_content
-            // 
-            this.lcd_content.DataPropertyName = "lcd_content";
-            this.lcd_content.HeaderText = "核对内容";
-            this.lcd_content.MinimumWidth = 10;
-            this.lcd_content.Name = "lcd_content";
-            this.lcd_content.Width = 200;
-            // 
-            // lcd_sql
-            // 
-            this.lcd_sql.DataPropertyName = "lcd_sql";
-            this.lcd_sql.HeaderText = "SQL";
-            this.lcd_sql.MinimumWidth = 10;
-            this.lcd_sql.Name = "lcd_sql";
-            this.lcd_sql.Width = 200;
-            // 
             // sir_remark
             // 
             this.sir_remark.AllPower = null;
@@ -584,11 +589,40 @@
             this.sn_code.Str2 = null;
             this.sn_code.TabIndex = 65;
             // 
-            // Make_SNLabelCheckPallet
+            // pa_car
+            // 
+            this.pa_car.AllPower = "ifall";
+            this.pa_car.BackColor = System.Drawing.Color.White;
+            this.pa_car.ID = null;
+            this.pa_car.Location = new System.Drawing.Point(724, 802);
+            this.pa_car.Margin = new System.Windows.Forms.Padding(6);
+            this.pa_car.Name = "pa_car";
+            this.pa_car.Power = null;
+            this.pa_car.Size = new System.Drawing.Size(208, 35);
+            this.pa_car.Str = null;
+            this.pa_car.Str1 = null;
+            this.pa_car.Str2 = null;
+            this.pa_car.TabIndex = 194;
+            this.pa_car.Tag = "IfRead";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(598, 796);
+            this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(114, 41);
+            this.label1.TabIndex = 195;
+            this.label1.Text = "车牌号";
+            // 
+            // Make_SNLabelCheckPalletPassStep
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1796, 974);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.pa_car);
             this.Controls.Add(this.LabelDataGridView);
             this.Controls.Add(this.NoteForChange);
             this.Controls.Add(this.sir_remark);
@@ -617,14 +651,14 @@
             this.Controls.Add(this.ma_prodcode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Margin = new System.Windows.Forms.Padding(6);
-            this.Name = "Make_SNLabelCheckPallet";
+            this.Name = "Make_SNLabelCheckPalletPassStep";
             this.Tag = "Make!FeedingCollection";
             this.Text = "上料采集";
             this.Load += new System.EventHandler(this.Make_FeedingCollection_Load);
             this.SizeChanged += new System.EventHandler(this.Make_FeedingCollection_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).EndInit();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }
@@ -672,5 +706,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn lcd_sql;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox pa_car;
+        private System.Windows.Forms.Label label1;
     }
 }

+ 2 - 0
UAS_MES_YDCY/FunctionCode/Make/Make_SNLabelCheckPalletPassStep.cs

@@ -250,6 +250,8 @@ namespace UAS_MES_NEW.Make
                                     ",'" + User.UserSourceCode + "','" + User.UserCode + "',sysdate from dual");
                                 dh.BatchInsert(sql.GetString(), new string[] { "LCL_LABELTYPE", "lcl_prefix", "lcl_length", "LCL_LABELVALUE" },
                                     labeltype_list.ToArray(), prefix_list.ToArray(), length_list.ToArray(), value.ToArray());
+                                dh.ExecuteSql("update package set pa_car='" + pa_car.Text + "' where pa_outboxcode='" + sn_code.Text + "'", "update");
+                                pa_car.Clear();
                                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "上料采集", "上料成功", sn_code.Text, "");
                                 OperateResult.AppendText(">>校验完成\n", Color.Green, code);