[feat] 工程管理

新增开发修改单修改页面：新增开发修改单提交方法
新增开发修改单后端加载修改窗口接口
新增开发修改单修改保存后端接口
新增开发修改单 开发修改物料后端查询接口
新增开发修改单 采购修改物料后端查询接口
新增开发修改单提交审批后端接口
新增开发修改单加载审批弹窗后端接口
新增开发修改单自动绑定页面字段后端接口
新增开发修改单 完成任务后端接口
修改开发修改单和开发修改单详情 开发单号字段两者保持一致

ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpDevelopModifyorderController.java

@@ -1,17 +1,27 @@
 package com.ruoyi.erp.controller;
 
+import java.util.HashMap;
 import java.util.List;
 
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.erp.domain.ErpDevelopModifyorderDetail;
 import com.ruoyi.erp.domain.ErpMaterial;
 import com.ruoyi.erp.domain.ErpMaterialVo;
+import com.ruoyi.erp.domain.vo.ErpDevelopModifyorderVo;
 import com.ruoyi.erp.service.IErpMaterialService;
+import com.ruoyi.process.general.service.IProcessService;
+import com.ruoyi.sales.domain.VO.SalesAftersalesNoticeVO;
 import com.ruoyi.system.domain.SysMakeOrder;
 import com.ruoyi.system.domain.SysMakeorderDept;
 import com.ruoyi.system.domain.SysSalesOrderChild;
 import com.ruoyi.system.mapper.SysMakeOrderMapper;
 import com.ruoyi.system.service.ISysSalesOrderChildService;
 import com.ruoyi.system.service.ISysUserService;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.TaskService;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -26,6 +36,9 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
 /**
  * 开发修改单Controller
  * 
@@ -53,6 +66,15 @@ public class ErpDevelopModifyorderController extends BaseController
     @Autowired
     private IErpMaterialService erpMaterialService;
 
+    @Autowired
+    private TaskService taskService;
+
+    @Autowired
+    private RuntimeService runtimeService;
+
+    @Autowired
+    private IProcessService processService;
+
 
     @RequiresPermissions("erp:developModifyOrder:view")
     @GetMapping()
@@ -117,7 +139,9 @@ public class ErpDevelopModifyorderController extends BaseController
     @ResponseBody
     public AjaxResult addSave(@RequestBody ErpDevelopModifyorder erpDevelopModifyorder)
     {
-        return toAjax(erpDevelopModifyorderService.insertErpDevelopModifyorder(erpDevelopModifyorder));
+
+        erpDevelopModifyorderService.submitApply(erpDevelopModifyorder);
+        return AjaxResult.success();
     }
 
 
@@ -169,6 +193,96 @@ public class ErpDevelopModifyorderController extends BaseController
 
 
 
+    /**
+     * 加载审批弹窗
+     * @param taskId
+     * @param mmap
+     * @return
+     */
+    @GetMapping("/showVerifyDialog/{taskId}")
+    public String showVerifyDialog(@PathVariable("taskId") String taskId, ModelMap mmap) {
+        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+        String processInstanceId = task.getProcessInstanceId();
+        ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+        ErpDevelopModifyorderVo erpDevelopModifyorderVo = erpDevelopModifyorderService.selectErpDevelopModifyorderById(new Long(processInstance.getBusinessKey()));
+        mmap.put("formData", erpDevelopModifyorderVo);
+        mmap.put("taskId", taskId);
+        String verifyName = task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1);
+        return prefix + "/task" + verifyName;
+    }
+
+    /**
+     * 自动绑定页面字段
+     */
+    @ModelAttribute("preloadObj")
+    public ErpDevelopModifyorderVo getObj(@RequestParam(value = "developOrderId", required = false) Long developOrderId, HttpSession session) {
+        if (developOrderId != null) {
+
+            return erpDevelopModifyorderService.selectErpDevelopModifyorderById(developOrderId);
+        }
+        return new ErpDevelopModifyorderVo();
+    }
+
+
+
+
+    /**
+     * 完成任务
+     *
+     * @return
+     */
+    @RequestMapping(value = "/complete/{taskId}", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public AjaxResult complete(@PathVariable("taskId") String taskId, @RequestParam(value = "saveEntity", required = false) String saveEntity,
+                               @ModelAttribute("preloadObj") ErpDevelopModifyorderVo erpDevelopModifyorderVo, HttpServletRequest request) {
+        boolean saveEntityBoolean = BooleanUtils.toBoolean(saveEntity);
+        //获取实例id
+        String instanceId = erpDevelopModifyorderVo.getInstanceId();
+        //获取实例类型
+        String instanceType = erpDevelopModifyorderVo.getInstanceType();
+        boolean approvedFlag = processService.complete(taskId, instanceId, erpDevelopModifyorderVo.getApplyTitle(), erpDevelopModifyorderVo.getDevelopOrderCode(), "developModifyOrder", new HashMap<String, Object>(), request);
+        if(!approvedFlag){
+            // 审核状态-审核拒绝
+            erpDevelopModifyorderVo.setAuditStatus("2");
+        }
+        // 如果任务已结束更新业务表状态
+        boolean processIsFinish = processService.judgeProcessIsFinish(instanceId);
+        if (processIsFinish) {
+            // 审核通过
+            erpDevelopModifyorderVo.setAuditStatus("1");
+            String developOderCode = erpDevelopModifyorderVo.getDevelopOrderCode();
+//            SalesAftersalesNoticeVO tempSalesAftersalesNoticeVO = salesAftersalesNoticeService.selectSalesAftersalesNoticeByCode(aftersalesNoticeCode);
+//
+//            //如果审核通过生成售后单
+//            aftersalesOrderService.generateAftersalesOrderBySalesAftersalesNotice(tempSalesAftersalesNoticeVO);
+
+            // 提交
+            if("submit".equals(instanceType)){
+                // 使用状态-是
+//                erpBomVo.setUseStatus("1");
+            }
+            // 作废
+            else if("cancel".equals(instanceType)){
+                // 使用状态-已作废
+//                erpBomVo.setUseStatus("2");
+            }
+            // 恢复
+            else if("restore".equals(instanceType)){
+                // 使用状态-是
+//                erpBomVo.setUseStatus("1");
+            }
+        }
+        erpDevelopModifyorderService.updateErpDevelopModifyorder(erpDevelopModifyorderVo);
+        // 驳回申请后继续申请，可能修改表单
+        if (saveEntityBoolean) {
+            erpDevelopModifyorderService.updateErpDevelopModifyorder(erpDevelopModifyorderVo);
+        }
+        return success("任务已完成");
+    }
+
+
+
+
     /**
      * 修改开发修改单
      */
@@ -176,9 +290,49 @@ public class ErpDevelopModifyorderController extends BaseController
     public String edit(@PathVariable("developOrderId") Long developOrderId, ModelMap mmap)
     {
         ErpDevelopModifyorder erpDevelopModifyorder = erpDevelopModifyorderService.selectErpDevelopModifyorderById(developOrderId);
+        mmap.put("beforeUpdateRemark", erpDevelopModifyorder.getBeforeUpdateRemark());
+        mmap.put("afterUpdateRemark", erpDevelopModifyorder.getAfterUpdateRemark());
         mmap.put("erpDevelopModifyorder", erpDevelopModifyorder);
         return prefix + "/edit";
     }
+
+    /**
+     * 修改保存开发修改单
+     */
+    @RequiresPermissions("erp:developModifyOrder:edit")
+    @Log(title = "开发修改单", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(@RequestBody ErpDevelopModifyorder erpDevelopModifyorder)
+    {
+        return toAjax(erpDevelopModifyorderService.updateErpDevelopModifyorder(erpDevelopModifyorder));
+    }
+
+    /**
+     * 修改开发修改单 开发修改物料查询
+     */
+    @PostMapping("/getDevelopModifyMaterialById")
+    @ResponseBody
+    public TableDataInfo getDevelopModifyMaterialById(@RequestParam("developOrderId") Long developOrderId)
+    {
+        startPage();
+        List<ErpDevelopModifyorder> erpDevelopModifyorderList = erpDevelopModifyorderService.selectDevelopModifyMaterialById(developOrderId);
+        return getDataTable(erpDevelopModifyorderList);
+    }
+
+    /**
+     * 修改开发修改单 采购修改物料查询
+     */
+    @PostMapping("/getDevelopModifyDetailMaterialByCode")
+    @ResponseBody
+    public TableDataInfo getDevelopModifyDetailMaterialByCode(@RequestParam("developOrderCode") String developOrderCode)
+    {
+        startPage();
+        List<ErpDevelopModifyorderDetail> erpDevelopModifyorderDetailList = erpDevelopModifyorderService.selectDevelopModifyDetailMaterialByCode(developOrderCode);
+        return getDataTable(erpDevelopModifyorderDetailList);
+    }
+
+
     /**相关人员确认*/
     @GetMapping("/confirm/{developOrderId}")
     public String confrimDetail(@PathVariable("developOrderId") Long developOrderId, ModelMap mmap)
@@ -195,17 +349,6 @@ public class ErpDevelopModifyorderController extends BaseController
         mmap.put("erpDevelopModifyorder", erpDevelopModifyorder);
         return prefix + "/pickAdd";
     }
-    /**
-     * 修改保存开发修改单
-     */
-    @RequiresPermissions("erp:developModifyOrder:edit")
-    @Log(title = "开发修改单", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    @ResponseBody
-    public AjaxResult editSave(ErpDevelopModifyorder erpDevelopModifyorder)
-    {
-        return toAjax(erpDevelopModifyorderService.updateErpDevelopModifyorder(erpDevelopModifyorder));
-    }
 
     /**
      *  查看开发修改单详情

ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpDevelopModifyorder.java

@@ -25,7 +25,7 @@ public class ErpDevelopModifyorder extends BaseEntity
 
     /** 开发修改单号 */
     @Excel(name = "开发修改单号")
-    private String developOderCode;
+    private String developOrderCode;
 
     /** 生产单号 */
     @Excel(name = "生产单号")
@@ -162,14 +162,14 @@ public class ErpDevelopModifyorder extends BaseEntity
     {
         return developOrderId;
     }
-    public void setDevelopOderCode(String developOderCode) 
+    public void setDevelopOrderCode(String developOrderCode)
     {
-        this.developOderCode = developOderCode;
+        this.developOrderCode = developOrderCode;
     }
 
-    public String getDevelopOderCode() 
+    public String getDevelopOrderCode()
     {
-        return developOderCode;
+        return developOrderCode;
     }
     public void setMaterialNo(String materialNo) 
     {
@@ -426,7 +426,7 @@ public class ErpDevelopModifyorder extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("developOrderId", getDevelopOrderId())
-            .append("developOderCode", getDevelopOderCode())
+            .append("developOrderCode", getDevelopOrderCode())
             .append("makeNo",getMakeNo())
             .append("materialNo", getMaterialNo())
             .append("purchaseStorageStatus", getPurchaseStorageStatus())

ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpDevelopModifyorderDetail.java

@@ -22,7 +22,7 @@ public class ErpDevelopModifyorderDetail extends BaseEntity
 
     /** 开发修改单单号 */
     @Excel(name = "开发修改单单号")
-    private String developOderCode;
+    private String developOrderCode;
 
     /** 生产单号 */
     @Excel(name = "生产单号")
@@ -82,14 +82,14 @@ public class ErpDevelopModifyorderDetail extends BaseEntity
     {
         return developOrderDetailId;
     }
-    public void setDevelopOderCode(String developOderCode) 
+    public void setDevelopOrderCode(String developOrderCode)
     {
-        this.developOderCode = developOderCode;
+        this.developOrderCode = developOrderCode;
     }
 
-    public String getDevelopOderCode() 
+    public String getDevelopOrderCode()
     {
-        return developOderCode;
+        return developOrderCode;
     }
     public void setMakeNo(String makeNo) 
     {
@@ -204,7 +204,7 @@ public class ErpDevelopModifyorderDetail extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("developOrderDetailId", getDevelopOrderDetailId())
-            .append("developOderCode", getDevelopOderCode())
+            .append("developOrderCode", getDevelopOrderCode())
             .append("makeNo", getMakeNo())
             .append("materialNo", getMaterialNo())
             .append("materialName", getMaterialName())

ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpDevelopModifyorderDetailMapper.java

@@ -74,4 +74,9 @@ public interface ErpDevelopModifyorderDetailMapper
      * @return 结果
      */
     public int restoreErpDevelopModifyorderDetailById(Long developOrderDetailId);
+
+    /**
+     *  根据开发修改单号查询开发修改详情物料信息
+     * */
+    List<ErpDevelopModifyorderDetail> selectDevelopModifyDetailMaterialByCode(String developOrderCode);
 }

ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpDevelopModifyorderMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.erp.mapper;
 
 import java.util.List;
 import com.ruoyi.erp.domain.ErpDevelopModifyorder;
+import com.ruoyi.erp.domain.vo.ErpDevelopModifyorderVo;
 
 /**
  * 开发修改单Mapper接口
@@ -17,7 +18,7 @@ public interface ErpDevelopModifyorderMapper
      * @param developOrderId 开发修改单ID
      * @return 开发修改单
      */
-    public ErpDevelopModifyorder selectErpDevelopModifyorderById(Long developOrderId);
+    public ErpDevelopModifyorderVo selectErpDevelopModifyorderById(Long developOrderId);
 
     /**
      * 查询开发修改单列表
@@ -74,4 +75,10 @@ public interface ErpDevelopModifyorderMapper
      * @return 结果
      */
     public int restoreErpDevelopModifyorderById(Long developOrderId);
+
+
+    /**
+     *  根据开发修改单查询开发修改物料
+     * */
+    List<ErpDevelopModifyorder> selectDevelopModifyMaterialById(Long developOrderId);
 }

ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpDevelopModifyorderService.java

@@ -2,6 +2,10 @@ package com.ruoyi.erp.service;
 
 import java.util.List;
 import com.ruoyi.erp.domain.ErpDevelopModifyorder;
+import com.ruoyi.erp.domain.ErpDevelopModifyorderDetail;
+import com.ruoyi.erp.domain.vo.ErpDevelopModifyorderVo;
+import com.ruoyi.system.domain.SysSalesOrder;
+import org.activiti.engine.runtime.ProcessInstance;
 
 /**
  * 开发修改单Service接口
@@ -17,7 +21,7 @@ public interface IErpDevelopModifyorderService
      * @param developOrderId 开发修改单ID
      * @return 开发修改单
      */
-    public ErpDevelopModifyorder selectErpDevelopModifyorderById(Long developOrderId);
+    public ErpDevelopModifyorderVo selectErpDevelopModifyorderById(Long developOrderId);
 
     /**
      * 查询开发修改单列表
@@ -72,4 +76,22 @@ public interface IErpDevelopModifyorderService
      * @return
      */
     int restoreErpDevelopModifyorderById(Long developOrderId);
+
+
+
+    /**
+     *  审批流程启动
+     * */
+    ProcessInstance submitApply(ErpDevelopModifyorder erpDevelopModifyorder);
+
+    /**
+    *  根据开发修改单id查询开发修改物料
+    * */
+    List<ErpDevelopModifyorder> selectDevelopModifyMaterialById(Long developOrderId);
+
+
+    /**
+     *  根据开发修改单号查询开发修改详情物料信息
+     * */
+    List<ErpDevelopModifyorderDetail> selectDevelopModifyDetailMaterialByCode(String developOrderCode);
 }

ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpDevelopModifyorderServiceImpl.java

@@ -1,19 +1,29 @@
 package com.ruoyi.erp.service.impl;
 
-import java.util.List;
+import java.util.*;
 
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ShiroUtils;
 import com.ruoyi.erp.domain.ErpDevelopModifyorderDetail;
 import com.ruoyi.erp.domain.vo.ErpDevelopModifyorderMaterialVo;
+import com.ruoyi.erp.domain.vo.ErpDevelopModifyorderVo;
 import com.ruoyi.erp.mapper.ErpDevelopModifyorderDetailMapper;
+import com.ruoyi.process.general.service.IProcessService;
+import com.ruoyi.process.todoitem.mapper.BizTodoItemMapper;
+import com.ruoyi.sales.domain.SalesAftersalesNotice;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.service.ISysRoleService;
+import org.activiti.engine.TaskService;
+import org.activiti.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.erp.mapper.ErpDevelopModifyorderMapper;
 import com.ruoyi.erp.domain.ErpDevelopModifyorder;
 import com.ruoyi.erp.service.IErpDevelopModifyorderService;
 import com.ruoyi.common.core.text.Convert;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 开发修改单Service业务层处理
@@ -33,6 +43,22 @@ public class ErpDevelopModifyorderServiceImpl implements IErpDevelopModifyorderS
     @Autowired
     private RedisCache redisCache;
 
+
+    @Autowired
+    private IProcessService processService;
+
+    @Autowired
+    private ISysRoleService roleService;
+
+    @Autowired
+    private SysUserMapper userMapper;
+
+    @Autowired
+    private TaskService taskService;
+
+    @Autowired
+    private BizTodoItemMapper todoItemMapper;
+
     /**
      * 查询开发修改单
      * 
@@ -40,7 +66,7 @@ public class ErpDevelopModifyorderServiceImpl implements IErpDevelopModifyorderS
      * @return 开发修改单
      */
     @Override
-    public ErpDevelopModifyorder selectErpDevelopModifyorderById(Long developOrderId)
+    public ErpDevelopModifyorderVo selectErpDevelopModifyorderById(Long developOrderId)
     {
         return erpDevelopModifyorderMapper.selectErpDevelopModifyorderById(developOrderId);
     }
@@ -71,7 +97,7 @@ public class ErpDevelopModifyorderServiceImpl implements IErpDevelopModifyorderS
         erpDevelopModifyorder.setCreateTime(DateUtils.getNowDate());
 
         String developOderCode = redisCache.generateBillNo("KF");
-        erpDevelopModifyorder.setDevelopOderCode(developOderCode);
+        erpDevelopModifyorder.setDevelopOrderCode(developOderCode);
 
         ErpDevelopModifyorderMaterialVo erpDevelopModifyorderMaterialVo = erpDevelopModifyorder.getDevelopModifyorderMaterialVoList().get(0);
         erpDevelopModifyorder.setMaterialNo(erpDevelopModifyorderMaterialVo.getMaterialNo());
@@ -83,7 +109,7 @@ public class ErpDevelopModifyorderServiceImpl implements IErpDevelopModifyorderS
 
         //添加采购物料相关数据
         ErpDevelopModifyorderDetail erpDevelopModifyorderDetail = erpDevelopModifyorder.getDevelopModifyorderDetailList().get(0);
-        erpDevelopModifyorderDetail.setDevelopOderCode(developOderCode);
+        erpDevelopModifyorderDetail.setDevelopOrderCode(developOderCode);
         developModifyorderDetailMapper.insertErpDevelopModifyorderDetail(erpDevelopModifyorderDetail);
 
 
@@ -96,12 +122,20 @@ public class ErpDevelopModifyorderServiceImpl implements IErpDevelopModifyorderS
      * @param erpDevelopModifyorder 开发修改单
      * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public int updateErpDevelopModifyorder(ErpDevelopModifyorder erpDevelopModifyorder)
     {
         String loginName = ShiroUtils.getLoginName();
         erpDevelopModifyorder.setUpdateBy(loginName);
-        erpDevelopModifyorder.setUpdateTime(DateUtils.getNowDate());
+        erpDevelopModifyorder.setUpdateTime(new Date());
+
+        //添加采购物料相关数据
+        ErpDevelopModifyorderDetail erpDevelopModifyorderDetail = erpDevelopModifyorder.getDevelopModifyorderDetailList().get(0);
+        erpDevelopModifyorderDetail.setUpdateBy(loginName);
+        erpDevelopModifyorderDetail.setUpdateTime(new Date());
+        developModifyorderDetailMapper.updateErpDevelopModifyorderDetail(erpDevelopModifyorderDetail);
+
         return erpDevelopModifyorderMapper.updateErpDevelopModifyorder(erpDevelopModifyorder);
     }
 
@@ -152,4 +186,92 @@ public class ErpDevelopModifyorderServiceImpl implements IErpDevelopModifyorderS
     {
         return erpDevelopModifyorderMapper.restoreErpDevelopModifyorderById(developOrderId);
     }
+
+
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public ProcessInstance submitApply(ErpDevelopModifyorder erpDevelopModifyorder) {
+        SysUser user = ShiroUtils.getSysUser();
+        erpDevelopModifyorder.setAuditStatus("0");
+        erpDevelopModifyorder.setPurchaseStorageStatus("0");
+        erpDevelopModifyorder.setQualityStatus("0");
+        erpDevelopModifyorder.setCompleteStatus("0");
+        erpDevelopModifyorder.setFinshStatus("0");
+        //插入数据
+        insertErpDevelopModifyorder(erpDevelopModifyorder);
+        // 启动流程
+        String applyTitle = user.getUserName()+"发起了开发修改单提交审批-"+DateUtils.dateTimeNow();
+        String instanceType = "submit";
+        ProcessInstance processInstance = startProcessInstance(applyTitle,instanceType,erpDevelopModifyorder, user);
+        String processInstanceId = processInstance.getProcessInstanceId();
+        // 提交实例id
+        erpDevelopModifyorder.setSubmitInstanceId(processInstanceId);
+        // 存在提交完就流程结束的情况
+        boolean processIsFinish = processService.judgeProcessIsFinish(processInstanceId);
+        if(processIsFinish){
+            // 审核状态-审核通过
+            erpDevelopModifyorder.setAuditStatus("1");
+        }
+        erpDevelopModifyorderMapper.updateErpDevelopModifyorder(erpDevelopModifyorder);
+        return processInstance;
+    }
+
+
+    /**
+     *  根据开发修改单查询开发修改物料
+     * */
+    @Override
+    public List<ErpDevelopModifyorder> selectDevelopModifyMaterialById(Long developOrderId) {
+        return erpDevelopModifyorderMapper.selectDevelopModifyMaterialById(developOrderId);
+    }
+
+
+    /**
+     *  根据开发修改单号查询开发修改详情物料信息
+     * */
+    @Override
+    public List<ErpDevelopModifyorderDetail> selectDevelopModifyDetailMaterialByCode(String developOrderCode) {
+
+        return developModifyorderDetailMapper.selectDevelopModifyDetailMaterialByCode(developOrderCode);
+    }
+
+
+    /**
+     * 创建售后单审核流程
+     * @param applyTitle
+     * @param instanceType
+     * @param user
+     * @return
+     */
+    private ProcessInstance startProcessInstance(String applyTitle, String instanceType, ErpDevelopModifyorder erpDevelopModifyorder, SysUser user) {
+        Long developOrderId = erpDevelopModifyorder.getDevelopOrderId();
+        String businessKey = developOrderId.toString(); // 实体类 ID，作为流程的业务 key
+        String key = "developModifyOrder";
+        Map<String,Object> variables = new HashMap<>();
+        // 构造authority传参
+        buildAuthority(user, variables);
+        erpDevelopModifyorder.setApplyTitle(applyTitle);
+        // 启动流程
+        ProcessInstance processInstance = processService.submitApply(user.getLoginName(), businessKey, applyTitle, erpDevelopModifyorder.getDevelopOrderCode(), key, variables);
+        String processInstanceId = processInstance.getId();
+        erpDevelopModifyorder.setInstanceId(processInstanceId); // 建立双向关系
+        erpDevelopModifyorder.setInstanceType(instanceType);
+        return processInstance;
+    }
+
+    /**
+     *  发起人节点判断
+     * */
+    private void buildAuthority(SysUser user, Map<String, Object> variables) {
+        Set<String> roleKeys = roleService.selectRoleKeys(user.getUserId());
+        // 角色不同审核人不同
+        if(roleKeys.contains("gcwyRole")){
+            variables.put("authority",1);
+        }else if(roleKeys.contains("gcjlRole")){
+            variables.put("authority",2);
+        }else if(roleKeys.contains("gczgRole")){
+            variables.put("authority",3);
+        }
+    }
 }

ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderDetailMapper.xml

