Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java

@@ -166,12 +166,16 @@ public enum StatusEnum {
     TRACK_END("3", "已结束", "track_end"),
     REQUESTED("4", "已申请", "requested"),
     TRACK_REIMBURSEMENT("5", "已报销", "track_reimbursement"),
+    TRACK_SUCCESST("6", "已通过", "track_success"),
 
     //申请状态
     APPLY_ING("1", "已申请", "apply_ing"),
     APPLY_FAIL("3", "已驳回", "apply_fail"),
     APPLY_SUCCESS("5", "已通过", "apply_success"),
 
+    //汽运报表状态
+    PENDING_PAY("1", "待请款", "pending_pay"),
+
 
     ;
     @Getter

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/TranSettlementReportController.java

@@ -88,5 +88,15 @@ public class TranSettlementReportController {
     public TranSettlementReport getInfo(@RequestParam String id) {
         return tranSettlementReportService.getInfo(id);
     }
+
+    /**
+     * 物流部提交
+     * @param tranSettlementReport
+     * @return
+     */
+    @PostMapping("/api/submitLogistics")
+    public String submitLogistics(@RequestBody TranSettlementReport tranSettlementReport) {
+        return tranSettlementReportService.submitLogistics(tranSettlementReport);
+    }
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ITranSettlementReportService.java

@@ -53,6 +53,11 @@ public interface ITranSettlementReportService extends IService<TranSettlementRep
      * @param
      */
     TranSettlementReport getInfo(String id);
+    /**
+     * 物流部批量提交
+     * @param tranSettlementReport
+     */
+    String submitLogistics(TranSettlementReport tranSettlementReport);
 
 
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranSettlementReportServiceImpl.java

@@ -9,10 +9,13 @@ import com.winsea.svc.base.base.entity.CommonRoleResource;
 import com.winsea.svc.base.base.service.ICommonRoleResourceService;
 import com.winsea.svc.base.security.entity.User;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
+import com.winsea.svc.base.workflow.entity.Workflow;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
+import com.yh.saas.plugin.yiliangyiyun.exception.YException;
+import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.TranSettlementReportMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
@@ -58,6 +61,8 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
     private IInOutWarehouseTaskService inOutWarehouseTaskService;
     @Autowired
     private IExpenseInfoService expenseInfoService;
+    @Autowired
+    private IBatchReviewInfoService batchReviewInfoService;
 
 
 
@@ -499,4 +504,52 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
         return tranSettlementReport;
     }
 
+    @Override
+    public String submitLogistics(TranSettlementReport tranSettlementReport) {
+        BatchReviewInfo batchReviewInfo = new BatchReviewInfo();
+        batchReviewInfo.setId(IdGenerator.generateUUID());
+        List<TranSettlementReport> tranSettlementReportList = tranSettlementReport.getTranSettlementReportList();
+        //批量
+        if (!CollectionUtils.isEmpty(tranSettlementReportList)) {
+            for (TranSettlementReport tranSettlementReport1 : tranSettlementReportList) {
+                tranSettlementReport1.setBatchId(batchReviewInfo.getId());
+                this.updateById(tranSettlementReport1);
+            }
+        }
+        batchReviewInfo.setCompId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
+        batchReviewInfoService.insert(batchReviewInfo);
+        boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(batchReviewInfo.getWorkflowId());
+        // 不是退回的单子
+        if (isStartWorkflow) {
+            Workflow workflow = workflowService
+                    .findLatestWorkflowByBusinessCodeByApp(batchReviewInfo.getCompId(), "TRANSPORTATION-SETTLEMENT-REPORT");
+            // 没配置审核流程，直接结束并处理信息
+            if (workflow == null) {
+                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+            }
+            // 开启审核流
+            else {
+
+                // 设置状态 已提交审核
+                batchReviewInfo.setWorkflowId(workflow.getId());
+                batchReviewInfoService.updateById(batchReviewInfo);
+                workflowService.startInstance(workflow.getId(), batchReviewInfo.getId());
+            }
+        }
+        //  更新详细状态
+        batchReviewInfo = batchReviewInfoService.selectById(batchReviewInfo.getId());
+        List<TranSettlementReport> tranSettlementReports = this.selectList(new EntityWrapper<TranSettlementReport>()
+                .eq("batch_id",batchReviewInfo.getId()));
+        if(!CollectionUtils.isEmpty(tranSettlementReports)){
+            for(int i=0;i<tranSettlementReports.size();i++){
+                TranSettlementReport settlementReport = tranSettlementReports.get(i);
+                settlementReport.setWorkflowId(batchReviewInfo.getWorkflowId());
+                settlementReport.setStatus(batchReviewInfo.getStatus());
+                settlementReport.setApproveStatus(batchReviewInfo.getApproveStatus());
+            }
+            this.updateBatchById(tranSettlementReports);
+        }
+        return "ok";
+    }
+
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInOutInfoServiceImpl.java

@@ -1496,31 +1496,33 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     }
                                     tranSettlementReport.setLoadingImg(warehouseInOutInfo.getAddressUrl());
                                     tranSettlementReport.setLoadingWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                                    tranSettlementReport.setStatusFlag(StatusEnum.PENDING_PAY.getFlag());
