预付款申请转预付单明细根据核算到明细判断获取明细订单

src/com/uas/erp/dao/common/impl/PayPleaseDaoImpl.java

@@ -133,22 +133,29 @@ public class PayPleaseDaoImpl extends BaseDao implements PayPleaseDao {
 							rsPPD.getObject("ppd_bankaccount"), rsPPD.getObject("pp_payremark"), rsPPD.getObject("pp_remark"),
 							rsPPD.getObject("pp_paymentcode"), rsPPD.getObject("pp_payment") });
 			if (bool) {
-				int detno = 1;
-				if (thisamount < rsPPD.getGeneralDouble("ppd_applyamount")) {
-					String res = callProcedure("CT_CATCHPUTOPPSPLIT", new Object[] { ppd_id, thisamount, pp_id });
+				if (isDBSetting("sys", "payByDetail")) {
+					String res = callProcedure("CT_CATCHPPDDDTOPPDDSPLIT", new Object[]{ppd_id, thisamount, pp_id});
 					if (!("ok").equals(res.trim())) {
 						BaseUtil.showError(res);
 					}
 				} else {
-					while (rsPPDD.next()) {
-						execute(INSERTPREPAYDETAIL,
-								new Object[] { pp_id, code, detno++, rsPPDD.getObject("ppdd_currency"),
-										rsPPDD.getObject("ppdd_thisapplyamount"), rsPPDD.getObject("ppdd_type"),
-										rsPPDD.getObject("ppdd_pucode"), rsPPDD.getObject("ppdd_makecode"),
-										rsPPDD.getObject("ppdd_billdate"), rsPPDD.getGeneralDouble("ppdd_billamount"),
-										rsPPDD.getObject("ppdd_account"), rsPPDD.getObject("ppdd_id"),
-										rsPPDD.getGeneralInt("ppdd_pddetno"), rsPPDD.getGeneralInt("ppdd_pdid"),
-										rsPPDD.getObject("ppdd_prodcode") });
+					int detno = 1;
+					if (thisamount < rsPPD.getGeneralDouble("ppd_applyamount")) {
+						String res = callProcedure("CT_CATCHPUTOPPSPLIT", new Object[]{ppd_id, thisamount, pp_id});
+						if (!("ok").equals(res.trim())) {
+							BaseUtil.showError(res);
+						}
+					} else {
+						while (rsPPDD.next()) {
+							execute(INSERTPREPAYDETAIL,
+									new Object[]{pp_id, code, detno++, rsPPDD.getObject("ppdd_currency"),
+											rsPPDD.getObject("ppdd_thisapplyamount"), rsPPDD.getObject("ppdd_type"),
+											rsPPDD.getObject("ppdd_pucode"), rsPPDD.getObject("ppdd_makecode"),
+											rsPPDD.getObject("ppdd_billdate"), rsPPDD.getGeneralDouble("ppdd_billamount"),
+											rsPPDD.getObject("ppdd_account"), rsPPDD.getObject("ppdd_id"),
+											rsPPDD.getGeneralInt("ppdd_pddetno"), rsPPDD.getGeneralInt("ppdd_pdid"),
+											rsPPDD.getObject("ppdd_prodcode")});
+						}
 					}
 				}
 				execute("update PrePayDetail set (ppd_buyer,ppd_buyerid)=(select pu_buyername,pu_buyerid from purchasewithoa_view where ppd_ordercode=pu_code) where nvl(ppd_ordercode,' ')<>' ' and ppd_ppid="