@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="ErpDevelopModifyorderDetail" id="ErpDevelopModifyorderDetailResult">
         <result property="developOrderDetailId"    column="develop_order_detail_id"    />
-        <result property="developOderCode"    column="develop_oder_code"    />
+        <result property="developOrderCode"    column="develop_order_code"    />
         <result property="makeNo"    column="make_no"    />
         <result property="materialNo"    column="material_no"    />
         <result property="materialName"    column="material_name"    />
@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectErpDevelopModifyorderDetailVo">
-        select develop_order_detail_id, develop_oder_code, make_no, material_no, material_name, material_type, material_photo_url, material_unit, material_brand, material_describe, material_process_method, bom_id, material_num, update_finish_time, create_by, create_time, update_by, update_time, remark from erp_develop_modifyorder_detail
+        select develop_order_detail_id, develop_order_code, make_no, material_no, material_name, material_type, material_photo_url, material_unit, material_brand, material_describe, material_process_method, bom_id, material_num, update_finish_time, create_by, create_time, update_by, update_time, remark from erp_develop_modifyorder_detail
     </sql>
 
     <select id="selectErpDevelopModifyorderDetailList" parameterType="ErpDevelopModifyorderDetail" resultMap="ErpDevelopModifyorderDetailResult">
@@ -40,11 +40,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectErpDevelopModifyorderDetailVo"/>
         where develop_order_detail_id = #{developOrderDetailId}
     </select>