+                                    tranSettlementReport.setStatus(StatusEnum.PENDING_PAY.getName());
                                     tranSettlementReportService.insert(tranSettlementReport);
-                                    boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(tranSettlementReport.getWorkflowId());
-                                    // 不是退回的单子
-                                    if (isStartWorkflow) {
-                                        Workflow workflow = workflowService
-                                                .findLatestWorkflowByBusinessCodeByApp(tranSettlementReport.getCompId(), "TRANSPORTATION-SETTLEMENT-REPORT");
-                                        // 没配置审核流程，直接结束并处理信息
-                                        if (workflow == null) {
-                                            throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
-                                        }
-                                        // 开启审核流
-                                        else {
-
-                                            // 设置状态 已提交审核
-                                            tranSettlementReport.setWorkflowId(workflow.getId());
-                                            tranSettlementReportService.updateById(tranSettlementReport);
-                                            workflowService.startInstance(workflow.getId(), tranSettlementReport.getId());
-                                        }
-                                    }
-                                    // 退回的单子 再启用
-                                    else {
-
-                                        tranSettlementReportService.updateById(tranSettlementReport);
-                                        workflowService.activateInstance(tranSettlementReport.getWorkflowId(), tranSettlementReport.getId());
-                                    }
+//                                    boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(tranSettlementReport.getWorkflowId());
+//                                    // 不是退回的单子
+//                                    if (isStartWorkflow) {
+//                                        Workflow workflow = workflowService
+//                                                .findLatestWorkflowByBusinessCodeByApp(tranSettlementReport.getCompId(), "TRANSPORTATION-SETTLEMENT-REPORT");
+//                                        // 没配置审核流程，直接结束并处理信息
+//                                        if (workflow == null) {
+//                                            throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+//                                        }
+//                                        // 开启审核流
+//                                        else {
+//
+//                                            // 设置状态 已提交审核
+//                                            tranSettlementReport.setWorkflowId(workflow.getId());
+//                                            tranSettlementReportService.updateById(tranSettlementReport);
+//                                            workflowService.startInstance(workflow.getId(), tranSettlementReport.getId());
+//                                        }
+//                                    }
+//                                    // 退回的单子 再启用
+//                                    else {
+//
+//                                        tranSettlementReportService.updateById(tranSettlementReport);
+//                                        workflowService.activateInstance(tranSettlementReport.getWorkflowId(), tranSettlementReport.getId());
+//                                    }
                                 }
                             } else {
                                 throw new YException(YExceptionEnum.TRANTASK_NOT_CREATED_ERROR);
@@ -1653,31 +1655,33 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             }
                             tranSettlementReport.setLoadingImg(warehouseInOutInfo.getAddressUrl());
                             tranSettlementReport.setLoadingWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                            tranSettlementReport.setStatusFlag(StatusEnum.PENDING_PAY.getFlag());
+                            tranSettlementReport.setStatus(StatusEnum.PENDING_PAY.getName());
                             tranSettlementReportService.insert(tranSettlementReport);
