用友出库

platform-activiti/src/main/java/com/platform/activiti/enums/ActApplyEnum.java

@@ -21,7 +21,8 @@ public enum ActApplyEnum {
     SUPPLIER("supplier", "设备报废审批"),
     PURCHASE_APPLY("purchase_apply", "设备报废审批"),
     PURCHASE_APPLY_SPECIAL("purchase_apply_special", "设备报废审批"),
-    SB_INFO_SCRAP("sb_info_scrap", "设备报废审批");
+    SB_INFO_SCRAP("sb_info_scrap", "设备报废审批"),
+    OUT_STORE_BACK("out_store_back", "仓库审批");
     /**
      * 类型
      */

platform-dao/src/main/java/com/platform/dao/dto/store/OutStoreFormDTO.java

@@ -24,6 +24,10 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class OutStoreFormDTO extends BaseDTO implements Serializable {
+    /**
+     * 工作流实例ID
+     */
+    private String processInstanceId;
     /**
      * 使用公司
      */

platform-dao/src/main/java/com/platform/dao/entity/store/OutStoreForm.java

@@ -22,6 +22,10 @@ import javax.persistence.Transient;
 @Accessors(chain = true)
 @Table(name = "t_out_store_form")
 public class OutStoreForm implements Serializable{
+    /**
+     * 工作流实例ID
+     */
+    private String processInstanceId;
     /**
      * 总价
      */

platform-dao/src/main/java/com/platform/dao/enums/OutStoreStatusEnum.java

@@ -13,15 +13,15 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum OutStoreStatusEnum {
     /**
-     * 新建
+     * 新建,未提交审核
      */
     CREATED(0),
     /**
-     * 未出库：待审核（等待主管审核）
+     * 已提交：待审核（等待主管审核）
      */
     NOT_EXECUTE(1),
     /**
-     * 已出库：提交到用友审核
+     * 主管审核通过：自动提交到用友审核：待仓库出库
      */
     EXECUTING(2),
     /**

platform-dao/src/main/java/com/platform/dao/vo/query/store/OutStoreFormVO.java

@@ -26,7 +26,10 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class OutStoreFormVO extends BaseVO implements Serializable {
     private Integer roleFlag;
-
+    /**
+     * 工作流实例ID
+     */
+    private String processInstanceId;
     /**
      * 主键
      */

platform-dao/src/main/resources/mapper/store/OutStoreFormMapper.xml

@@ -2,13 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.platform.dao.mapper.store.OutStoreFormMapper">
     <sql id="Base_Column_List">
-                             outstoreform.id,
+        outstoreform
+        .
+        id
+        ,
                              outstoreform.total_price,
                                      outstoreform.out_no,
                                      outstoreform.type,
                                      outstoreform.yy_id,
                                      outstoreform.pick_id,
                                      outstoreform.pick_no,
+outstoreform.process_instance_id,
                                      outstoreform.remark,
                                      outstoreform.is_out,
                                      outstoreform.created_user_id,
@@ -21,9 +25,12 @@
                                      outstoreform.created_time,
                                      outstoreform.user_time,
                                      outstoreform.update_time
-                        </sql>
+    </sql>
     <sql id="Ref_Column_List">
-                                                                         outstoreform.out_no,
+        outstoreform
+        .
+        out_no
+        ,
                                       outstoreform.total_price,
                                        outstoreform.status,
                                      outstoreform.yy_id,
@@ -34,8 +41,9 @@
                                      outstoreform.user_time,
                                      outstoreform.is_out,
                                      outstoreform.store_name,
-                                     outstoreform.remark,
-                                                                                                                                                                                                                                                                                                </sql>
+outstoreform.process_instance_id,
+                                     outstoreform.remark
+    </sql>
     <sql id="List_Condition">
         <if test="storeIdList != null and storeIdList.size > 0">
             and outstoreform.store_id in
@@ -52,6 +60,9 @@
         <if test="pickId != null and pickId != ''">
             and outstoreform.pick_id = #{pickId}
         </if>
+        <if test="processInstanceId != null">
+            and outstoreform.process_instance_id = #{processInstanceId}
+        </if>
         <if test="isOut != null">
             and outstoreform.is_out = #{isOut}
         </if>
@@ -146,12 +157,12 @@
         </where>
     </select>
 
-<!--    <select id="selectOutStoreList" parameterType="com.platform.dao.dto.store.OutStoreFormDTO"-->
-<!--            resultType="com.platform.dao.vo.query.store.OutStoreFormVO">-->
-<!-- select detail.*,form.status-->
-<!--        from t_out_store_detail detail-->
-<!--        left join  t_out_store_form form on form.id = detail.out_id-->
-<!--    </select>-->
+    <!--    <select id="selectOutStoreList" parameterType="com.platform.dao.dto.store.OutStoreFormDTO"-->
+    <!--            resultType="com.platform.dao.vo.query.store.OutStoreFormVO">-->
+    <!-- select detail.*,form.status-->
+    <!--        from t_out_store_detail detail-->
+    <!--        left join  t_out_store_form form on form.id = detail.out_id-->
+    <!--    </select>-->
 
     <!--<select id="selectDetailList"  resultType="com.platform.dao.vo.query.store.OutStoreDetailVO">
         select detail.*,
@@ -166,7 +177,7 @@
         left join t_spare_part_info spareinfo on spareinfo.id = detail.spare_id
         where form.id = #{id}
     </select>-->
-    <select id="selectDetailList"  resultType="com.platform.dao.vo.query.store.OutStoreDetailVO">
+    <select id="selectDetailList" resultType="com.platform.dao.vo.query.store.OutStoreDetailVO">
         select detail.*
         from t_out_store_detail detail
         where detail.out_id = #{id}
@@ -174,33 +185,36 @@
 
     <select id="selectOutStoreList" parameterType="com.platform.dao.dto.store.OutStoreFormDTO"
             resultType="com.platform.dao.vo.query.store.OutStoreFormVO">
- SELECT form.type, COUNT(*) outstorenum FROM `t_out_store_form` form left
-     join t_store store on store.id=form.store_id
-    <where>
-             status=1
+        SELECT form.type, COUNT(*) outstorenum FROM `t_out_store_form` form left
+        join t_store store on store.id=form.store_id
+        <where>
+            status=1
 
-        <if test="userId!=null">
-            and user_id=#{userId}
-        </if>
-    </where>
+            <if test="userId!=null">
+                and user_id=#{userId}
+            </if>
+        </where>
 
-    GROUP BY
-    form.type
+        GROUP BY
+        form.type
     </select>
 
     <select id="getOutStoreFormCount" parameterType="String"
             resultType="BigDecimal">
-        select count(0) from t_out_store_form form join t_spare_store store on form.store_id=store.store_id
-        where store.store_id=#{storeId}
+        select count(0)
+        from t_out_store_form form
+                 join t_spare_store store on form.store_id = store.store_id
+        where store.store_id = #{storeId}
     </select>
 
     <select id="getRentleOutStoreForm" parameterType="com.platform.dao.dto.store.OutStoreFormDTO"
             resultType="com.platform.dao.vo.query.store.OutStoreFormVO">
-        select form.*,store.name as storeName,form.created_user_name from t_out_store_form form join t_store store
-        where store.id=form.store_id
-        and user_id=#{userId}
-        order by form.update_time desc
-        limit 1
+        select form.*, store.name as storeName, form.created_user_name
+        from t_out_store_form form
+                 join t_store store
+        where store.id = form.store_id
+          and user_id = #{userId}
+        order by form.update_time desc limit 1
     </select>
 
     <select id="getOutStoreFormCount1" parameterType="com.platform.dao.dto.store.OutStoreFormDTO"

platform-rest/src/main/java/com/platform/rest/controller/activiti/OutStoreFormActivitiController.java

@@ -0,0 +1,105 @@
+package com.platform.rest.controller.activiti;
+
+import com.platform.activiti.dao.entity.ActAuditRequest;
+import com.platform.activiti.enums.ActApplyEnum;
+import com.platform.common.util.R;
+import com.platform.dao.entity.store.OutStoreForm;
+import com.platform.rest.log.annotation.SysLog;
+import com.platform.service.business.impl.OutStoreFormActivitiServiceImpl;
+import com.platform.service.business.impl.SbScrapActivitiServiceImpl;
+import com.platform.service.customize.BaseFormCheckServiceFactory;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Description 出入库 控制器
+ * @Author liuyu
+ * @Date 2020-04-21 21:05:46
+ * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Slf4j
+@RestController
+@AllArgsConstructor
+@RequestMapping("/activiti/outStore/form")
+public class OutStoreFormActivitiController {
+
+    private final OutStoreFormActivitiServiceImpl outStoreFormActivitiServiceImpl;
+
+    /**
+     * 启动：将设备id和表单id设置到businessKey中
+     * @param actAuditRequest 设备基础信息DTO
+     * @return R
+     */
+    @SysLog("审批单提交审批")
+    @PutMapping("/start")
+    public R start(@RequestBody ActAuditRequest actAuditRequest) {
+        actAuditRequest.setAuditModelKey(ActApplyEnum.OUT_STORE_BACK.getKey());
+        actAuditRequest.setAuditModelName(ActApplyEnum.OUT_STORE_BACK.getName());
+        actAuditRequest.setAuditFlag(true);
+        actAuditRequest.setRefuseReason("提交申请");
+        outStoreFormActivitiServiceImpl.start(actAuditRequest);
+        return new R<>("审批单已提交");
+    }
+
+    /**
+     * 审核
+     * @param actAuditRequest:不包括processInstanceId，
+     * @return R
+     */
+    @SysLog("审批单审核")
+    @PutMapping("/audit")
+    public R audit(@RequestBody ActAuditRequest actAuditRequest) {
+        outStoreFormActivitiServiceImpl.audit(actAuditRequest);
+        return new R<>();
+    }
+
+    /**
+     * 终止
+     * @param actAuditRequest
+     * @return R
+     */
+    @SysLog("审批单终止审核")
+    @PutMapping("/stop")
+    public R stop(@RequestBody ActAuditRequest actAuditRequest) {
+        outStoreFormActivitiServiceImpl.stop(actAuditRequest);
+        return new R<>();
+    }
+
+    /**
+     * 签收
+     * @param actAuditRequest
+     * @return R
+     */
+    @SysLog("审批单转签")
+    @PutMapping("/claim")
+    public R claim(@RequestBody ActAuditRequest actAuditRequest) {
+        outStoreFormActivitiServiceImpl.claim(actAuditRequest);
+        return new R<>("已签收，请办理");
+    }
+
+    /**
+     * 转签
+     * @param actAuditRequest
+     * @return R
+     */
+    @SysLog("审批单转签")
+    @PutMapping("/assign")
+    public R assign(@RequestBody ActAuditRequest actAuditRequest) {
+        outStoreFormActivitiServiceImpl.assign(actAuditRequest);
+        return new R<>("已转签");
+    }
+
+    /**
+     * 审核历史
+     * @param processInstanceId
+     * @return R
+     */
+    @SysLog("审批单审核历史")
+    @GetMapping("/history/{processInstanceId}")
+    public R history(@PathVariable("processInstanceId") String processInstanceId) {
+        return new R(outStoreFormActivitiServiceImpl.history(processInstanceId));
+    }
+
+}
+

platform-service/src/main/java/com/platform/service/activiti/impl/ActivitiUserModelServiceImpl.java

@@ -176,6 +176,9 @@ public class ActivitiUserModelServiceImpl extends BaseServiceImpl<ActivitiUserMo
      */
     private byte[] getByteArray(String deploymentId) {
         Map<String, Object> result = mapper.queryActByteArray(deploymentId);
+        if(result == null){
+            throw new BusinessException("请先发布流程图，然后才能配置审批节点");
+        }
         byte[] object = (byte[]) result.get("bytes");
         return object;
     }

platform-service/src/main/java/com/platform/service/activiti/strategy/ActivitiAssignStrategyStartUserDeptRole.java

@@ -75,7 +75,6 @@ public class ActivitiAssignStrategyStartUserDeptRole implements ActivitiAssignSt
         String roleId = activitiUserModel.getRoleId();
         SysUserDTO sysUserDTO = new SysUserDTO();
         sysUserDTO.setRoleIds(Arrays.asList(roleId));
-
         // 找到和发起人部门一致的
         sysUserDTO.setDeptIds(sysUserDeptService.selectByUserId(userId).stream().map(SysUserDept::getDeptId).collect(Collectors.toList()));
         List<SysUserVO> sysUserVOList = sysUserService.getDeptChildrenRoleUser(sysUserDTO);
@@ -86,7 +85,8 @@ public class ActivitiAssignStrategyStartUserDeptRole implements ActivitiAssignSt
             }
             throw new BusinessException("查询不到角色对应人员，请先设置，角色名称：" + sysRoleVO.getRoleName());
         }
-        List<String> ids = sysUserVOList.stream().map(SysUserVO::getUserId).collect(Collectors.toList());
+        List<String> ids = sysUserVOList.stream().distinct().map(SysUserVO::getUserId).collect(Collectors.toList());
+        log.info("查询的用户id：" + ids);
         return StringUtils.join(ids, ",");
     }
 }