-        
+
+    <select id="selectDevelopModifyDetailMaterialByCode"  parameterType="String" resultMap="ErpDevelopModifyorderDetailResult">
+        <include refid="selectErpDevelopModifyorderDetailVo"/>
+        where develop_order_code = #{developOrderCode}
+    </select>
+
     <insert id="insertErpDevelopModifyorderDetail" parameterType="ErpDevelopModifyorderDetail" useGeneratedKeys="true" keyProperty="developOrderDetailId">
         insert into erp_develop_modifyorder_detail
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="developOderCode != null">develop_oder_code,</if>
+            <if test="developOrderCode != null">develop_order_code,</if>
             <if test="makeNo != null">make_no,</if>
             <if test="materialNo != null">material_no,</if>
             <if test="materialName != null">material_name,</if>
@@ -64,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="developOderCode != null">#{developOderCode},</if>
+            <if test="developOrderCode != null">#{developOrderCode},</if>
             <if test="makeNo != null">#{makeNo},</if>
             <if test="materialNo != null">#{materialNo},</if>
             <if test="materialName != null">#{materialName},</if>
@@ -88,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateErpDevelopModifyorderDetail" parameterType="ErpDevelopModifyorderDetail">
         update erp_develop_modifyorder_detail
         <trim prefix="SET" suffixOverrides=",">
