diff --git a/Handler/Project/Dialog/Model_Operation.Designer.cs b/Handler/Project/Dialog/Model_Operation.Designer.cs index c35d63d..412869b 100644 --- a/Handler/Project/Dialog/Model_Operation.Designer.cs +++ b/Handler/Project/Dialog/Model_Operation.Designer.cs @@ -29,13 +29,17 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Model_Operation)); this.dv = new arCtl.arDatagridView(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dvc_title = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Code = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dvc_bsave = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ds1 = new Project.DataSet1(); this.tmDisplay = new System.Windows.Forms.Timer(this.components); @@ -44,6 +48,7 @@ this.chkOwnZPL = new System.Windows.Forms.CheckBox(); this.panel5 = new System.Windows.Forms.Panel(); this.panel4 = new System.Windows.Forms.Panel(); + this.label24 = new System.Windows.Forms.Label(); this.panel1 = new System.Windows.Forms.Panel(); this.panel8 = new System.Windows.Forms.Panel(); this.label20 = new System.Windows.Forms.Label(); @@ -149,18 +154,15 @@ this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.btAdd = new System.Windows.Forms.ToolStripButton(); this.btDel = new System.Windows.Forms.ToolStripButton(); + this.btReName = new System.Windows.Forms.ToolStripButton(); this.btSave = new System.Windows.Forms.ToolStripButton(); this.btCopy = new System.Windows.Forms.ToolStripButton(); this.toolStripButton10 = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.arLabel2 = new arCtl.arLabel(); this.arLabel18 = new arCtl.arLabel(); - this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dvc_title = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Code = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dvc_bsave = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.btReName = new System.Windows.Forms.ToolStripButton(); - this.label24 = new System.Windows.Forms.Label(); + this.checkBox1 = new System.Windows.Forms.CheckBox(); + this.checkBox33 = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.dv)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ds1)).BeginInit(); @@ -203,15 +205,15 @@ this.Code, this.dvc_bsave}); this.dv.DataSource = this.bs; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle5.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle5.Padding = new System.Windows.Forms.Padding(5); - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dv.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle20.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle20.Padding = new System.Windows.Forms.Padding(5); + dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dv.DefaultCellStyle = dataGridViewCellStyle20; this.dv.Dock = System.Windows.Forms.DockStyle.Fill; this.dv.Location = new System.Drawing.Point(0, 136); this.dv.MultiSelect = false; @@ -222,6 +224,44 @@ this.dv.TabIndex = 1; this.dv.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.dv_DataError); // + // Column1 + // + this.Column1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells; + this.Column1.DataPropertyName = "idx"; + dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.Column1.DefaultCellStyle = dataGridViewCellStyle16; + this.Column1.HeaderText = "*"; + this.Column1.Name = "Column1"; + this.Column1.Width = 50; + // + // dvc_title + // + this.dvc_title.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.dvc_title.DataPropertyName = "Title"; + dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.dvc_title.DefaultCellStyle = dataGridViewCellStyle17; + this.dvc_title.HeaderText = "Description(Vendor-Customer)"; + this.dvc_title.Name = "dvc_title"; + this.dvc_title.ReadOnly = true; + // + // Code + // + this.Code.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.Code.DataPropertyName = "Code"; + dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.Code.DefaultCellStyle = dataGridViewCellStyle18; + this.Code.HeaderText = "Customer Code"; + this.Code.Name = "Code"; + // + // dvc_bsave + // + this.dvc_bsave.DataPropertyName = "BSave"; + dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dvc_bsave.DefaultCellStyle = dataGridViewCellStyle19; + this.dvc_bsave.HeaderText = "BLoad"; + this.dvc_bsave.Name = "dvc_bsave"; + this.dvc_bsave.Width = 86; + // // bs // this.bs.DataMember = "OPModel"; @@ -290,6 +330,18 @@ this.panel4.Size = new System.Drawing.Size(1368, 766); this.panel4.TabIndex = 3; // + // label24 + // + this.label24.Dock = System.Windows.Forms.DockStyle.Bottom; + this.label24.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label24.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.label24.Location = new System.Drawing.Point(0, 671); + this.label24.Name = "label24"; + this.label24.Size = new System.Drawing.Size(639, 20); + this.label24.TabIndex = 33; + this.label24.Text = "BLoad Descriptoin , 1=QR+DM+PDF417, 2=1D, 3=QR, 4=DM, 5=PDF417"; + this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // panel1 // this.panel1.BackColor = System.Drawing.Color.LightGray; @@ -1168,6 +1220,8 @@ // // grpApplyWMSinfo // + this.grpApplyWMSinfo.Controls.Add(this.checkBox33); + this.grpApplyWMSinfo.Controls.Add(this.checkBox1); this.grpApplyWMSinfo.Controls.Add(this.checkBox36); this.grpApplyWMSinfo.Controls.Add(this.checkBox38); this.grpApplyWMSinfo.Controls.Add(this.label22); @@ -1205,7 +1259,7 @@ // this.checkBox38.AutoSize = true; this.checkBox38.ForeColor = System.Drawing.Color.Green; - this.checkBox38.Location = new System.Drawing.Point(407, 24); + this.checkBox38.Location = new System.Drawing.Point(505, 24); this.checkBox38.Name = "checkBox38"; this.checkBox38.Size = new System.Drawing.Size(63, 23); this.checkBox38.TabIndex = 35; @@ -1641,6 +1695,15 @@ this.btDel.Text = "Delete(&D)"; this.btDel.Click += new System.EventHandler(this.toolStripButton5_Click); // + // btReName + // + this.btReName.Image = ((System.Drawing.Image)(resources.GetObject("btReName.Image"))); + this.btReName.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btReName.Name = "btReName"; + this.btReName.Size = new System.Drawing.Size(104, 52); + this.btReName.Text = "ReName"; + this.btReName.Click += new System.EventHandler(this.btReName_Click); + // // btSave // this.btSave.Image = ((System.Drawing.Image)(resources.GetObject("btSave.Image"))); @@ -1766,64 +1829,29 @@ this.arLabel18.TextShadow = true; this.arLabel18.TextVisible = true; // - // Column1 + // checkBox1 // - this.Column1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells; - this.Column1.DataPropertyName = "idx"; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.Column1.DefaultCellStyle = dataGridViewCellStyle1; - this.Column1.HeaderText = "*"; - this.Column1.Name = "Column1"; - this.Column1.Width = 50; + this.checkBox1.AutoSize = true; + this.checkBox1.ForeColor = System.Drawing.Color.Blue; + this.checkBox1.Location = new System.Drawing.Point(359, 51); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(92, 23); + this.checkBox1.TabIndex = 38; + this.checkBox1.Tag = "12"; + this.checkBox1.Text = "MFG Date"; + this.checkBox1.UseVisualStyleBackColor = true; // - // dvc_title + // checkBox33 // - this.dvc_title.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.dvc_title.DataPropertyName = "Title"; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.dvc_title.DefaultCellStyle = dataGridViewCellStyle2; - this.dvc_title.HeaderText = "Description(Vendor-Customer)"; - this.dvc_title.Name = "dvc_title"; - this.dvc_title.ReadOnly = true; - // - // Code - // - this.Code.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.Code.DataPropertyName = "Code"; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.Code.DefaultCellStyle = dataGridViewCellStyle3; - this.Code.HeaderText = "Customer Code"; - this.Code.Name = "Code"; - // - // dvc_bsave - // - this.dvc_bsave.DataPropertyName = "BSave"; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dvc_bsave.DefaultCellStyle = dataGridViewCellStyle4; - this.dvc_bsave.HeaderText = "BLoad"; - this.dvc_bsave.Name = "dvc_bsave"; - this.dvc_bsave.Width = 86; - // - // btReName - // - this.btReName.Image = ((System.Drawing.Image)(resources.GetObject("btReName.Image"))); - this.btReName.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btReName.Name = "btReName"; - this.btReName.Size = new System.Drawing.Size(104, 52); - this.btReName.Text = "ReName"; - this.btReName.Click += new System.EventHandler(this.btReName_Click); - // - // label24 - // - this.label24.Dock = System.Windows.Forms.DockStyle.Bottom; - this.label24.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label24.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.label24.Location = new System.Drawing.Point(0, 671); - this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(639, 20); - this.label24.TabIndex = 33; - this.label24.Text = "BLoad Descriptoin , 1=QR+DM+PDF417, 2=1D, 3=QR, 4=DM, 5=PDF417"; - this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.checkBox33.AutoSize = true; + this.checkBox33.ForeColor = System.Drawing.SystemColors.ControlText; + this.checkBox33.Location = new System.Drawing.Point(407, 24); + this.checkBox33.Name = "checkBox33"; + this.checkBox33.Size = new System.Drawing.Size(92, 23); + this.checkBox33.TabIndex = 39; + this.checkBox33.Tag = "13"; + this.checkBox33.Text = "MFG Date"; + this.checkBox33.UseVisualStyleBackColor = true; // // Model_Operation // @@ -2001,5 +2029,7 @@ private System.Windows.Forms.DataGridViewTextBoxColumn dvc_bsave; private System.Windows.Forms.ToolStripButton btReName; private System.Windows.Forms.Label label24; + private System.Windows.Forms.CheckBox checkBox1; + private System.Windows.Forms.CheckBox checkBox33; } } \ No newline at end of file diff --git a/Handler/Project/Dialog/Model_Operation.resx b/Handler/Project/Dialog/Model_Operation.resx index 3acc583..842049b 100644 --- a/Handler/Project/Dialog/Model_Operation.resx +++ b/Handler/Project/Dialog/Model_Operation.resx @@ -132,6 +132,9 @@ 17, 17 + + 17, 17 + 88, 17 diff --git a/Handler/Project/Dialog/fSelectJob.Designer.cs b/Handler/Project/Dialog/fSelectJob.Designer.cs index 14df27d..473eff6 100644 --- a/Handler/Project/Dialog/fSelectJob.Designer.cs +++ b/Handler/Project/Dialog/fSelectJob.Designer.cs @@ -41,6 +41,7 @@ this.lbTitle = new arCtl.arLabel(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.chkApplyWMSInfo = new System.Windows.Forms.CheckBox(); this.chkApplySidInfo = new System.Windows.Forms.CheckBox(); this.chkApplyJobInfo = new System.Windows.Forms.CheckBox(); this.chkApplySIDConv = new System.Windows.Forms.CheckBox(); @@ -90,14 +91,6 @@ this.chkInfoApplySID = new System.Windows.Forms.CheckBox(); this.chkInfoApplyCust = new System.Windows.Forms.CheckBox(); this.chkInfoApplyPart = new System.Windows.Forms.CheckBox(); - this.tabPage3 = new System.Windows.Forms.TabPage(); - this.chkCustom = new System.Windows.Forms.CheckBox(); - this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); - this.btOK = new arCtl.arLabel(); - this.btCancle = new arCtl.arLabel(); - this.dataSet11 = new Project.DataSet1(); - this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.chkApplyWMSInfo = new System.Windows.Forms.CheckBox(); this.grpApplyWMSinfo = new System.Windows.Forms.GroupBox(); this.checkBox36 = new System.Windows.Forms.CheckBox(); this.chkWMSApplyBatch = new System.Windows.Forms.CheckBox(); @@ -110,6 +103,15 @@ this.checkBox45 = new System.Windows.Forms.CheckBox(); this.checkBox46 = new System.Windows.Forms.CheckBox(); this.checkBox47 = new System.Windows.Forms.CheckBox(); + this.tabPage3 = new System.Windows.Forms.TabPage(); + this.chkCustom = new System.Windows.Forms.CheckBox(); + this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); + this.btOK = new arCtl.arLabel(); + this.btCancle = new arCtl.arLabel(); + this.dataSet11 = new Project.DataSet1(); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.checkBox1 = new System.Windows.Forms.CheckBox(); + this.checkBox2 = new System.Windows.Forms.CheckBox(); this.panel2.SuspendLayout(); this.panel5.SuspendLayout(); this.tabControl1.SuspendLayout(); @@ -118,10 +120,10 @@ this.GrpSidConvData.SuspendLayout(); this.grpapplyjob.SuspendLayout(); this.grpApplySidinfo.SuspendLayout(); + this.grpApplyWMSinfo.SuspendLayout(); this.tabPage3.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataSet11)).BeginInit(); - this.grpApplyWMSinfo.SuspendLayout(); this.SuspendLayout(); // // panel2 @@ -327,6 +329,20 @@ this.tabPage1.Text = "Options"; this.tabPage1.UseVisualStyleBackColor = true; // + // chkApplyWMSInfo + // + this.chkApplyWMSInfo.AutoSize = true; + this.chkApplyWMSInfo.Font = new System.Drawing.Font("맑은 고딕", 12F); + this.chkApplyWMSInfo.ForeColor = System.Drawing.Color.Gray; + this.chkApplyWMSInfo.Location = new System.Drawing.Point(13, 303); + this.chkApplyWMSInfo.Name = "chkApplyWMSInfo"; + this.chkApplyWMSInfo.Size = new System.Drawing.Size(446, 25); + this.chkApplyWMSInfo.TabIndex = 35; + this.chkApplyWMSInfo.Tag = "8"; + this.chkApplyWMSInfo.Text = "Automatically record data using WMS information table"; + this.chkApplyWMSInfo.UseVisualStyleBackColor = true; + this.chkApplyWMSInfo.CheckStateChanged += new System.EventHandler(this.checkBox1_CheckStateChanged); + // // chkApplySidInfo // this.chkApplySidInfo.AutoSize = true; @@ -951,12 +967,163 @@ this.chkInfoApplyPart.Text = "Part No"; this.chkInfoApplyPart.UseVisualStyleBackColor = true; // + // grpApplyWMSinfo + // + this.grpApplyWMSinfo.Controls.Add(this.checkBox2); + this.grpApplyWMSinfo.Controls.Add(this.checkBox1); + this.grpApplyWMSinfo.Controls.Add(this.checkBox36); + this.grpApplyWMSinfo.Controls.Add(this.chkWMSApplyBatch); + this.grpApplyWMSinfo.Controls.Add(this.label22); + this.grpApplyWMSinfo.Controls.Add(this.label23); + this.grpApplyWMSinfo.Controls.Add(this.checkBox41); + this.grpApplyWMSinfo.Controls.Add(this.checkBox42); + this.grpApplyWMSinfo.Controls.Add(this.checkBox43); + this.grpApplyWMSinfo.Controls.Add(this.checkBox44); + this.grpApplyWMSinfo.Controls.Add(this.checkBox45); + this.grpApplyWMSinfo.Controls.Add(this.checkBox46); + this.grpApplyWMSinfo.Controls.Add(this.checkBox47); + this.grpApplyWMSinfo.Dock = System.Windows.Forms.DockStyle.Top; + this.grpApplyWMSinfo.Enabled = false; + this.grpApplyWMSinfo.Font = new System.Drawing.Font("맑은 고딕", 10F); + this.grpApplyWMSinfo.Location = new System.Drawing.Point(10, 10); + this.grpApplyWMSinfo.Name = "grpApplyWMSinfo"; + this.grpApplyWMSinfo.Size = new System.Drawing.Size(705, 82); + this.grpApplyWMSinfo.TabIndex = 36; + this.grpApplyWMSinfo.TabStop = false; + this.grpApplyWMSinfo.Text = "WMS Information Application"; + // + // checkBox36 + // + this.checkBox36.AutoSize = true; + this.checkBox36.ForeColor = System.Drawing.Color.Blue; + this.checkBox36.Location = new System.Drawing.Point(311, 51); + this.checkBox36.Name = "checkBox36"; + this.checkBox36.Size = new System.Drawing.Size(62, 23); + this.checkBox36.TabIndex = 37; + this.checkBox36.Tag = "11"; + this.checkBox36.Text = "VLOT"; + this.checkBox36.UseVisualStyleBackColor = true; + // + // chkWMSApplyBatch + // + this.chkWMSApplyBatch.AutoSize = true; + this.chkWMSApplyBatch.ForeColor = System.Drawing.Color.Green; + this.chkWMSApplyBatch.Location = new System.Drawing.Point(529, 24); + this.chkWMSApplyBatch.Name = "chkWMSApplyBatch"; + this.chkWMSApplyBatch.Size = new System.Drawing.Size(63, 23); + this.chkWMSApplyBatch.TabIndex = 35; + this.chkWMSApplyBatch.Tag = "9"; + this.chkWMSApplyBatch.Text = "Batch"; + this.chkWMSApplyBatch.UseVisualStyleBackColor = true; + // + // label22 + // + this.label22.AutoSize = true; + this.label22.Font = new System.Drawing.Font("맑은 고딕", 9F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic)))); + this.label22.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); + this.label22.Location = new System.Drawing.Point(6, 54); + this.label22.Name = "label22"; + this.label22.Size = new System.Drawing.Size(41, 15); + this.label22.TabIndex = 29; + this.label22.Text = "Query"; + // + // label23 + // + this.label23.AutoSize = true; + this.label23.Font = new System.Drawing.Font("맑은 고딕", 9F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic)))); + this.label23.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); + this.label23.Location = new System.Drawing.Point(7, 28); + this.label23.Name = "label23"; + this.label23.Size = new System.Drawing.Size(40, 15); + this.label23.TabIndex = 29; + this.label23.Text = "Apply"; + // + // checkBox41 + // + this.checkBox41.AutoSize = true; + this.checkBox41.Location = new System.Drawing.Point(311, 24); + this.checkBox41.Name = "checkBox41"; + this.checkBox41.Size = new System.Drawing.Size(114, 23); + this.checkBox41.TabIndex = 28; + this.checkBox41.Tag = "3"; + this.checkBox41.Text = "Vender Name"; + this.checkBox41.UseVisualStyleBackColor = true; + // + // checkBox42 + // + this.checkBox42.AutoSize = true; + this.checkBox42.ForeColor = System.Drawing.Color.Blue; + this.checkBox42.Location = new System.Drawing.Point(255, 50); + this.checkBox42.Name = "checkBox42"; + this.checkBox42.Size = new System.Drawing.Size(50, 23); + this.checkBox42.TabIndex = 27; + this.checkBox42.Tag = "7"; + this.checkBox42.Text = "SID"; + this.checkBox42.UseVisualStyleBackColor = true; + // + // checkBox43 + // + this.checkBox43.AutoSize = true; + this.checkBox43.ForeColor = System.Drawing.Color.Blue; + this.checkBox43.Location = new System.Drawing.Point(156, 50); + this.checkBox43.Name = "checkBox43"; + this.checkBox43.Size = new System.Drawing.Size(93, 23); + this.checkBox43.TabIndex = 25; + this.checkBox43.Tag = "6"; + this.checkBox43.Text = "Cust Code"; + this.checkBox43.UseVisualStyleBackColor = true; + // + // checkBox44 + // + this.checkBox44.AutoSize = true; + this.checkBox44.ForeColor = System.Drawing.Color.Blue; + this.checkBox44.Location = new System.Drawing.Point(73, 50); + this.checkBox44.Name = "checkBox44"; + this.checkBox44.Size = new System.Drawing.Size(77, 23); + this.checkBox44.TabIndex = 25; + this.checkBox44.Tag = "5"; + this.checkBox44.Text = "Part No"; + this.checkBox44.UseVisualStyleBackColor = true; + // + // checkBox45 + // + this.checkBox45.AutoSize = true; + this.checkBox45.Location = new System.Drawing.Point(255, 24); + this.checkBox45.Name = "checkBox45"; + this.checkBox45.Size = new System.Drawing.Size(50, 23); + this.checkBox45.TabIndex = 26; + this.checkBox45.Tag = "2"; + this.checkBox45.Text = "SID"; + this.checkBox45.UseVisualStyleBackColor = true; + // + // checkBox46 + // + this.checkBox46.AutoSize = true; + this.checkBox46.Location = new System.Drawing.Point(156, 24); + this.checkBox46.Name = "checkBox46"; + this.checkBox46.Size = new System.Drawing.Size(93, 23); + this.checkBox46.TabIndex = 25; + this.checkBox46.Tag = "1"; + this.checkBox46.Text = "Cust Code"; + this.checkBox46.UseVisualStyleBackColor = true; + // + // checkBox47 + // + this.checkBox47.AutoSize = true; + this.checkBox47.Location = new System.Drawing.Point(73, 24); + this.checkBox47.Name = "checkBox47"; + this.checkBox47.Size = new System.Drawing.Size(77, 23); + this.checkBox47.TabIndex = 25; + this.checkBox47.Tag = "0"; + this.checkBox47.Text = "Part No"; + this.checkBox47.UseVisualStyleBackColor = true; + // // tabPage3 // this.tabPage3.Controls.Add(this.chkCustom); this.tabPage3.Location = new System.Drawing.Point(4, 26); this.tabPage3.Name = "tabPage3"; - this.tabPage3.Size = new System.Drawing.Size(725, 266); + this.tabPage3.Size = new System.Drawing.Size(725, 345); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "Others"; this.tabPage3.UseVisualStyleBackColor = true; @@ -1082,168 +1249,29 @@ this.dataSet11.DataSetName = "DataSet1"; this.dataSet11.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; // - // chkApplyWMSInfo + // checkBox1 // - this.chkApplyWMSInfo.AutoSize = true; - this.chkApplyWMSInfo.Font = new System.Drawing.Font("맑은 고딕", 12F); - this.chkApplyWMSInfo.ForeColor = System.Drawing.Color.Gray; - this.chkApplyWMSInfo.Location = new System.Drawing.Point(13, 303); - this.chkApplyWMSInfo.Name = "chkApplyWMSInfo"; - this.chkApplyWMSInfo.Size = new System.Drawing.Size(446, 25); - this.chkApplyWMSInfo.TabIndex = 35; - this.chkApplyWMSInfo.Tag = "8"; - this.chkApplyWMSInfo.Text = "Automatically record data using WMS information table"; - this.chkApplyWMSInfo.UseVisualStyleBackColor = true; - this.chkApplyWMSInfo.CheckStateChanged += new System.EventHandler(this.checkBox1_CheckStateChanged); + this.checkBox1.AutoSize = true; + this.checkBox1.ForeColor = System.Drawing.Color.Blue; + this.checkBox1.Location = new System.Drawing.Point(379, 50); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(92, 23); + this.checkBox1.TabIndex = 38; + this.checkBox1.Tag = "12"; + this.checkBox1.Text = "MFG Date"; + this.checkBox1.UseVisualStyleBackColor = true; // - // grpApplyWMSinfo + // checkBox2 // - this.grpApplyWMSinfo.Controls.Add(this.checkBox36); - this.grpApplyWMSinfo.Controls.Add(this.chkWMSApplyBatch); - this.grpApplyWMSinfo.Controls.Add(this.label22); - this.grpApplyWMSinfo.Controls.Add(this.label23); - this.grpApplyWMSinfo.Controls.Add(this.checkBox41); - this.grpApplyWMSinfo.Controls.Add(this.checkBox42); - this.grpApplyWMSinfo.Controls.Add(this.checkBox43); - this.grpApplyWMSinfo.Controls.Add(this.checkBox44); - this.grpApplyWMSinfo.Controls.Add(this.checkBox45); - this.grpApplyWMSinfo.Controls.Add(this.checkBox46); - this.grpApplyWMSinfo.Controls.Add(this.checkBox47); - this.grpApplyWMSinfo.Dock = System.Windows.Forms.DockStyle.Top; - this.grpApplyWMSinfo.Enabled = false; - this.grpApplyWMSinfo.Font = new System.Drawing.Font("맑은 고딕", 10F); - this.grpApplyWMSinfo.Location = new System.Drawing.Point(10, 10); - this.grpApplyWMSinfo.Name = "grpApplyWMSinfo"; - this.grpApplyWMSinfo.Size = new System.Drawing.Size(705, 82); - this.grpApplyWMSinfo.TabIndex = 36; - this.grpApplyWMSinfo.TabStop = false; - this.grpApplyWMSinfo.Text = "WMS Information Application"; - // - // checkBox36 - // - this.checkBox36.AutoSize = true; - this.checkBox36.ForeColor = System.Drawing.Color.Blue; - this.checkBox36.Location = new System.Drawing.Point(311, 51); - this.checkBox36.Name = "checkBox36"; - this.checkBox36.Size = new System.Drawing.Size(62, 23); - this.checkBox36.TabIndex = 37; - this.checkBox36.Tag = "11"; - this.checkBox36.Text = "VLOT"; - this.checkBox36.UseVisualStyleBackColor = true; - // - // chkWMSApplyBatch - // - this.chkWMSApplyBatch.AutoSize = true; - this.chkWMSApplyBatch.ForeColor = System.Drawing.Color.Green; - this.chkWMSApplyBatch.Location = new System.Drawing.Point(431, 24); - this.chkWMSApplyBatch.Name = "chkWMSApplyBatch"; - this.chkWMSApplyBatch.Size = new System.Drawing.Size(63, 23); - this.chkWMSApplyBatch.TabIndex = 35; - this.chkWMSApplyBatch.Tag = "9"; - this.chkWMSApplyBatch.Text = "Batch"; - this.chkWMSApplyBatch.UseVisualStyleBackColor = true; - // - // label22 - // - this.label22.AutoSize = true; - this.label22.Font = new System.Drawing.Font("맑은 고딕", 9F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic)))); - this.label22.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); - this.label22.Location = new System.Drawing.Point(6, 54); - this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(41, 15); - this.label22.TabIndex = 29; - this.label22.Text = "Query"; - // - // label23 - // - this.label23.AutoSize = true; - this.label23.Font = new System.Drawing.Font("맑은 고딕", 9F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic)))); - this.label23.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); - this.label23.Location = new System.Drawing.Point(7, 28); - this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(40, 15); - this.label23.TabIndex = 29; - this.label23.Text = "Apply"; - // - // checkBox41 - // - this.checkBox41.AutoSize = true; - this.checkBox41.Location = new System.Drawing.Point(311, 24); - this.checkBox41.Name = "checkBox41"; - this.checkBox41.Size = new System.Drawing.Size(114, 23); - this.checkBox41.TabIndex = 28; - this.checkBox41.Tag = "3"; - this.checkBox41.Text = "Vender Name"; - this.checkBox41.UseVisualStyleBackColor = true; - // - // checkBox42 - // - this.checkBox42.AutoSize = true; - this.checkBox42.ForeColor = System.Drawing.Color.Blue; - this.checkBox42.Location = new System.Drawing.Point(255, 50); - this.checkBox42.Name = "checkBox42"; - this.checkBox42.Size = new System.Drawing.Size(50, 23); - this.checkBox42.TabIndex = 27; - this.checkBox42.Tag = "7"; - this.checkBox42.Text = "SID"; - this.checkBox42.UseVisualStyleBackColor = true; - // - // checkBox43 - // - this.checkBox43.AutoSize = true; - this.checkBox43.ForeColor = System.Drawing.Color.Blue; - this.checkBox43.Location = new System.Drawing.Point(156, 50); - this.checkBox43.Name = "checkBox43"; - this.checkBox43.Size = new System.Drawing.Size(93, 23); - this.checkBox43.TabIndex = 25; - this.checkBox43.Tag = "6"; - this.checkBox43.Text = "Cust Code"; - this.checkBox43.UseVisualStyleBackColor = true; - // - // checkBox44 - // - this.checkBox44.AutoSize = true; - this.checkBox44.ForeColor = System.Drawing.Color.Blue; - this.checkBox44.Location = new System.Drawing.Point(73, 50); - this.checkBox44.Name = "checkBox44"; - this.checkBox44.Size = new System.Drawing.Size(77, 23); - this.checkBox44.TabIndex = 25; - this.checkBox44.Tag = "5"; - this.checkBox44.Text = "Part No"; - this.checkBox44.UseVisualStyleBackColor = true; - // - // checkBox45 - // - this.checkBox45.AutoSize = true; - this.checkBox45.Location = new System.Drawing.Point(255, 24); - this.checkBox45.Name = "checkBox45"; - this.checkBox45.Size = new System.Drawing.Size(50, 23); - this.checkBox45.TabIndex = 26; - this.checkBox45.Tag = "2"; - this.checkBox45.Text = "SID"; - this.checkBox45.UseVisualStyleBackColor = true; - // - // checkBox46 - // - this.checkBox46.AutoSize = true; - this.checkBox46.Location = new System.Drawing.Point(156, 24); - this.checkBox46.Name = "checkBox46"; - this.checkBox46.Size = new System.Drawing.Size(93, 23); - this.checkBox46.TabIndex = 25; - this.checkBox46.Tag = "1"; - this.checkBox46.Text = "Cust Code"; - this.checkBox46.UseVisualStyleBackColor = true; - // - // checkBox47 - // - this.checkBox47.AutoSize = true; - this.checkBox47.Location = new System.Drawing.Point(73, 24); - this.checkBox47.Name = "checkBox47"; - this.checkBox47.Size = new System.Drawing.Size(77, 23); - this.checkBox47.TabIndex = 25; - this.checkBox47.Tag = "0"; - this.checkBox47.Text = "Part No"; - this.checkBox47.UseVisualStyleBackColor = true; + this.checkBox2.AutoSize = true; + this.checkBox2.ForeColor = System.Drawing.Color.Black; + this.checkBox2.Location = new System.Drawing.Point(431, 24); + this.checkBox2.Name = "checkBox2"; + this.checkBox2.Size = new System.Drawing.Size(92, 23); + this.checkBox2.TabIndex = 39; + this.checkBox2.Tag = "13"; + this.checkBox2.Text = "MFG Date"; + this.checkBox2.UseVisualStyleBackColor = true; // // fSelectJob // @@ -1273,12 +1301,12 @@ this.grpapplyjob.PerformLayout(); this.grpApplySidinfo.ResumeLayout(false); this.grpApplySidinfo.PerformLayout(); + this.grpApplyWMSinfo.ResumeLayout(false); + this.grpApplyWMSinfo.PerformLayout(); this.tabPage3.ResumeLayout(false); this.tabPage3.PerformLayout(); this.tableLayoutPanel3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataSet11)).EndInit(); - this.grpApplyWMSinfo.ResumeLayout(false); - this.grpApplyWMSinfo.PerformLayout(); this.ResumeLayout(false); } @@ -1364,5 +1392,7 @@ private System.Windows.Forms.CheckBox checkBox45; private System.Windows.Forms.CheckBox checkBox46; private System.Windows.Forms.CheckBox checkBox47; + private System.Windows.Forms.CheckBox checkBox2; + private System.Windows.Forms.CheckBox checkBox1; } } \ No newline at end of file diff --git a/Handler/Project/Dialog/fSelectJob.cs b/Handler/Project/Dialog/fSelectJob.cs index e0aef00..6c3f549 100644 --- a/Handler/Project/Dialog/fSelectJob.cs +++ b/Handler/Project/Dialog/fSelectJob.cs @@ -279,13 +279,16 @@ namespace Project.Dialog VAR.BOOL[eVarBool.Opt_WMS_Apply_VenderName] = checkBox41.Checked; VAR.BOOL[eVarBool.Opt_WMS_Apply_batch] = chkWMSApplyBatch.Checked; VAR.BOOL[eVarBool.Opt_WMS_Apply_qty] = false;// chkInfoApplyQty.Checked; + VAR.BOOL[eVarBool.Opt_WMS_Apply_MFG] = checkBox2.Checked; VAR.BOOL[eVarBool.Opt_WMS_Where_PartNo] = checkBox44.Checked; VAR.BOOL[eVarBool.Opt_WMS_Where_CustCode] = checkBox43.Checked; VAR.BOOL[eVarBool.Opt_WMS_Where_SID] = checkBox42.Checked; VAR.BOOL[eVarBool.Opt_WMS_Where_VLOT] = checkBox36.Checked; VAR.BOOL[eVarBool.Opt_WMS_Where_MC] = false;// chkInfoWhereMC.Checked; + VAR.BOOL[eVarBool.Opt_WMS_Where_MFG] = checkBox1.Checked; VAR.BOOL[eVarBool.Opt_WMS_WriteServer] = false;// chkInfoSave.Checked; + //SID Information VAR.BOOL[eVarBool.Opt_SID_Apply_PartNo] = chkInfoApplyPart.Checked; diff --git a/Handler/Project/Util/BarcodeDataProcessing.cs b/Handler/Project/Util/BarcodeDataProcessing.cs index 7f2b059..36d8b65 100644 --- a/Handler/Project/Util/BarcodeDataProcessing.cs +++ b/Handler/Project/Util/BarcodeDataProcessing.cs @@ -279,6 +279,7 @@ namespace Project if (VAR.BOOL[eVarBool.Opt_WMS_Apply_VenderName] && (vdata.VNAME_Trust == false || vdata.VNAME.isEmpty())) fields.Add("VENDOR_NM"); if (VAR.BOOL[eVarBool.Opt_WMS_Apply_SID] && (vdata.SID_Trust == false || vdata.SID.isEmpty())) fields.Add("SID"); if (VAR.BOOL[eVarBool.Opt_WMS_Apply_batch] && (vdata.SID_Trust == false || vdata.BATCH.isEmpty())) fields.Add("BATCH_NO"); //220921 + if (VAR.BOOL[eVarBool.Opt_WMS_Apply_MFG] && (vdata.MFGDATE_Trust == false || vdata.MFGDATE.isEmpty())) fields.Add("MFG_DATE"); //where coluns List wheres = new List(); @@ -310,7 +311,11 @@ namespace Project if (vdata.VLOT_Trust && vdata.VLOT.isEmpty() == false) wheres.Add($"VENDOR_LOT = '{vdata.VLOT}'"); else Apply = false; } - + if (Apply && VAR.BOOL[eVarBool.Opt_WMS_Where_MFG]) //221013 + { + if (vdata.MFGDATE_Trust && vdata.MFGDATE.isEmpty() == false) wheres.Add($"MFG_DATE = '{vdata.MFGDATE}'"); + else Apply = false; + } //if query data . no error if (Apply && fields.Count > 0 && wheres.Count > 0) { diff --git a/Handler/Sub/CommData/Enum.cs b/Handler/Sub/CommData/Enum.cs index 8f22158..8dff342 100644 --- a/Handler/Sub/CommData/Enum.cs +++ b/Handler/Sub/CommData/Enum.cs @@ -95,11 +95,13 @@ namespace AR Opt_WMS_Apply_VenderName, Opt_WMS_Apply_batch, Opt_WMS_Apply_qty, + Opt_WMS_Apply_MFG, Opt_WMS_Where_PartNo, Opt_WMS_Where_CustCode, Opt_WMS_Where_SID, Opt_WMS_Where_VLOT, Opt_WMS_Where_MC, + Opt_WMS_Where_MFG, Opt_WMS_WriteServer,