diff --git a/SC-boot/linkage-admin/src/main/resources/mapper/workflow/engine/FlowTaskMapper.xml b/SC-boot/linkage-admin/src/main/resources/mapper/workflow/engine/FlowTaskMapper.xml
index 72ee4441..df798bd3 100644
--- a/SC-boot/linkage-admin/src/main/resources/mapper/workflow/engine/FlowTaskMapper.xml
+++ b/SC-boot/linkage-admin/src/main/resources/mapper/workflow/engine/FlowTaskMapper.xml
@@ -68,4 +68,7 @@
WHERE 1=1 AND o.F_Completion = 0 AND t.F_Status = 1 AND o.F_State = '0' ${sql}
+
+ UPDATE jg_purchaseorder SET is_payment = '0' WHERE id IN (SELECT purchaseorder_id FROM jg_paymentdoc_item0 WHERE paymentdoc_id = #{paymentdocId})
+
diff --git a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/controller/FlowBeforeController.java b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/controller/FlowBeforeController.java
index b47c0dff..d955a2ea 100644
--- a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/controller/FlowBeforeController.java
+++ b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/controller/FlowBeforeController.java
@@ -26,6 +26,8 @@ import jnpf.engine.util.FlowJsonUtil;
import jnpf.engine.util.FlowNature;
import jnpf.engine.util.ServiceAllUtil;
import jnpf.exception.WorkFlowException;
+import jnpf.form.entity.PoundlistFlowEntity;
+import jnpf.form.service.PoundlistFlowService;
import jnpf.permission.entity.UserEntity;
import jnpf.util.JsonUtil;
import jnpf.util.RedisUtil;
@@ -72,6 +74,8 @@ public class FlowBeforeController {
private FlowEngineService flowEngineService;
@Autowired
private FlowTaskNewService flowTaskNewService;
+ @Autowired
+ private PoundlistFlowService poundlistFlowService;
/**
* 获取待我审核列表
@@ -141,7 +145,27 @@ public class FlowBeforeController {
@PostMapping("/Audit/{id}")
public ActionResult audit(@PathVariable("id") String id, @RequestBody FlowHandleModel flowHandleModel) throws WorkFlowException {
FlowTaskOperatorEntity operator = flowTaskOperatorService.getInfo(id);
+ FlowTaskNodeEntity flowTaskNodeEntity = flowTaskNodeService.getById(operator.getTaskNodeId());
FlowTaskEntity flowTask = flowTaskService.getInfo(operator.getTaskId());
+ if("end".equals(flowTaskNodeEntity.getNodeNext()) && "398482034802139205".equals(flowTask.getFlowId())){
+ //判断当前采购订单的磅单有没有是否垫资为否,并且是否回款为否
+ //判断是否开进项票
+ Map map = flowHandleModel.getFormData();
+ List