-            <if test="developOderCode != null">develop_oder_code = #{developOderCode},</if>
+            <if test="developOrderCode != null">develop_order_code = #{developOrderCode},</if>
             <if test="makeNo != null">make_no = #{makeNo},</if>
             <if test="materialNo != null">material_no = #{materialNo},</if>
             <if test="materialName != null">material_name = #{materialName},</if>

ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml

@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="ErpDevelopModifyorderVo" id="ErpDevelopModifyorderResult">
         <result property="developOrderId"    column="develop_order_id"    />
-        <result property="developOderCode"    column="develop_oder_code"    />
+        <result property="developOrderCode"    column="develop_order_code"    />
         <result property="makeNo" column="make_no"/>
         <result property="materialNo"    column="material_no"    />
         <result property="purchaseStorageStatus"    column="purchase_storage_status"    />
@@ -44,16 +44,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectErpDevelopModifyorderVo">
-        select develop_order_id, develop_oder_code, make_no, material_no, purchase_storage_status, quality_status, audit_status, complete_status, finsh_status, use_status, material_name, material_type, material_photo_url, material_unit, material_brand, material_describe, material_process_method, user_id, update_finish_time, before_update_remark, after_update_remark, create_by, create_time, user_name, update_by, update_time, remark, instance_id, instance_type, submit_instance_id, apply_title, apply_time, apply_user, cancel_instance_id, restore_instance_id from erp_develop_modifyorder
+        select develop_order_id, develop_order_code, make_no, material_no, purchase_storage_status, quality_status, audit_status, complete_status, finsh_status, use_status, material_name, material_type, material_photo_url, material_unit, material_brand, material_describe, material_process_method, user_id, update_finish_time, before_update_remark, after_update_remark, create_by, create_time, user_name, update_by, update_time, remark, instance_id, instance_type, submit_instance_id, apply_title, apply_time, apply_user, cancel_instance_id, restore_instance_id from erp_develop_modifyorder
 
         </sql>
 
     <select id="selectErpDevelopModifyorderList" parameterType="ErpDevelopModifyorder" resultMap="ErpDevelopModifyorderResult">
