补打功能优化

UAS_MES_ZT/FunctionCode/Make/Make_StencilPrint.Designer.cs

@@ -42,10 +42,10 @@
             this.pr_spec = new System.Windows.Forms.Label();
             this.PrintNum = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.printButton = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
-            this.pr_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.inputText = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
             this.Printer = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.PrinterCombox();
+            this.pr_code = new System.Windows.Forms.ComboBox();
             this.SuspendLayout();
             // 
             // pr_code_label
@@ -198,24 +198,6 @@
             this.printButton.Visible = false;
             this.printButton.Click += new System.EventHandler(this.printButton_Click);
             // 
-            // pr_code
-            // 
-            this.pr_code.AllPower = null;
-            this.pr_code.BackColor = System.Drawing.Color.White;
-            this.pr_code.Font = new System.Drawing.Font("宋体", 9F);
-            this.pr_code.ID = null;
-            this.pr_code.Location = new System.Drawing.Point(240, 43);
-            this.pr_code.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.pr_code.Name = "pr_code";
-            this.pr_code.Power = null;
-            this.pr_code.Size = new System.Drawing.Size(246, 35);
-            this.pr_code.Str = null;
-            this.pr_code.Str1 = null;
-            this.pr_code.Str2 = null;
-            this.pr_code.TabIndex = 191;
-            this.pr_code.KeyDown += new System.Windows.Forms.KeyEventHandler(this.pr_code_KeyDown);
-            this.pr_code.Leave += new System.EventHandler(this.pr_code_Leave);
-            // 
             // inputText
             // 
             this.inputText.AllPower = "ifall";
@@ -224,7 +206,7 @@
             this.inputText.BackColor = System.Drawing.Color.White;
             this.inputText.ID = null;
             this.inputText.Location = new System.Drawing.Point(222, 733);
-            this.inputText.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.inputText.Margin = new System.Windows.Forms.Padding(6);
             this.inputText.Name = "inputText";
             this.inputText.Power = null;
             this.inputText.Size = new System.Drawing.Size(388, 35);
@@ -239,7 +221,7 @@
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.OperateResult.Location = new System.Drawing.Point(66, 216);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(6);
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Size = new System.Drawing.Size(1408, 471);
             this.OperateResult.TabIndex = 186;
@@ -248,21 +230,34 @@
             // Printer
             // 
             this.Printer.Location = new System.Drawing.Point(693, 43);
-            this.Printer.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8);
+            this.Printer.Margin = new System.Windows.Forms.Padding(8);
             this.Printer.Name = "Printer";
             this.Printer.Size = new System.Drawing.Size(254, 50);
             this.Printer.TabIndex = 182;
             // 
-            // Make_CustomLabelPrint
+            // pr_code
+            // 
+            this.pr_code.FormattingEnabled = true;
+            this.pr_code.Items.AddRange(new object[] {
+            "FOB条码",
+            "玻璃ID",
+            "出货条码"});
+            this.pr_code.Location = new System.Drawing.Point(247, 48);
+            this.pr_code.Name = "pr_code";
+            this.pr_code.Size = new System.Drawing.Size(241, 32);
+            this.pr_code.TabIndex = 196;
+            this.pr_code.SelectedIndexChanged += new System.EventHandler(this.pr_code_SelectedIndexChanged);
+            // 
+            // Make_StencilPrint
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1542, 824);
+            this.Controls.Add(this.pr_code);
             this.Controls.Add(this.PrintNum);
             this.Controls.Add(this.pr_spec);
             this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.printButton);
-            this.Controls.Add(this.pr_code);
             this.Controls.Add(this.label6);
             this.Controls.Add(this.sncode_label);
             this.Controls.Add(this.inputText);
@@ -276,13 +271,13 @@
             this.Controls.Add(this.pr_code_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.Name = "Make_CustomLabelPrint";
+            this.Name = "Make_StencilPrint";
             this.Tag = "Make!CustomLabelPrint";
             this.Text = "Make_CustomLabelPrint";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_CustomLabelPrint_FormClosing);
             this.Load += new System.EventHandler(this.Make_CustomLablePrint_Load);
             this.SizeChanged += new System.EventHandler(this.Make_CustomLabelPrint_SizeChanged);
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }
@@ -300,10 +295,10 @@
         private System.Windows.Forms.Label sncode_label;
         private CustomControl.TextBoxWithIcon.SnCollectionBox inputText;
         private System.Windows.Forms.Label label6;
-        private CustomControl.TextBoxWithIcon.SnCollectionBox pr_code;
         private CustomControl.ButtonUtil.NormalButton printButton;
         private System.Windows.Forms.Label pr_detail;
         private System.Windows.Forms.Label pr_spec;
         private CustomControl.TextBoxWithIcon.NumOnlyTextBox PrintNum;
+        private System.Windows.Forms.ComboBox pr_code;
     }
 }