platform-service/src/main/java/com/platform/service/business/impl/ActivitiBaseServiceAbstract.java

@@ -4,9 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.platform.activiti.dao.entity.ActApplyInfo;
 import com.platform.activiti.dao.entity.ActAuditRecord;
 import com.platform.activiti.dao.entity.ActAuditRequest;
-import com.platform.activiti.enums.ActApplyEnum;
 import com.platform.common.constant.CommonConstants;
-import com.platform.common.enums.ResultCode;
 import com.platform.common.exception.BusinessException;
 import com.platform.common.model.UserInfo;
 import com.platform.common.util.SecurityUtils;
@@ -15,8 +13,6 @@ import com.platform.dao.entity.upms.SysUser;
 import com.platform.service.activiti.ActivitiAssignStrategy;
 import com.platform.service.activiti.ActivitiUserModelService;
 import com.platform.service.business.ActivitiBaseService;
-import com.platform.service.sb.SbInfoService;
-import com.platform.service.sb.SbScrapFormService;
 import com.platform.service.upms.SysUserService;
 import lombok.AllArgsConstructor;
 import org.activiti.engine.*;
@@ -86,7 +82,7 @@ public abstract class ActivitiBaseServiceAbstract implements ActivitiBaseService
         UserInfo user = SecurityUtils.getUserInfo();
         // 设置发起对象，保存到流程实例中
         ActApplyInfo applyInfo = new ActApplyInfo(actAuditRequest.getId(),
-                ActApplyEnum.SB_INFO_SCRAP.getName(), ActApplyEnum.SB_INFO_SCRAP.getKey(),
+                actAuditRequest.getAuditModelName(), actAuditRequest.getAuditModelKey(),
                 0,
                 LocalDateTime.now());
         Map<String, Object> map = new HashMap<>(1);