-        select edm.develop_order_id, edm.develop_oder_code, edm.material_no, edm.purchase_storage_status, edm.quality_status, edm.audit_status, edm.complete_status, edm.finsh_status, edm.use_status, edm.material_name, edm.material_type, edm.material_photo_url, edm.material_unit, edm.material_brand, edm.material_describe, edm.material_process_method, edm.user_id, edm.create_by, edm.create_time, edm.update_by, edm.update_time, edm.remark,su.user_name
+        select edm.develop_order_id, edm.develop_order_code, edm.material_no, edm.purchase_storage_status, edm.quality_status, edm.audit_status, edm.complete_status, edm.finsh_status, edm.use_status, edm.material_name, edm.material_type, edm.material_photo_url, edm.material_unit, edm.material_brand, edm.material_describe, edm.material_process_method, edm.user_id, edm.create_by, edm.create_time, edm.update_by, edm.update_time, edm.remark,su.user_name
         from erp_develop_modifyorder edm
         left join sys_user su on su.user_id = edm.user_id
         <where>
-            <if test="developOderCode != null  and developOderCode != ''"> and edm.develop_oder_code = #{developOderCode}</if>
+            <if test="developOrderCode != null  and developOrderCode != ''"> and edm.develop_order_code = #{developOrderCode}</if>
             <if test="materialNo != null  and materialNo != ''"> and edm.material_no = #{materialNo}</if>
             <if test="auditStatus != null  and auditStatus != ''"> and edm.audit_status = #{auditStatus}</if>
             <if test="finshStatus != null  and finshStatus != ''"> and edm.finsh_status = #{finshStatus}</if>