-                            boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(tranSettlementReport.getWorkflowId());
-                            // 不是退回的单子
-                            if (isStartWorkflow) {
-                                Workflow workflow = workflowService
-                                        .findLatestWorkflowByBusinessCodeByApp(tranSettlementReport.getCompId(), "TRANSPORTATION-SETTLEMENT-REPORT");
-                                // 没配置审核流程，直接结束并处理信息
-                                if (workflow == null) {
-                                    throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
-                                }
-                                // 开启审核流
-                                else {
-
-                                    // 设置状态 已提交审核
-                                    tranSettlementReport.setWorkflowId(workflow.getId());
-                                    tranSettlementReportService.updateById(tranSettlementReport);
-                                    workflowService.startInstance(workflow.getId(), tranSettlementReport.getId());
-                                }
-                            }
-                            // 退回的单子 再启用
-                            else {
-
-                                tranSettlementReportService.updateById(tranSettlementReport);
-                                workflowService.activateInstance(tranSettlementReport.getWorkflowId(), tranSettlementReport.getId());
-                            }
+//                            boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(tranSettlementReport.getWorkflowId());
+//                            // 不是退回的单子
+//                            if (isStartWorkflow) {
+//                                Workflow workflow = workflowService
+//                                        .findLatestWorkflowByBusinessCodeByApp(tranSettlementReport.getCompId(), "TRANSPORTATION-SETTLEMENT-REPORT");
+//                                // 没配置审核流程，直接结束并处理信息
+//                                if (workflow == null) {
+//                                    throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+//                                }
+//                                // 开启审核流
+//                                else {
+//
+//                                    // 设置状态 已提交审核
+//                                    tranSettlementReport.setWorkflowId(workflow.getId());
+//                                    tranSettlementReportService.updateById(tranSettlementReport);
+//                                    workflowService.startInstance(workflow.getId(), tranSettlementReport.getId());
+//                                }
+//                            }
+//                            // 退回的单子 再启用
+//                            else {
+//
+//                                tranSettlementReportService.updateById(tranSettlementReport);
+//                                workflowService.activateInstance(tranSettlementReport.getWorkflowId(), tranSettlementReport.getId());
+//                            }
                         }
                     }
                     //运费大于0生成运费结算报表数据
@@ -2154,31 +2158,33 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             }
                             tranSettlementReport.setLoadingImg(warehouseInOutInfo.getAddressUrl());
                             tranSettlementReport.setLoadingWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                            tranSettlementReport.setStatusFlag(StatusEnum.PENDING_PAY.getFlag());
+                            tranSettlementReport.setStatus(StatusEnum.PENDING_PAY.getName());
                             tranSettlementReportService.insert(tranSettlementReport);
-                            boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(tranSettlementReport.getWorkflowId());
-                            // 不是退回的单子
-                            if (isStartWorkflow) {
-                                Workflow workflow = workflowService
-                                        .findLatestWorkflowByBusinessCodeByApp(tranSettlementReport.getCompId(), "TRANSPORTATION-SETTLEMENT-REPORT");
-                                // 没配置审核流程，直接结束并处理信息
-                                if (workflow == null) {
-                                    throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
-                                }
-                                // 开启审核流
-                                else {
-
-                                    // 设置状态 已提交审核
-                                    tranSettlementReport.setWorkflowId(workflow.getId());
-                                    tranSettlementReportService.updateById(tranSettlementReport);
-                                    workflowService.startInstance(workflow.getId(), tranSettlementReport.getId());
-                                }
-                            }
-                            // 退回的单子 再启用
-                            else {
-
-                                tranSettlementReportService.updateById(tranSettlementReport);
-                                workflowService.activateInstance(tranSettlementReport.getWorkflowId(), tranSettlementReport.getId());
-                            }
+//                            boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(tranSettlementReport.getWorkflowId());
+//                            // 不是退回的单子
+//                            if (isStartWorkflow) {
+//                                Workflow workflow = workflowService
+//                                        .findLatestWorkflowByBusinessCodeByApp(tranSettlementReport.getCompId(), "TRANSPORTATION-SETTLEMENT-REPORT");
+//                                // 没配置审核流程，直接结束并处理信息
+//                                if (workflow == null) {
+//                                    throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+//                                }
+//                                // 开启审核流
+//                                else {
+//
+//                                    // 设置状态 已提交审核
+//                                    tranSettlementReport.setWorkflowId(workflow.getId());
+//                                    tranSettlementReportService.updateById(tranSettlementReport);
+//                                    workflowService.startInstance(workflow.getId(), tranSettlementReport.getId());
+//                                }
+//                            }
+//                            // 退回的单子 再启用
+//                            else {
+//
+//                                tranSettlementReportService.updateById(tranSettlementReport);
+//                                workflowService.activateInstance(tranSettlementReport.getWorkflowId(), tranSettlementReport.getId());
+//                            }
                         }
                     }
                     if (warehouseBaseInfo != null) {
@@ -4158,31 +4164,33 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     }
                                     tranSettlementReport.setLoadingImg(warehouseInOutInfo.getAddressUrl());
                                     tranSettlementReport.setLoadingWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                                    tranSettlementReport.setStatusFlag(StatusEnum.PENDING_PAY.getFlag());
+                                    tranSettlementReport.setStatus(StatusEnum.PENDING_PAY.getName());
                                     tranSettlementReportService.insert(tranSettlementReport);
