|
|
@@ -679,10 +679,17 @@ namespace UAS_MES_NEW.Make
|
|
|
List<string> nowcodelist = new List<string>();
|
|
|
for (int i = 0; i < dt.Rows.Count; i++)
|
|
|
{
|
|
|
- if (dt.Rows[i]["工单"].ToString().Trim()==ma_code.Text&&dt.Rows[i]["拼板号"].ToString().Trim().Length >2
|
|
|
- && dt.Rows[i]["打码内容"].ToString().Trim()!=ma_code.Text
|
|
|
- && dt.Rows[i]["打码内容"].ToString().Trim().Length > 7 && dt.Rows[i]["拼板号"].ToString().Trim().Substring(0, 2)
|
|
|
- == dt.Rows[i]["打码内容"].ToString().Trim().Substring(0, 2))
|
|
|
+ if (dt.Rows[i]["工单"].ToString().Trim() != ma_code.Text)
|
|
|
+ {
|
|
|
+ OperateResult.AppendText(">>镭雕日志工单与所选工单不一致,请检查\n", Color.Red);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (dt.Rows[i]["工单"].ToString().Trim() == ma_code.Text
|
|
|
+ && dt.Rows[i]["拼板号"].ToString().Trim().Length >2
|
|
|
+ && dt.Rows[i]["打码内容"].ToString().Trim()!= ma_code.Text
|
|
|
+ && dt.Rows[i]["打码内容"].ToString().Trim().Length > 7
|
|
|
+ && dt.Rows[i]["拼板号"].ToString().Trim().Substring(0, 2) == dt.Rows[i]["打码内容"].ToString().Trim().Substring(0, 2))
|
|
|
{
|
|
|
maincodelist.Add(dt.Rows[i]["拼板号"].ToString().Trim());
|
|
|
nowcodelist.Add(dt.Rows[i]["打码内容"].ToString().Trim());
|
|
|
@@ -725,6 +732,7 @@ namespace UAS_MES_NEW.Make
|
|
|
MessageBox.Show("导入成功"+ number + "条!");
|
|
|
OperateResult.AppendText(">>导入成功" + number + "条!\n", Color.Green);
|
|
|
|
|
|
+ LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "SMT拼版绑定", $"镭雕日志绑定拼板成功,已绑定: {number}", "", "");
|
|
|
RefreshData();
|
|
|
|
|
|
}
|