@@ -67,11 +67,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectErpDevelopModifyorderVo"/>
         where develop_order_id = #{developOrderId}
     </select>
-        
+
+    <select id="selectDevelopModifyMaterialById" parameterType="Long" resultMap="ErpDevelopModifyorderResult">
+        <include refid="selectErpDevelopModifyorderVo"/>
+        where develop_order_id = #{developOrderId}
+    </select>
+
     <insert id="insertErpDevelopModifyorder" parameterType="ErpDevelopModifyorderVo" useGeneratedKeys="true" keyProperty="developOrderId">
         insert into erp_develop_modifyorder
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="developOderCode != null">develop_oder_code,</if>
+            <if test="developOrderCode != null">develop_order_code,</if>
             <if test="makeNo != null">make_no,</if>
             <if test="materialNo != null">material_no,</if>
             <if test="purchaseStorageStatus != null">purchase_storage_status,</if>
@@ -107,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="restoreInstanceId != null">restore_instance_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="developOderCode != null">#{developOderCode},</if>
+            <if test="developOrderCode != null">#{developOrderCode},</if>
             <if test="makeNo != null">#{makeNo},</if>
             <if test="materialNo != null">#{materialNo},</if>
             <if test="purchaseStorageStatus != null">#{purchaseStorageStatus},</if>
@@ -147,7 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateErpDevelopModifyorder" parameterType="ErpDevelopModifyorderVo">
         update erp_develop_modifyorder
         <trim prefix="SET" suffixOverrides=",">
-            <if test="developOderCode != null">develop_oder_code = #{developOderCode},</if>
+            <if test="developOrderCode != null">develop_order_code = #{developOrderCode},</if>
             <if test="makeNo != null">make_no = #{makeNo},</if>
             <if test="materialNo != null">material_no = #{materialNo},</if>
             <if test="purchaseStorageStatus != null">purchase_storage_status = #{purchaseStorageStatus},</if>