|
@@ -493,7 +493,7 @@ namespace UAS_LabelMachine
|
|
|
CustCode = dh.getFieldDataByCondition("ProdInOut", "pi_cardcode", "pi_inoutno='" + pi_inoutno.Text + "'").ToString();
|
|
|
|
|
|
dt = (DataTable)dh.ExecuteSql("select pi_class,pi_id from prodinout where pi_inoutno='" + pi_inoutno.Text + "'", "select");
|
|
|
- DataTable custrule = (DataTable)dh.ExecuteSql("select CU_PRINT_MIDSPEC,CU_PRINT_MIDPO from customer where cu_code='" + CustCode + "'", "select");
|
|
|
+ DataTable custrule = (DataTable)dh.ExecuteSql("select CU_PRINT_MIDSPEC,CU_PRINT_MIDPO,cu_print_midprod from customer where cu_code='" + CustCode + "'", "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
pi_id = dt.Rows[0]["pi_id"].ToString();
|
|
@@ -503,27 +503,28 @@ namespace UAS_LabelMachine
|
|
|
{
|
|
|
string CU_PRINT_MIDSPEC = custrule.Rows[0]["CU_PRINT_MIDSPEC"].ToString();
|
|
|
string CU_PRINT_MIDPO = custrule.Rows[0]["CU_PRINT_MIDPO"].ToString();
|
|
|
- if (CU_PRINT_MIDSPEC == "-1" && CU_PRINT_MIDPO == "-1")
|
|
|
+ string cu_print_midprod = custrule.Rows[0]["cu_print_midprod"].ToString();
|
|
|
+ if (CU_PRINT_MIDSPEC == "-1")
|
|
|
{
|
|
|
- condition = ",pd_vespec_user,pd_pocode";
|
|
|
+ condition += ",pd_vespec_user";
|
|
|
}
|
|
|
- if (CU_PRINT_MIDSPEC != "-1" && CU_PRINT_MIDPO == "-1")
|
|
|
+ if (CU_PRINT_MIDPO == "-1")
|
|
|
{
|
|
|
- condition = ",pd_pocode";
|
|
|
+ condition += ",pd_pocode";
|
|
|
}
|
|
|
- if (CU_PRINT_MIDSPEC == "-1" && CU_PRINT_MIDPO != "-1")
|
|
|
+ if (cu_print_midprod == "-1")
|
|
|
{
|
|
|
- condition = ",pd_vespec_user";
|
|
|
+ condition += ",pd_custprodcode";
|
|
|
}
|
|
|
}
|
|
|
switch (pi_class.Text)
|
|
|
{
|
|
|
case "出货单":
|
|
|
sql.Clear();
|
|
|
- sql.Append("select pd_piid,pd_id,pr_id,pr_brand,pr_orispeccode,pr_madein,pr_unit,pr_detail,pr_spec,pr_zxbzs,outqty pd_totalqty,pd_pocode,pd_ordercode,pd_orderdetno,pd_pdno,pd_prodcode,");
|
|
|
+ sql.Append("select pd_piid,pd_id,pr_id,pr_brand,pr_orispeccode,pr_madein,pr_unit,pr_detail,pr_spec,pr_zxbzs,outqty pd_totalqty,pd_pocode,pd_ordercode,pd_orderdetno,pd_pdno,pd_prodcode,pd_custprodcode,");
|
|
|
sql.Append("pd_piclass,pd_qty from (select pd_piid,pd_id,pr_id,pr_brand,nvl(pd_vespec_user,pr_orispeccode)pr_orispeccode,pr_madein,pr_unit,pr_detail,pr_spec,pr_zxbzs,outqty,pd_pocode,pd_ordercode,pd_orderdetno,pd_pdno,");
|
|
|
- sql.Append("pd_prodcode,pd_piclass,outqty-nvl((select sum(nvl(pib_qty,0)) from PRODIOBARCODE where PIB_PIID=pd_piid and pib_pdno=pd_pdno ),0)pd_qty ");
|
|
|
- sql.Append("from (select pd_piid,min(pd_id)pd_id,max(pd_vespec_user)pd_vespec_user,sum(pd_outqty)outqty,min(pd_pocode)pd_pocode,min(pd_ordercode)pd_ordercode,min(pd_orderdetno)pd_orderdetno,min(pd_pdno)pd_pdno,max(pd_prodcode)pd_prodcode,max(pd_piclass)pd_piclass ");
|
|
|
+ sql.Append("pd_prodcode,pd_custprodcode,pd_piclass,outqty-nvl((select sum(nvl(pib_qty,0)) from PRODIOBARCODE where PIB_PIID=pd_piid and pib_pdno=pd_pdno ),0)pd_qty ");
|
|
|
+ sql.Append("from (select pd_piid,min(pd_id)pd_id,max(pd_vespec_user)pd_vespec_user,sum(pd_outqty)outqty,min(pd_pocode)pd_pocode,min(pd_ordercode)pd_ordercode,min(pd_orderdetno)pd_orderdetno,min(pd_pdno)pd_pdno,max(pd_custprodcode)pd_custprodcode,max(pd_prodcode)pd_prodcode,max(pd_piclass)pd_piclass ");
|
|
|
sql.Append("from prodiodetail group by pd_piid" + condition + ")T left join product ");
|
|
|
sql.Append("on pr_code=pd_prodcode) where pd_piid='" + pi_id + "' order by pd_pdno");
|
|
|
break;
|