From 751eed929bb751a1a6115b86eb6d56f669fd0d09 Mon Sep 17 00:00:00 2001
From: "XI_TENG\\xixi_" <971623072>
Date: Fri, 12 Jul 2024 17:12:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BB=98=E6=AC=BE=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=8A=A0=E9=87=8D=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/workflow/engine/FlowTaskMapper.xml  | 5 +++++
 .../main/java/jnpf/engine/service/FlowTaskService.java   | 9 +++++++++
 .../src/main/java/jnpf/engine/mapper/FlowTaskMapper.java | 7 +++++++
 .../jnpf/engine/service/impl/FlowTaskServiceImpl.java    | 7 +++++++
 .../jnpf/engine/controller/FlowBeforeController.java     | 6 +++++-
 5 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/workflow/engine/FlowTaskMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/workflow/engine/FlowTaskMapper.xml
index 3afe16a1..d2693848 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/workflow/engine/FlowTaskMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/workflow/engine/FlowTaskMapper.xml
@@ -324,4 +324,9 @@
         select SUM(delivery_num) from jg_delivery_product_relation
         where f_delete_mark is null and order_id = #{processId}
     </select>
+
+    <select id="getNetWeightBypayment" resultType="java.math.BigDecimal">
+        select apply_weight from jg_cw_payment_application
+        where f_delete_mark is null and id = #{processId}
+    </select>
 </mapper>
diff --git a/jnpf-java-boot/jnpf-public/jnpf-provider/src/main/java/jnpf/engine/service/FlowTaskService.java b/jnpf-java-boot/jnpf-public/jnpf-provider/src/main/java/jnpf/engine/service/FlowTaskService.java
index cc28ae3d..42138c56 100644
--- a/jnpf-java-boot/jnpf-public/jnpf-provider/src/main/java/jnpf/engine/service/FlowTaskService.java
+++ b/jnpf-java-boot/jnpf-public/jnpf-provider/src/main/java/jnpf/engine/service/FlowTaskService.java
@@ -216,5 +216,14 @@ public interface FlowTaskService extends SuperService<FlowTaskEntity> {
      */
     BigDecimal getNetWeight(String flowName,String processId);
 
+    /**
+     * 获取付款申请重量
+     * @return
+     */
+    BigDecimal getNetWeightPayment(String flowName,String processId);
+    /**
+     * 待审核可删除流程
+     * @return
+     */
     void remove(FlowTaskEntity flowTaskEntity);
 }
diff --git a/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-biz/src/main/java/jnpf/engine/mapper/FlowTaskMapper.java b/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-biz/src/main/java/jnpf/engine/mapper/FlowTaskMapper.java
index e2e2b108..750b0200 100644
--- a/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-biz/src/main/java/jnpf/engine/mapper/FlowTaskMapper.java
+++ b/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-biz/src/main/java/jnpf/engine/mapper/FlowTaskMapper.java
@@ -55,4 +55,11 @@ public interface FlowTaskMapper extends SuperMapper<FlowTaskEntity> {
      * @return
      */
     BigDecimal getNetWeightByReceiptOrder(@Param("processId") String processId);
+
+    /**
+     * 获取付款申请单重量
+     *
+     * @return
+     */
+    BigDecimal getNetWeightBypayment(@Param("processId") String processId);
 }
diff --git a/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-biz/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java b/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-biz/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java
index 1482f457..2af6c4d1 100644
--- a/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-biz/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java
+++ b/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-biz/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java
@@ -867,6 +867,13 @@ public class FlowTaskServiceImpl extends SuperServiceImpl<FlowTaskMapper, FlowTa
             return this.baseMapper.getNetWeightByReceiptOrder(processId);
         }
     }
+    /**
+     *  获取付款申请重量
+     */
+    @Override
+    public BigDecimal getNetWeightPayment(String flowName, String processId) {
+        return this.baseMapper.getNetWeightBypayment(processId);
+    }
 
     @Override
     public void remove(FlowTaskEntity entity)   {
diff --git a/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-controller/src/main/java/jnpf/engine/controller/FlowBeforeController.java b/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-controller/src/main/java/jnpf/engine/controller/FlowBeforeController.java
index 103c97da..22e16b54 100644
--- a/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-controller/src/main/java/jnpf/engine/controller/FlowBeforeController.java
+++ b/jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-controller/src/main/java/jnpf/engine/controller/FlowBeforeController.java
@@ -108,10 +108,14 @@ public class FlowBeforeController {
         boolean isBatch = FlowNature.BATCH.equals(category);
         for (FlowTaskListModel task : data) {
             FlowBeforeListVO vo = JsonUtil.getJsonToBean(task, FlowBeforeListVO.class);
-            if (vo.getFlowName().equals("采购订单") || vo.getFlowName().equals("销售订单") || vo.getFlowName().equals("采购收货单") || vo.getFlowName().equals("销售发货单")){
+            if (vo.getFlowName().equals("采购订单") || vo.getFlowName().equals("销售订单") || vo.getFlowName().equals("采购收货单") || vo.getFlowName().equals("销售发货单")|| vo.getFlowName().equals("销售发货单")){
                 BigDecimal netWeight = flowTaskService.getNetWeight(vo.getFlowName(),vo.getProcessId());
                 vo.setNetWeight(netWeight);
             }
+            if ( vo.getFlowName().equals("付款申请单")){
+                BigDecimal netWeight = flowTaskService.getNetWeightPayment(vo.getFlowName(),vo.getProcessId());
+                vo.setNetWeight(netWeight);
+            }
             //用户名称赋值
             UserEntity user = userList.stream().filter(t -> t.getId().equals(vo.getCreatorUserId())).findFirst().orElse(null);
             vo.setUserName(user != null ? user.getRealName() + "/" + user.getAccount() : "");