@@ -99,13 +95,13 @@ public abstract class ActivitiBaseServiceAbstract implements ActivitiBaseService
         if (StringUtils.isBlank(actAuditRequest.getProcessInstanceId())) {
             // 第一次启动，设置流程启动人信息，为了后面查询我的发起列表
             identityService.setAuthenticatedUserId(user.getUserId());
-            instance = runtimeService.startProcessInstanceByKey(ActApplyEnum.SB_INFO_SCRAP.getKey(), actAuditRequest.getId(), map);
+            instance = runtimeService.startProcessInstanceByKey(actAuditRequest.getAuditModelKey(), actAuditRequest.getId(), map);
             actAuditRequest.setProcessInstanceId(instance.getId());
         } else { // 再次提交审批的，之前被拒绝的
             ProcessInstance instanceExsit = runtimeService.createProcessInstanceQuery()
                     .processInstanceId(actAuditRequest.getProcessInstanceId()).singleResult();
             if (instanceExsit == null) {
-                instance = runtimeService.startProcessInstanceByKey(ActApplyEnum.SB_INFO_SCRAP.getKey(), actAuditRequest.getId(), map);
+                instance = runtimeService.startProcessInstanceByKey(actAuditRequest.getAuditModelKey(), actAuditRequest.getId(), map);
                 actAuditRequest.setProcessInstanceId(instance.getId());
             } else {
                 instance = runtimeService.startProcessInstanceById(actAuditRequest.getProcessInstanceId(), actAuditRequest.getId(), map);
@@ -128,7 +124,7 @@ public abstract class ActivitiBaseServiceAbstract implements ActivitiBaseService
         taskService.complete(task.getId(), data);
         // 分配下一个节点的审批人信息
         // 设置各个节点审批人员信息
-        Model model = repositoryService.createModelQuery().modelKey(ActApplyEnum.SB_INFO_SCRAP.getKey()).singleResult();
+        Model model = repositoryService.createModelQuery().modelKey(actAuditRequest.getAuditModelKey()).singleResult();
         List<ActivitiUserModel> list = activitiUserModelService.getModelByModelId(model.getId());
         if (CollectionUtil.isEmpty(list)) {
             throw new BusinessException("审批节点未设置，请先设置");
@@ -152,7 +148,7 @@ public abstract class ActivitiBaseServiceAbstract implements ActivitiBaseService
         if (doAudit(actAuditRequest)) {
             if (!doCheckLast(actAuditRequest)) {
                 // 分配下一个节点的审批人信息
-                Model model = repositoryService.createModelQuery().modelKey(ActApplyEnum.SB_INFO_SCRAP.getKey()).singleResult();
+                Model model = repositoryService.createModelQuery().modelKey(actAuditRequest.getAuditModelKey()).singleResult();
                 List<ActivitiUserModel> list = activitiUserModelService.getModelByModelId(model.getId());
                 if (CollectionUtil.isEmpty(list)) {
                     throw new BusinessException("审批节点未设置，请先设置");

platform-service/src/main/java/com/platform/service/business/impl/OutStoreFormActivitiServiceImpl.java

@@ -0,0 +1,106 @@
+package com.platform.service.business.impl;
+
+import com.platform.activiti.dao.entity.ActAuditRequest;
+import com.platform.common.exception.BusinessException;
+import com.platform.common.util.JsonUtils;
+import com.platform.dao.dto.activiti.SbScrapFormActiviti;
+import com.platform.dao.entity.customize.CustomFieldTemplateData;
+import com.platform.dao.entity.sb.SbInfo;
+import com.platform.dao.entity.store.OutStoreForm;
+import com.platform.dao.enums.ActivitiFormStatusEnum;
+import com.platform.dao.enums.CustomFieldTemplateDataStatusEnum;
+import com.platform.dao.enums.OutStoreStatusEnum;
+import com.platform.dao.enums.SbInfoStatusEnum;
+import com.platform.dao.mapper.customize.CustomFieldTemplateDataMapper;
+import com.platform.dao.mapper.sb.SbInfoMapper;
+import com.platform.dao.mapper.store.OutStoreFormMapper;
+import com.platform.service.yongyou.YongyouService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description 工作流业务
+ * @Author chenyuehu
+ * @Date 2020/11/19
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
+ */
+@Slf4j
+@AllArgsConstructor
+@Service("outStoreFormActivitiServiceImpl")
+public class OutStoreFormActivitiServiceImpl extends ActivitiBaseServiceAbstract {
+    private OutStoreFormMapper outStoreFormMapper;
+    private final YongyouService yongyouService;
+    /**
+     * 检查业务是否可以发起，比如检查业务状态等
+     *
+     * @param actAuditRequest
+     */
+    @Override
+    protected void doCheck(ActAuditRequest actAuditRequest) {
+        OutStoreForm outStoreForm = outStoreFormMapper.selectByPrimaryKey(actAuditRequest.getId());
+        if (outStoreForm == null) {
+            throw new BusinessException("单据不存在");
+        }
+        if (!outStoreForm.getStatus().equals(OutStoreStatusEnum.CREATED.getValue())) {
+            throw new BusinessException("只有待审核状态下的单据，才可以提交申请");
+        }
+    }
+
+    /**
+     * 发起审核后的状态，等待主管审核
+     *
+     * @param actAuditRequest
+     */
+    @Override
+    protected void doUpdate(ActAuditRequest actAuditRequest) {
+        OutStoreForm outStoreForm = new OutStoreForm();
+        outStoreForm.setId(actAuditRequest.getId());
+        outStoreForm.setProcessInstanceId(actAuditRequest.getProcessInstanceId());
+        outStoreForm.setStatus(OutStoreStatusEnum.NOT_EXECUTE.getValue());
+        outStoreFormMapper.updateByPrimaryKeySelective(outStoreForm);
+    }
+
+    /**
+     * 拒绝业务
+     *
+     * @param actAuditRequest
+     */
+    @Override
+    protected void doRefuse(ActAuditRequest actAuditRequest) {
+        OutStoreForm outStoreForm = new OutStoreForm();
+        outStoreForm.setId(actAuditRequest.getId());
+        outStoreForm.setStatus(OutStoreStatusEnum.CREATED.getValue());
+        outStoreFormMapper.updateByPrimaryKeySelective(outStoreForm);
+    }
+
+    /**
+     * 完成业务
+     *  -自动提交到用友
+     * @param actAuditRequest
+     */
+    @Override
+    protected void doFinish(ActAuditRequest actAuditRequest) {
+        OutStoreForm outStoreForm = new OutStoreForm();
+        outStoreForm.setId(actAuditRequest.getId());
+        outStoreForm.setStatus(OutStoreStatusEnum.EXECUTING.getValue());
+        outStoreFormMapper.updateByPrimaryKeySelective(outStoreForm);
+        yongyouService.addOutForm(actAuditRequest.getId());
+
+    }
+
+    /**
+     * 终止审批业务
+     * 清空：processInstanceId
+     * @param actAuditRequest
+     */
+    @Override
+    protected void doStop(ActAuditRequest actAuditRequest) {
+        OutStoreForm outStoreForm = new OutStoreForm();
+        outStoreForm.setId(actAuditRequest.getId());
+        outStoreForm.setStatus(OutStoreStatusEnum.CREATED.getValue());
+        outStoreForm.setProcessInstanceId(null);
+        outStoreFormMapper.updateByPrimaryKeySelective(outStoreForm);
+    }
+}

platform-service/src/main/java/com/platform/service/business/impl/SbScrapActivitiServiceImpl.java

@@ -77,7 +77,7 @@ public class SbScrapActivitiServiceImpl extends ActivitiBaseServiceAbstract {
         CustomFieldTemplateData updInfo = customFieldTemplateDataMapper.selectByPrimaryKey(actAuditRequest.getId());
         updInfo.setId(actAuditRequest.getId());
         updInfo.setStatus(ActivitiFormStatusEnum.EXECUTING.getValue());
-        SbScrapFormActiviti activiti = JsonUtils.jsonToModel(updInfo.getData(),SbScrapFormActiviti.class);
+        SbScrapFormActiviti activiti = JsonUtils.jsonToModel(updInfo.getData(), SbScrapFormActiviti.class);
         activiti.setStatus(ActivitiFormStatusEnum.EXECUTING.getValue());
         activiti.setProcessInstanceId(actAuditRequest.getProcessInstanceId());
         updInfo.setData(JsonUtils.objectToJson(activiti));
@@ -108,7 +108,7 @@ public class SbScrapActivitiServiceImpl extends ActivitiBaseServiceAbstract {
     protected void doRefuse(ActAuditRequest actAuditRequest) {
         CustomFieldTemplateData updInfo = customFieldTemplateDataMapper.selectByPrimaryKey(actAuditRequest.getId());
         updInfo.setStatus(ActivitiFormStatusEnum.REFUSE.getValue());
-        SbScrapFormActiviti activiti = JsonUtils.jsonToModel(updInfo.getData(),SbScrapFormActiviti.class);
+        SbScrapFormActiviti activiti = JsonUtils.jsonToModel(updInfo.getData(), SbScrapFormActiviti.class);
         activiti.setStatus(ActivitiFormStatusEnum.REFUSE.getValue());
         updInfo.setData(JsonUtils.objectToJson(activiti));
         customFieldTemplateDataMapper.updateByPrimaryKeySelective(updInfo);
@@ -126,7 +126,7 @@ public class SbScrapActivitiServiceImpl extends ActivitiBaseServiceAbstract {
     protected void doFinish(ActAuditRequest actAuditRequest) {
         CustomFieldTemplateData updInfo = customFieldTemplateDataMapper.selectByPrimaryKey(actAuditRequest.getId());
         updInfo.setStatus(ActivitiFormStatusEnum.FINISH.getValue());
-        SbScrapFormActiviti activiti = JsonUtils.jsonToModel(updInfo.getData(),SbScrapFormActiviti.class);
+        SbScrapFormActiviti activiti = JsonUtils.jsonToModel(updInfo.getData(), SbScrapFormActiviti.class);
         activiti.setStatus(ActivitiFormStatusEnum.FINISH.getValue());
         updInfo.setData(JsonUtils.objectToJson(activiti));
         customFieldTemplateDataMapper.updateByPrimaryKeySelective(updInfo);
@@ -154,7 +154,7 @@ public class SbScrapActivitiServiceImpl extends ActivitiBaseServiceAbstract {
     protected void doStop(ActAuditRequest actAuditRequest) {
         CustomFieldTemplateData updInfo = customFieldTemplateDataMapper.selectByPrimaryKey(actAuditRequest.getId());
         updInfo.setId(actAuditRequest.getId());
-        SbScrapFormActiviti activiti = JsonUtils.jsonToModel(updInfo.getData(),SbScrapFormActiviti.class);
+        SbScrapFormActiviti activiti = JsonUtils.jsonToModel(updInfo.getData(), SbScrapFormActiviti.class);
         activiti.setStatus(ActivitiFormStatusEnum.NOT_EXECUTE.getValue());
         activiti.setProcessInstanceId(null);
         updInfo.setData(JsonUtils.objectToJson(activiti));

platform-service/src/main/java/com/platform/service/store/impl/OutStoreFormServiceImpl.java

@@ -170,7 +170,7 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
         model.setOutNo(IdGeneratorUtils.getOutStoreNo(++count));
         model.setDelFlag(false);
         model.setUserInfo(userInfo);
-        model.setStatus(OutStoreStatusEnum.CREATED.getValue());
+        model.setStatus(OutStoreStatusEnum.NOT_EXECUTE.getValue());
         OutStoreForm outStoreForm = super.saveModelByDTO(model);
         // 出库单详情
         List<OutStoreDetailDTO> detailList = model.getDetailList();
@@ -233,7 +233,9 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
         model.setOutNo(IdGeneratorUtils.getOutStoreNo(++count));
         model.setDelFlag(false);
         model.setUserInfo(userInfo);
-        model.setStatus(OutStoreStatusEnum.NOT_EXECUTE.getValue());
+        model.setStatus(OutStoreStatusEnum.CREATED.getValue());
+        model.setType(OutStoreTypeEnum.CHUKU_LINGYONG.getValue());
+        model.setUserInfo(userInfo);
         // 出库单详情
         List<OutStoreDetailDTO> detailList = model.getDetailList();
         List<String> storeIds = detailList.stream().map(OutStoreDetailDTO::getStoreId).distinct().collect(Collectors.toList());

platform-service/src/main/java/com/platform/service/upms/impl/SysUserServiceImpl.java

@@ -596,6 +596,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser,
             List<SysDept> depts = deptMapper.selectByExample(weekend);
             query.setDeptIds(depts.stream().map(item -> item.getDeptId()).collect(Collectors.toList()));
         }
+        query.setRoleIds(sysUserDTO.getRoleIds());
+        query.setDeptIds(sysUserDTO.getDeptIds());
         query.setRoleCodes(sysUserDTO.getRoleCodes());
         query.setRoleCode(roleCode);
         return mapper.selectDeptRoleUser(query);