Browse Source

出货品牌字段添加

章政 6 years ago
parent
commit
e786d9a4fa

+ 10 - 0
UAS-出货标签管理(吉利通)/UAS_出货标签管理.Designer.cs

@@ -235,6 +235,7 @@
             this.pib_ifupload = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.pr_vendprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pib_brand = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.sd_brand = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pib_madein = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_orispeccode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -1528,6 +1529,7 @@
             this.pib_ifupload,
             this.pr_vendprodcode,
             this.pib_brand,
+            this.sd_brand,
             this.pib_madein,
             this.pr_orispeccode,
             this.pr_barcode,
@@ -2540,6 +2542,13 @@
             this.pib_brand.ReadOnly = true;
             this.pib_brand.Width = 54;
             // 
+            // sd_brand
+            // 
+            this.sd_brand.DataPropertyName = "sd_brand";
+            this.sd_brand.HeaderText = "出货品牌";
+            this.sd_brand.Name = "sd_brand";
+            this.sd_brand.Width = 78;
+            // 
             // pib_madein
             // 
             this.pib_madein.DataPropertyName = "pib_madein";
@@ -3035,6 +3044,7 @@
         private System.Windows.Forms.DataGridViewCheckBoxColumn pib_ifupload;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_vendprodcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_brand;
+        private System.Windows.Forms.DataGridViewTextBoxColumn sd_brand;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_madein;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_orispeccode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_barcode;

+ 2 - 2
UAS-出货标签管理(吉利通)/UAS_出货标签管理.cs

@@ -1605,9 +1605,9 @@ namespace UAS_LabelMachine
                 sql.Clear();
                 sql.Append("select t.*,rownum from (select pib_autoset,pd_ordercode,pib_year,pib_month,pib_day,pr_barcode,pr_detail,pib_custoutboxcode,pib_custmidboxcode,pr_orispeccode,pd_id,pd_custprodcode,pib_indate,pi_date,pib_inoutno,pd_custprodspec,");
                 sql.Append("nvl(pib_ifrecheck,0)pib_ifrecheck,nvl(pib_ifupload,0)pib_ifupload,nvl(pib_ifmodify,0)pib_ifmodify,pd_pocode,pib_madein,pib_custbarcode,pib_id,pib_pdid,pib_piid,");
-                sql.Append("pib_pdno,pib_prodcode,nvl(nvl(pd_brand,pib_brand),pr_brand)pib_brand, pr_vendprodcode,pib_lotno,pib_datecode,pib_qty,pr_spec,pi_title,pr_zxbzs,pr_unit,pib_barcode,pib_outboxcode1,");
+                sql.Append("pib_pdno,pib_prodcode,nvl(nvl(pd_brand,pib_brand),pr_brand)pib_brand,(select pr_brand from saledetail left join product on pr_code=sd_prodcode where sd_code=pd_ordercode and sd_detno=pd_orderdetno ) sd_brand, pr_vendprodcode,pib_lotno,pib_datecode,pib_qty,pr_spec,pi_title,pr_zxbzs,pr_unit,pib_barcode,pib_outboxcode1,");
                 sql.Append("pib_outboxcode2,nvl(pib_ifpick,0)pib_ifpick,nvl(pib_ifprint,0)pib_ifprint from prodiobarcode left join prodinout on pib_piid=pi_id left join prodiodetail on pib_piid=pd_piid and  ");
-                sql.Append("pd_pdno=pib_pdno and pd_prodcode=pib_prodcode left join product on pr_code=pib_prodcode left join sale on sa_code=pib_ordercode where pib_piid='" + PI_ID + "' order by to_number(pib_id))t");
+                sql.Append("pd_pdno=pib_pdno and pd_prodcode=pib_prodcode left join product on pr_code=pib_prodcode  where pib_piid='" + PI_ID + "' order by to_number(pib_id))t");
                 LabelInfDataTable = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                 //检验查询的字段和本地数据库字段是否匹配
                 adh.AddColumFromDataTable(LabelInfDataTable, "prodiobarcode");

+ 3 - 0
UAS-出货标签管理(吉利通)/UAS_出货标签管理.resx

@@ -141,6 +141,9 @@
   <metadata name="pib_ifupload.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="sd_brand.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="pib_madein.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>