|
|
@@ -78,7 +78,7 @@ namespace UAS_MES.Make
|
|
|
//加载表单数据
|
|
|
string Err = "";
|
|
|
sql.Clear();
|
|
|
- sql.Append("select pr_code,pa_outboxcode,pa_makecode,pa_sccode,nvl(pa_downstatus,0) pa_downstatus,pa_checkno,pa_status,pr_packrule,pr_detail,pa_packageqty,pa_standardqty,pr_outboxinnerqty,pa_currentqty from package left join product on pa_prodcode=");
|
|
|
+ sql.Append("select pr_code,pa_outboxcode,pa_prodcode,pa_makecode,pa_sccode,nvl(pa_downstatus,0) pa_downstatus,pa_checkno,pa_status,pr_packrule,pr_detail,pa_packageqty,pa_standardqty,pr_outboxinnerqty,pa_currentqty from package left join product on pa_prodcode=");
|
|
|
sql.Append("pr_code where pa_outboxcode='" + pa_outboxcode.Text + "'");
|
|
|
Err = "箱号";
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
@@ -112,7 +112,7 @@ namespace UAS_MES.Make
|
|
|
}
|
|
|
else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "尚未封箱，请封箱后执行打印\n", Color.Red);
|
|
|
}
|
|
|
- else OperateResult.AppendText(">>产品" + pr_code.Text + "未维护打印标签\n", Color.Red);
|
|
|
+ else OperateResult.AppendText(">>产品" + pa_prodcode.Text + "未维护打印标签\n", Color.Red);
|
|
|
}
|
|
|
|
|
|
//加载工单信息和装箱明细信息
|
|
|
@@ -136,7 +136,7 @@ namespace UAS_MES.Make
|
|
|
if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, sn_code.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage))
|
|
|
{
|
|
|
sql.Clear();
|
|
|
- sql.Append("select ms_makecode,pr_code,nvl(pa_downstatus,0) pa_downstatus,pa_sccode,pa_checkno,pr_packrule,pr_code,pr_detail,nvl(pa_standardqty,pr_outboxinnerqty) ");
|
|
|
+ sql.Append("select pa_prodcode,ms_makecode,pr_code,nvl(pa_downstatus,0) pa_downstatus,pa_sccode,pa_checkno,pr_packrule,pr_code,pr_detail,pa_standardqty,");
|
|
|
sql.Append("pr_outboxinnerqty from makeserial left join product on ms_prodcode=pr_code left join packagedetail ");
|
|
|
sql.Append("on pd_barcode=ms_sncode left join package on pa_id =pd_paid where ms_id='" + oMsID + "'");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
@@ -184,18 +184,18 @@ namespace UAS_MES.Make
|
|
|
if (dh.CheckExist("package", "pa_outboxcode='" + pa_outboxcode.Text + "'"))
|
|
|
{
|
|
|
sql.Clear();
|
|
|
- sql.Append("select 1 from package left join make on pa_salecode=ma_salecode left join makeserial ");
|
|
|
+ sql.Append("select 1 from package left join make on pa_salecode=ma_salecode and pa_prodcode=ma_prodcode left join makeserial ");
|
|
|
sql.Append("on ma_code=ms_makecode where pa_outboxcode='" + pa_outboxcode.Text + "' and ms_id='" + oMsID + "'");
|
|
|
DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
if (dt.Rows.Count == 0)
|
|
|
{
|
|
|
- OperateResult.AppendText(">>序列号" + sn_code.Text + "所属订单号和当前箱号订单不相等\n", Color.Red, sn_code);
|
|
|
+ OperateResult.AppendText(">>序列号" + sn_code.Text + "所属订单号和当前箱号订单不相等或者订单产品不相等\n", Color.Red, sn_code);
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
break;
|
|
|
case "PROD":
|
|
|
- if (dh.getFieldDataByCondition("makeserial", "ms_prodcode", "ms_id='" + oMsID + "'").ToString() != pr_code.Text)
|
|
|
+ if (dh.getFieldDataByCondition("makeserial", "ms_prodcode", "ms_id='" + oMsID + "'").ToString() != pa_prodcode.Text)
|
|
|
{
|
|
|
OperateResult.AppendText(">>序列号" + sn_code.Text + "对应物料和该箱所装物料不同\n", Color.Red, sn_code);
|
|
|
return;
|
|
|
@@ -284,9 +284,9 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
LoadCheckQTY();
|
|
|
pa_outboxcode.MakeCode = pa_makecode.Text;
|
|
|
- pa_outboxcode.ProdCode = pr_code.Text;
|
|
|
+ pa_outboxcode.ProdCode = pa_prodcode.Text;
|
|
|
pa_outboxcode.Caller = "PACKAGE";
|
|
|
- dt = (DataTable)dh.ExecuteSql("select pl_labelcode||':'||pl_labelname pl_laname,pl_labelname,pl_labelcode,pl_labelurl,pl_indate from productlabel where pl_prodcode='" + pr_code.Text + "' order by pl_isdefault desc ", "select");
|
|
|
+ dt = (DataTable)dh.ExecuteSql("select pl_labelcode||':'||pl_labelname pl_laname,pl_labelname,pl_labelcode,pl_labelurl,pl_indate from productlabel where pl_prodcode='" + pa_prodcode.Text + "' order by pl_isdefault desc ", "select");
|
|
|
PrintLabel.DataSource = dt;
|
|
|
PrintLabel.DisplayMember = "pl_laname";
|
|
|
PrintLabel.ValueMember = "pl_labelcode";
|
|
|
@@ -354,7 +354,7 @@ namespace UAS_MES.Make
|
|
|
condition = "and ob_status='ENTERING' ";
|
|
|
}
|
|
|
sql.Append("select ob_batchqty,ob_nowcheckqty,ob_checkno from oqcbatch where ");
|
|
|
- sql.Append("ob_linecode='" + User.UserLineCode + "' and ob_prodcode='" + pr_code.Text + "' and ");
|
|
|
+ sql.Append("ob_linecode='" + User.UserLineCode + "' and ob_prodcode='" + pa_prodcode.Text + "' and ");
|
|
|
sql.Append("ob_stepcode='" + User.CurrentStepCode + "' " + condition);
|
|
|
DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
if (dt.Rows.Count > 0)
|
章政