|
|
@@ -260,15 +260,23 @@ namespace UAS_MES_NEW.Warehouse
|
|
|
if (Combine.Checked)
|
|
|
{
|
|
|
sql.Clear();
|
|
|
- sql.Append("select min(pd_custpo)pd_custpo,pd_custpodetno,max(pd_pdno)pd_pdno,max(pd_id)pd_id,pd_prodcode,sum(nvl(pd_cartons,0))pd_cartons,sum(pd_outqty)pd_outqty,max(pr_detail)pr_detail,max(pr_spec)pr_spec from prodiodetail left join prodinout ");
|
|
|
+ sql.Append("select min(pd_custprod)pd_custprod,min(pd_custpo)pd_custpo,pd_custpodetno,max(pd_pdno)pd_pdno,max(pd_id)pd_id,pd_prodcode,sum(nvl(pd_cartons,0))pd_cartons,sum(pd_outqty)pd_outqty,max(pr_detail)pr_detail,max(pr_spec)pr_spec from prodiodetail left join prodinout ");
|
|
|
sql.Append("on pd_piid=pi_id left join product on pd_prodcode=pr_code where pi_inoutno='" + pi_inoutno.Text + "' group by pd_prodcode,pd_custpo,pd_custpodetno");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
BaseUtil.FillDgvWithDataTable(Prodiodetail, dt);
|
|
|
}
|
|
|
+ if (CombineCust.Checked)
|
|
|
+ {
|
|
|
+ sql.Clear();
|
|
|
+ sql.Append("select pd_custprod,min(pd_custpo)pd_custpo,pd_custpodetno,max(pd_pdno)pd_pdno,max(pd_id)pd_id,wm_concat(pd_prodcode)pd_prodcode,sum(nvl(pd_cartons,0))pd_cartons,sum(pd_outqty)pd_outqty,max(pr_detail)pr_detail,max(pr_spec)pr_spec from prodiodetail left join prodinout ");
|
|
|
+ sql.Append("on pd_piid=pi_id left join product on pd_prodcode=pr_code where pi_inoutno='" + pi_inoutno.Text + "' group by pd_custprod,pd_custpo,pd_custpodetno");
|
|
|
+ dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
+ BaseUtil.FillDgvWithDataTable(Prodiodetail, dt);
|
|
|
+ }
|
|
|
else
|
|
|
{
|
|
|
sql.Clear();
|
|
|
- sql.Append("select pd_custpo,pd_custpodetno,pd_pdno,pd_prodcode,pd_id,pd_outqty,nvl(pd_cartons,0)pd_cartons,pr_detail,pr_spec from prodiodetail left join prodinout ");
|
|
|
+ sql.Append("select pd_custprod,pd_custpo,pd_custpodetno,pd_pdno,pd_prodcode,pd_id,pd_outqty,nvl(pd_cartons,0)pd_cartons,pr_detail,pr_spec from prodiodetail left join prodinout ");
|
|
|
sql.Append("on pd_piid=pi_id left join product on pd_prodcode=pr_code where pi_inoutno='" + pi_inoutno.Text + "'");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
BaseUtil.FillDgvWithDataTable(Prodiodetail, dt);
|
|
|
@@ -349,12 +357,12 @@ namespace UAS_MES_NEW.Warehouse
|
|
|
OperateResult.AppendText("栈板号" + input.Text + "不存在,请重新输入\n", Color.Red, input);
|
|
|
return;
|
|
|
}
|
|
|
- dtms = (DataTable)dh.ExecuteSql("select ma_prodcode from mes_package_view left join make on ma_code=v_makecode where v_outboxcode='" + input.Text + "'", "select");
|
|
|
- if (!Combine.Checked)
|
|
|
+ dtms = (DataTable)dh.ExecuteSql("select ma_prodcode,ma_custprodcode from mes_package_view left join make on ma_code=v_makecode where v_outboxcode='" + input.Text + "'", "select");
|
|
|
+ if (Combine.Checked)
|
|
|
{
|
|
|
sql.Clear();
|
|
|
- sql.Append("select cn,outqty,outqty-nvl((select count(1) from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_pdid='" + PDID + "'),0)ungetqty from");
|
|
|
- sql.Append("(select nvl(sum(pd_outqty),0) outqty ,count(1)cn from prodiodetail where pd_piid=" + pi_id.Text + " and pd_id='" + PDID + "')");
|
|
|
+ sql.Append("select cn,outqty,outqty-nvl((select count(1) from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_prodcode='" + dtms.Rows[0]["ma_prodcode"].ToString() + "'),0)ungetqty from");
|
|
|
+ sql.Append("(select nvl(sum(pd_outqty),0) outqty ,count(1)cn from prodiodetail where pd_piid=" + pi_id.Text + " and pd_prodcode='" + dtms.Rows[0]["ma_prodcode"].ToString() + "')");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
if (dt.Rows[0]["cn"].ToString() == "0")
|
|
|
{
|
|
|
@@ -372,11 +380,33 @@ namespace UAS_MES_NEW.Warehouse
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
+ if (CombineCust.Checked)
|
|
|
+ {
|
|
|
+ sql.Clear();
|
|
|
+ sql.Append("select cn,outqty,outqty-nvl((select count(1) from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_custprodcode='" + dtms.Rows[0]["ma_custprodcode"] + "'),0)ungetqty from");
|
|
|
+ sql.Append("(select nvl(sum(pd_outqty),0) outqty ,count(1)cn from prodiodetail where pd_piid=" + pi_id.Text + " and pd_custprod='" + dtms.Rows[0]["ma_custprodcode"] + "')");
|
|
|
+ dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
+ if (dt.Rows[0]["cn"].ToString() == "0")
|
|
|
+ {
|
|
|
+ OperateResult.AppendText("序列号" + input.Text + "所属产品客户料号:" + dtms.Rows[0]["ma_custprodcode"].ToString() + ",不在出货单" + pi_inoutno.Text + "中\n", Color.Red, input);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ else if (int.Parse(dt.Rows[0]["cn"].ToString()) > 0 && int.Parse(dt.Rows[0]["ungetqty"].ToString()) <= 0)
|
|
|
+ {
|
|
|
+ OperateResult.AppendText("出货单产品,客户料号:" + dtms.Rows[0]["ma_custprodcode"].ToString() + "已经完成出货采集\n", Color.Red, input);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (int.Parse(dt.Rows[0]["ungetqty"].ToString()) < int.Parse(PA_TOTALQTY))
|
|
|
+ {
|
|
|
+ OperateResult.AppendText("当前栈板数量" + PA_TOTALQTY + ",超出待采集数量\n", Color.Red, input);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
else
|
|
|
{
|
|
|
sql.Clear();
|
|
|
- sql.Append("select cn,outqty,outqty-nvl((select count(1) from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_prodcode='" + pdprodcode + "'),0)ungetqty from");
|
|
|
- sql.Append("(select nvl(sum(pd_outqty),0) outqty ,count(1)cn from prodiodetail where pd_piid=" + pi_id.Text + " and pd_prodcode='" + pdprodcode + "')");
|
|
|
+ sql.Append("select cn,outqty,outqty-nvl((select count(1) from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_pdid='" + PDID + "'),0)ungetqty from");
|
|
|
+ sql.Append("(select nvl(sum(pd_outqty),0) outqty ,count(1)cn from prodiodetail where pd_piid=" + pi_id.Text + " and pd_id='" + PDID + "')");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
if (dt.Rows[0]["cn"].ToString() == "0")
|
|
|
{
|
|
|
@@ -427,18 +457,23 @@ namespace UAS_MES_NEW.Warehouse
|
|
|
string pr_packrule = "";
|
|
|
string pa_salecode = "";
|
|
|
string pa_mothercode = "";
|
|
|
+ string PA_TOTALQTY = "";
|
|
|
if (outboxcode != "")
|
|
|
{
|
|
|
input.Text = outboxcode;
|
|
|
}
|
|
|
sql.Clear();
|
|
|
- sql.Append("select pa_id,pr_palletqty,pr_packrule,pa_salecode,pa_outboxcode,pa_mothercode,pa_makecode,pa_status,nvl(pa_iostatus,0) pa_iostatus,nvl(pa_downstatus,0)pa_downstatus,pa_prodcode,pa_outno, pa_mothercode from package left join product on pr_code=pa_prodcode where pa_outboxcode='" + input.Text + "' and pa_type in(1,2,3)");
|
|
|
+ sql.Append("select pa_id,pr_palletqty,PA_TOTALQTY,pr_packrule,pa_salecode,pa_outboxcode,pa_mothercode,pa_makecode,pa_status,nvl(pa_iostatus,0) pa_iostatus,nvl(pa_downstatus,0)pa_downstatus,pa_prodcode,pa_outno, pa_mothercode from package left join product on pr_code=pa_prodcode where pa_outboxcode='" + input.Text + "' and pa_type in(1,2,3)");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
pa_makecode = dt.Rows[0]["pa_makecode"].ToString();
|
|
|
+ PA_TOTALQTY = dt.Rows[0]["PA_TOTALQTY"].ToString();
|
|
|
pa_prodcode = dt.Rows[0]["pa_prodcode"].ToString();
|
|
|
- pa_standardqty.Text = dt.Rows[0]["pr_palletqty"].ToString();
|
|
|
+ if (dt.Rows[0]["pr_palletqty"].ToString() != "")
|
|
|
+ {
|
|
|
+ pa_standardqty.Text = dt.Rows[0]["pr_palletqty"].ToString();
|
|
|
+ }
|
|
|
pr_packrule = dt.Rows[0]["pr_packrule"].ToString();
|
|
|
pa_salecode = dt.Rows[0]["pa_salecode"].ToString();
|
|
|
pa_mothercode = dt.Rows[0]["pa_mothercode"].ToString();
|
|
|
@@ -448,6 +483,78 @@ namespace UAS_MES_NEW.Warehouse
|
|
|
OperateResult.AppendText("箱号" + input.Text + "不存在,请重新输入\n", Color.Red, input);
|
|
|
return;
|
|
|
}
|
|
|
+ if (pa_standardqty.Text == "")
|
|
|
+ {
|
|
|
+ OperateResult.AppendText("请输入栈板容量\n", Color.Red, input);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ dtms = (DataTable)dh.ExecuteSql("select ma_prodcode,ma_custprodcode from mes_package_view left join make on ma_code=v_makecode where v_outboxcode='" + input.Text + "'", "select");
|
|
|
+ if (Combine.Checked)
|
|
|
+ {
|
|
|
+ sql.Clear();
|
|
|
+ sql.Append("select cn,outqty,outqty-nvl((select count(1) from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_prodcode='" + dtms.Rows[0]["ma_prodcode"].ToString() + "'),0)ungetqty from");
|
|
|
+ sql.Append("(select nvl(sum(pd_outqty),0) outqty ,count(1)cn from prodiodetail where pd_piid=" + pi_id.Text + " and pd_prodcode='" + dtms.Rows[0]["ma_prodcode"].ToString() + "')");
|
|
|
+ dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
+ if (dt.Rows[0]["cn"].ToString() == "0")
|
|
|
+ {
|
|
|
+ OperateResult.AppendText("序列号" + input.Text + "所属产品:" + dtms.Rows[0]["ma_prodcode"].ToString() + ",不在出货单" + pi_inoutno.Text + "中\n", Color.Red, input);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ else if (int.Parse(dt.Rows[0]["cn"].ToString()) > 0 && int.Parse(dt.Rows[0]["ungetqty"].ToString()) <= 0)
|
|
|
+ {
|
|
|
+ OperateResult.AppendText("出货单产品" + dtms.Rows[0]["ma_prodcode"].ToString() + "已经完成出货采集\n", Color.Red, input);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (int.Parse(dt.Rows[0]["ungetqty"].ToString()) < int.Parse(PA_TOTALQTY))
|
|
|
+ {
|
|
|
+ OperateResult.AppendText("当前栈板数量" + PA_TOTALQTY + ",超出待采集数量\n", Color.Red, input);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (CombineCust.Checked)
|
|
|
+ {
|
|
|
+ sql.Clear();
|
|
|
+ sql.Append("select cn,outqty,outqty-nvl((select count(1) from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_custprodcode='" + dtms.Rows[0]["ma_custprodcode"].ToString() + "'),0)ungetqty from");
|
|
|
+ sql.Append("(select nvl(sum(pd_outqty),0) outqty ,count(1)cn from prodiodetail where pd_piid=" + pi_id.Text + " and pd_custprod='" + dtms.Rows[0]["ma_custprodcode"].ToString() + "')");
|
|
|
+ dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
+ if (dt.Rows[0]["cn"].ToString() == "0")
|
|
|
+ {
|
|
|
+ OperateResult.AppendText("序列号" + input.Text + "所属产品客户料号:" + dtms.Rows[0]["ma_custprodcode"].ToString() + ",不在出货单" + pi_inoutno.Text + "中\n", Color.Red, input);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ else if (int.Parse(dt.Rows[0]["cn"].ToString()) > 0 && int.Parse(dt.Rows[0]["ungetqty"].ToString()) <= 0)
|
|
|
+ {
|
|
|
+ OperateResult.AppendText("出货单产品,客户料号:" + dtms.Rows[0]["ma_custprodcode"].ToString() + "已经完成出货采集\n", Color.Red, input);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (int.Parse(dt.Rows[0]["ungetqty"].ToString()) < int.Parse(PA_TOTALQTY))
|
|
|
+ {
|
|
|
+ OperateResult.AppendText("当前栈板数量" + PA_TOTALQTY + ",超出待采集数量\n", Color.Red, input);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ sql.Clear();
|
|
|
+ sql.Append("select cn,outqty,outqty-nvl((select count(1) from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_pdid='" + PDID + "'),0)ungetqty from");
|
|
|
+ sql.Append("(select nvl(sum(pd_outqty),0) outqty ,count(1)cn from prodiodetail where pd_piid=" + pi_id.Text + " and pd_id='" + PDID + "')");
|
|
|
+ dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
+ if (dt.Rows[0]["cn"].ToString() == "0")
|
|
|
+ {
|
|
|
+ OperateResult.AppendText("序列号" + input.Text + "所属产品:" + dtms.Rows[0]["ma_prodcode"].ToString() + ",不在出货单" + pi_inoutno.Text + "中\n", Color.Red, input);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ else if (int.Parse(dt.Rows[0]["cn"].ToString()) > 0 && int.Parse(dt.Rows[0]["ungetqty"].ToString()) <= 0)
|
|
|
+ {
|
|
|
+ OperateResult.AppendText("出货单产品" + dtms.Rows[0]["ma_prodcode"].ToString() + "已经完成出货采集\n", Color.Red, input);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (int.Parse(dt.Rows[0]["ungetqty"].ToString()) < int.Parse(PA_TOTALQTY))
|
|
|
+ {
|
|
|
+ OperateResult.AppendText("当前栈板数量" + PA_TOTALQTY + ",超出待采集数量\n", Color.Red, input);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
if (pa_outboxcode.Text == "" && !AutoOutBoxCode.Checked)
|
|
|
{
|
|
|
pa_outboxcode.Text = LogicHandler.GetOutBoxCode("PALLET", pa_makecode, pa_prodcode, User.UserCode);
|
|
|
@@ -462,7 +569,7 @@ namespace UAS_MES_NEW.Warehouse
|
|
|
pa_id = dh.GetSEQ("package_seq");
|
|
|
dh.ExecuteSql("insert into package(PA_ID, PA_OUTBOXCODE,PA_PRODCODE,PA_LEVEL,PA_PACKAGEQTY,PA_TOTALQTY,PA_MAKECODE,PA_STATUS,PA_INDATE,PA_SALECODE,PA_TYPE,PA_CURRENTQTY,PA_PACKTYPE,PA_STANDARDQTY,PA_SCCODE,PA_OUTNO)values" +
|
|
|
"(" + pa_id + ",'" + pa_outboxcode.Text + "',case when nvl('" + pr_packrule + "',' ')<>'MIX' then '" + pa_prodcode + "' ELSE''END,3,0,0,case when '" + pr_packrule + "'='MAKE' THEN '" + pa_makecode + "' ELSE '' END, 0,SYSDATE,case when '" + pr_packrule + "'='SALE' " +
|
|
|
- "then '" + pa_salecode + "' else ''end,3,0,'" + pr_packrule + "'," + pa_standardqty.Text + ",'" + User.UserSourceCode + "','" + pi_inoutno.Text + "')", "insert");
|
|
|
+ "then '" + pa_salecode + "' else ''end,3,0,'" + pr_packrule + "','" + pa_standardqty.Text + "','" + User.UserSourceCode + "','" + pi_inoutno.Text + "')", "insert");
|
|
|
}
|
|
|
sql.Clear();
|
|
|
sql.Append("insert into packagedetail(pd_id, pd_paid, pd_outboxcode,pd_makecode,pd_prodcode,pd_innerboxcode, pd_innerqty,pd_builddate)");
|
|
|
@@ -479,6 +586,10 @@ namespace UAS_MES_NEW.Warehouse
|
|
|
dh.ExecuteSql("update package set pa_packageqty=pa_packageqty-1,pa_totalqty=pa_totalqty-(select pa_totalqty from package where pa_outboxcode='" + input.Text + "'),pa_currentqty=pa_currentqty-1,pa_status=0 where pa_outboxcode='" + pa_mothercode + "'", "update");
|
|
|
dh.ExecuteSql("update package set pa_mothercode='" + pa_outboxcode.Text + "' where pa_outboxcode='" + input.Text + "'", "update");
|
|
|
}
|
|
|
+ else
|
|
|
+ {
|
|
|
+ dh.ExecuteSql("update package set pa_mothercode='" + pa_outboxcode.Text + "' where pa_outboxcode='" + input.Text + "'", "update");
|
|
|
+ }
|
|
|
RefreshWeight(pa_prodcode, input.Text);
|
|
|
if (!checkinsertprodiomac("栈板号", pa_outboxcode.Text))
|
|
|
return;
|
|
|
@@ -503,6 +614,11 @@ namespace UAS_MES_NEW.Warehouse
|
|
|
else
|
|
|
{
|
|
|
int boxnum = int.Parse(dh.getFieldDataByCondition("prodiomac", " count(distinct pim_outboxcode)", "pim_inoutno='" + pi_inoutno.Text + "' and PIM_TYPE='BOX' ").ToString());
|
|
|
+ if (pi_boxnum.Text == "")
|
|
|
+ {
|
|
|
+ OperateResult.AppendText("请设置散箱数量\n", Color.Red, input);
|
|
|
+ return;
|
|
|
+ }
|
|
|
if (boxnum >= int.Parse(pi_boxnum.Text))
|
|
|
{
|
|
|
OperateResult.AppendText("当前散数量" + boxnum + ",超出设置散箱数" + pi_boxnum.Text + "\n", Color.Red, input);
|
|
|
@@ -622,7 +738,7 @@ namespace UAS_MES_NEW.Warehouse
|
|
|
sql.Clear();
|
|
|
sql.Append("select pa_id,pa_outboxcode,pa_status,nvl(pa_downstatus,0)pa_downstatus, ");
|
|
|
sql.Append("pa_outno,nvl(pa_iostatus,0) pa_iostatus,pa_makecode,pa_mothercode from package ");
|
|
|
- sql.Append("where pa_outboxcode='" + input.Text + "' and pa_type in (1,2)");
|
|
|
+ sql.Append("where pa_outboxcode='" + input.Text + "' and pa_type in (1,2,3)");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
@@ -700,9 +816,9 @@ namespace UAS_MES_NEW.Warehouse
|
|
|
pib_type = "BOX";
|
|
|
}
|
|
|
sql.Clear();
|
|
|
- sql.Append("insert into prodiomac(pim_id,pim_inoutno,pim_piid,pim_prodcode,pim_mac,pim_indate,pim_inman,pim_type,pim_outboxcode,pim_inorout,pim_class,pim_custpo,pim_custdetno,pim_pdid)");
|
|
|
- sql.Append("select prodiomac_seq.nextval,'" + pi_inoutno.Text + "','" + pi_id.Text + "',v_prodcode,ms_sncode,sysdate,'" + User.UserCode + "','" + pib_type + "','" + iBox + "','OUT','出货','" + custpo + "','" + custpodetno + "','" + PDID + "'" +
|
|
|
- " from mes_package_view left join makeserial on ms_sncode=v_barcode and ms_makecode=v_makecode where v_outboxcode='" + iBox + "' and ms_outno is null");
|
|
|
+ sql.Append("insert into prodiomac(pim_id,pim_inoutno,pim_piid,pim_prodcode,pim_mac,pim_indate,pim_inman,pim_type,pim_outboxcode,pim_inorout,pim_class,pim_custpo,pim_custdetno,pim_pdid,pim_custprodcode)");
|
|
|
+ sql.Append("select prodiomac_seq.nextval,'" + pi_inoutno.Text + "','" + pi_id.Text + "',v_prodcode,ms_sncode,sysdate,'" + User.UserCode + "','" + pib_type + "','" + iBox + "','OUT','出货','" + custpo + "','" + custpodetno + "','" + PDID + "',ma_custprodcode " +
|
|
|
+ " from mes_package_view left join makeserial on ms_sncode=v_barcode and ms_makecode=v_makecode left join make on ma_code=ms_makecode where v_outboxcode='" + iBox + "' and ms_outno is null");
|
|
|
dh.ExecuteSql(sql.GetString(), "insert");
|
|
|
}
|
|
|
|
|
|
@@ -819,12 +935,7 @@ namespace UAS_MES_NEW.Warehouse
|
|
|
{
|
|
|
if (((RadioButton)sender).Checked == true)
|
|
|
{
|
|
|
- if (((RadioButton)sender).Name == "serBtn")
|
|
|
- {
|
|
|
- input.Focus();
|
|
|
- OperateResult.AppendText("请输入序列号进行采集\n", Color.Black, input);
|
|
|
- }
|
|
|
- else if (((RadioButton)sender).Name == "bigboxBtn")
|
|
|
+ if (((RadioButton)sender).Name == "bigboxBtn")
|
|
|
{
|
|
|
input.Focus();
|
|
|
OperateResult.AppendText("请输入箱号进行采集\n", Color.Black, input);
|
|
|
@@ -835,6 +946,7 @@ namespace UAS_MES_NEW.Warehouse
|
|
|
OperateResult.AppendText("请输入栈板进行采集\n", Color.Black, input);
|
|
|
}
|
|
|
}
|
|
|
+ Console.WriteLine(CombineCust.Checked);
|
|
|
}
|
|
|
|
|
|
private void InOutDetailDGV_DataSourceChanged(object sender, EventArgs e)
|
|
|
@@ -847,11 +959,13 @@ namespace UAS_MES_NEW.Warehouse
|
|
|
string PdPDNO = "";
|
|
|
string PDID = "0";
|
|
|
string pdprodcode = "";
|
|
|
+ string pdcustprodcode = "";
|
|
|
private void Prodiodetail_CellClick(object sender, DataGridViewCellEventArgs e)
|
|
|
{
|
|
|
if (e.RowIndex >= 0)
|
|
|
{
|
|
|
string pd_prodcode = Prodiodetail.Rows[e.RowIndex].Cells["pd_prodcode"].Value.ToString();
|
|
|
+ pdcustprodcode = Prodiodetail.Rows[e.RowIndex].Cells["pd_custprod"].Value.ToString();
|
|
|
pdprodcode = pd_prodcode;
|
|
|
string pd_pdno = Prodiodetail.Rows[e.RowIndex].Cells["pd_pdno"].Value.ToString();
|
|
|
string pd_id = Prodiodetail.Rows[e.RowIndex].Cells["pd_id"].Value.ToString();
|
callm