导出划片号BUG修改

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

@@ -90,9 +90,9 @@
             this.CH_BLUEFILM.Location = new System.Drawing.Point(260, 116);
             this.CH_BLUEFILM.Margin = new System.Windows.Forms.Padding(4);
             this.CH_BLUEFILM.Name = "CH_BLUEFILM";
-            this.CH_BLUEFILM.Size = new System.Drawing.Size(125, 31);
+            this.CH_BLUEFILM.Size = new System.Drawing.Size(152, 31);
             this.CH_BLUEFILM.TabIndex = 1;
-            this.CH_BLUEFILM.Text = "蓝膜号";
+            this.CH_BLUEFILM.Text = "划片片号";
             this.CH_BLUEFILM.UseVisualStyleBackColor = true;
             // 
             // CH_SPLITBATCH

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

@@ -87,7 +87,7 @@ namespace UAS_LabelMachine
                 if (Chinese.Checked)
                 {
                     caption = "es_caption";
-                    dh.ExecuteSql("update prodinout set pi_exporttype='Chinese' where pi_inoutno='"+inoutno+"'","update");
+                    dh.ExecuteSql("update prodinout set pi_exporttype='Chinese' where pi_inoutno='" + inoutno + "'", "update");
                 }
                 else
                 {
@@ -98,7 +98,8 @@ namespace UAS_LabelMachine
                 {
                     dh.ExecuteSql("update prodinout set pi_exporttype1='QTY' where pi_inoutno='" + inoutno + "'", "update");
                 }
-                else {
+                else
+                {
                     dh.ExecuteSql("update prodinout set pi_exporttype1='Rate' where pi_inoutno='" + inoutno + "'", "update");
                 }
                 DataTable SQL1_ = (DataTable)dh.ExecuteSql("select es_filed,es_datatype," + caption + ",es_filed1 from CS_EXPORTSETTING where es_type='DataPage' and es_enable=-1 and es_custcode='" + custcode + "' order by es_detno", "select");

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

@@ -209,7 +209,7 @@ namespace UAS_LabelMachine
             pi_inoutno.TableName = "prodinout";
             pi_inoutno.Field = "pi_inoutno";
             pi_inoutno.ValueField = "pi_inoutno";
-            pi_inoutno.Condition = "pi_class in('出货单','拨出单')";
+            pi_inoutno.Condition = "pi_class in('出货单','拨出单','其它出库单')";
             pi_inoutno.Focus();
             //将本地读取的打印机设置进Combox，并选中默认打印机
             sg_code.FormName = Name;
@@ -1735,7 +1735,7 @@ namespace UAS_LabelMachine
                 sdh.BatchInsert("prodiobarcode", LabelInfDataTable);
             }
             sql.Clear();
-            sql.Append("select * from prodiobarcode where pib_inoutno='" + pi_inoutno.Text + "'");
+            sql.Append("select * from prodiobarcode where pib_inoutno='" + pi_inoutno.Text + "' order by cast(pib_outboxcode1 as int)");
             LabelInfDataTable = (DataTable)sdh.ExecuteSql(sql.ToString(), "select");
             bindingsource(LabelInf, LabelInfDataTable);
             //有数据的话默认取第一条的品牌去取采集策略