|
@@ -124,8 +124,14 @@ namespace UAS_MES.Make
|
|
|
private void LoadGridData()
|
|
|
{
|
|
|
//加载Grid数据
|
|
|
- dt = (DataTable)dh.ExecuteSql("select pa_outboxcode,pa_prodcode,pd_barcode,pd_innerqty,pa_indate from packageDetail left join package on pa_id=pd_paid where pa_outboxcode='" + pa_outboxcode.Text + "'", "select");
|
|
|
+ dt = (DataTable)dh.ExecuteSql("select pa_outboxcode,pa_prodcode,pd_barcode,pd_innerqty,pd_makecode,pa_indate from packageDetail left join package on pa_id=pd_paid where pa_outboxcode='" + pa_outboxcode.Text + "'", "select");
|
|
|
BaseUtil.FillDgvWithDataTable(PackageDetail, dt);
|
|
|
+ if (dt.Rows.Count > 0)
|
|
|
+ {
|
|
|
+ string choose_pd_barcode = dt.Rows[0]["pd_barcode"].ToString();
|
|
|
+ string choose_pd_makecode = dt.Rows[0]["pd_makecode"].ToString();
|
|
|
+ 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='" + choose_pd_barcode + "' and ms_makecode='" + choose_pd_makecode + "' and cd_stepcode = '" + User.CurrentStepCode + "'").ToString();
|
|
|
+ }
|
|
|
//更新界面的采集数量
|
|
|
pa_currentqty.Text = dh.getFieldDataByCondition("package", "pa_currentqty", "pa_outboxcode='" + pa_outboxcode.Text + "'").ToString();
|
|
|
}
|
|
@@ -202,7 +208,7 @@ namespace UAS_MES.Make
|
|
|
//获取序列号信息
|
|
|
sql.Clear();
|
|
|
sql.Append("select nvl(ms_iostatus,0) ms_iostatus,pa_salecode,ms_salecode,ms_outno,ms_makecode,ms_prodcode,nvl(pa_downstatus,0) pa_downstatus,pa_sccode,pa_checkno,pr_packrule,");
|
|
|
- sql.Append("nvl(pr_outboxinnerqty,0)pr_outboxinnerqty,nvl(pr_sendchecktype,'LineCode')pr_sendchecktype,nvl(PR_CHECKCARTONW,'0') PR_CHECKCARTONW from makeserial left join product on ms_prodcode=pr_code left join packagedetail ");
|
|
|
+ sql.Append("nvl(pr_outboxinnerqty,0)pr_outboxinnerqty,nvl(pr_sendchecktype,'LineCode')pr_sendchecktype 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");
|
|
|
string ms_makecode = "";
|
|
@@ -528,7 +534,7 @@ namespace UAS_MES.Make
|
|
|
dh.UpdateByCondition("package", "pa_status=1,pa_totalqty=pa_currentqty,pa_packageqty=pa_currentqty", "pa_outboxcode='" + pa_outboxcode.Text + "'");
|
|
|
pa_status.Text = "1";
|
|
|
pa_standardqty.Text = "";
|
|
|
- LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "装箱采集", "封箱成功", pa_outboxcode.Text, "");
|
|
|
+ LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "装箱采集", "卡通箱" + pa_outboxcode.Text + "封箱成功", pa_outboxcode.Text, "");
|
|
|
if (!CollecRemark.Checked)
|
|
|
{
|
|
|
if (!AutoGenBoxCode.Checked)
|