|
|
@@ -39,6 +39,8 @@ namespace UAS_MES.Make
|
|
|
//保存TSN编号
|
|
|
string ms_id = null;
|
|
|
|
|
|
+ string PR_CHECKCARTONW = "0";
|
|
|
+
|
|
|
bool pr_change = false;
|
|
|
|
|
|
Thread InitPrint;
|
|
|
@@ -172,6 +174,12 @@ namespace UAS_MES.Make
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
+ PR_CHECKCARTONW = dh.getFieldDataByCondition("craftdetail left join craft on cr_id=cd_crid left join makeserial on ms_craftcode =cr_code and cr_prodcode = ms_prodcode", "nvl(cd_ifweigh,'0') cd_ifweigh", "ms_sncode='" + sncode.Text + "' and ms_makecode='" + oMakeCode + "' and cd_stepcode = '" + User.CurrentStepCode + "'").ToString();
|
|
|
+ if (PR_CHECKCARTONW != "0")
|
|
|
+ {
|
|
|
+ OperateResult.AppendText(">>彩盒" + sncode.Text + "当前处于称重工序,无法在此界面采集,需去彩盒称重界面进行采集\n", Color.Black, sncode);
|
|
|
+ return;
|
|
|
+ }
|
|
|
BaseUtil.SetFormValue(this.Controls, dt);
|
|
|
LockMakeCode.Checked = true;
|
|
|
//提示用户“<<工单号:取ma_makecode”
|