UAS_MES_ZT/FunctionCode/Make/Make_StencilPrint.cs

@@ -79,47 +79,6 @@ namespace UAS_MES_NEW.Make
             }
         }
 
-        private void pr_code_KeyDown(object sender, KeyEventArgs e)
-        {
-            //按下enter键
-            if (e.KeyCode == Keys.Enter)
-            {
-                //判断产品是否存在
-                dt = (DataTable)dh.ExecuteSql("select pr_code,pr_detail,pr_spec from product where pr_code='" + pr_code.Text + "'  and pr_statuscode ='AUDITED'", "select");
-                //查询没有值，返回提示用户“产品：XXX,不存在或者为审核”，清空产品代码输入框中的值 
-                if (dt.Rows.Count == 0)
-                {
-                    OperateResult.AppendText("<<产品：" + pr_code.Text + ",不存在或者未审核\n", Color.Red, pr_code);
-                    return;
-                }
-                //查询产品是否有自定义的标签模板
-                sql.Clear();
-                sql.Append("select la_code,la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault ");
-                sql.Append("from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='自定义' and la_statuscode='AUDITED' order by la_isdefault");
-                listA = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                if (listA.Rows.Count == 0)
-                {
-                    OperateResult.AppendText("<<产品：" + pr_code.Text + ",没有维护自定义模板\n", Color.Red, pr_code);
-                    return;
-                }
-                string la_id = listA.Rows[0]["la_id"].ToString();
-                string la_code = listA.Rows[0]["la_code"].ToString();
-                Console.WriteLine(listA.Rows[0]["la_isdefault"].ToString());
-                {
-                    //说明没有默认的模板，那就取pl_id最大的
-                    listA = (DataTable)dh.ExecuteSql("select fp_name la_url,'" + la_id + "' la_id,'" + la_code + "'la_code from FILEPATH where fp_id in (select *  from table(select parsestring(LA_SOFTTYPE,';') from label where la_id='" + la_id + "' ) where COLUMN_VALUE is not null)", "select");
-                    //listA = (DataTable)dh.ExecuteSql("select la_code,la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='自定义' and la_statuscode='AUDITED' order by la_isdefault", "select");
-                }
-                //标签显示
-                PrintLabel.DataSource = listA;
-                PrintLabel.DisplayMember = "la_url";
-                PrintLabel.ValueMember = "la_id";
-                //有值，填充界面
-                BaseUtil.SetFormValue(this.Controls, dt);
-                //paramsInfo = (DataTable)dh.ExecuteSql("select lp_detno, lp_name, lp_valuetype,lp_sql from label left join labelparameter on lp_laid=la_id where la_code='"+ listA.Rows[0]["pl_labelcode"].ToString() + "' order by lp_detno asc", "select");
-            }
-        }
-
         private void inputText_KeyDown(object sender, KeyEventArgs e)
         {
             //按下enter键
@@ -261,5 +220,41 @@ namespace UAS_MES_NEW.Make
                 PrintNum.Text = (PrintNums == "" ? "1" : PrintNums);
             }
         }
+
+        private void pr_code_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            //判断产品是否存在
+            dt = (DataTable)dh.ExecuteSql("select pr_code,pr_detail,pr_spec from product where pr_code='" + pr_code.Text + "'  and pr_statuscode ='AUDITED'", "select");
+            //查询没有值，返回提示用户“产品：XXX,不存在或者为审核”，清空产品代码输入框中的值 
+            if (dt.Rows.Count == 0)
+            {
+                OperateResult.AppendText("<<产品：" + pr_code.Text + ",不存在或者未审核\n", Color.Red, pr_code);
+                return;
+            }
+            //查询产品是否有自定义的标签模板
+            sql.Clear();
+            sql.Append("select la_code,la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault ");
+            sql.Append("from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='自定义' and la_statuscode='AUDITED' order by la_isdefault");
+            listA = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            if (listA.Rows.Count == 0)
+            {
+                OperateResult.AppendText("<<产品：" + pr_code.Text + ",没有维护自定义模板\n", Color.Red, pr_code);
+                return;
+            }
+            string la_id = listA.Rows[0]["la_id"].ToString();
+            string la_code = listA.Rows[0]["la_code"].ToString();
+            Console.WriteLine(listA.Rows[0]["la_isdefault"].ToString());
+            {
+                //说明没有默认的模板，那就取pl_id最大的
+                listA = (DataTable)dh.ExecuteSql("select fp_name la_url,'" + la_id + "' la_id,'" + la_code + "'la_code from FILEPATH where fp_id in (select *  from table(select parsestring(LA_SOFTTYPE,';') from label where la_id='" + la_id + "' ) where COLUMN_VALUE is not null)", "select");
+                //listA = (DataTable)dh.ExecuteSql("select la_code,la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='自定义' and la_statuscode='AUDITED' order by la_isdefault", "select");
+            }
+            //标签显示
+            PrintLabel.DataSource = listA;
+            PrintLabel.DisplayMember = "la_url";
+            PrintLabel.ValueMember = "la_id";
+            //有值，填充界面
+            BaseUtil.SetFormValue(this.Controls, dt);
+        }
     }
 }

