|
|
@@ -425,11 +425,26 @@ namespace UAS_MES_NEW.Packing
|
|
|
}
|
|
|
if (dh.CheckExist("MAKEADDRESSLIST", "mal_sncode='" + sn_code.Text + "' and mal_outboxcode is not null"))
|
|
|
{
|
|
|
- if (!dh.CheckExist("MAKEADDRESSLIST", "mal_sncode='" + sn_code.Text + "' and mal_outboxcode ='" + pa_outboxcode.Text + "' "))
|
|
|
+ //获取装箱的最后一个序列号
|
|
|
+ string pd_barcode = dh.getFieldDataByCondition("packagedetail", "pd_barcode", "pd_id=(select max(pd_id) from packagedetail where pd_outboxcode='" + pa_outboxcode.Text + "')").ToString();
|
|
|
+ //如果之前有装箱的话
|
|
|
+ if (pd_barcode != "")
|
|
|
{
|
|
|
- OperateResult.AppendText(">>SN号" + sn_code.Text + ",卡通箱号" + pa_outboxcode.Text + "不属于卡通箱绑定关系\n", Color.Red, sn_code);
|
|
|
- return;
|
|
|
+ //本次装箱的箱号
|
|
|
+ string boxcode_now = dh.getFieldDataByCondition("MAKEADDRESSLIST", "mal_outboxcode", "mal_sncode='" + sn_code.Text + "'").ToString();
|
|
|
+ //上次装箱的箱号
|
|
|
+ string boxcode_before = dh.getFieldDataByCondition("MAKEADDRESSLIST", "mal_outboxcode", "mal_sncode='" + pd_barcode + "'").ToString();
|
|
|
+ if (boxcode_now != boxcode_before)
|
|
|
+ {
|
|
|
+ OperateResult.AppendText(">>SN号" + sn_code.Text + ",卡通箱号" + pa_outboxcode.Text + "不属于卡通箱绑定关系\n", Color.Red, sn_code);
|
|
|
+ return;
|
|
|
+ }
|
|
|
}
|
|
|
+ //if (!dh.CheckExist("MAKEADDRESSLIST", "mal_sncode='" + sn_code.Text + "' and mal_outboxcode ='" + pa_outboxcode.Text + "' "))
|
|
|
+ //{
|
|
|
+ // OperateResult.AppendText(">>SN号" + sn_code.Text + ",卡通箱号" + pa_outboxcode.Text + "不属于卡通箱绑定关系\n", Color.Red, sn_code);
|
|
|
+ // return;
|
|
|
+ //}
|
|
|
//if (!dh.CheckExist("packagedetail", "pd_outboxcode='" + pa_outboxcode.Text + "'"))
|
|
|
//{
|
|
|
// if (dh.getFieldDataByCondition("PACKBIND", "min(pkb_sn)", "pkb_box ='" + pa_outboxcode.Text + "'").ToString() != sn_code.Text)
|
