|
|
@@ -64,13 +64,13 @@ 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");
|
|
|
+ DataTable dt1 = (DataTable)dh.ExecuteSql("select mm_code from makematerial where mm_code='" + ma_code.Text + "' and mm_prodcode=(select BI_PRODUCTSPECNAME from boxinfo_package_view 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();
|
|
|
+ //string boxprodcode = dh.getFieldDataByCondition("boxinfo_package_view", "BI_PRODUCTSPECNAME", "BI_BOXNAME='" + boxcode.Text + "'").ToString();
|
|
|
//if (boxprodcode != pr_code.Text)
|
|
|
//{
|
|
|
// OperateResult.AppendText(">>箱号对应产品编号" + boxprodcode + "与工单对应产品编号" + pr_code.Text + "不一致\n", Color.Red);
|
|
|
@@ -88,7 +88,7 @@ namespace UAS_MES_NEW.Make
|
|
|
sql.Append(",ms_craftcode,ms_craftname,ms_nextstepcode,ms_status,ms_makecode,ms_linecode");
|
|
|
sql.Append(",ms_sourcecode,ms_maid,ms_firstsn,ms_salecode,MS_LOTNO,ms_boxcode)select MakeSerial_seq.nextval,BI_PANELID,BI_PANELID,'" + pr_code.Text + "',");
|
|
|
sql.Append("sysdate,'" + ma_wccode.Text + "','" + ma_craftcode.Text + "',ma_craftname,'" + User.CurrentStepCode + "',1,'" + ma_code.Text + "','" + User.UserLineCode + "'");
|
|
|
- sql.Append(",'" + User.UserSourceCode + "',ma_id,bi_panelid,ma_salecode,'" + lotno + "','" + sncode.Text + "' from boxinfo,make where BI_BOXNAME='" + boxcode.Text + "' and ma_code='" + ma_code.Text + "'");
|
|
|
+ sql.Append(",'" + User.UserSourceCode + "',ma_id,bi_panelid,ma_salecode,'" + lotno + "','" + sncode.Text + "' from boxinfo_package_view,make where BI_BOXNAME='" + boxcode.Text + "' and ma_code='" + ma_code.Text + "'");
|
|
|
dh.ExecuteSql(sql.GetString(), "insert");
|
|
|
OperateResult.AppendText(">>箱号" + boxcode.Text + "绑定工装篮" + sncode.Text + "成功\n", Color.Green);
|
|
|
BaseUtil.CleanDGVData(LabelDataGridView);
|
|
|
@@ -112,7 +112,7 @@ namespace UAS_MES_NEW.Make
|
|
|
if (e.KeyCode == Keys.Enter)
|
|
|
{
|
|
|
DataTable dt = (DataTable)dh.ExecuteSql("select BI_ID, BI_GLASSID, BI_PANELID, BI_POSITION, BI_OWNER, BI_BOXNAME, BI_PRODUCTSPECNAME, BI_YULIU, BI_UPDATETIME" +
|
|
|
- " from boxinfo where bi_boxname='" + boxcode.Text + "'", "select");
|
|
|
+ " from boxinfo_package_view where bi_boxname='" + boxcode.Text + "'", "select");
|
|
|
if (dt.Rows.Count == 0)
|
|
|
{
|
|
|
OperateResult.AppendText(">>箱号" + boxcode.Text + "不存在\n", Color.Red);
|
callm