界面修改以及产品标签维护修改

UAS-MES/FunctionCode/Make/Make_BigBoxWeight.Designer.cs

@@ -129,60 +129,60 @@
             // pa_makecode_label
             // 
             this.pa_makecode_label.AutoSize = true;
-            this.pa_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_makecode_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.pa_makecode_label.Location = new System.Drawing.Point(34, 191);
             this.pa_makecode_label.Name = "pa_makecode_label";
-            this.pa_makecode_label.Size = new System.Drawing.Size(58, 21);
+            this.pa_makecode_label.Size = new System.Drawing.Size(72, 27);
             this.pa_makecode_label.TabIndex = 73;
             this.pa_makecode_label.Text = "工单号";
             // 
             // PA_TOTALQTY_label
             // 
             this.PA_TOTALQTY_label.AutoSize = true;
-            this.PA_TOTALQTY_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.PA_TOTALQTY_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.PA_TOTALQTY_label.Location = new System.Drawing.Point(24, 260);
             this.PA_TOTALQTY_label.Name = "PA_TOTALQTY_label";
-            this.PA_TOTALQTY_label.Size = new System.Drawing.Size(74, 21);
+            this.PA_TOTALQTY_label.Size = new System.Drawing.Size(92, 27);
             this.PA_TOTALQTY_label.TabIndex = 74;
             this.PA_TOTALQTY_label.Text = "箱内总数";
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label2.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.Location = new System.Drawing.Point(24, 327);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(74, 21);
+            this.label2.Size = new System.Drawing.Size(92, 27);
             this.label2.TabIndex = 75;
             this.label2.Text = "产品编号";
             // 
             // pr_detail_label
             // 
             this.pr_detail_label.AutoSize = true;
-            this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.pr_detail_label.Location = new System.Drawing.Point(24, 406);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(74, 21);
+            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
             this.pr_detail_label.TabIndex = 76;
             this.pr_detail_label.Text = "名称规格";
             // 
             // pa_salecode_label
             // 
             this.pa_salecode_label.AutoSize = true;
-            this.pa_salecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_salecode_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.pa_salecode_label.Location = new System.Drawing.Point(243, 191);
             this.pa_salecode_label.Name = "pa_salecode_label";
-            this.pa_salecode_label.Size = new System.Drawing.Size(74, 21);
+            this.pa_salecode_label.Size = new System.Drawing.Size(92, 27);
             this.pa_salecode_label.TabIndex = 77;
             this.pa_salecode_label.Text = "订单编号";
             // 
             // PA_PACKAGEQTY_label
             // 
             this.PA_PACKAGEQTY_label.AutoSize = true;
-            this.PA_PACKAGEQTY_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.PA_PACKAGEQTY_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.PA_PACKAGEQTY_label.Location = new System.Drawing.Point(243, 260);
             this.PA_PACKAGEQTY_label.Name = "PA_PACKAGEQTY_label";
-            this.PA_PACKAGEQTY_label.Size = new System.Drawing.Size(74, 21);
+            this.PA_PACKAGEQTY_label.Size = new System.Drawing.Size(92, 27);
             this.PA_PACKAGEQTY_label.TabIndex = 78;
             this.PA_PACKAGEQTY_label.Text = "箱内件数";
             // 
@@ -329,7 +329,7 @@
             this.pa_packageqty.AutoSize = true;
             this.pa_packageqty.CutLength = null;
             this.pa_packageqty.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_packageqty.Location = new System.Drawing.Point(335, 257);
+            this.pa_packageqty.Location = new System.Drawing.Point(343, 257);
             this.pa_packageqty.MaximumSize = new System.Drawing.Size(150, 0);
             this.pa_packageqty.Name = "pa_packageqty";
             this.pa_packageqty.Size = new System.Drawing.Size(0, 27);
@@ -341,7 +341,7 @@
             this.pa_salecode.AutoSize = true;
             this.pa_salecode.CutLength = null;
             this.pa_salecode.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_salecode.Location = new System.Drawing.Point(335, 188);
+            this.pa_salecode.Location = new System.Drawing.Point(343, 188);
             this.pa_salecode.MaximumSize = new System.Drawing.Size(150, 0);
             this.pa_salecode.Name = "pa_salecode";
             this.pa_salecode.Size = new System.Drawing.Size(0, 27);
@@ -353,7 +353,7 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(108, 403);
+            this.pr_detail.Location = new System.Drawing.Point(116, 403);
             this.pr_detail.MaximumSize = new System.Drawing.Size(150, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 27);
@@ -365,7 +365,7 @@
             this.pa_prodcode.AutoSize = true;
             this.pa_prodcode.CutLength = null;
             this.pa_prodcode.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_prodcode.Location = new System.Drawing.Point(108, 324);