UAS_MES_ZT/FunctionCode/Make/Make_StencilPrint.resx

@@ -121,39 +121,39 @@
   <data name="printButton.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
-        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
-        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
-        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
-        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
-        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
-        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFfSURBVFhH5dhNTsJgFIXhM2WiCxL2oAEHrJKhQSYM
+        JIgzjSLIX0sRKPSPtl+Lo2uOgVbWcJu8CzhP8nVwISIAUAFwA+AWQFNh3M39lZMHrgDUu91uyxjji8KP
+        u7mfDgCuiVLt958fkjSTie3I62iqLu7m/sHgpQ2gRpSG6/nmc2bL23imtuHMkp0f5ADuidIMoljev+bq
+        o8PpH4NmcIjlY7JQHx0KlPCQyHBqqY8OJUqcyGhuq48OBUoUJzJeLNVHhwLlkKQysRz10eECZbpcqe8C
+        JU6NzJ1v9dGhQElSI9Zqoz46lCgmE3u9VR8dCpTUZOJsXPXRoUTJclltd+qjQ4FislzW7l59dChR8lw2
+        e099dDijNA5xYnZBKFvPVxv3x0lanA5qT71eOzsexQsjcf1AXdzN/XQ4H5l4fqs/djqtIIzC/Pgj2uJu
+        7i/Okf8O11UAd6c3pS3u5v6/w/UvTaFspAxAMh4AAAAASUVORK5CYII=
 </value>
   </data>
   <data name="printButton.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
-        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
-        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
-        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
-        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
-        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
-        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
-        gg==
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAF3SURBVFhH5djbSgJRFMbxHsP7wBfYT7jvu46QDIoI
+        C4QNQRAIgVBRSdpxpgZN83wYx5nZOjNqrvgEd73DGvhfzdX3g32ztohoS0iVElLtCakehVQdhmE39qfg
+        AZBtIdX70Y0TjsJ4SQw/7MZ+OAip0kDJnD3UdJAsyXIjKvWm7MJu7M+X6lpIlQWK3ZhEq8pgRvfdKdvK
+        /Rk1/XglpHKA0ulPF3Tb0eyDAzzWKL3pgq7bmn1wMChdPadiK2QfHAxKW8/pqhmwDw4GpRXOqdAI2AcH
+        g9IME7qs++yDg0H5DhK6qE3YBweD0vATOq967IODQfnyE1KOxz44GJTaJKb855h9cDAoVS+mU9tlHxwM
+        iuPFdGK57IPDH8o4ouO3EfvgYFA+xhEdvg7ZB4cNil3uhquc5dLBy5Bt2P/U0+Z0kN0tOhqHlpzt0v7z
+        gF3Yjf1w2ByZ0jjD7RSs8K7l/+Ant7Ab+8058t/hOiOkquBNMQy7sX99uP4F5D4U8hdr4uMAAAAASUVO
+        RK5CYII=
 </value>
   </data>
   <data name="printButton.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
-        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
-        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
-        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
-        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
-        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
-        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
-        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGpSURBVFhH5dg/ayJBGMfxB4YFXTARBAvBQhAsBEEQ
+        ZLnNzFu4I6aYV5kyF9tgbad1jrsYY9T4Z3fcnV2f45e38Sx8q6l+n2IWhpiZjDFVY8wPY8xPY4wVGHZj
+        fxUepLW+0Vrfz+fzR+fclgV+2I39cNBa31Icx/FisXi6XpnL8io27F8ul89xHN9RFEWTPM+ToihZet57
+        F0XRA43HYwsp7wvxwQEeNBqNbFmWnOW5+OAADxoOh7YoS3ZZJj44wIMGg4H1RcGpu4gPDvCgfr9vvfd8
+        TlPxwQEe1Ov1bO49H8+J+OAAD+p2uxaXzNfpJD44wIM6nY69ZDnvDkfxwQEe1G637SXLeLs/iA8O8KBW
+        q2XdJePNbi8+OMCDms2mxe9o/bkTHxzgQY1GwybO8WrzKT44wIPq9bpNUsdv64344AAPqtVq9pw6/vv+
+        IT44wIPCMJzsvg7Jv/UH/1m9iw3794ejC8PwgSqVyt3LbPZ8SpLvg9e3lbiwG/vhAA8KguA2CIL739Pp
+        42a73eNQWtiN/XCAB+GhVilVVUrFSqlfSikrMOzG/u+H6/+yQ4jdXN8e9AAAAABJRU5ErkJggg==
 </value>
   </data>
 </root>