|
@@ -801,12 +801,12 @@ public class APCheckServiceImpl implements APCheckService {
|
|
|
+ "select PayPleaseDetailDetDet_SEQ.NEXTVAL,"
|
|
|
+ ppid
|
|
|
+ ", rownum,ab_id,abd_id,ab_code,"
|
|
|
- + "abd_detno,ab_class,ab_currency,abd_apamount,abd_payamount,case when round(nvl(abd_apamount,0)-nvl(abd_payamount,0)-nvl(abd_lockamount,0),2)<nvl(ad_amount,0) then round(nvl(abd_apamount,0)-nvl(abd_payamount,0)-nvl(abd_lockamount,0),2) else nvl(ad_amount,0) end,"
|
|
|
+ + "abd_detno,ab_class,ab_currency,abd_apamount,abd_payamount,case when (abs(round(nvl(abd_apamount,0)-nvl(abd_payamount,0)-nvl(abd_lockamount,0),2))<abs(round(nvl(abd_thisvoprice,0)*nvl(ad_qty,0),2))) then round(nvl(abd_apamount,0)-nvl(abd_payamount,0)-nvl(abd_lockamount,0),2) else round(nvl(abd_thisvoprice,0)*nvl(ad_qty,0),2) end,"
|
|
|
+ "abd_prodcode,abd_qty,abd_thisvoprice "
|
|
|
- + "from APCHECKDETAIL,APBILL,APBILLDETAIL WHERE ad_acid="
|
|
|
- + id
|
|
|
- + " and ad_sourcecode=ABD_CODE and ad_sourcedetno=abd_detno and AB_ID=ABD_ABID "
|
|
|
- + "AND ROUND(ABS(abd_apamount),2)>ROUND(ABS(NVL(abd_payamount,0)+NVL(abd_lockamount,0)),2) AND nvl(abd_sourcetype,' ')<>'模具验收报告'");
|
|
|
+ + "from (select sum(nvl(ad_amount,0)) ad_amount,sum(nvl(ad_qty,0)) ad_qty,ad_sourcecode,ad_sourcedetno,ad_acid from APCHECKDETAIL WHERE ad_acid= " +id+
|
|
|
+ " group by ad_acid,ad_sourcecode,ad_sourcedetno)" +
|
|
|
+ " left join APBILLDETAIL on ad_sourcecode=ABD_CODE and ad_sourcedetno=abd_detno left join APBILL on ab_id=abd_abid " +
|
|
|
+ " where ROUND(ABS(abd_apamount),2)>ROUND(ABS(NVL(abd_payamount,0)+NVL(abd_lockamount,0)),2) AND nvl(abd_sourcetype,' ')<>'模具验收报告'");
|
|
|
baseDao.execute("insert into PayPleaseDetailDet(PPDD_ID,PPDD_PPDID,PPDD_PPID,PPDD_DETNO,PPDD_TYPE,ppdd_billcode,PPDD_CURRENCY,ppdd_paymethod,ppdd_billdate,"
|
|
|
+ "ppdd_planpaydate,ppdd_account,ppdd_billamount,ppdd_thisapplyamount,ppdd_turnamount)"
|
|
|
+ "select PAYPLEASEDETAILDET_SEQ.NEXTVAL,"
|
|
@@ -824,7 +824,7 @@ public class APCheckServiceImpl implements APCheckService {
|
|
|
List<Map<Object, Object>> params = new ArrayList<Map<Object, Object>>();
|
|
|
SqlRowList rs = baseDao
|
|
|
.queryForRowSet(
|
|
|
- "select ad_sourcecode,ad_sourcetype,sum(round(nvl(abd_thisvoprice,0)*nvl(ad_qty,0),2)) ad_amount from APCHECKDETAIL left join APBILLDETAIL on ad_sourcecode=ABD_CODE and ad_sourcedetno=abd_detno where AD_ACID=? group by ad_sourcecode,ad_sourcetype",
|
|
|
+ "select ad_sourcecode,ad_sourcetype,sum(nvl(ad_amount,0)) ad_amount from APCHECKDETAIL where AD_ACID=? group by ad_sourcecode,ad_sourcetype",
|
|
|
id);
|
|
|
while (rs.next()) {
|
|
|
Map<Object, Object> map = new HashMap<Object, Object>();
|