问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyFeign.java

@@ -107,6 +107,10 @@ public interface BaseShuntingInvoicingApplyFeign {
     @PostMapping("/callInOrgToCallOutOrg")
     public ResultBean callInOrgToCallOutOrg(@Valid @RequestBody BaseShuntingInvoicingApplyCompleteDto query);
 
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/callOutSaleManageExa")
+    public ResultBean callOutSaleManageExa(@Valid @RequestBody BaseShuntingInvoicingApplyCompleteDto query);
+
     @ApiOperation(value = "获取上一个环节")
     @GetMapping(value = "/getPreviousNodesForReject")
     ResultBean getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyFeignFallback.java

@@ -96,6 +96,11 @@ public class BaseShuntingInvoicingApplyFeignFallback implements BaseShuntingInvo
 		return null;
 	}
 
+	@Override
+	public ResultBean callOutSaleManageExa(BaseShuntingInvoicingApplyCompleteDto query) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
 		return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java

@@ -98,6 +98,10 @@ public interface BusVehicleOrderFeign {
     @GetMapping("/selectDetails")
     ResultBean<BusVehicleOrderDetailsVo> selectDetails(@RequestParam("sid") String sid);
 
+    @ApiOperation("入账审批通关修改采购订单状态")
+    @PostMapping("/updateState")
+    ResultBean updateState(@RequestParam("vehicleOrderSid") String vehicleOrderSid);
+
     /******************************** App接口 ********************************/
 
     @ApiOperation("手机端排产车分页列表")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java

@@ -87,6 +87,11 @@ public class BusVehicleOrderFeignFallback implements BusVehicleOrderFeign {
         return null;
     }
 
+    @Override
+    public ResultBean updateState(String vehicleOrderSid) {
+        return null;
+    }
+
     @Override
     public ResultBean<PagerVo<AppProductionSchedulingByPageVo>> getAppProductionSchedulingByPageList(PagerQuery<AppProductionSchedulingByPageQuery> pagerQuery) {
         return null;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyRest.java

@@ -122,6 +122,14 @@ public class BaseShuntingInvoicingApplyRest implements BaseShuntingInvoicingAppl
 		return baseShuntingInvoicingApplyService.callInOrgToCallOutOrg(bv);
 	}
 
+	@Override
+	public ResultBean callOutSaleManageExa(BaseShuntingInvoicingApplyCompleteDto query) {
+		BusinessVariables bv = new BusinessVariables();
+		BeanUtil.copyProperties(query, bv);
+		bv.setModelId(ProcDefEnum.BASESHUNINVOICAPPLY.getProDefId());
+		return baseShuntingInvoicingApplyService.callOutSaleManageExa(bv);
+	}
+
 	@Override
 	public ResultBean getPreviousNodesForReject(GetNodeQuery query) {
 		return baseShuntingInvoicingApplyService.getPreviousNodesForReject(query);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java

@@ -42,6 +42,7 @@ import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeQuery;
 import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
 import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService;
 import com.yxt.anrui.base.biz.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehService;
+import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@@ -97,6 +98,8 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
     private FlowableFeign flowableFeign;
     @Autowired
     private FlowTaskFeign flowTaskFeign;
+    @Autowired
+    private BaseVehicleCertificateService baseVehicleCertificateService;
 
     private QueryWrapper<BaseShuntingInvoicingApply> createQueryWrapper(BaseShuntingInvoicingApplyQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -336,6 +339,25 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
         return handleProcess(bv, rb, baseShuntingInvoicingApply);
     }
 
+    public ResultBean callOutSaleManageExa(BusinessVariables bv) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseShuntingInvoicingApply baseShuntingInvoicingApply = fetchBySid(bv.getBusinessSid());
+        List<BaseShuntingInvoicinApplyeVehDetailsVo> baseShuntingInvoicinApplyeVehDetailsVos = baseShuntingInvoicinApplyeVehService.fetchByMainSid(bv.getBusinessSid());
+        if (bv.getTaskId().equals(baseShuntingInvoicingApply.getTaskId())) {
+            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+            if (!resultBean.getSuccess()) {
+                return rb.setMsg(resultBean.getMsg());
+            }
+            updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+            for (BaseShuntingInvoicinApplyeVehDetailsVo baseShuntingInvoicinApplyeVehDetailsVo : baseShuntingInvoicinApplyeVehDetailsVos) {
+                baseVehicleCertificateService.updateCertificateState(baseShuntingInvoicinApplyeVehDetailsVo.getVinNo());
+            }
+            return rb.success().setData(resultBean.getData());
+        } else {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+    }
+
     /**
      * 流程流转：调入到调出  跨分公司
      *
@@ -484,5 +506,4 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
         }
         return rb.setMsg("操作失败!提交的数据不一致!");
     }
-
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java

@@ -279,7 +279,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      * @param vehicleStateValue 车辆状态vlaue
      * @return
      */
-    ResultBean updateByVinNo(@Param("vinNoList") List<String> stringList, @Param("vehicleState") String vehicleState, @Param("vehicleStateValue") String vehicleStateValue);
+    void updateByVinNo(@Param("vinNoList") List<String> stringList, @Param("vehicleState") String vehicleState, @Param("vehicleStateValue") String vehicleStateValue);
 
     /**
      * 询该车辆数组中是否包含车辆状态为采购退库状态的车辆，若有返回true，没有则返回false

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -681,7 +681,7 @@
 
     <update id="updateByVinNo">
         update base_vehicle
-        set vehicleState = #{vehicleState} and vehicleStateValue = #{vehicleStateValue}
+        set vehicleState = #{vehicleState},vehicleStateValue = #{vehicleStateValue}
         where vinNo in
         <foreach item="vinNo" collection="vinNoList" open="(" separator="," close=")">
             #{vinNo}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -1053,6 +1053,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             if (params.getVinNoList().size() > 0) {
                 qw.notIn("bv.vinNo", params.getVinNoList());
             }
+            qw.eq("bv.isDelete",0);
             //锁定状态
             qw.eq("bv.lockedState", VehicleState.LockEnum.UN_LOCK.getCode());
 //            qw.and(wrapper -> wrapper.isNull("bv.lockedStateValue").or().eq("bv.lockedStateValue", ""));
@@ -1069,10 +1070,12 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      * @return
      */
     public ResultBean updateByVinNo(BaseVehicleUpdateQuery baseVehicleUpdateQuery) {
+        ResultBean rb = ResultBean.fireFail();
         List<String> stringList = baseVehicleUpdateQuery.getVinNoLis();
         String vehicleState = baseVehicleUpdateQuery.getVehicleState();
         String vehicleStateValue = baseVehicleUpdateQuery.getVihicleStateValue();
-        return baseMapper.updateByVinNo(stringList, vehicleState, vehicleStateValue);
+        baseMapper.updateByVinNo(stringList, vehicleState, vehicleStateValue);
+        return rb.success().setMsg("更新成功");
     }
 
     /**

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java

@@ -89,4 +89,7 @@ public interface BaseVehicleCertificateMapper extends BaseMapper<BaseVehicleCert
     int checkByCertificationNo(String certificationNo);
 
     BaseVehicleCertificateVo selStateByVehicleSid(@Param("sid") String sid);
+
+    @Update("update base_vehicle_certificate set certificateState = 003,certificateStateValue = '待转' where vinNo = #{vinNo}")
+    void updateCertificateState(String vinNo);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java

@@ -161,4 +161,8 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
     public int checkByCertificationNo(String certificationNo) {
         return baseMapper.checkByCertificationNo(certificationNo);
     }
+
+    public void updateCertificateState(String vinNo) {
+        baseMapper.updateCertificateState(vinNo);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.java

@@ -35,6 +35,7 @@ import com.yxt.anrui.base.api.busvehicleorder.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -112,4 +113,7 @@ public interface BusVehicleOrderMapper extends BaseMapper<BusVehicleOrder> {
     List<AppOrderReadyCar> getAppReadyCar(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
 
     String getContractPrice(String sid);
+
+    @Update("update bus_vehicle_order set state = 1 where sid = #{vehicleOrderSid}")
+    void updateState(String vehicleOrderSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java

@@ -162,6 +162,11 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign {
         return rb.success().setData(vo);
     }
 
+    @Override
+    public ResultBean updateState(String vehicleOrderSid) {
+        return busVehicleOrderService.updateState(vehicleOrderSid);
+    }
+
     /**
      * 手机端排产车分页列表
      *

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java

@@ -512,4 +512,10 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
         }
         return rb.success();
     }
+
+    public ResultBean updateState(String vehicleOrderSid) {
+        ResultBean rb = ResultBean.fireFail();
+        baseMapper.updateState(vehicleOrderSid);
+        return rb.success().setMsg("更新成功");
+    }
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java

@@ -40,4 +40,6 @@ public class ScmVehicleReturnDetailsVo implements Vo {
     private String createBySid;
     @ApiModelProperty(value = "分公司sid")
     private String createOrgSid;
+    @ApiModelProperty(value = "taskId")
+    private String taskId;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java

@@ -26,7 +26,7 @@ public class ScmVehicleReturnDto implements Dto {
     private String applicationCode;*/
     @ApiModelProperty(value = "申请人sid", required = true)
     @NotBlank(message = "申请人不能为空")
-    private String userSid;
+    private String createBySid;
     @ApiModelProperty(value = "申请人", required = true)
     @NotBlank(message = "申请人不能为空")
     private String name;
@@ -60,8 +60,6 @@ public class ScmVehicleReturnDto implements Dto {
 
     @ApiModelProperty(value = "费用说明")
     private String remarks;
-    @ApiModelProperty(value = "createBySid")
-    private String createBySid;
     @ApiModelProperty(value = "分公司名称")
     private String orgName;
     @ApiModelProperty(value = "分公司sid")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFeign.java

@@ -1,14 +1,18 @@
 package com.yxt.anrui.scm.api.scmvehiclereturn;
 
 import com.yxt.anrui.scm.api.flow.FlowTaskVo;
+import com.yxt.anrui.scm.api.scmvehiclereturn.flow.GetNodeQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
+
 /**
  * @Author dimengzhe
  * @Date 2022/4/6 16:39
@@ -52,6 +56,11 @@ public interface ScmVehicleReturnFeign {
     @ResponseBody
     public ResultBean complete(@RequestBody ScmVehicleReturnFlowQuery scmVehicleReturnFlowQuery);
 
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/companyToDivisionOperate")
+    @ResponseBody
+    public ResultBean companyToDivisionOperate(@RequestBody ScmVehicleReturnFlowQuery scmVehicleReturnFlowQuery);
+
     @ApiOperation(value = "终止任务")
     @PostMapping("/breakProcess")
     @ResponseBody
@@ -61,15 +70,16 @@ public interface ScmVehicleReturnFeign {
     @PostMapping("/revokeProcess")
     @ResponseBody
     ResultBean revokeProcess( @ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo);
+
     @ApiOperation(value = "获取上一个环节")
-    @PostMapping("/getPreviousNodesForReject")
+    @GetMapping("/getPreviousNodesForReject")
     @ResponseBody
-    ResultBean getPreviousNodesForReject(@ApiParam(value = "变量集合,json对象") @RequestBody ScmVehicleReturnFlowDto dto);
+    ResultBean getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
 
     @ApiOperation("获取下一个环节_提交")
     @PostMapping("/getNextNodesForSubmit")
     @ResponseBody
-    ResultBean getNextNodesForSubmit(@RequestBody ScmVehicleReturnDto scmVehicleReturnDto);
+    ResultBean getNextNodesForSubmit(@Valid @RequestBody GetNodeQuery query);
 
     @ApiOperation(value = "驳回任务")
     @PostMapping("/reject")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java

@@ -14,18 +14,10 @@ public class ScmVehicleReturnQuery implements Query {
     private static final long serialVersionUID = 3301749651674469965L;
     @ApiModelProperty(value = "开始日期")
     private String applyDateStart;
-
     @ApiModelProperty(value = "结束日期")
     private String applyDateEnd;
-
     @ApiModelProperty(value = "节点状态")
     private String nodeState;
-
     @ApiModelProperty(value = "用户sid")
     private String userSid;
-
-    @ApiModelProperty(value = "分公司sid")
-    private String createOrgSid;
-
-
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/flow/GetNodeQuery.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.scm.api.scmvehiclereturn.flow;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Map;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 10:42
+ * @Description
+ */
+@Data
+public class GetNodeQuery implements Query {
+    private static final long serialVersionUID = -5674867230708197611L;
+
+    @ApiModelProperty(value = "环节定义id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+
+    @ApiModelProperty(value = "分支字段及业务字段")
+    private Map<String, Object> formVariables;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/flow/GetNodeVo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.scm.api.scmvehiclereturn.flow;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 11:09
+ * @Description
+ */
+@Data
+public class GetNodeVo implements Vo {
+    private static final long serialVersionUID = 8802774014747063504L;
+    @ApiModelProperty(value = "节点名称")
+    private String name;
+    @ApiModelProperty(value = "节点id")
+    private String id;
+    @ApiModelProperty(value = "审批组")
+    private List<String> candidateGroups;
+    @ApiModelProperty(value = "是否是最后环节")
+    private String endTask;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/flow/ScmVehicleReturnCompleteDto.java

@@ -0,0 +1,42 @@
+package com.yxt.anrui.scm.api.scmvehiclereturn.flow;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 9:01
+ * @Description
+ */
+@Data
+public class ScmVehicleReturnCompleteDto implements Dto {
+    private static final long serialVersionUID = 3240453987322803352L;
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "用户全路径sid")
+    @NotBlank(message = "参数错误：orgSidPath")
+    private String orgSidPath;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id")
+    @NotBlank(message = "参数错误：instanceId")
+    private String instanceId;
+    @ApiModelProperty(value = "意见")
+//    @NotBlank(message = "参数错误：comment")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    @ApiModelProperty(value = "分支字段及业务字段")
+    private Map<String, Object> formVariables = new HashMap<>();
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/flow/ScmVehicleReturnTaskQuery.java

@@ -0,0 +1,56 @@
+package com.yxt.anrui.scm.api.scmvehiclereturn.flow;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 17:29
+ * @Description 终止、撤回、驳回查询参数
+ */
+@Data
+public class ScmVehicleReturnTaskQuery implements Query {
+    private static final long serialVersionUID = -4006020771892400451L;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("任务Id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    /**
+     * 终止、驳回
+     */
+    @ApiModelProperty("任务意见")
+    private String comment;
+    /**
+     * 终止、撤回、驳回
+     */
+    @ApiModelProperty("用户Sid")
+    private String userSid;
+    /**
+     * 终止
+     */
+    @ApiModelProperty("流程实例Id")
+    private String instanceId;
+    /*@ApiModelProperty("用户Id")
+    private String userId;
+    @ApiModelProperty("节点")
+    private String targetKey;
+    @ApiModelProperty("流程变量信息")
+    private Map<String, Object> values = new HashMap<>();
+    @ApiModelProperty("审批人")
+    private String assignee;
+    @ApiModelProperty("候选人")
+    private List<String> candidateUsers = new ArrayList<>();
+    @ApiModelProperty("审批组")
+    private List<String> candidateGroups = new ArrayList<>();*/
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/flow/SubmitScmVehicleReturnDto.java

@@ -0,0 +1,29 @@
+package com.yxt.anrui.scm.api.scmvehiclereturn.flow;
+
+import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundDto;
+import com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturnDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/27 13:38
+ * @Description
+ */
+@Data
+public class SubmitScmVehicleReturnDto extends ScmVehicleReturnDto {
+    private static final long serialVersionUID = 378585162071125756L;
+    /*@ApiModelProperty("意见")
+    private String comment;*/
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+   /* @ApiModelProperty("业务sid")
+    private String businessSid;
+    @ApiModelProperty("流程定义id")
+    private String modelId;
+    @ApiModelProperty("下一环节的代办人sid")
+    private String nextNodeUserSids;*/
+
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
@@ -66,6 +67,8 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
     @Autowired
     private ScmApplyInboundVehicleService scmApplyInboundVehicleService;
     @Autowired
+    private ScmApplyInboundService scmApplyInboundService;
+    @Autowired
     private SysUserFeign sysUserFeign;
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
@@ -85,6 +88,8 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
     private ScmFileService scmFileService;
     @Autowired
     private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private BusVehicleOrderFeign busVehicleOrderFeign;
 
     public PagerVo<ScmApplyInbound> listPage(PagerQuery<ScmApplyInboundQuery> pq) {
         ScmApplyInboundQuery query = pq.getParams();
@@ -408,6 +413,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             }
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+                ScmApplyInbound scmApplyInbound = scmApplyInboundService.fetchBySid(businessSid);
                 List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos = scmApplyInboundVehicleService.fetchByMainSid(businessSid);
                 List<BaseVehicleDto> baseVehicleDtos = new ArrayList<>();
                 for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : scmApplyInboundVehicleDtos) {
@@ -466,6 +472,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                     baseVehicleDtos.add(baseVehicleDto);
                 }
                 baseVehicleFeign.saveAll(baseVehicleDtos);
+                busVehicleOrderFeign.updateState(scmApplyInbound.getVehicleOrderSid());
             }
             return rb.success().setData(resultBean.getData());
         } else {

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

@@ -15,7 +15,7 @@
     </select>
 
     <select id="details" resultType="com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturnDetailsVo">
-        select sid, DATE_FORMAT(createTime, '%Y-%m-%d') as createTime, reason, applicationName as name, money, remarks,applicationCode,orgName
+        select sid, DATE_FORMAT(createTime, '%Y-%m-%d') as createTime, reason, applicationName as name, money, remarks,applicationCode,orgName,createBySid,createOrgSid,taskId
         from scm_vehicle_return
         where sid = #{sid}
     </select>

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

@@ -4,15 +4,14 @@ import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.scm.api.flow.FlowTaskVo;
+import com.yxt.anrui.scm.api.scmvehiclereturn.flow.GetNodeQuery;
 import com.yxt.anrui.scm.api.scmvehiclereturn.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
@@ -56,8 +55,8 @@ public class ScmVehicleReturnRest implements ScmVehicleReturnFeign {
     }
 
     @Override
-    public ResultBean getNextNodesForSubmit(ScmVehicleReturnDto scmVehicleReturnDto) {
-        return scmVehicleReturnService.getNextNodesForSubmit(scmVehicleReturnDto);
+    public ResultBean getNextNodesForSubmit(GetNodeQuery query) {
+        return scmVehicleReturnService.getNextNodesForSubmit(query);
     }
 
     @Override
@@ -73,6 +72,16 @@ public class ScmVehicleReturnRest implements ScmVehicleReturnFeign {
         bv.setFormVariables(BeanUtil.beanToMap(bvd));
         return scmVehicleReturnService.complete(bv);
     }
+
+    @Override
+    public ResultBean companyToDivisionOperate(ScmVehicleReturnFlowQuery scmVehicleReturnFlowQuery) {
+        BusinessVariables bv=new BusinessVariables();
+        BeanUtil.copyProperties(scmVehicleReturnFlowQuery,bv);
+        bv.setModelId(ProcDefEnum.SCMVEHICLERETURN.getProDefId());
+        bv.setFormVariables(BeanUtil.beanToMap(scmVehicleReturnFlowQuery));
+        return scmVehicleReturnService.companyToDivisionOperate(bv);
+    }
+
     @Override
     public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
         return scmVehicleReturnService.breakProcess(flowTaskVo);
@@ -84,7 +93,7 @@ public class ScmVehicleReturnRest implements ScmVehicleReturnFeign {
     }
 
     @Override
-    public ResultBean getPreviousNodesForReject(ScmVehicleReturnFlowDto dto) {
-        return scmVehicleReturnService.getPreviousNodesForReject(dto);
+    public ResultBean getPreviousNodesForReject(GetNodeQuery query) {
+        return scmVehicleReturnService.getPreviousNodesForReject(query);
     }
 }

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

@@ -2,13 +2,16 @@ package com.yxt.anrui.scm.biz.scmvehiclereturn;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchase;
 import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareDto;
 import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareFeign;
 import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehDto;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleUpdateQuery;
+import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
@@ -25,11 +28,9 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
-import com.yxt.anrui.portal.api.sysuser.SysUser;
-import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
-import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.portal.api.sysuser.*;
 import com.yxt.anrui.scm.api.scmvehiclereturn.*;
+import com.yxt.anrui.scm.api.scmvehiclereturn.flow.GetNodeQuery;
 import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetails;
 import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetailsDto;
 import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetailssVo;
@@ -49,10 +50,8 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Author dimengzhe
@@ -102,7 +101,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
             String money = scmVehicleReturnDto.getMoney();
             BigDecimal mo = new BigDecimal(money);
             scmVehicleReturn.setMoney(mo);
-            scmVehicleReturn.setCreateBySid(scmVehicleReturnDto.getUserSid());
+            scmVehicleReturn.setCreateBySid(scmVehicleReturnDto.getCreateBySid());
             scmVehicleReturn.setApplicationName(scmVehicleReturnDto.getName());
             boolean isSave = save(scmVehicleReturn);
             if (!isSave) {
@@ -178,7 +177,6 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
             if (StringUtils.isNotBlank(params.getUserSid())) {
                 qw.eq("sr.createBySid", params.getUserSid());
             }
-            qw.eq("sr.createOrgSid",params.getCreateOrgSid());
         }
         IPage<ScmVehicleReturnVo> pagging = baseMapper.pagerList(page, qw);
         PagerVo<ScmVehicleReturnVo> p = PagerUtil.pageToVo(pagging, null);
@@ -193,7 +191,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
         }
         Map<String, Object> variables = BeanUtil.beanToMap(scmVehicleReturnDto);
         variables.put("isLoan", new BigDecimal(scmVehicleReturnDto.getMoney()).compareTo(new BigDecimal("0")) > 0);
-        ResultBean<SysUserInfoVo> sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(scmVehicleReturnDto.getUserSid());
+        ResultBean<SysUserInfoVo> sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(scmVehicleReturnDto.getCreateBySid());
         //取组织架构的全路径sid
         SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserInfoVoResultBean.getData().getStaffSid()).getData();
         String orgSidPath = sysStaffOrg.getOrgSidPath();
@@ -205,6 +203,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
      /*   if (scmVehicleReturnDto.getDetailsList().size() == 0) {
             return rb.setMsg("请选择需要退库的车辆");
         }*/
+        scmVehicleReturnDto.setBusinessSid(scmVehicleReturnDto.getSid());
         String busSid = scmVehicleReturnDto.getBusinessSid();
         if (org.apache.commons.lang3.StringUtils.isBlank(busSid)) {
             ResultBean resultBean = saveOrUpdateVehicleReturn(scmVehicleReturnDto);
@@ -213,7 +212,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
             BeanUtil.copyProperties(scmVehicleReturnDto, bv);
             bv.setOrgSidPath(orgSidPath);
             bv.setBusinessSid(businessSid);
-            bv.setUserSid(scmVehicleReturnDto.getUserSid());
+            bv.setUserSid(scmVehicleReturnDto.getCreateBySid());
             variables.put("businessSid", businessSid);
             bv.setFormVariables(variables);
             bv.setModelId(ProcDefEnum.SCMVEHICLERETURN.getProDefId());
@@ -247,7 +246,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
         BeanUtil.copyProperties(dto, bv);
         bv.setOrgSidPath(orgSidPath);
         bv.setBusinessSid(businessSid);
-        bv.setUserSid(dto.getUserSid());
+        bv.setUserSid(dto.getCreateBySid());
         variables.put("businessSid", businessSid);
         bv.setFormVariables(variables);
         bv.setModelId(ProcDefEnum.SCMVEHICLERETURN.getProDefId());
@@ -320,7 +319,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
                 BaseManufacturerRetwareDto brd=new BaseManufacturerRetwareDto();
                 brd.setSource("采购退库"); // 来源
                 brd.setOperatorName(booad.getName()); // 操作人姓名
-                brd.setCreateBySid(booad.getUserSid());
+                brd.setCreateBySid(booad.getCreateBySid());
                 brd.setApplyName(booad.getName()); // 申请人姓名
                 SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
                 brd.setAppluDate(sdf.format(booad.getCreateTime())); // 申请日期
@@ -344,6 +343,41 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
         }
     }
 
+    public ResultBean companyToDivisionOperate(BusinessVariables bv) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmVehicleReturn scmVehicleReturn = fetchBySid(bv.getBusinessSid());
+        ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
+        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+        List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+        List<String> candidateGroups = voList.get(0).getCandidateGroups();
+        UserQuery userQuery = new UserQuery();
+        userQuery.setRoleSid(candidateGroups.get(0));
+        userQuery.setOrgSidPath("");
+        List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
+        StringBuilder nextNodeUserSids = new StringBuilder();
+        if (sysUserVos.size() > 0) {
+            for (SysUserVo sysUserVo : sysUserVos) {
+                String sid = sysUserVo.getSid();
+                nextNodeUserSids.append(sid).append(",");
+            }
+        }
+        if (org.apache.commons.lang3.StringUtils.isBlank(nextNodeUserSids)) {
+            return rb.setMsg("下一环节暂无操作人员");
+        }
+        String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
+        bv.setNextNodeUserSids(substring);
+        if (bv.getTaskId().equals(scmVehicleReturn.getTaskId())) {
+            ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.handleProsess(bv);
+            if (!resultBean1.getSuccess()) {
+                return rb.setMsg(resultBean1.getMsg());
+            }
+            updateFlowFiled(BeanUtil.beanToMap(resultBean1.getData()));
+            return rb.success().setData(resultBean1.getData());
+        } else {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+    }
+
 
     /**
      * 更新流程相关的状态
@@ -509,7 +543,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
     }
 
     public String getApplyCode(ScmVehicleReturnDto dto) {
-        String userSid = dto.getUserSid();
+        String userSid = dto.getCreateBySid();
         //获取分公司sid
         ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
         ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
@@ -540,23 +574,24 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
         return rb.success().setMsg("删除成功");
     }
 
-    public ResultBean getNextNodesForSubmit(ScmVehicleReturnDto scmVehicleReturnDto) {
+    public ResultBean getNextNodesForSubmit(GetNodeQuery query) {
         BusinessVariables bv = new BusinessVariables();
         bv.setModelId(ProcDefEnum.SCMVEHICLERETURN.getProDefId());
-        bv.setTaskDefKey(scmVehicleReturnDto.getTaskDefKey());
-        bv.setFormVariables(BeanUtil.beanToMap(scmVehicleReturnDto));
-        bv.getFormVariables().put("isLoan", new BigDecimal(scmVehicleReturnDto.getMoney()).compareTo(new BigDecimal("0")) > 0);
+        bv.setTaskDefKey(query.getTaskDefKey());
+        bv.setFormVariables(BeanUtil.beanToMap(query));
+        String money = query.getFormVariables().get("money").toString();
+        bv.getFormVariables().put("isLoan", new BigDecimal(money).compareTo(new BigDecimal("0")) > 0);
         ResultBean processCirculationNodesByMap = flowTaskFeign.getNextNodesForSubmit(bv);
         processCirculationNodesByMap.setCode("200");
         processCirculationNodesByMap.setSuccess(true);
         return processCirculationNodesByMap;
     }
 
-    public ResultBean getPreviousNodesForReject(ScmVehicleReturnFlowDto dto) {
+    public ResultBean getPreviousNodesForReject(GetNodeQuery query) {
         BusinessVariables bv = new BusinessVariables();
-        bv.setTaskDefKey(dto.getTaskDefKey());
+        bv.setTaskDefKey(query.getTaskDefKey());
         bv.setModelId(ProcDefEnum.SCMVEHICLERETURN.getProDefId());
-        bv.setFormVariables(BeanUtil.beanToMap(dto));
+        bv.setFormVariables(BeanUtil.beanToMap(query));
         ResultBean processCirculationNodesByMap = flowTaskFeign.getPreviousNodesForReject(bv);
         processCirculationNodesByMap.setCode("200");
         processCirculationNodesByMap.setSuccess(true);