-                                    boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(tranSettlementReport.getWorkflowId());
-                                    // 不是退回的单子
-                                    if (isStartWorkflow) {
-                                        Workflow workflow = workflowService
-                                                .findLatestWorkflowByBusinessCodeByApp(tranSettlementReport.getCompId(), "TRANSPORTATION-SETTLEMENT-REPORT");
-                                        // 没配置审核流程，直接结束并处理信息
-                                        if (workflow == null) {
-                                            throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
-                                        }
-                                        // 开启审核流
-                                        else {
-
-                                            // 设置状态 已提交审核
-                                            tranSettlementReport.setWorkflowId(workflow.getId());
-                                            tranSettlementReportService.updateById(tranSettlementReport);
-                                            workflowService.startInstance(workflow.getId(), tranSettlementReport.getId());
-                                        }
-                                    }
-                                    // 退回的单子 再启用
-                                    else {
-
-                                        tranSettlementReportService.updateById(tranSettlementReport);
-                                        workflowService.activateInstance(tranSettlementReport.getWorkflowId(), tranSettlementReport.getId());
-                                    }
+//                                    boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(tranSettlementReport.getWorkflowId());
+//                                    // 不是退回的单子
+//                                    if (isStartWorkflow) {
+//                                        Workflow workflow = workflowService
+//                                                .findLatestWorkflowByBusinessCodeByApp(tranSettlementReport.getCompId(), "TRANSPORTATION-SETTLEMENT-REPORT");
+//                                        // 没配置审核流程，直接结束并处理信息
+//                                        if (workflow == null) {
+//                                            throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+//                                        }
+//                                        // 开启审核流
+//                                        else {
+//
+//                                            // 设置状态 已提交审核
+//                                            tranSettlementReport.setWorkflowId(workflow.getId());
+//                                            tranSettlementReportService.updateById(tranSettlementReport);
+//                                            workflowService.startInstance(workflow.getId(), tranSettlementReport.getId());
+//                                        }
+//                                    }
+//                                    // 退回的单子 再启用
+//                                    else {
+//
+//                                        tranSettlementReportService.updateById(tranSettlementReport);
+//                                        workflowService.activateInstance(tranSettlementReport.getWorkflowId(), tranSettlementReport.getId());
+//                                    }
                                 }
                             } else {
                                 throw new YException(YExceptionEnum.TRANTASK_NOT_CREATED_ERROR);
@@ -4315,31 +4323,33 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 }
                                 tranSettlementReport.setLoadingImg(warehouseInOutInfo.getAddressUrl());
                                 tranSettlementReport.setLoadingWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                                tranSettlementReport.setStatusFlag(StatusEnum.PENDING_PAY.getFlag());
+                                tranSettlementReport.setStatus(StatusEnum.PENDING_PAY.getName());
                                 tranSettlementReportService.insert(tranSettlementReport);
-                                boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(tranSettlementReport.getWorkflowId());
-                                // 不是退回的单子
-                                if (isStartWorkflow) {
-                                    Workflow workflow = workflowService
-                                            .findLatestWorkflowByBusinessCodeByApp(tranSettlementReport.getCompId(), "TRANSPORTATION-SETTLEMENT-REPORT");
-                                    // 没配置审核流程，直接结束并处理信息
-                                    if (workflow == null) {
-                                        throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
-                                    }
-                                    // 开启审核流
-                                    else {
-
-                                        // 设置状态 已提交审核
-                                        tranSettlementReport.setWorkflowId(workflow.getId());
-                                        tranSettlementReportService.updateById(tranSettlementReport);
-                                        workflowService.startInstance(workflow.getId(), tranSettlementReport.getId());
-                                    }
-                                }
-                                // 退回的单子 再启用
-                                else {
-
-                                    tranSettlementReportService.updateById(tranSettlementReport);
-                                    workflowService.activateInstance(tranSettlementReport.getWorkflowId(), tranSettlementReport.getId());
-                                }
+//                                boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(tranSettlementReport.getWorkflowId());
+//                                // 不是退回的单子
+//                                if (isStartWorkflow) {
+//                                    Workflow workflow = workflowService
+//                                            .findLatestWorkflowByBusinessCodeByApp(tranSettlementReport.getCompId(), "TRANSPORTATION-SETTLEMENT-REPORT");
+//                                    // 没配置审核流程，直接结束并处理信息
+//                                    if (workflow == null) {
+//                                        throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+//                                    }
+//                                    // 开启审核流
+//                                    else {
+//
+//                                        // 设置状态 已提交审核
+//                                        tranSettlementReport.setWorkflowId(workflow.getId());
+//                                        tranSettlementReportService.updateById(tranSettlementReport);
+//                                        workflowService.startInstance(workflow.getId(), tranSettlementReport.getId());
+//                                    }
+//                                }
+//                                // 退回的单子 再启用
+//                                else {
+//
+//                                    tranSettlementReportService.updateById(tranSettlementReport);
+//                                    workflowService.activateInstance(tranSettlementReport.getWorkflowId(), tranSettlementReport.getId());
+//                                }
                             }
                         }
                     }
