|
|
@@ -322,6 +322,7 @@ namespace UAS_LabelMachine
|
|
|
Input.SelectAll();
|
|
|
return;
|
|
|
}
|
|
|
+ GetBarCodeRule(out Prefix, out Suffix, out MaxNum, out NumLength, out Radix);
|
|
|
List<string> CustBarCode = new List<string>();
|
|
|
if (!(Radix > 0))
|
|
|
{
|
|
|
@@ -348,9 +349,9 @@ namespace UAS_LabelMachine
|
|
|
}
|
|
|
sql.Clear();
|
|
|
sql.Append("insert into prodiobarcode(PIB_ID,PIB_PRODCODE,PIB_INDATE,PIB_INOUTNO,PIB_PIID,PIB_PDNO, PIB_PDID,PIB_PICLASS,");
|
|
|
- sql.Append("PIB_BARCODE,PIB_CUSTBARCODE,PIB_QTY,pib_brand,pib_datecode,pib_lotno,PIB_OUTBOXCODE2,pib_inman,PIB_IFPRINT,PIB_ORDERCODE,PIB_CUSTPO,pib_remark,pib_midcapatity) ");
|
|
|
+ sql.Append("PIB_BARCODE,PIB_CUSTBARCODE,PIB_QTY,pib_brand,pib_datecode,pib_lotno,PIB_OUTBOXCODE2,pib_inman,PIB_IFPRINT,PIB_ORDERCODE,PIB_CUSTPO,pib_remark,pib_midcapatity,pib_custcode) ");
|
|
|
sql.Append("select :PIB_ID,pd_prodcode,sysdate,pi_inoutno,pi_id,pd_pdno,pd_id,pi_class,");
|
|
|
- sql.Append("'" + pib_barcode + "',:PIB_CUSTBARCODE,'" + CurrentZXBZ + "','" + Data["BRAND"] + "','" + Data["DATECODE"] + "','" + Data["LOTNO"] + "','" + pib_outboxcode2 + "','" + User.UserCode + "','" + (EnablePrint && SingleLabelAutoPrint.Checked ? 1 : 0).ToString() + "',pd_ordercode,pd_pocode,pd_remark,'" + MidboxCapacity.Value + "' ");
|
|
|
+ sql.Append("'" + pib_barcode + "',:PIB_CUSTBARCODE,'" + CurrentZXBZ + "','" + Data["BRAND"] + "','" + Data["DATECODE"] + "','" + Data["LOTNO"] + "','" + pib_outboxcode2 + "','" + User.UserCode + "','" + (EnablePrint && SingleLabelAutoPrint.Checked ? 1 : 0).ToString() + "',pd_ordercode,pd_pocode,pd_remark,'" + MidboxCapacity.Value + "','" + pi_cardcode.Text + "' ");
|
|
|
sql.Append("from prodinout left join prodiodetail on pi_id=pd_piid left join PRODJOINVENDDETAIL on pjd_brand =pd_brand and pjd_prodcode=pd_prodcode where pi_id='" + PI_ID + "' and pd_prodcode='" + CurrentPrCode + "' and pd_pdno='" + CurrentPDNO + "'");
|
|
|
dh.BatchInsert(sql.ToString(), new string[] { "PIB_ID", "PIB_CUSTBARCODE" }, PIBID, CustBarCode.ToArray());
|
|
|
//更新流水号
|
|
|
@@ -405,7 +406,7 @@ namespace UAS_LabelMachine
|
|
|
OutBoxNum.Items.Add(io);
|
|
|
}
|
|
|
if (OutBoxNum.Items.Count > 2)
|
|
|
- OutBoxNum.SelectedIndex = 2;
|
|
|
+ OutBoxNum.SelectedIndex = 0;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -1070,17 +1071,13 @@ namespace UAS_LabelMachine
|
|
|
sql.Append("pr_zxbzs,pr_unit,pib_barcode,pib_outboxcode1,pib_outboxcode2,nvl(pib_ifprint,0)pib_ifprint from prodiobarcode left join ");
|
|
|
sql.Append("prodiodetail on pib_piid=pd_piid and pd_pdno=pib_pdno and pd_prodcode=pib_prodcode left join product on pr_code=pib_prodcode ");
|
|
|
sql.Append("left join sale on sa_code=pib_ordercode left join PRODJOINVENDDETAIL on pjd_brand =pd_brand and pjd_prodcode=pd_prodcode where pib_piid='" + PI_ID + "' ");
|
|
|
- sql.Append(" order by to_number(pib_outboxcode2),pib_id,pd_prodcode");
|
|
|
- LabelInfDataTable = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
|
|
|
if (OutBoxNum.Text != "全部")
|
|
|
{
|
|
|
- BaseUtil.FillDgvWithDataTable(LabelInf, BaseUtil.filterDataTable(LabelInfDataTable, " pib_outboxcode2='" + OutBoxNum.Text + "'"));
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- BaseUtil.FillDgvWithDataTable(LabelInf, LabelInfDataTable);
|
|
|
+ sql.Append(" and pib_outboxcode2 ='" + OutBoxNum.Text + "' ");
|
|
|
}
|
|
|
- //LabelInf.AutoResizeColumns();
|
|
|
+ sql.Append(" order by to_number(pib_outboxcode2),pib_id,pd_prodcode");
|
|
|
+ LabelInfDataTable = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
|
|
|
+ BaseUtil.FillDgvWithDataTable(LabelInf, LabelInfDataTable);
|
|
|
if (LabelInf.Rows.Count > 0)
|
|
|
LabelInf.FirstDisplayedScrollingRowIndex = LabelInf.Rows.Count - 1;
|
|
|
double CollectNum = 0;
|
|
|
@@ -1372,7 +1369,7 @@ namespace UAS_LabelMachine
|
|
|
if (OutBoxNum.Text == "新增" || OutBoxNum.Text == "")
|
|
|
{
|
|
|
if (dt.Rows.Count > 0)
|
|
|
- OutBoxNum.SelectedIndex = 2;
|
|
|
+ OutBoxNum.SelectedIndex = 0;
|
|
|
else
|
|
|
OutBoxNum.SelectedIndex = 0;
|
|
|
}
|