gongdoudou
/
lc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.泛微实现类调整，付款结果反馈调整

This commit is contained in:
龚豆豆 2025-11-14 15:39:38 +08:00
parent 8a7dc3efbd
commit 1992ce895f
4 changed files with 768 additions and 759 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lc123/cloud/app/api/controller/CasPaybillController.java
View File

@ -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接口")

1
lc123/cloud/app/plugin/form/conm/RebateRulesBillPlugin.java
View File

@ -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");

5
lc123/cloud/app/plugin/form/sys/SupplierFormPlugin.java
View File

@ -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;
}
} }
} }
} }

39
lc123/cloud/app/plugin/trd/FWImpl.java
View File

@ -72,6 +72,7 @@ public class FWImpl {
/** /**
* 采购供应商推送泛微 * 采购供应商推送泛微
*
* @param bill * @param bill
* @return * @return
*/ */
@ -620,6 +621,7 @@ public class FWImpl {
String tqq9_dzhdbh = dataEntity.getString("tqq9_dzhdbh");//电子回单编号 String tqq9_dzhdbh = dataEntity.getString("tqq9_dzhdbh");//电子回单编号
String tqq9_digital_receipt = dataEntity.getString("tqq9_digital_receipt");//电子回单编号 String tqq9_digital_receipt = dataEntity.getString("tqq9_digital_receipt");//电子回单编号
String filename = ""; String filename = "";
String content = null;
if (StringUtils.isNotBlank(tqq9_digital_receipt)) { if (StringUtils.isNotBlank(tqq9_digital_receipt)) {
HttpRequest request = HttpRequest.get(tqq9_digital_receipt); HttpRequest request = HttpRequest.get(tqq9_digital_receipt);
HttpResponse response = request.execute(); HttpResponse response = request.execute();
@ -627,7 +629,7 @@ public class FWImpl {
if (contentDisposition != null && contentDisposition.contains("filename=")) { if (contentDisposition != null && contentDisposition.contains("filename=")) {
filename = contentDisposition.split("filename=")[1].replace("\"", ""); filename = contentDisposition.split("filename=")[1].replace("\"", "");
} }
}
// List<Map<String, Object>> attachments = AttachmentServiceHelper.getAttachments("cas_paybill", dataEntity.getPkValue(), "attachmentpanel"); // List<Map<String, Object>> attachments = AttachmentServiceHelper.getAttachments("cas_paybill", dataEntity.getPkValue(), "attachmentpanel");
// for (Map<String, Object> attachment : attachments) { // for (Map<String, Object> attachment : attachments) {
@ -635,7 +637,7 @@ public class FWImpl {
// System.out.println(); // System.out.println();
// } // }
byte[] bytes = HttpUtil.downloadBytes(tqq9_digital_receipt); byte[] bytes = HttpUtil.downloadBytes(tqq9_digital_receipt);
String content = cn.hutool.core.codec.Base64.encode(bytes); content = cn.hutool.core.codec.Base64.encode(bytes);
if (StringUtils.isBlank(filename)) { if (StringUtils.isBlank(filename)) {
filename = "银行电子回单" + new Date().getTime(); filename = "银行电子回单" + new Date().getTime();
String hz = ".jpg"; String hz = ".jpg";
@ -648,7 +650,7 @@ public class FWImpl {
} }
filename = filename + hz; filename = filename + hz;
} }
}
JSONObject mainTable = new JSONObject(); JSONObject mainTable = new JSONObject();
mainTable.put("lcid", tqq9_fwrequestid); mainTable.put("lcid", tqq9_fwrequestid);
mainTable.put("fkzt", fkzt); mainTable.put("fkzt", fkzt);
@ -929,7 +931,7 @@ public class FWImpl {
recordsArr1.add(recordObj); recordsArr1.add(recordObj);
DynamicObject warehouse = billentry.getDynamicObject("warehouse"); DynamicObject warehouse = billentry.getDynamicObject("warehouse");
shck = warehouse.getString("number")+"_"+org.getString("number");//shck shck = warehouse.getString("number") + "<>" + org.getString("number");//shck
} }
detail1.put("tableDBName", "formtable_main_97_dt1"); detail1.put("tableDBName", "formtable_main_97_dt1");
detail1.put("workflowRequestTableRecords", recordsArr1); detail1.put("workflowRequestTableRecords", recordsArr1);
@ -1269,13 +1271,13 @@ public class FWImpl {
e4.put("fieldValue", jldw); e4.put("fieldValue", jldw);
JSONObject e5 = new JSONObject(); JSONObject e5 = new JSONObject();
e5.put("fieldName", "sl"); e5.put("fieldName", "sl");
e5.put("fieldValue", sl!=null&&sl.compareTo(BigDecimal.ZERO)!=0?sl:0); e5.put("fieldValue", sl);
JSONObject e6 = new JSONObject(); JSONObject e6 = new JSONObject();
e6.put("fieldName", "bhsdj"); e6.put("fieldName", "bhsdj");
e6.put("fieldValue", bhsdj!=null&&bhsdj.compareTo(BigDecimal.ZERO)!=0?bhsdj:0); e6.put("fieldValue", bhsdj);
JSONObject e7 = new JSONObject(); JSONObject e7 = new JSONObject();
e7.put("fieldName", "je"); e7.put("fieldName", "je");
e7.put("fieldValue", je!=null&&je.compareTo(BigDecimal.ZERO)!=0?je:0); e7.put("fieldValue", je);
JSONObject e15 = new JSONObject(); JSONObject e15 = new JSONObject();
e15.put("fieldName", "sfzp"); e15.put("fieldName", "sfzp");
e15.put("fieldValue", sfzp); e15.put("fieldValue", sfzp);
@ -1293,7 +1295,7 @@ public class FWImpl {
//入库仓库 //入库仓库
DynamicObject warehouse = billentry.getDynamicObject("warehouse"); DynamicObject warehouse = billentry.getDynamicObject("warehouse");
if (warehouse != null) { if (warehouse != null) {
rkck = warehouse.getString("number")+"_"+orgNumber; rkck = warehouse.getString("number") + "<>" + orgNumber;
} }
} }
detail1.put("tableDBName", "formtable_main_110_dt2"); detail1.put("tableDBName", "formtable_main_110_dt2");
@ -1346,7 +1348,7 @@ public class FWImpl {
m16.put("fieldValue", sqyybz); m16.put("fieldValue", sqyybz);
JSONObject m17 = new JSONObject(); JSONObject m17 = new JSONObject();
m17.put("fieldName", "hzje"); m17.put("fieldName", "hzje");
m17.put("fieldValue", hzje!=null&&hzje.compareTo(BigDecimal.ZERO)!=0?hzje:0); m17.put("fieldValue", hzje);
JSONObject m18 = new JSONObject(); JSONObject m18 = new JSONObject();
m18.put("fieldName", "shdh"); m18.put("fieldName", "shdh");
m18.put("fieldValue", shdh); m18.put("fieldValue", shdh);
@ -1595,10 +1597,10 @@ public class FWImpl {
e5.put("fieldValue", sl); e5.put("fieldValue", sl);
JSONObject e6 = new JSONObject(); JSONObject e6 = new JSONObject();
e6.put("fieldName", "bhsdj"); e6.put("fieldName", "bhsdj");
e6.put("fieldValue", bhsdj!=null&&bhsdj.compareTo(BigDecimal.ZERO)!=0?bhsdj:0); e6.put("fieldValue", bhsdj);
JSONObject e7 = new JSONObject(); JSONObject e7 = new JSONObject();
e7.put("fieldName", "je"); e7.put("fieldName", "je");
e7.put("fieldValue", je!=null&&je.compareTo(BigDecimal.ZERO)!=0?je:0); e7.put("fieldValue", je);
JSONObject e8 = new JSONObject(); JSONObject e8 = new JSONObject();
e8.put("fieldName", "scrq"); e8.put("fieldName", "scrq");
e8.put("fieldValue", scrq); e8.put("fieldValue", scrq);
@ -1686,7 +1688,7 @@ public class FWImpl {
m16.put("fieldValue", sqyybz); m16.put("fieldValue", sqyybz);
JSONObject m17 = new JSONObject(); JSONObject m17 = new JSONObject();
m17.put("fieldName", "hzje"); m17.put("fieldName", "hzje");
m17.put("fieldValue", hzje!=null&&hzje.compareTo(BigDecimal.ZERO)!=0?hzje:0); m17.put("fieldValue", hzje);
JSONObject m18 = new JSONObject(); JSONObject m18 = new JSONObject();
m18.put("fieldName", "shdh"); m18.put("fieldName", "shdh");
m18.put("fieldValue", shdh); m18.put("fieldValue", shdh);
@ -2779,6 +2781,7 @@ public class FWImpl {
/** /**
* 采购合同推送泛微 * 采购合同推送泛微
*
* @param bill * @param bill
* @return * @return
*/ */
@ -3064,7 +3067,6 @@ public class FWImpl {
} }
JSONObject e0 = new JSONObject(); JSONObject e0 = new JSONObject();
e0.put("fieldName", "flgzdjh"); e0.put("fieldName", "flgzdjh");
e0.put("fieldValue", flgzdjh); e0.put("fieldValue", flgzdjh);
@ -3259,6 +3261,7 @@ public class FWImpl {
/** /**
* 采购合同变更单 * 采购合同变更单
*
* @param bill * @param bill
* @return * @return
*/ */
@ -4263,7 +4266,7 @@ public class FWImpl {
String ck = null; String ck = null;
DynamicObject warehouse = entry.getDynamicObject("warehouse");//仓库 DynamicObject warehouse = entry.getDynamicObject("warehouse");//仓库
if (null != warehouse) { if (null != warehouse) {
ck = warehouse.getString("number")+"_"+orgNumber; ck = warehouse.getString("number") + "<>" + orgNumber;
} }
JSONObject e1 = new JSONObject(); JSONObject e1 = new JSONObject();
@ -4644,6 +4647,7 @@ public class FWImpl {
/** /**
* 新增供应商推送泛微 * 新增供应商推送泛微
*
* @param bill * @param bill
* @return * @return
*/ */
@ -5138,7 +5142,7 @@ public class FWImpl {
m43.put("fieldValue", sxrq); m43.put("fieldValue", sxrq);
JSONObject m44 = new JSONObject(); JSONObject m44 = new JSONObject();
m44.put("fieldName", "zczb"); m44.put("fieldName", "zczb");
m44.put("fieldValue", StringUtils.isNotBlank(zczb)?zczb:0); m44.put("fieldValue", zczb);
JSONObject m45 = new JSONObject(); JSONObject m45 = new JSONObject();
m45.put("fieldName", "zs"); m45.put("fieldName", "zs");
m45.put("fieldValue", zs); m45.put("fieldValue", zs);
@ -5380,6 +5384,7 @@ public class FWImpl {
/** /**
* 物料提交推送泛微 * 物料提交推送泛微
*
* @param bill * @param bill
* @return * @return
*/ */
@ -5885,7 +5890,7 @@ public class FWImpl {
String shck_sh = null; String shck_sh = null;
DynamicObject tqq9_rewares_sh = bill.getDynamicObject("tqq9_rewares_sh"); DynamicObject tqq9_rewares_sh = bill.getDynamicObject("tqq9_rewares_sh");
if (tqq9_rewares_sh != null) { if (tqq9_rewares_sh != null) {
shck_sh = tqq9_rewares_sh.getString("number")+"_"+orgnumber; shck_sh = tqq9_rewares_sh.getString("number") + "<>" + orgnumber;
} }
String fktj_sh = null; String fktj_sh = null;
DynamicObject tqq9_paycondition_sh = bill.getDynamicObject("tqq9_paycondition_sh"); DynamicObject tqq9_paycondition_sh = bill.getDynamicObject("tqq9_paycondition_sh");
@ -6073,7 +6078,7 @@ public class FWImpl {
String shck_gz = null; String shck_gz = null;
DynamicObject tqq9_rewares_gz = bill.getDynamicObject("tqq9_rewares_gz"); DynamicObject tqq9_rewares_gz = bill.getDynamicObject("tqq9_rewares_gz");
if (tqq9_rewares_gz != null) { if (tqq9_rewares_gz != null) {
shck_gz = tqq9_rewares_gz.getString("number")+"_"+orgnumber; shck_gz = tqq9_rewares_gz.getString("number") + "<>" + orgnumber;
} }
String fktj_gz = null; String fktj_gz = null;
DynamicObject tqq9_paycondition_gz = bill.getDynamicObject("tqq9_paycondition_gz"); DynamicObject tqq9_paycondition_gz = bill.getDynamicObject("tqq9_paycondition_gz");