修改合并字段

UAS-出货标签管理(贸易版)/CustomerRule.Designer.cs

@@ -32,10 +32,10 @@
             this.cu_print_midspec = new System.Windows.Forms.CheckBox();
             this.cu_print_midpo = new System.Windows.Forms.CheckBox();
             this.CustomerTreeView = new System.Windows.Forms.TreeView();
-            this.ButtonSaveScanGroup = new UAS_LabelMachine.CustomControl.NormalButton();
             this.Customer = new System.Windows.Forms.TextBox();
             this.label1 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
+            this.ButtonSaveScanGroup = new UAS_LabelMachine.CustomControl.NormalButton();
             this.SuspendLayout();
             // 
             // cu_print_midspec
@@ -47,7 +47,7 @@
             this.cu_print_midspec.Size = new System.Drawing.Size(93, 25);
             this.cu_print_midspec.TabIndex = 3;
             this.cu_print_midspec.Tag = "QTY";
-            this.cu_print_midspec.Text = "合并型号";
+            this.cu_print_midspec.Text = "区分型号";
             this.cu_print_midspec.UseVisualStyleBackColor = true;
             // 
             // cu_print_midpo
@@ -59,7 +59,7 @@
             this.cu_print_midpo.Size = new System.Drawing.Size(93, 25);
             this.cu_print_midpo.TabIndex = 4;
             this.cu_print_midpo.Tag = "PN";
-            this.cu_print_midpo.Text = "合并订单";
+            this.cu_print_midpo.Text = "区分订单";
             this.cu_print_midpo.UseVisualStyleBackColor = true;
             // 
             // CustomerTreeView
@@ -70,17 +70,6 @@
             this.CustomerTreeView.TabIndex = 0;
             this.CustomerTreeView.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.CustomerTreeView_NodeMouseClick);
             // 
-            // ButtonSaveScanGroup
-            // 
-            this.ButtonSaveScanGroup.Image = ((System.Drawing.Image)(resources.GetObject("ButtonSaveScanGroup.Image")));
-            this.ButtonSaveScanGroup.Location = new System.Drawing.Point(254, 4);
-            this.ButtonSaveScanGroup.Name = "ButtonSaveScanGroup";
-            this.ButtonSaveScanGroup.Size = new System.Drawing.Size(64, 23);
-            this.ButtonSaveScanGroup.TabIndex = 42;
-            this.ButtonSaveScanGroup.Text = "保存";
-            this.ButtonSaveScanGroup.UseVisualStyleBackColor = true;
-            this.ButtonSaveScanGroup.Click += new System.EventHandler(this.ButtonSaveScanGroup_Click);
-            // 
             // Customer
             // 
             this.Customer.Location = new System.Drawing.Point(85, 1);
@@ -109,6 +98,17 @@
             this.label2.TabIndex = 51;
             this.label2.Text = "中盒合并规则";
             // 
+            // ButtonSaveScanGroup
+            // 
+            this.ButtonSaveScanGroup.Image = ((System.Drawing.Image)(resources.GetObject("ButtonSaveScanGroup.Image")));
+            this.ButtonSaveScanGroup.Location = new System.Drawing.Point(254, 4);
+            this.ButtonSaveScanGroup.Name = "ButtonSaveScanGroup";
+            this.ButtonSaveScanGroup.Size = new System.Drawing.Size(64, 23);
+            this.ButtonSaveScanGroup.TabIndex = 42;
+            this.ButtonSaveScanGroup.Text = "保存";
+            this.ButtonSaveScanGroup.UseVisualStyleBackColor = true;
+            this.ButtonSaveScanGroup.Click += new System.EventHandler(this.ButtonSaveScanGroup_Click);
+            // 
             // CustomerRule
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);

UAS-出货标签管理(贸易版)/生成条码.Designer.cs

