限制物料必须在用料清单中

UAS_MES_XMW/FunctionCode/Make/Make_BoxLotBind.cs

@@ -64,6 +64,18 @@ namespace UAS_MES_NEW.Make
                     OperateResult.AppendText(">>该岗位资源对应的工序不是当前工单途程中的第一道工序，请切换资源编号\n", Color.Red);
                     return;
                 }
+                DataTable dt1 = (DataTable)dh.ExecuteSql("select mm_code from makematerial where mm_code='" + ma_code.Text + "' and mm_prodcode=(select BI_PRODUCTSPECNAME from boxinfo where BI_BOXNAME='" + boxcode.Text + "')", "select");
+                if (dt1.Rows.Count == 0)
+                {
+                    OperateResult.AppendText(">>箱号" + boxcode.Text + "不在用工单" + ma_code.Text + "用料清单中,不允许采集\n", Color.Red, boxcode);
+                    return;
+                }
+                //string boxprodcode = dh.getFieldDataByCondition("boxinfo", "BI_PRODUCTSPECNAME", "BI_BOXNAME='" + boxcode.Text + "'").ToString();
+                //if (boxprodcode != pr_code.Text)
+                //{
+                //    OperateResult.AppendText(">>箱号对应产品编号" + boxprodcode + "与工单对应产品编号" + pr_code.Text + "不一致\n", Color.Red);
+                //    return;
+                //}
                 string makecode = dh.getFieldDataByCondition("makeserial", "ms_makecode", "ms_boxcode='" + sncode.Text + "'").ToString();
                 if (makecode != "")
                 {