|
|
@@ -1492,9 +1492,9 @@ namespace UAS_LabelMachine
|
|
|
string pib_id = LabelInf.Rows[rowindex].Cells["pib_id1"].Value.ToString();
|
|
|
string pib_outboxcode2 = LabelInf.Rows[rowindex].Cells["pib_outboxcode2"].Value.ToString();
|
|
|
if (PrintMethod == "CodeSoft")
|
|
|
- Print.CodeSoft.OutPrint(OutBoxDoc, OutLabelParam, pi_inoutno.Text, pib_id, pib_outboxcode2, cu_print_outprod.Checked, cu_print_outpo.Checked, cu_print_outdc.Checked, cu_print_outlotno.Checked);
|
|
|
+ Print.CodeSoft.OutPrint(OutBoxDoc, OutLabelParam, pi_inoutno.Text, pib_id, pib_outboxcode2, cu_print_outprod.Checked, cu_print_outpo.Checked, cu_print_ordercode.Checked, cu_print_outdc.Checked, cu_print_outlotno.Checked);
|
|
|
else
|
|
|
- Print.BarTender.OutPrint(OutFormat, OutLabelParam, pi_inoutno.Text, pib_id, pib_outboxcode2, cu_print_outprod.Checked, cu_print_outpo.Checked, cu_print_outdc.Checked, cu_print_outlotno.Checked);
|
|
|
+ Print.BarTender.OutPrint(OutFormat, OutLabelParam, pi_inoutno.Text, pib_id, pib_outboxcode2, cu_print_outprod.Checked, cu_print_outpo.Checked, cu_print_ordercode.Checked, cu_print_outdc.Checked, cu_print_outlotno.Checked);
|
|
|
}
|
|
|
|
|
|
private void CleanDetail_Click(object sender, EventArgs e)
|
|
|
@@ -1898,6 +1898,13 @@ namespace UAS_LabelMachine
|
|
|
BoxCode = BoxCode + 1;
|
|
|
}
|
|
|
}
|
|
|
+ else if (cu_print_ordercode.Checked)
|
|
|
+ {
|
|
|
+ if (LabelInf.Rows[i].Cells["pd_ordercode"].Value.ToString() != LabelInf.Rows[i + 1].Cells["pd_ordercode"].Value.ToString())
|
|
|
+ {
|
|
|
+ BoxCode = BoxCode + 1;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
sdh.BatchInsert("prodiobarcode", LabelInf.DataSource as DataTable);
|
|
|
@@ -2553,6 +2560,7 @@ namespace UAS_LabelMachine
|
|
|
ArrayList<string> madein = new ArrayList<string>();
|
|
|
ArrayList<string> size = new ArrayList<string>();
|
|
|
ArrayList<string> weight = new ArrayList<string>();
|
|
|
+ ArrayList<string> prdetail = new ArrayList<string>();
|
|
|
//用于数量的校验
|
|
|
Dictionary<string, decimal> sumqty = new Dictionary<string, decimal>();
|
|
|
Dictionary<string, Dictionary<string, decimal>> outsumqty = new Dictionary<string, Dictionary<string, decimal>>();
|
|
|
@@ -2597,6 +2605,7 @@ namespace UAS_LabelMachine
|
|
|
string 产地 = dt.Rows[i]["产地"].ToString().Trim();
|
|
|
string 尺寸 = dt.Rows[i]["尺寸"].ToString().Trim();
|
|
|
string 重量 = dt.Rows[i]["重量"].ToString().Trim();
|
|
|
+ string 名称 = dt.Rows[i]["产品名称"].ToString().Trim();
|
|
|
if (pr_spec.Trim() == "")
|
|
|
{
|
|
|
break;
|
|
|
@@ -2649,6 +2658,7 @@ namespace UAS_LabelMachine
|
|
|
string pd_piclass = dr[k]["pd_piclass"].ToString();
|
|
|
string pr_id = dr[k]["pr_id"].ToString();
|
|
|
string pr_madein = dr[k]["pr_madein"].ToString();
|
|
|
+ string pr_detail = dr[k]["pr_detail"].ToString();
|
|
|
//已导入数量
|
|
|
decimal zxbzs = decimal.Parse(dr[k]["pr_zxbzs"].ToString());
|
|
|
decimal pd_outqty = 0;
|
|
|
@@ -2691,6 +2701,7 @@ namespace UAS_LabelMachine
|
|
|
size.Add(尺寸);
|
|
|
weight.Add(重量);
|
|
|
pdprodcode.Add(pd_prodcode);
|
|
|
+ prdetail.Add(名称 == "" ? pr_detail : 名称);
|
|
|
}
|
|
|
custbarcode.Add(BarcodeMethod1(PrefixFixed, Suffix, SerialNumIndex, SerialNumLength, Radix));
|
|
|
pib_custoutboxcode.Add(pib_outboxcode2);
|
|
|
@@ -2708,6 +2719,7 @@ namespace UAS_LabelMachine
|
|
|
size.Add(尺寸);
|
|
|
weight.Add(重量);
|
|
|
pdprodcode.Add(pd_prodcode);
|
|
|
+ prdetail.Add(名称 == "" ? pr_detail : 名称);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -2730,9 +2742,14 @@ namespace UAS_LabelMachine
|
|
|
size.Add(尺寸);
|
|
|
weight.Add(重量);
|
|
|
pdprodcode.Add(pd_prodcode);
|
|
|
+ prdetail.Add(名称 == "" ? pr_detail : 名称);
|
|
|
}
|
|
|
}
|
|
|
outqty -= outsumqty[pr_spec][pd_pdno];
|
|
|
+ if (outqty <= 0)
|
|
|
+ {
|
|
|
+ outqty = 0;
|
|
|
+ }
|
|
|
outsumqty[pr_spec][pd_pdno] -= pd_outqty;
|
|
|
}
|
|
|
}
|
|
|
@@ -2784,10 +2801,10 @@ namespace UAS_LabelMachine
|
|
|
sql.Clear();
|
|
|
sql.Append("insert into prodiobarcode (PIB_ID,PIB_PRODCODE,pib_inman,PIB_INDATE,PIB_INOUTNO,PIB_PIID,pib_brand,PIB_BARCODE,PIB_PDNO,");
|
|
|
sql.Append("PIB_PDID,PIB_PICLASS,PIB_QTY,pib_datecode,pib_lotno,PIB_IFPRINT,PIB_IFPICK,PIB_ORDERCODE,pib_orderdetno,");
|
|
|
- sql.Append("pib_outboxcode2,pib_custbarcode,pib_custoutboxcode,pib_madein,pib_size,pib_weight)values(prodiobarcode_seq.nextval,:pd_prodcode,'" + User.UserName + "',sysdate,");
|
|
|
+ sql.Append("pib_outboxcode2,pib_custbarcode,pib_custoutboxcode,pib_madein,pib_size,pib_weight,pib_prdetail)values(prodiobarcode_seq.nextval,:pd_prodcode,'" + User.UserName + "',sysdate,");
|
|
|
sql.Append("'" + pi_inoutno.Text + "'," + PI_ID + ",:pr_brand,:barcode,:pd_pdno,:pd_id,'" + pi_class.Text + "',:pib_inqty,");
|
|
|
- sql.Append(":pib_datecode,:pib_lotno,0,-1,:pd_ordercode,:pd_orderdetno,:outboxcode,:custbarcode,:pib_custoutboxcode,:pib_madein,:pib_size,:pib_weight)");
|
|
|
- dh.BatchInsert(sql.ToString(), new string[] { "pd_prodcode", "pr_brand", "barcode", "pd_pdno", "pd_id", "pib_inqty", "pib_datecode", "pib_lotno", "pd_ordercode", "pd_orderdetno", "outboxcode", "custbarcode", "pib_custoutboxcode", "pib_madein" , "pib_size", "pib_weight" }, pdprodcode.ToArray(), prbrand.ToArray(), barcode.ToArray(), pdpdno.ToArray(), pdid.ToArray(), pib_inqty.ToArray(), datecode.ToArray(), lotno.ToArray(), pdordercode.ToArray(), pdorderdetno.ToArray(), piboutboxcode2.ToArray(), custbarcode.ToArray(), custoutboxcode.ToArray(), madein.ToArray(),size.ToArray(),weight.ToArray());
|
|
|
+ sql.Append(":pib_datecode,:pib_lotno,0,-1,:pd_ordercode,:pd_orderdetno,:outboxcode,:custbarcode,:pib_custoutboxcode,:pib_madein,:pib_size,:pib_weight,:pib_prdetail)");
|
|
|
+ dh.BatchInsert(sql.ToString(), new string[] { "pd_prodcode", "pr_brand", "barcode", "pd_pdno", "pd_id", "pib_inqty", "pib_datecode", "pib_lotno", "pd_ordercode", "pd_orderdetno", "outboxcode", "custbarcode", "pib_custoutboxcode", "pib_madein", "pib_size", "pib_weight", "pib_prdetail" }, pdprodcode.ToArray(), prbrand.ToArray(), barcode.ToArray(), pdpdno.ToArray(), pdid.ToArray(), pib_inqty.ToArray(), datecode.ToArray(), lotno.ToArray(), pdordercode.ToArray(), pdorderdetno.ToArray(), piboutboxcode2.ToArray(), custbarcode.ToArray(), custoutboxcode.ToArray(), madein.ToArray(), size.ToArray(), weight.ToArray(), prdetail.ToArray());
|
|
|
//更新流水
|
|
|
dh.UpdateByCondition("RuleMaxNum", "rmn_maxnumber='" + custserialnum + "'", "rmn_nrcode='" + NrCode + "' and rmn_prefix='" + Prefix + "'");
|
|
|
LoadGridData();
|
|
|
@@ -2916,7 +2933,5 @@ namespace UAS_LabelMachine
|
|
|
sdh.ExecuteSql(SQL, "update");
|
|
|
LoadGridData();
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
}
|
callm