@@ -52,7 +52,7 @@
             this.pd_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pd_ordercode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_orispeccode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_brand = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_unit = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pd_totalqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -194,7 +194,7 @@
             this.pd_prodcode,
             this.pr_detail,
             this.pd_ordercode,
-            this.pr_spec,
+            this.pr_orispeccode,
             this.pr_brand,
             this.pr_unit,
             this.pd_totalqty,
@@ -311,14 +311,14 @@
             this.pd_ordercode.Name = "pd_ordercode";
             this.pd_ordercode.Width = 78;
             // 
-            // pr_spec
+            // pr_orispeccode
             // 
-            this.pr_spec.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
-            this.pr_spec.DataPropertyName = "pr_spec";
-            this.pr_spec.HeaderText = "规格描述";
-            this.pr_spec.Name = "pr_spec";
-            this.pr_spec.ReadOnly = true;
-            this.pr_spec.Width = 78;
+            this.pr_orispeccode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
+            this.pr_orispeccode.DataPropertyName = "pr_orispeccode";
+            this.pr_orispeccode.HeaderText = "型号";
+            this.pr_orispeccode.Name = "pr_orispeccode";
+            this.pr_orispeccode.ReadOnly = true;
+            this.pr_orispeccode.Width = 54;
             // 
             // pr_brand
             // 
@@ -448,7 +448,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_prodcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_detail;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_ordercode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pr_orispeccode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_brand;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_unit;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_totalqty;

UAS-出货标签管理(贸易版)/生成条码.cs

@@ -520,8 +520,8 @@ namespace UAS_LabelMachine
                 {
                     case "出货单":
                         sql.Clear();
-                        sql.Append("select pd_piid,pd_id,pr_id,pr_brand,pd_vespec_user,pr_madein,pr_unit,pr_detail,pr_spec,pr_zxbzs,outqty pd_totalqty,pd_pocode,pd_ordercode,pd_orderdetno,pd_pdno,pd_prodcode,");
-                        sql.Append("pd_piclass,pd_qty from (select pd_piid,pd_id,pr_id,pr_brand,pd_vespec_user,pr_madein,pr_unit,pr_detail,pr_spec,pr_zxbzs,outqty,pd_pocode,pd_ordercode,pd_orderdetno,pd_pdno,");
+                        sql.Append("select pd_piid,pd_id,pr_id,pr_brand,pr_orispeccode,pr_madein,pr_unit,pr_detail,pr_spec,pr_zxbzs,outqty pd_totalqty,pd_pocode,pd_ordercode,pd_orderdetno,pd_pdno,pd_prodcode,");
+                        sql.Append("pd_piclass,pd_qty from (select pd_piid,pd_id,pr_id,pr_brand,nvl(pd_vespec_user,pr_orispeccode)pr_orispeccode,pr_madein,pr_unit,pr_detail,pr_spec,pr_zxbzs,outqty,pd_pocode,pd_ordercode,pd_orderdetno,pd_pdno,");
                         sql.Append("pd_prodcode,pd_piclass,outqty-nvl((select sum(nvl(pib_qty,0)) from PRODIOBARCODE where PIB_PIID=pd_piid and pib_pdno=pd_pdno ),0)pd_qty ");
                         sql.Append("from (select pd_piid,min(pd_id)pd_id,max(pd_vespec_user)pd_vespec_user,sum(pd_outqty)outqty,min(pd_pocode)pd_pocode,min(pd_ordercode)pd_ordercode,min(pd_orderdetno)pd_orderdetno,min(pd_pdno)pd_pdno,max(pd_prodcode)pd_prodcode,max(pd_piclass)pd_piclass ");
                         sql.Append("from prodiodetail group by pd_piid" + condition + ")T left join product ");

UAS-出货标签管理(贸易版)/生成条码.resx

@@ -178,7 +178,7 @@
   <metadata name="pd_ordercode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="pr_spec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="pr_orispeccode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="pr_brand.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">