|
|
@@ -2485,7 +2485,7 @@ namespace UAS_LabelMachine
|
|
|
Dictionary<string, Dictionary<string, decimal>> outsumqty = new Dictionary<string, Dictionary<string, decimal>>();
|
|
|
for (int i = 0; i < dt.Rows.Count; i++)
|
|
|
{
|
|
|
- string pr_spec = dt.Rows[i]["规格型号"].ToString();
|
|
|
+ string pr_spec = dt.Rows[i]["规格型号"].ToString().Trim();
|
|
|
if (pr_spec.Trim() == "")
|
|
|
{
|
|
|
break;
|
|
|
@@ -2502,7 +2502,7 @@ namespace UAS_LabelMachine
|
|
|
for (int i = 0; i < dt1.Rows.Count; i++)
|
|
|
{
|
|
|
//不包含型号则进行添加
|
|
|
- string pr_spec = dt1.Rows[i]["pr_spec"].ToString();
|
|
|
+ string pr_spec = dt1.Rows[i]["pr_spec"].ToString().Trim();
|
|
|
string pd_pdno = dt1.Rows[i]["pd_pdno"].ToString();
|
|
|
decimal pd_outqty = decimal.Parse(dt1.Rows[i]["pd_outqty"].ToString());
|
|
|
if (!outsumqty.ContainsKey(pr_spec))
|
|
|
@@ -2519,7 +2519,7 @@ namespace UAS_LabelMachine
|
|
|
//上一个的最小外箱号,如果箱号没有发生变化则外箱条码也不变化
|
|
|
for (int i = 0; i < dt.Rows.Count; i++)
|
|
|
{
|
|
|
- string pr_spec = dt.Rows[i]["规格型号"].ToString();
|
|
|
+ string pr_spec = dt.Rows[i]["规格型号"].ToString().Trim();
|
|
|
if (pr_spec.Trim() == "")
|
|
|
{
|
|
|
break;
|
|
|
@@ -2534,6 +2534,11 @@ namespace UAS_LabelMachine
|
|
|
DateCode = dt.Rows[i]["DC/LOT NO"].ToString().Split('-')[0];
|
|
|
LotNo = dt.Rows[i]["DC/LOT NO"].ToString().Split('-')[1];
|
|
|
}
|
|
|
+ else if (dt.Rows[i]["DC/LOT NO"].ToString().IndexOf(" ") > 0)
|
|
|
+ {
|
|
|
+ DateCode = dt.Rows[i]["DC/LOT NO"].ToString().Split(' ')[0];
|
|
|
+ LotNo = dt.Rows[i]["DC/LOT NO"].ToString().Split(' ')[1];
|
|
|
+ }
|
|
|
}
|
|
|
if (dt.Columns.Contains("DC") && DateCode == "")
|
|
|
{
|