付款申请无PO流程调整：在BPM付款流程中非PO付款改造。

1.按照目前流程节点将付款信息传到SAP生成付款凭证； 2.重新经过申请人提交（费用类型代码、发票号码、税码、不含税金额（自动计算）、税额（自动计算）），费用会计审核传到SAP后生成费用凭证。

付款申请无PO流程调整：在BPM付款流程中非PO付款改造。
1.按照目前流程节点将付款信息传到SAP生成付款凭证； 2.重新经过申请人提交（费用类型代码、发票号码、税码、不含税金额（自动计算）、税额（自动计算）），费用会计审核传到SAP后生成费用凭证。
afd5ee79 · 1650842865 · de687e9a · afd5ee79 · afd5ee79 · afd5ee79
Commit afd5ee79 authored Apr 24, 2025 by 1650842865
4 changed files
--- a/topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApplyNoPO.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApplyNoPO.js
--- a/topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApplyNoPO.jsp
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApplyNoPO.jsp
@@ -4,7 +4,6 @@
 <html>
 <head>
    <x:base include="layout,dialog,grid,tree,combox,commonTree,date,attachment"/>
-    <x:script src='/biz/topsun/sap/costReimbursement/payApplyNoPO.js'/>
 </head>
 <body>

@@ -23,6 +22,7 @@
        <x:hidden name="positionName"/>
        <x:hidden name="personMemberId"/>
        <x:hidden name="personMemberName"/>
+        <x:hidden name="statusId"/>
        <div class="hg-form-cols">
            <div class="hg-form-row">
                <x:inputC name="zepNo" required="false" readonly="true" label="EP流程单号" labelCol="2" maxLength="64" fieldCol="2"/>
@@ -104,5 +104,7 @@
        </div>
 </div>
 </form>
+<x:script src='/biz/topsun/sap/costReimbursement/payApplyNoPO.js'/>
+
 </body>
 </html>
--- a/topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/application/impl/SapCostReimbursementApplicationImpl.java
+++ b/topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/application/impl/SapCostReimbursementApplicationImpl.java
@@ -79,19 +79,12 @@ public class SapCostReimbursementApplicationImpl extends FlowBroker implements S
        }
        sapCostReimbursement = costReimbursementRepository.save(sapCostReimbursement);

-
-//        String CRDetailJSON = sdo.getString("CRDetail");
-//        ObjectMapper objectMapper = new ObjectMapper();
-//        List<SapCostReimbursementDetail> CRDetailAll = costReimbursementDetailRepository.findAllByReimbursementBaseInfoId(sapCostReimbursement.getId());
-//        if (!CRDetailAll.isEmpty()) {
-//            costReimbursementDetailRepository.delete(CRDetailAll);
-//        }
-//        List<SapCostReimbursementDetail> CRDetailList = objectMapper.readValue(CRDetailJSON, new TypeReference<List<SapCostReimbursementDetail>>() {
-//        });
        List<SapCostReimbursementDetail> CRDetailAll = getBizEntities(SapCostReimbursementDetail.class, "CRDetail");
        for (SapCostReimbursementDetail item : CRDetailAll) {
            item.setReimbursementBaseInfoId(sapCostReimbursement.getId());
-            item.setZpayStaus("未支付");
+            if (StringUtil.isBlank(item.getZpayStaus())){
+                item.setZpayStaus("未支付");
+            }
            costReimbursementDetailRepository.save(item);
        }
        return sapCostReimbursement.getId();
@@ -150,7 +143,7 @@ public class SapCostReimbursementApplicationImpl extends FlowBroker implements S
            // 获取流程任务对应的审批环节信息
            ProcUnitHandler procUnitHandler = procUnitHandlerApplication.loadProcUnitHandler(te.getProcUnitHandlerId());
            String subProcUnitId = procUnitHandler.getSubProcUnitId();
-            if ("fundNode".equals(subProcUnitId)){
+            if ("fundNode".equals(subProcUnitId) || "applyPerson".equals(subProcUnitId)) {
                //在资产节点传到SAP
                this.sendSapDate(this.costReimbursementRepository.findOne(bizId));
            }
@@ -278,7 +271,11 @@ public class SapCostReimbursementApplicationImpl extends FlowBroker implements S
        for (SapCostReimbursementDetail costReimbursementDetail : all) {

            Map<String, Object> detailMap = MyBaseUtil.convertToMap(costReimbursementDetail, true);
-            detailMap.remove("ZPAY_STAUS");
+            //已付款，传S
+            String zpayStaus = (String) detailMap.get("ZPAY_STAUS");
+            if ("已支付".equals(zpayStaus)){
+                detailMap.put("ZPAY_STAUS","S");
+            }
            if (costReimbursementDetail.getZepFpldate() != null){
                String dateFormat = DateUtil.getDateFormat(costReimbursementDetail.getZepFpldate(), "yyyyMMdd");
                detailMap.put("ZEP_FPLDATE",dateFormat);

--- a/topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/controller/SapCostReimbursementController.java
+++ b/topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/controller/SapCostReimbursementController.java
@@ -219,7 +219,10 @@ public class SapCostReimbursementController extends CommonController {
    public String checkzyl06(){
        SDO sdo = this.getSDO();
        String zyl06 = sdo.getString("zyl06");
-        Integer count = costReimbursementApplication.checkzyl06(zyl06);
+        Integer count = 0;
+        if (StringUtil.isNotBlank(zyl06)){
+            count = costReimbursementApplication.checkzyl06(zyl06);
+        }
        return success(count);
    }