@@ -4873,31 +4883,33 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         }
                         tranSettlementReport.setLoadingImg(warehouseInOutInfo.getAddressUrl());
                         tranSettlementReport.setLoadingWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                        tranSettlementReport.setStatusFlag(StatusEnum.PENDING_PAY.getFlag());
+                        tranSettlementReport.setStatus(StatusEnum.PENDING_PAY.getName());
                         tranSettlementReportService.insert(tranSettlementReport);
-                        boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(tranSettlementReport.getWorkflowId());
-                        // 不是退回的单子
-                        if (isStartWorkflow) {
-                            Workflow workflow = workflowService
-                                    .findLatestWorkflowByBusinessCodeByApp(tranSettlementReport.getCompId(), "TRANSPORTATION-SETTLEMENT-REPORT");
-                            // 没配置审核流程，直接结束并处理信息
-                            if (workflow == null) {
-                                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
-                            }
-                            // 开启审核流
-                            else {
-
-                                // 设置状态 已提交审核
-                                tranSettlementReport.setWorkflowId(workflow.getId());
-                                tranSettlementReportService.updateById(tranSettlementReport);
-                                workflowService.startInstance(workflow.getId(), tranSettlementReport.getId());
-                            }
-                        }
-                        // 退回的单子 再启用
-                        else {
-
-                            tranSettlementReportService.updateById(tranSettlementReport);
-                            workflowService.activateInstance(tranSettlementReport.getWorkflowId(), tranSettlementReport.getId());
-                        }
+//                        boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(tranSettlementReport.getWorkflowId());
+//                        // 不是退回的单子
+//                        if (isStartWorkflow) {
+//                            Workflow workflow = workflowService
+//                                    .findLatestWorkflowByBusinessCodeByApp(tranSettlementReport.getCompId(), "TRANSPORTATION-SETTLEMENT-REPORT");
+//                            // 没配置审核流程，直接结束并处理信息
+//                            if (workflow == null) {
+//                                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+//                            }
+//                            // 开启审核流
+//                            else {
+//
+//                                // 设置状态 已提交审核
+//                                tranSettlementReport.setWorkflowId(workflow.getId());
+//                                tranSettlementReportService.updateById(tranSettlementReport);
+//                                workflowService.startInstance(workflow.getId(), tranSettlementReport.getId());
+//                            }
+//                        }
+//                        // 退回的单子 再启用
+//                        else {
+//
+//                            tranSettlementReportService.updateById(tranSettlementReport);
+//                            workflowService.activateInstance(tranSettlementReport.getWorkflowId(), tranSettlementReport.getId());
+//                        }
                     }
                     if (warehouseBaseInfo != null) {
                         //出库时打入成本

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/workflow/FuelFingListener.java

@@ -38,8 +38,8 @@ public class FuelFingListener extends AbstractWorkflowTaskListener {
             }
         }
         if (processIsEnd) {
-            fuelFillingInfo.setStatusFlag(StatusEnum.ORDER_PASSED.getFlag());
-            fuelFillingInfo.setStatus(StatusEnum.ORDER_PASSED.getName());
+            fuelFillingInfo.setTravelStatus(StatusEnum.TRACK_SUCCESST.getName());
+            fuelFillingInfo.setTravelStatusFlag(StatusEnum.TRACK_SUCCESST.getFlag());
             fuelFillingInfo.setWorkflowId(null);
             fuelFillingInfo.setApproveStatus(null);
         } else {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/workflow/TranSettlementReportListener.java

@@ -62,8 +62,8 @@ public class TranSettlementReportListener extends AbstractWorkflowTaskListener {
                     settlementReport.setApproveStatus(batchReviewInfo.getApproveStatus());
                 }
 
+                tranSettlementReportService.updateAllColumnById(settlementReport);
             }
-            tranSettlementReportService.updateBatchById(tranSettlementReports);
 
         }
     }