|
|
@@ -29,10 +29,6 @@ namespace UAS_MES_NEW.Make
|
|
|
|
|
|
string imei2 = "";
|
|
|
|
|
|
- bool isImei1 = false;
|
|
|
-
|
|
|
- bool isImei2 = false;
|
|
|
-
|
|
|
string oErrorMessage = "";
|
|
|
|
|
|
string SN = "";
|
|
|
@@ -81,23 +77,32 @@ namespace UAS_MES_NEW.Make
|
|
|
{
|
|
|
sncode.Text = dt.Rows[0]["ms_sncode"].ToString();
|
|
|
}
|
|
|
- if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
|
|
|
- {
|
|
|
- sql.Clear();
|
|
|
- sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode,pr_detail,");
|
|
|
- sql.Append("ma_qty - nvl(mcd_okqty, 0) remain_qty from make left join makecraftdetail on ");
|
|
|
- sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + omakeCode + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
|
|
|
- dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
- BaseUtil.SetFormValue(Controls, dt);
|
|
|
- }
|
|
|
- //else
|
|
|
- //{
|
|
|
- // OperateResult.AppendText("<<" + oErrorMessage + "\n", Color.Red, sncode);
|
|
|
- // return;
|
|
|
- //}
|
|
|
- //输入的是SN
|
|
|
- if (!isImei1 && !isImei2)
|
|
|
+ if (sn1.Text == "")
|
|
|
{
|
|
|
+ if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
|
|
|
+ {
|
|
|
+ string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsid + "'").ToString();
|
|
|
+ if (nextstepcode != User.CurrentStepCode)
|
|
|
+ {
|
|
|
+ string stname = dh.getFieldDataByCondition("step", "st_name", "st_code='" + nextstepcode + "'").ToString();
|
|
|
+ OperateResult.AppendText("<<序列号:" + sncode.Text + "下一工序是" + stname + ",不是当前岗位的工序\n", Color.Red, sncode);
|
|
|
+ imei1 = "";
|
|
|
+ imei2 = "";
|
|
|
+ checksn = "";
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ sql.Clear();
|
|
|
+ sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode,pr_detail,");
|
|
|
+ sql.Append("ma_qty - nvl(mcd_okqty, 0) remain_qty from make left join makecraftdetail on ");
|
|
|
+ sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + omakeCode + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
|
|
|
+ dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
+ BaseUtil.SetFormValue(Controls, dt);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
|
|
|
+ return;
|
|
|
+ }
|
|
|
OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Black);
|
|
|
sql.Clear();
|
|
|
sql.Append("select max(ms_id) ms_id from makeserial where ms_sncode ='" + sncode.Text + "' or ms_code='" + sncode.Text + "' ");
|
|
|
@@ -119,9 +124,10 @@ namespace UAS_MES_NEW.Make
|
|
|
SN = sncode.Text;
|
|
|
//>> 请输入彩盒上的SN
|
|
|
OperateResult.AppendText("<<条码" + sncode.Text + "对应的SN号为:" + checksn + "\n", Color.Green);
|
|
|
+ sn1.Text = checksn;
|
|
|
OperateResult.AppendText(">>请输入需要核对的条码1\n", Color.Black, sncode);
|
|
|
+ sn1.Text = checksn;
|
|
|
//设定要输入imei1
|
|
|
- isImei1 = true;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -131,24 +137,19 @@ namespace UAS_MES_NEW.Make
|
|
|
BaseUtil.SetFormCenter(set);
|
|
|
set.ShowDialog();
|
|
|
}
|
|
|
- }
|
|
|
- else if (isImei1)
|
|
|
+ }else if (sn1.Text != "" && sn2.Text == "")
|
|
|
{
|
|
|
OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Black);
|
|
|
imei1 = sncode.Text;
|
|
|
if (imei1.Contains(checksn))
|
|
|
{
|
|
|
+ sn2.Text = sncode.Text;
|
|
|
OperateResult.AppendText("<<条码1核对成功\n", Color.Green, sncode);
|
|
|
OperateResult.AppendText(">>请输入需要核对的条码2\n", Color.Black);
|
|
|
- isImei2 = true;
|
|
|
- isImei1 = false;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
//清空imei1变量的值
|
|
|
- imei1 = "";
|
|
|
- imei2 = "";
|
|
|
- checksn = "";
|
|
|
//SN核对失败
|
|
|
//>> 请输入SN
|
|
|
OperateResult.AppendText(">>SN核对失败,不一致" + sncode.Text + "\n", Color.Red, sncode);
|
|
|
@@ -156,12 +157,9 @@ namespace UAS_MES_NEW.Make
|
|
|
BaseUtil.SetFormCenter(set);
|
|
|
set.ShowDialog();
|
|
|
OperateResult.AppendText(">>请输入SN\n", Color.Black);
|
|
|
- isImei1 = false;
|
|
|
- isImei2 = false;
|
|
|
}
|
|
|
}
|
|
|
- //输入的是imei1
|
|
|
- else
|
|
|
+ else if (sn1.Text != "" && sn2.Text != "")
|
|
|
{
|
|
|
sql.Clear();
|
|
|
sql.Append("select ZD_SN from ZTEDATA where ZD_DEV_EN_NO='" + sncode.Text + "' and zd_makecode='" + ma_code.Text + "' order by zd_id desc");
|
|
|
@@ -178,24 +176,8 @@ namespace UAS_MES_NEW.Make
|
|
|
if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out oErrorMessage))
|
|
|
{
|
|
|
//判断序列号下一工序（CHECKSTEPSNANDMACODE）
|
|
|
- if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, sncode.Text, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
|
|
|
- {
|
|
|
- string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsid + "'").ToString();
|
|
|
- if (nextstepcode != User.CurrentStepCode)
|
|
|
- {
|
|
|
- string stname = dh.getFieldDataByCondition("step", "st_name", "st_code='" + nextstepcode + "'").ToString();
|
|
|
- OperateResult.AppendText("<<序列号:" + sncode.Text + "下一工序是" + stname + ",不是当前岗位的工序\n", Color.Red, sncode);
|
|
|
- imei1 = "";
|
|
|
- imei2 = "";
|
|
|
- checksn = "";
|
|
|
- isImei1 = false;
|
|
|
- isImei2 = false;
|
|
|
- return;
|
|
|
- }
|
|
|
- //调用 SETSTEPRESULT ，获取返回的工单号，
|
|
|
if (LogicHandler.SetStepResult(omakeCode, User.UserSourceCode, sncode.Text, "标签核对", "OK", User.UserCode, out oErrorMessage))
|
|
|
{
|
|
|
-
|
|
|
//提示正确返回时传递的信息
|
|
|
if (oErrorMessage.Contains("AFTERSUCCESS"))
|
|
|
OperateResult.AppendText(">>" + oErrorMessage + "\n");
|
|
|
@@ -206,6 +188,10 @@ namespace UAS_MES_NEW.Make
|
|
|
sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + omakeCode + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
BaseUtil.SetFormValue(Controls, dt);
|
|
|
+ sn3.Text = sncode.Text;
|
|
|
+ sn1.Text = "";
|
|
|
+ sn2.Text = "";
|
|
|
+ sn3.Text = "";
|
|
|
//将SN,时间，结果记录在页面
|
|
|
recordResult(checksn, DateTime.Now.ToString(), "成功");
|
|
|
//记录日志
|
|
|
@@ -224,16 +210,7 @@ namespace UAS_MES_NEW.Make
|
|
|
BaseUtil.SetFormCenter(set);
|
|
|
set.ShowDialog();
|
|
|
}
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- //判定序列号下一工序不通过
|
|
|
- OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
|
|
|
- recordResult(checksn, DateTime.Now.ToString(), "失败");
|
|
|
- SetCheck set = new SetCheck("NG", Color.Red);
|
|
|
- BaseUtil.SetFormCenter(set);
|
|
|
- set.ShowDialog();
|
|
|
- }
|
|
|
+
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -249,9 +226,6 @@ namespace UAS_MES_NEW.Make
|
|
|
else
|
|
|
{
|
|
|
//清空imei1变量的值
|
|
|
- imei1 = "";
|
|
|
- imei2 = "";
|
|
|
- checksn = "";
|
|
|
//SN核对失败
|
|
|
//>> 请输入SN
|
|
|
OperateResult.AppendText(">>SN核对失败,不一致" + sncode.Text + "\n", Color.Red, sncode);
|
|
|
@@ -261,8 +235,6 @@ namespace UAS_MES_NEW.Make
|
|
|
OperateResult.AppendText(">>请输入SN\n", Color.Black);
|
|
|
}
|
|
|
//imei1校对结束，下次输入的是SN
|
|
|
- isImei1 = false;
|
|
|
- isImei2 = false;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -276,15 +248,5 @@ namespace UAS_MES_NEW.Make
|
|
|
//添加结果的信息进去
|
|
|
showResult.Items.Add(lvi);
|
|
|
}
|
|
|
- private void clear()
|
|
|
- {
|
|
|
- //清空变量的值
|
|
|
- omakeCode = "";
|
|
|
- oMsid = "";
|
|
|
- SN = "";
|
|
|
- imei1 = "";
|
|
|
- imei2 = "";
|
|
|
- checksn = "";
|
|
|
- }
|
|
|
}
|
|
|
}
|
callm