|
|
@@ -38,6 +38,8 @@ namespace UAS_MES_NEW.Make
|
|
|
string LastSncode;
|
|
|
bool WeightChange = false;
|
|
|
|
|
|
+ DataTable Dbfind;
|
|
|
+
|
|
|
Regex re = new Regex("\\d+.\\d+\\w+");
|
|
|
|
|
|
string ErrorMessage;
|
|
|
@@ -62,6 +64,16 @@ namespace UAS_MES_NEW.Make
|
|
|
SetLoadingWindow stw = new SetLoadingWindow(InitPrint, "初始化打印程序");
|
|
|
BaseUtil.SetFormCenter(stw);
|
|
|
stw.ShowDialog();
|
|
|
+ //设置锁定工单
|
|
|
+ LockMakeCode.GetMakeCodeCtl(ma_code);
|
|
|
+ ma_code.SetLockCheckBox(LockMakeCode);
|
|
|
+ //工单号放大镜配置
|
|
|
+ ma_code.TableName = "make left join product on ma_prodcode=pr_code";
|
|
|
+ ma_code.SelectField = "ma_code # 工单号,pr_code # 产品编号,pr_detail # 产品名称";
|
|
|
+ ma_code.FormName = Name;
|
|
|
+ ma_code.SetValueField = new string[] { "ma_code", "pr_code", "pr_detail" };
|
|
|
+ ma_code.Condition = "ma_statuscode='STARTED'";
|
|
|
+ ma_code.DbChange += Ma_code_DbChange;
|
|
|
StartWeight.PerformClick();
|
|
|
dh = SystemInf.dh;
|
|
|
StepCount.StepCode = User.CurrentStepCode;
|
|
|
@@ -71,6 +83,22 @@ namespace UAS_MES_NEW.Make
|
|
|
StepCount.Start();
|
|
|
}
|
|
|
|
|
|
+ private void Ma_code_DbChange(object sender, EventArgs e)
|
|
|
+ {
|
|
|
+ Dbfind = ma_code.ReturnData;
|
|
|
+ BaseUtil.SetFormValue(this.Controls, Dbfind);
|
|
|
+ //获取工单的其他信息
|
|
|
+ sql.Clear();
|
|
|
+ sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode as pr_code ,pr_detail,");
|
|
|
+ sql.Append("pr_spec,ma_qty - nvl(mcd_inqty, 0) mcd_remainqty from make left join makecraftdetail on ");
|
|
|
+ sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
|
|
|
+ dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
+ if (dt.Rows.Count > 0)
|
|
|
+ {
|
|
|
+ BaseUtil.SetFormValue(this.Controls, dt);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
private void InPrint()
|
|
|
{
|
|
|
try
|
|
|
@@ -90,8 +118,18 @@ namespace UAS_MES_NEW.Make
|
|
|
{
|
|
|
if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
|
|
|
{
|
|
|
+ string oMakeCode = "";
|
|
|
+ string oMsID = "";
|
|
|
+ if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage))
|
|
|
+ {
|
|
|
+ //string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsID + "'").ToString();
|
|
|
+ //if (nextstepcode != User.CurrentStepCode)
|
|
|
+ //{
|
|
|
+ // OperateResult.AppendText("<<序列号:" + sncode.Text + "下一工序是" + nextstepcode + ",不是当前岗位的工序\n", Color.Red, sncode);
|
|
|
+ // return;
|
|
|
+ //}
|
|
|
sql.Clear();
|
|
|
- sql.Append("select ms_makecode,ma_qty,ma_salecode,pr_detail,pr_colorboxunit,pr_code,pr_colorboxgw,");
|
|
|
+ sql.Append("select ms_makecode ma_code,ma_qty,ma_salecode,pr_detail,pr_colorboxunit,pr_code,pr_colorboxgw,");
|
|
|
sql.Append("pr_colorboxunit,pr_colorboxmaxw,pr_colorboxminw,nvl(PR_CHECKCOLORBOXW,'0') PR_CHECKCOLORBOXW,nvl(pr_sendchecktype,'LineCode')");
|
|
|
sql.Append("pr_sendchecktype from makeserial left join make on ms_makecode=ma_code left join product on ");
|
|
|
sql.Append("ms_prodcode=pr_code where ms_sncode='" + sncode.Text + "' order by ms_id desc");
|
|
|
@@ -121,16 +159,7 @@ namespace UAS_MES_NEW.Make
|
|
|
pr_colorboxgw.Text = Weight + "±" + (MaxWeight - Weight) + dt.Rows[0]["pr_colorboxunit"].ToString();
|
|
|
else
|
|
|
pr_colorboxgw.Text = MinWeight + "-" + MaxWeight + dt.Rows[0]["pr_colorboxunit"].ToString();
|
|
|
- string oMakeCode = "";
|
|
|
- string oMsID = "";
|
|
|
- if (LogicHandler.CheckStepSNAndMacode(ms_makecode.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage))
|
|
|
- {
|
|
|
- string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsID + "'").ToString();
|
|
|
- if (nextstepcode != User.CurrentStepCode)
|
|
|
- {
|
|
|
- OperateResult.AppendText("<<序列号:" + sncode.Text + "下一工序是" + nextstepcode + ",不是当前岗位的工序\n", Color.Red, sncode);
|
|
|
- return;
|
|
|
- }
|
|
|
+
|
|
|
//如果未打开串口设置为0
|
|
|
//if (pr_colorboxunit.Text == "kg" && !WeightChange)
|
|
|
//{
|
|
|
@@ -148,21 +177,21 @@ namespace UAS_MES_NEW.Make
|
|
|
if ((ActualWeight >= MinWeight) && (ActualWeight <= MaxWeight))
|
|
|
{
|
|
|
OperateResult.AppendText(">>彩盒" + sncode.Text + "重量检测检测合格\n", Color.Green);
|
|
|
- LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "彩盒称重:" + weight.Text, "称量合格", sncode.Text, "");
|
|
|
+ LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "彩盒称重:" + weight.Text, "称量合格", sncode.Text, "");
|
|
|
LogicHandler.RecordProdWeight(sncode.Text, "SN", float.Parse(ActualWeight.ToString()), "kg", User.UserLineCode, pr_code.Text, User.UserSourceCode, User.UserName);
|
|
|
dh.ExecuteSql("update makeserial set ms_grossw='" + ActualWeight + "' where ms_id='" + oMsID + "'", "update");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
OperateResult.AppendText(">>彩盒" + sncode.Text + "重量检测未通过\n", Color.Red);
|
|
|
- LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "彩盒称重:" + weight.Text, "称量不合格", sncode.Text, "");
|
|
|
+ LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "彩盒称重:" + weight.Text, "称量不合格", sncode.Text, "");
|
|
|
LogicHandler.RecordProdWeight(sncode.Text, "SN", float.Parse(ActualWeight.ToString()), "kg", User.UserLineCode, pr_code.Text, User.UserSourceCode, User.UserName);
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "彩盒称重:" + weight.Text, "称量完成", sncode.Text, "");
|
|
|
+ LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "彩盒称重:" + weight.Text, "称量完成", sncode.Text, "");
|
|
|
LogicHandler.RecordProdWeight(sncode.Text, "SN", float.Parse(ActualWeight.ToString()), "kg", User.UserLineCode, pr_code.Text, User.UserSourceCode, User.UserName);
|
|
|
dh.ExecuteSql("update makeserial set ms_grossw='" + ActualWeight + "' where ms_id='" + oMsID + "'", "update");
|
|
|
}
|
|
|
@@ -173,7 +202,7 @@ namespace UAS_MES_NEW.Make
|
|
|
WeighRecord.Items.Add(lsi);
|
|
|
OperateResult.AppendText(">>彩盒" + sncode.Text + "称重完成\n", Color.Green);
|
|
|
//显示最近的三个称量记录
|
|
|
- if (LogicHandler.SetStepResult(ms_makecode.Text, User.UserSourceCode, sncode.Text, "彩盒称量", "称量合格", User.UserCode, out ErrorMessage))
|
|
|
+ if (LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sncode.Text, "彩盒称量", "称量合格", User.UserCode, out ErrorMessage))
|
|
|
{
|
|
|
//提示正确返回时传递的信息
|
|
|
if (ErrorMessage.Contains("AFTERSUCCESS"))
|
|
|
@@ -197,7 +226,7 @@ namespace UAS_MES_NEW.Make
|
|
|
}
|
|
|
else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, sncode);
|
|
|
}
|
|
|
- else OperateResult.AppendText(">>序列号不存在\n", Color.Red, sncode);
|
|
|
+ else OperateResult.AppendText(">>"+ErrorMessage+"\n", Color.Red, sncode);
|
|
|
}
|
|
|
else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, sncode);
|
|
|
}
|
|
|
@@ -272,7 +301,7 @@ namespace UAS_MES_NEW.Make
|
|
|
{
|
|
|
//doc = lbl.Documents.Open(PrintLabel.Text);
|
|
|
string oErrorMessage;
|
|
|
- if (!Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, sncode.Text, int.Parse(PrintNum.Text), ms_makecode.Text, pr_code.Text, "彩盒标", "0", out oErrorMessage))
|
|
|
+ if (!Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, sncode.Text, int.Parse(PrintNum.Text), ma_code.Text, pr_code.Text, "彩盒标", "0", out oErrorMessage))
|
|
|
{
|
|
|
OperateResult.AppendText(oErrorMessage + "\n", Color.Red);
|
|
|
}
|
|
|
@@ -333,9 +362,9 @@ namespace UAS_MES_NEW.Make
|
|
|
ob_nowcheckqty.ForeColor = Color.Black;
|
|
|
SendCheck.Enabled = false;
|
|
|
OperateResult.AppendText(">>批次" + ob_checkno.Text + "送检成功\n", Color.Green);
|
|
|
- LogicHandler.InsertMakeProcess(LastSncode, ms_makecode.Text, User.UserSourceCode, "手动送检", "手动送检成功", User.UserCode);
|
|
|
+ LogicHandler.InsertMakeProcess(LastSncode, ma_code.Text, User.UserSourceCode, "手动送检", "手动送检成功", User.UserCode);
|
|
|
//记录操作日志
|
|
|
- LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "手动送检", "手动送检成功", "", ob_checkno.Text);
|
|
|
+ LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "手动送检", "手动送检成功", "", ob_checkno.Text);
|
|
|
ob_checkno.Text = "";
|
|
|
}
|
|
|
|
|
|
@@ -441,7 +470,7 @@ namespace UAS_MES_NEW.Make
|
|
|
|
|
|
private void LoadCollectedNum()
|
|
|
{
|
|
|
- dt = (DataTable)dh.ExecuteSql("select mcd_inqty,ma_qty-mcd_inqty mcd_remainqty from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ms_makecode.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
|
|
|
+ dt = (DataTable)dh.ExecuteSql("select mcd_inqty,ma_qty-mcd_inqty mcd_remainqty from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
|
|
|
BaseUtil.SetFormValue(Controls, dt);
|
|
|
}
|
|
|
}
|