+            this.pa_prodcode.Location = new System.Drawing.Point(116, 324);
             this.pa_prodcode.MaximumSize = new System.Drawing.Size(150, 0);
             this.pa_prodcode.Name = "pa_prodcode";
             this.pa_prodcode.Size = new System.Drawing.Size(0, 27);
@@ -378,7 +378,7 @@
             this.pa_totalqty.AutoSize = true;
             this.pa_totalqty.CutLength = null;
             this.pa_totalqty.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_totalqty.Location = new System.Drawing.Point(108, 259);
+            this.pa_totalqty.Location = new System.Drawing.Point(116, 259);
             this.pa_totalqty.MaximumSize = new System.Drawing.Size(150, 0);
             this.pa_totalqty.Name = "pa_totalqty";
             this.pa_totalqty.Size = new System.Drawing.Size(0, 27);
@@ -390,7 +390,7 @@
             this.pa_makecode.AutoSize = true;
             this.pa_makecode.CutLength = null;
             this.pa_makecode.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_makecode.Location = new System.Drawing.Point(108, 188);
+            this.pa_makecode.Location = new System.Drawing.Point(116, 188);
             this.pa_makecode.MaximumSize = new System.Drawing.Size(150, 0);
             this.pa_makecode.Name = "pa_makecode";
             this.pa_makecode.Size = new System.Drawing.Size(0, 27);

UAS-MES/FunctionCode/SystemSetting/SystemSetting_LabelMaintain.cs

@@ -379,12 +379,12 @@ namespace UAS_MES.SystemSetting
         }
 
         //判断与标签保存时是否已经有同类型标签存在
-        private Boolean isSameLabel(string pl_prodcode, string pl_labeltype, string pl_labelname)
+        private Boolean isSameLabel(string pl_prodcode, string pl_labeltype, string pl_labelname,string pl_labelcode)
         {
             LogStringBuilder sql2 = new LogStringBuilder();
             sql2.Append("select la_id,pl_labelname,pl_labelurl,pl_labeltype,pl_isdefault,pl_prodcode,pl_id,pl_labelcode,pl_detno,pl_labelsoft,pr_detail,pr_spec,");
             sql2.Append("pr_code from productlabel left join product on pl_prodcode=pr_code left join label on pl_labelcode=la_code");
-            sql2.Append(" where  pl_prodcode = '" + pl_prodcode + "'  and pl_labeltype = '" + pl_labeltype + "'  and pl_labelname = '" + pl_labelname + "'");
+            sql2.Append(" where  pl_prodcode = '" + pl_prodcode + "'  and pl_labeltype = '" + pl_labeltype + "'  and pl_labelname = '" + pl_labelname + "' and pl_labelcode = '"+ pl_labelcode + "'");
             dt = (DataTable)dh.ExecuteSql(sql2.GetString(), "select");
             if (dt.Rows.Count > 0)
             {
@@ -432,8 +432,7 @@ namespace UAS_MES.SystemSetting
         private void 产品标签维护_FormClosing(object sender, FormClosingEventArgs e)
         {
             //关闭所有的打印文件
-            if (lbl.Documents != null)
-                lbl.Documents.CloseAll();
+            lbl.Quit();
         }
 
         private void Save_Click(object sender, EventArgs e)
@@ -447,7 +446,7 @@ namespace UAS_MES.SystemSetting
                     ftp.UpLoadFile(FolderPath.Text, la_name.Text);
                     if (pl_id2 != "")
                     {
-                        if (!isSameLabel(pr_code.Text, la_type.Text, la_name.Text)&&(((isdefault(pr_code.Text, la_type.Text)==1)&& (pl_default == "1")||(pr_code.Text ==pr_code_1 && la_type.Text == la_type_1))|| (pl_default == "0")))
+                        if (!isSameLabel(pr_code.Text, la_type.Text, la_name.Text,la_code.Text)&&(((isdefault(pr_code.Text, la_type.Text)==1)&& (pl_default == "1")||(pr_code.Text ==pr_code_1 && la_type.Text == la_type_1))|| (pl_default == "0")))
                         {
                             sql.Clear();
                             sql.Append("update productlabel set pl_labelcode=:pl_labelcode,pl_labeltype=:pl_labeltype,pl_labelurl=:pl_labelurl,pl_labelname=:pl_labelname,");
@@ -464,7 +463,7 @@ namespace UAS_MES.SystemSetting
                     }
                     else
                     {
-                        if (!isSameLabel(pr_code.Text, la_type.Text, la_name.Text))
+                        if (!isSameLabel(pr_code.Text, la_type.Text, la_name.Text,la_code.Text))
                         {
                             sql.Clear();
                             sql.Append("insert into productlabel (pl_id,pl_labelcode,pl_labeltype,pl_isdefault,pl_labelurl,pl_labelsoft,pl_labelname,pl_prodcode,pl_indate) values( productlabel_seq.nextval, ");