Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java

@@ -269,20 +269,10 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
         Map<String, Object> variables = Convert.toMap(String.class, Object.class, scmVehicleReturnFlowQuery);
         BusinessVariables bv = BusinessVariables.builder().build();
         bv.setFormVariables(variables);
-        //判断车辆的状态是否包含采购退库的状态，如果是的话，返回审核失败
-        ResultBean<List<String>> vinNoList1 = scmVehicleReturnDetailsService.selectVinNoList(scmVehicleReturnFlowQuery.getBusinessSid());
-        if (vinNoList1.getSuccess() && vinNoList1.getData() != null && vinNoList1.getData().size() != 0) {
-            //查询车架号数组中是否有采购退库状态的车辆，若有则返回true，没有返回false
-            ResultBean<Boolean> stringResultBean = baseVehicleFeign.selectStateByVinNo(vinNoList1.getData());
-            if (stringResultBean.getSuccess()) {
-                if (stringResultBean.getData()) {
-                    return rb.setMsg("该申请中包含车辆状态已是采购退库状态的车辆");
-                }
-            }
-
+        boolean isTrue = isTrue(scmVehicleReturnFlowQuery.getBusinessSid());
+        if (isTrue) {
+            return rb.setMsg("该申请中包含车辆状态已是采购退库状态的车辆");
         }
-
-
         ResultBean<FlowTask> resultBean = flowTaskFeign.businessComplete(bv);
         if (!resultBean.getSuccess()) {
             return resultBean;
@@ -293,25 +283,14 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
         map.put("businessSid", variables.get("businessSid").toString());
         if (resultBean.getData() != null) {
             ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(resultBean.getData().getProcInsId());
-            if (listResultBean.getSuccess() && listResultBean.getData() != null && listResultBean.getData().size() != 0) {
+            if (listResultBean.getSuccess() && listResultBean.getData().size() != 0) {
                 nodeState = listResultBean.getData().get(0).getName_();
                 taskDefKey = listResultBean.getData().get(0).getTask_def_key_();
             } else {
-
                 nodeState = ProcessStateEnum.FINISHED.getStateName();
                 taskDefKey = "Event_end";
                 map.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
-                //更新车辆状态为采购退库中
-                ResultBean<List<String>> vinNoList = scmVehicleReturnDetailsService.selectVinNoList(scmVehicleReturnFlowQuery.getBusinessSid());
-                if (vinNoList.getSuccess() && vinNoList.getData() != null && vinNoList.getData().size() != 0) {
-                    String vehicleState = "0006";
-                    String vehicleStateValue = "采购退库中";
-                    BaseVehicleUpdateQuery baseVehicleUpdateQuery = new BaseVehicleUpdateQuery();
-                    baseVehicleUpdateQuery.setVehicleState(vehicleState);
-                    baseVehicleUpdateQuery.setVihicleStateValue(vehicleStateValue);
-                    baseVehicleUpdateQuery.setVinNoLis(vinNoList.getData());
-                    baseVehicleFeign.updateByVinNo(baseVehicleUpdateQuery);
-                }
+                updateByVinNo(scmVehicleReturnFlowQuery.getBusinessSid());
 
 
             }
@@ -319,7 +298,42 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
         map.put("nodeState", nodeState);
         map.put("taskDefKey", taskDefKey);
         sysFormLinkFeign.updateFiled(map);
-        return new ResultBean().success();
+        return rb.success();
+    }
+
+    public Boolean isTrue(String businessSid) {
+        //判断车辆的状态是否包含采购退库的状态，如果是的话，返回审核失败
+        boolean isTrue = false;
+        ResultBean<List<String>> vinNoList1 = scmVehicleReturnDetailsService.selectVinNoList(businessSid);
+        if (vinNoList1.getSuccess() && vinNoList1.getData().size() != 0) {
+            //查询车架号数组中是否有采购退库状态的车辆，若有则返回true，没有返回false
+            ResultBean<Boolean> stringResultBean = baseVehicleFeign.selectStateByVinNo(vinNoList1.getData());
+            if (stringResultBean.getSuccess()) {
+                isTrue = stringResultBean.getData();
+            }
+        }
+        return isTrue;
+    }
+
+    /**
+     * 审核通过更新车辆状态为采购退库中
+     *
+     * @param businessSid 业务sid
+     */
+    public void updateByVinNo(String businessSid) {
+        //更新车辆状态为采购退库中
+        ResultBean<List<String>> vinNoList = scmVehicleReturnDetailsService.selectVinNoList(businessSid);
+        if (vinNoList.getSuccess()) {
+            if (vinNoList.getData().size() != 0) {
+                String vehicleState = "0006";
+                String vehicleStateValue = "采购退库中";
+                BaseVehicleUpdateQuery baseVehicleUpdateQuery = new BaseVehicleUpdateQuery();
+                baseVehicleUpdateQuery.setVehicleState(vehicleState);
+                baseVehicleUpdateQuery.setVihicleStateValue(vehicleStateValue);
+                baseVehicleUpdateQuery.setVinNoLis(vinNoList.getData());
+                baseVehicleFeign.updateByVinNo(baseVehicleUpdateQuery);
+            }
+        }
     }
 
     /**