1.泛微实现类调整,付款结果反馈调整
This commit is contained in:
parent
8a7dc3efbd
commit
1992ce895f
|
|
@ -32,7 +32,7 @@ import java.util.List;
|
||||||
*/
|
*/
|
||||||
@ApiController(value = "CasPaybillController", desc = "付款单api接口,自定义插件")
|
@ApiController(value = "CasPaybillController", desc = "付款单api接口,自定义插件")
|
||||||
public class CasPaybillController {
|
public class CasPaybillController {
|
||||||
public static final String LC_PAYBILL_PROPERTIES = "billno,id,billstatus,bizdate,billtype,paymenttype,payeetype,description,issingle,org,payeracctcash,payeracctbank,payerbank," +
|
public static final String LC_PAYBILL_PROPERTIES = "billno,id,billstatus,bizdate,billtype,paymenttype,payeetype,description,issingle,org,payeracctcash,payeracctbank,payerbank,ispersonpay,bookdate," +
|
||||||
"payee,payeeformid,payeename,payeeaccformid,payeeacctbank,payeebanknum,payeebank,payeebankname,actpayamt,currency,exchangerate,localamt,settletype,settletnumber,fundflowitem,usage," +
|
"payee,payeeformid,payeename,payeeaccformid,payeeacctbank,payeebanknum,payeebank,payeebankname,actpayamt,currency,exchangerate,localamt,settletype,settletnumber,fundflowitem,usage," +
|
||||||
"expectdate,reccountry,recprovince,reccity,recaccbankname,recbanknumber,sourcetype,sourcebilltype,sourcebillid,cashier,paydate,bankcheckflag,bankcheckflag_tag,entrance,entrustorg," +
|
"expectdate,reccountry,recprovince,reccity,recaccbankname,recbanknumber,sourcetype,sourcebilltype,sourcebillid,cashier,paydate,bankcheckflag,bankcheckflag_tag,entrance,entrustorg," +
|
||||||
"applyorg,e_actamt,e_localamt,e_fundflowitem,e_remark,e_payableAmt,e_payablelocamt,e_discountamt,e_discountlocamt,e_sourcebillentryid,e_unsettledamt,e_settledamt,e_unsettledlocalamt," +
|
"applyorg,e_actamt,e_localamt,e_fundflowitem,e_remark,e_payableAmt,e_payablelocamt,e_discountamt,e_discountlocamt,e_sourcebillentryid,e_unsettledamt,e_settledamt,e_unsettledlocalamt," +
|
||||||
|
|
@ -41,7 +41,7 @@ public class CasPaybillController {
|
||||||
"acttradedate,feepayer,createtime,payeeacctcash,openorg,totalpayamt,payquotation,dppayquotation,agreedquotation,settletype,settletype.settlementtype,settletnumber,singlestream,basecurrency," +
|
"acttradedate,feepayer,createtime,payeeacctcash,openorg,totalpayamt,payquotation,dppayquotation,agreedquotation,settletype,settletype.settlementtype,settletnumber,singlestream,basecurrency," +
|
||||||
"paymentidentify,feepaydate,feepay,matchamountpay,unmatchamountpay,unmatchamountrec,matchamountrec,matchflag,bizdate,auditdate,sourcebilltype,entry,entry.e_sourcebillid,cas_draftinfo.draftbillinfo," +
|
"paymentidentify,feepaydate,feepay,matchamountpay,unmatchamountpay,unmatchamountrec,matchamountrec,matchflag,bizdate,auditdate,sourcebilltype,entry,entry.e_sourcebillid,cas_draftinfo.draftbillinfo," +
|
||||||
"cas_draftinfo.transamount,cas_draftinfo.draftbilllogid,entry.e_scheid,cas_draftinfo.srcbillindex,cas_draftinfo.paybillcurrency,entry.e_dpamt,tqq9_digital_receipt,tqq9_billstatus,iswaitsche,priority,changestatus," +
|
"cas_draftinfo.transamount,cas_draftinfo.draftbilllogid,entry.e_scheid,cas_draftinfo.srcbillindex,cas_draftinfo.paybillcurrency,entry.e_dpamt,tqq9_digital_receipt,tqq9_billstatus,iswaitsche,priority,changestatus," +
|
||||||
"istop,entry.e_refundamt,entry.e_remainrefundamt,totalrefundedamt,totalremainrefundamt,localrefundedamt,localremainrefundamt,tqq9_dzhdbh,tqq9_cwztfkzt"; //应收结算记录
|
"istop,entry.e_refundamt,entry.e_remainrefundamt,totalrefundedamt,totalremainrefundamt,localrefundedamt,localremainrefundamt,tqq9_dzhdbh,tqq9_cwztfkzt,entry.e_paymenttype"; //应收结算记录
|
||||||
private final static Log logger = LogFactory.getLog(CasPaybillController.class);
|
private final static Log logger = LogFactory.getLog(CasPaybillController.class);
|
||||||
|
|
||||||
@ApiPostMapping(value = "/CasPaybill_StatusChange", desc = "付款单状态变更api接口")
|
@ApiPostMapping(value = "/CasPaybill_StatusChange", desc = "付款单状态变更api接口")
|
||||||
|
|
|
||||||
|
|
@ -93,7 +93,6 @@ public class RebateRulesBillPlugin extends AbstractBillPlugIn implements BeforeF
|
||||||
JSONObject purcontract_supplier = formShowParameter.getCustomParam("purcontract_supplier");
|
JSONObject purcontract_supplier = formShowParameter.getCustomParam("purcontract_supplier");
|
||||||
JSONArray purcontract_tqq9_dxpp = formShowParameter.getCustomParam("purcontract_tqq9_dxpp");
|
JSONArray purcontract_tqq9_dxpp = formShowParameter.getCustomParam("purcontract_tqq9_dxpp");
|
||||||
DynamicObject supplier = null;
|
DynamicObject supplier = null;
|
||||||
// DynamicObject tqq9_dxpp = null;
|
|
||||||
DynamicObject purcontract = BusinessDataServiceHelper.loadSingle("conm_purcontract", new QFilter[]{new QFilter("billno", QCP.equals, billno)});
|
DynamicObject purcontract = BusinessDataServiceHelper.loadSingle("conm_purcontract", new QFilter[]{new QFilter("billno", QCP.equals, billno)});
|
||||||
DynamicObjectCollection tqq9_supplier = this.getModel().getDataEntity().getDynamicObjectCollection("tqq9_supplier");
|
DynamicObjectCollection tqq9_supplier = this.getModel().getDataEntity().getDynamicObjectCollection("tqq9_supplier");
|
||||||
DynamicObjectCollection tqq9_rebatebrand = this.getModel().getDataEntity().getDynamicObjectCollection("tqq9_rebatebrand");
|
DynamicObjectCollection tqq9_rebatebrand = this.getModel().getDataEntity().getDynamicObjectCollection("tqq9_rebatebrand");
|
||||||
|
|
|
||||||
|
|
@ -118,6 +118,11 @@ public class SupplierFormPlugin extends AbstractListPlugin implements Plugin {
|
||||||
stringBuilder.append(",").append("编码为 ").append(supNumber).append(" 的供应商提交失败,请手动提交");
|
stringBuilder.append(",").append("编码为 ").append(supNumber).append(" 的供应商提交失败,请手动提交");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if(stringBuilder.length()>0){
|
||||||
|
this.getView().showErrorNotification(stringBuilder.substring(1));
|
||||||
|
return;
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue