|
|
@@ -182,7 +182,7 @@ namespace UAS_MES_NEW.Make
|
|
|
object value = LabelDataGridView.Rows[i].Cells["BarCode"].Value;
|
|
|
if (value == null || (value != null && value.ToString() == ""))
|
|
|
{
|
|
|
- OperateResult.AppendText("<<请采" + dt1.Rows[i]["pr_detail"].ToString() + "数据\n", Color.Black);
|
|
|
+ OperateResult.AppendText("<<请采集" + dt1.Rows[i]["pr_detail"].ToString() + "数据\n", Color.Black);
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
@@ -221,8 +221,17 @@ namespace UAS_MES_NEW.Make
|
|
|
string sp_barcoderule = dt1.Rows[RemainIndex]["sp_barcoderule"].ToString();
|
|
|
string sp_checkbarcode = dt1.Rows[RemainIndex]["sp_checkbarcode"].ToString();
|
|
|
string sp_checksalecode = dt1.Rows[RemainIndex]["sp_checksalecode"].ToString();
|
|
|
+ string sp_ifbeforhandle = dt1.Rows[RemainIndex]["sp_ifbeforhandle"].ToString();
|
|
|
if (LogicHandler.CheckSNBeforeLoad(ma_code.Text, code.Text, sp_fsoncode, sp_soncode, sp_barcoderule, sp_prefix, length, sp_ifrepeat, sp_checksalecode, out ErrorMessage))
|
|
|
{
|
|
|
+ if (sp_ifbeforhandle == "是")
|
|
|
+ {
|
|
|
+ OperateResult.AppendText(">>预加工条码" + code.Text + "未绑定所有指定物料，请在预加工界面核对\n", Color.Red, code);
|
|
|
+ SetCheck set1 = new SetCheck("NG", Color.Red);
|
|
|
+ BaseUtil.SetFormCenter(set1);
|
|
|
+ set1.ShowDialog();
|
|
|
+ return;
|
|
|
+ }
|
|
|
if (CollectData.Contains(code.Text))
|
|
|
{
|
|
|
OperateResult.AppendText(">>条码" + code.Text + "已经上料\n", Color.Red, code);
|
|
|
@@ -253,8 +262,9 @@ namespace UAS_MES_NEW.Make
|
|
|
object value = LabelDataGridView.Rows[i].Cells["BarCode"].Value;
|
|
|
if (value == null || (value != null && value.ToString() == ""))
|
|
|
{
|
|
|
- OperateResult.AppendText("<<请采" + dt1.Rows[i]["pr_detail"].ToString() + "数据\n", Color.Black);
|
|
|
+ OperateResult.AppendText("<<请采集" + dt1.Rows[i]["pr_detail"].ToString() + "数据\n", Color.Black);
|
|
|
Filled = false;
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
if (Filled)
|
callm