|
|
@@ -35,6 +35,9 @@ namespace UAS_MES.Make
|
|
|
ST_ENSIONC.Enabled = false;
|
|
|
ST_ENSIOND.Enabled = false;
|
|
|
ST_ENSIONE.Enabled = false;
|
|
|
+ st_table.Enabled = false;
|
|
|
+ su_singlepringqty1.Enabled = false;
|
|
|
+ Receive.Enabled = false;
|
|
|
Return.Enabled = false;
|
|
|
Scrap.Enabled = false;
|
|
|
|
|
|
@@ -81,7 +84,7 @@ namespace UAS_MES.Make
|
|
|
private void LoadGridData()
|
|
|
{
|
|
|
sql.Clear();
|
|
|
- sql.Append("select St_PCBCODE,su_stcode,su_table,su_status,su_usemacode,su_singlepringqty,su_stverison ");
|
|
|
+ sql.Append("select St_PCBCODE,su_stcode,su_table,su_status,su_linecode,su_usemacode,su_singlepringqty,su_stverison ");
|
|
|
sql.Append("from StencilUse left join stencil on st_code=su_stcode where su_usemacode='" + ma_code.Text + "' and su_status='借出'");
|
|
|
DataTable dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
|
|
|
BaseUtil.FillDgvWithDataTable(ToolsBom, dt);
|
|
|
@@ -130,11 +133,17 @@ namespace UAS_MES.Make
|
|
|
DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,St_USECOUNT from Stencil where st_code='" + SU_DEVCODE1.Text + "'", "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
- if (dt.Rows[0]["ST_USESTATUS"].ToString() == "在仓")
|
|
|
+ string status = dt.Rows[0]["ST_USESTATUS"].ToString();
|
|
|
+ if (status == "在仓")
|
|
|
{
|
|
|
MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "未借出,无需归还");
|
|
|
return;
|
|
|
}
|
|
|
+ if (status == "报废")
|
|
|
+ {
|
|
|
+ MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "处于" + status + "状态,无法退回");
|
|
|
+ return;
|
|
|
+ }
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -151,6 +160,7 @@ namespace UAS_MES.Make
|
|
|
sql.Append("where st_code='" + SU_DEVCODE1.Text + "'");
|
|
|
dh.ExecuteSql(sql.ToString(), "update");
|
|
|
MessageBox.Show("钢网" + SU_DEVCODE1.Text + "退回成功!");
|
|
|
+ Confirm.PerformClick();
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -185,10 +195,27 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
string Code = "";
|
|
|
string scrapreason = form.Controls["Reason"].Text;
|
|
|
+ if (scrapreason == "")
|
|
|
+ {
|
|
|
+ MessageBox.Show("报废原因不能为空");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ DataTable dt = (DataTable)dh.ExecuteSql("select St_USECOUNT from stencil where st_code='" + SU_DEVCODE1.Text + "'", "select");
|
|
|
+ string St_USECOUNT = dt.Rows[0]["St_USECOUNT"].ToString();
|
|
|
+ sql.Clear();
|
|
|
+ sql.Append("update StencilUse set SU_STATUS='报废',su_usecount=" + (St_USECOUNT == "" ? "0" : St_USECOUNT) + "+" + st_combinenumber.Text);
|
|
|
+ sql.Append(",SU_RETURNIFCLEAN='" + (SU_RETURNIFCLEAN.Checked ? "-1" : "0") + "' where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "')");
|
|
|
+ dh.ExecuteSql(sql.ToString(), "update");
|
|
|
sql.Clear();
|
|
|
sql.Append("update STENCIL set ST_SCRAPREASON='" + scrapreason + "',ST_USESTATUS='报废' where st_code='" + SU_DEVCODE1.Text + "'");
|
|
|
dh.ExecuteSql(sql.ToString(), "insert");
|
|
|
- LogicHandler.SendMessage(User.UserID, User.UserName, "钢网" + SU_DEVCODE1.Text + "已报废");
|
|
|
+ //推送人员信息
|
|
|
+ string[] emid = dh.GetConfig("sendEmp", "Stencil").ToString().Replace("\n", "#").Split('#');
|
|
|
+ for (int i = 0; i < emid.Length; i++)
|
|
|
+ {
|
|
|
+ string em_name = dh.getFieldDataByCondition("employee", "em_name", "em_id='" + emid[i] + "'").ToString();
|
|
|
+ LogicHandler.SendMessage(emid[i], em_name, "钢网" + SU_DEVCODE1.Text + "已报废");
|
|
|
+ }
|
|
|
form.Close();
|
|
|
}
|
|
|
|
|
|
@@ -201,6 +228,9 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
SU_DEVCODE.Enabled = true;
|
|
|
Receive.Enabled = true;
|
|
|
+ st_table.Enabled = true;
|
|
|
+ su_singlepringqty1.Enabled = true;
|
|
|
+ Receive.Enabled = true;
|
|
|
st_combinenumber.Enabled = false;
|
|
|
SU_DEVCODE1.Enabled = false;
|
|
|
ST_ENSIONA.Enabled = false;
|
|
|
@@ -223,6 +253,9 @@ namespace UAS_MES.Make
|
|
|
ST_ENSIOND.Enabled = true;
|
|
|
ST_ENSIONE.Enabled = true;
|
|
|
SU_DEVCODE.Enabled = false;
|
|
|
+ st_table.Enabled = false;
|
|
|
+ su_singlepringqty1.Enabled = false;
|
|
|
+ Receive.Enabled = false;
|
|
|
Receive.Enabled = false;
|
|
|
}
|
|
|
break;
|
|
|
@@ -262,6 +295,13 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "不存在");
|
|
|
}
|
|
|
+ if (dt.Rows.Count > 0)
|
|
|
+ {
|
|
|
+ if (dt.Rows[0]["st_usestatus"].ToString() == "报废")
|
|
|
+ {
|
|
|
+ MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "已报废");
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|