[refactor]工程管理:

重构开发修改单：
完成数据填充，页面展示，条件查询操作

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

@@ -0,0 +1,160 @@
+package com.ruoyi.erp.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.erp.domain.ErpDevelopModifyorder;
+import com.ruoyi.erp.service.IErpDevelopModifyorderService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 开发修改单Controller
+ * 
+ * @author 刘晓旭
+ * @date 2024-04-18
+ */
+@Controller
+@RequestMapping("/erp/developModifyOrder")
+public class ErpDevelopModifyorderController extends BaseController
+{
+    private String prefix = "erp/developModifyOrder";
+
+    @Autowired
+    private IErpDevelopModifyorderService erpDevelopModifyorderService;
+
+    @RequiresPermissions("erp:developModifyOrder:view")
+    @GetMapping()
+    public String developModifyOrder()
+    {
+        return prefix + "/developModifyOrder";
+    }
+
+    /**
+     * 查询开发修改单列表
+     */
+    @RequiresPermissions("erp:developModifyOrder:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(ErpDevelopModifyorder erpDevelopModifyorder)
+    {
+        startPage();
+        List<ErpDevelopModifyorder> list = erpDevelopModifyorderService.selectErpDevelopModifyorderList(erpDevelopModifyorder);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出开发修改单列表
+     */
+    @RequiresPermissions("erp:developModifyOrder:export")
+    @Log(title = "开发修改单", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(ErpDevelopModifyorder erpDevelopModifyorder)
+    {
+        List<ErpDevelopModifyorder> list = erpDevelopModifyorderService.selectErpDevelopModifyorderList(erpDevelopModifyorder);
+        ExcelUtil<ErpDevelopModifyorder> util = new ExcelUtil<ErpDevelopModifyorder>(ErpDevelopModifyorder.class);
+        return util.exportExcel(list, "开发修改单数据");
+    }
+
+    /**
+     * 新增开发修改单
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存开发修改单
+     */
+    @RequiresPermissions("erp:developModifyOrder:add")
+    @Log(title = "开发修改单", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(ErpDevelopModifyorder erpDevelopModifyorder)
+    {
+        return toAjax(erpDevelopModifyorderService.insertErpDevelopModifyorder(erpDevelopModifyorder));
+    }
+
+    /**
+     * 修改开发修改单
+     */
+    @GetMapping("/edit/{developOrderId}")
+    public String edit(@PathVariable("developOrderId") Long developOrderId, ModelMap mmap)
+    {
+        ErpDevelopModifyorder erpDevelopModifyorder = erpDevelopModifyorderService.selectErpDevelopModifyorderById(developOrderId);
+        mmap.put("erpDevelopModifyorder", erpDevelopModifyorder);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存开发修改单
+     */
+    @RequiresPermissions("erp:developModifyOrder:edit")
+    @Log(title = "开发修改单", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(ErpDevelopModifyorder erpDevelopModifyorder)
+    {
+        return toAjax(erpDevelopModifyorderService.updateErpDevelopModifyorder(erpDevelopModifyorder));
+    }
+
+    /**
+     *  查看开发修改单详情
+     * */
+    @GetMapping("/detail/{developOrderId}")
+    public String detail(@PathVariable("developOrderId") Long developOrderId, ModelMap mmap){
+        ErpDevelopModifyorder erpDevelopModifyorder = erpDevelopModifyorderService.selectErpDevelopModifyorderById(developOrderId);
+        mmap.put("erpDevelopModifyorder",erpDevelopModifyorder);
+        return prefix+ "/detail";
+    }
+    /**
+     * 删除开发修改单
+     */
+    @RequiresPermissions("erp:developModifyOrder:remove")
+    @Log(title = "开发修改单", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(erpDevelopModifyorderService.deleteErpDevelopModifyorderByIds(ids));
+    }
+
+    /**
+     * 作废开发修改单
+     */
+    @RequiresPermissions("erp:developModifyOrder:cancel")
+    @Log(title = "开发修改单", businessType = BusinessType.CANCEL)
+    @GetMapping( "/cancel/{id}")
+    @ResponseBody
+    public AjaxResult cancel(@PathVariable("id") Long id){
+        return toAjax(erpDevelopModifyorderService.cancelErpDevelopModifyorderById(id));
+    }
+
+    /**
+     * 恢复开发修改单
+     */
+    @RequiresPermissions("erp:developModifyOrder:restore")
+    @Log(title = "开发修改单", businessType = BusinessType.RESTORE)
+    @GetMapping( "/restore/{id}")
+    @ResponseBody
+    public AjaxResult restore(@PathVariable("id")Long id)
+    {
+        return toAjax(erpDevelopModifyorderService.restoreErpDevelopModifyorderById(id));
+    }
+
+
+}

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

@@ -0,0 +1,280 @@
+package com.ruoyi.erp.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 开发修改单对象 erp_develop_modifyorder
+ * 
+ * @author 刘晓旭
+ * @date 2024-04-18
+ */
+public class ErpDevelopModifyorder extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 开发修改单ID */
+    private Long developOrderId;
+
+    /** 开发修改单号 */
+    @Excel(name = "开发修改单号")
+    private String developOderCode;
+
+    /** 料号 */
+    @Excel(name = "料号")
+    private String materialNo;
+
+    /** 采购入库状态 */
+    @Excel(name = "采购入库状态")
+    private String purchaseStorageStatus;
+
+    /** 品质状态 */
+    @Excel(name = "品质状态")
+    private String qualityStatus;
+
+    /** 审核状态 */
+    @Excel(name = "审核状态")
+    private String auditStatus;
+
+    /** 确认状态 */
+    @Excel(name = "确认状态")
+    private String completeStatus;
+
+    /** 完成状态 */
+    @Excel(name = "完成状态")
+    private String finshStatus;
+
+    /** 使用状态 */
+    @Excel(name = "使用状态")
+    private String useStatus;
+
+    /** 物料名称 */
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    /** 物料类型 */
+    @Excel(name = "物料类型")
+    private String materialType;
+
+    /** 图片 */
+    @Excel(name = "图片")
+    private String materialPhotoUrl;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String materialUnit;
+
+    /** 品牌 */
+    @Excel(name = "品牌")
+    private String materialBrand;
+
+    /** 描述 */
+    @Excel(name = "描述")
+    private String materialDescribe;
+
+    /** 加工方式 */
+    @Excel(name = "加工方式")
+    private String materialProcessMode;
+
+    /** 工程员 */
+    @Excel(name = "工程员")
+    private Long userId;
+
+    /** 工程员姓名 */
+    @Excel(name = "工程员姓名")
+    private String userName;
+
+    public void setDevelopOrderId(Long developOrderId) 
+    {
+        this.developOrderId = developOrderId;
+    }
+
+    public Long getDevelopOrderId() 
+    {
+        return developOrderId;
+    }
+    public void setDevelopOderCode(String developOderCode) 
+    {
+        this.developOderCode = developOderCode;
+    }
+
+    public String getDevelopOderCode() 
+    {
+        return developOderCode;
+    }
+    public void setMaterialNo(String materialNo) 
+    {
+        this.materialNo = materialNo;
+    }
+
+    public String getMaterialNo() 
+    {
+        return materialNo;
+    }
+    public void setPurchaseStorageStatus(String purchaseStorageStatus) 
+    {
+        this.purchaseStorageStatus = purchaseStorageStatus;
+    }
+
+    public String getPurchaseStorageStatus() 
+    {
+        return purchaseStorageStatus;
+    }
+    public void setQualityStatus(String qualityStatus) 
+    {
+        this.qualityStatus = qualityStatus;
+    }
+
+    public String getQualityStatus() 
+    {
+        return qualityStatus;
+    }
+    public void setAuditStatus(String auditStatus) 
+    {
+        this.auditStatus = auditStatus;
+    }
+
+    public String getAuditStatus() 
+    {
+        return auditStatus;
+    }
+    public void setCompleteStatus(String completeStatus) 
+    {
+        this.completeStatus = completeStatus;
+    }
+
+    public String getCompleteStatus() 
+    {
+        return completeStatus;
+    }
+    public void setFinshStatus(String finshStatus) 
+    {
+        this.finshStatus = finshStatus;
+    }
+
+    public String getFinshStatus() 
+    {
+        return finshStatus;
+    }
+    public void setUseStatus(String useStatus) 
+    {
+        this.useStatus = useStatus;
+    }
+
+    public String getUseStatus() 
+    {
+        return useStatus;
+    }
+    public void setMaterialName(String materialName) 
+    {
+        this.materialName = materialName;
+    }
+
+    public String getMaterialName() 
+    {
+        return materialName;
+    }
+    public void setMaterialType(String materialType) 
+    {
+        this.materialType = materialType;
+    }
+
+    public String getMaterialType() 
+    {
+        return materialType;
+    }
+    public void setMaterialPhotoUrl(String materialPhotoUrl) 
+    {
+        this.materialPhotoUrl = materialPhotoUrl;
+    }
+
+    public String getMaterialPhotoUrl() 
+    {
+        return materialPhotoUrl;
+    }
+    public void setMaterialUnit(String materialUnit) 
+    {
+        this.materialUnit = materialUnit;
+    }
+
+    public String getMaterialUnit() 
+    {
+        return materialUnit;
+    }
+    public void setMaterialBrand(String materialBrand) 
+    {
+        this.materialBrand = materialBrand;
+    }
+
+    public String getMaterialBrand() 
+    {
+        return materialBrand;
+    }
+    public void setMaterialDescribe(String materialDescribe) 
+    {
+        this.materialDescribe = materialDescribe;
+    }
+
+    public String getMaterialDescribe() 
+    {
+        return materialDescribe;
+    }
+    public void setMaterialProcessMode(String materialProcessMode) 
+    {
+        this.materialProcessMode = materialProcessMode;
+    }
+
+    public String getMaterialProcessMode() 
+    {
+        return materialProcessMode;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setUserName(String userName) 
+    {
+        this.userName = userName;
+    }
+
+    public String getUserName() 
+    {
+        return userName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("developOrderId", getDevelopOrderId())
+            .append("developOderCode", getDevelopOderCode())
+            .append("materialNo", getMaterialNo())
+            .append("purchaseStorageStatus", getPurchaseStorageStatus())
+            .append("qualityStatus", getQualityStatus())
+            .append("auditStatus", getAuditStatus())
+            .append("completeStatus", getCompleteStatus())
+            .append("finshStatus", getFinshStatus())
+            .append("useStatus", getUseStatus())
+            .append("materialName", getMaterialName())
+            .append("materialType", getMaterialType())
+            .append("materialPhotoUrl", getMaterialPhotoUrl())
+            .append("materialUnit", getMaterialUnit())
+            .append("materialBrand", getMaterialBrand())
+            .append("materialDescribe", getMaterialDescribe())
+            .append("materialProcessMode", getMaterialProcessMode())
+            .append("userId", getUserId())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("userName", getUserName())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,77 @@
+package com.ruoyi.erp.mapper;
+
+import java.util.List;
+import com.ruoyi.erp.domain.ErpDevelopModifyorder;
+
+/**
+ * 开发修改单Mapper接口
+ * 
+ * @author 刘晓旭
+ * @date 2024-04-18
+ */
+public interface ErpDevelopModifyorderMapper 
+{
+    /**
+     * 查询开发修改单
+     * 
+     * @param developOrderId 开发修改单ID
+     * @return 开发修改单
+     */
+    public ErpDevelopModifyorder selectErpDevelopModifyorderById(Long developOrderId);
+
+    /**
+     * 查询开发修改单列表
+     * 
+     * @param erpDevelopModifyorder 开发修改单
+     * @return 开发修改单集合
+     */
+    public List<ErpDevelopModifyorder> selectErpDevelopModifyorderList(ErpDevelopModifyorder erpDevelopModifyorder);
+
+    /**
+     * 新增开发修改单
+     * 
+     * @param erpDevelopModifyorder 开发修改单
+     * @return 结果
+     */
+    public int insertErpDevelopModifyorder(ErpDevelopModifyorder erpDevelopModifyorder);
+
+    /**
+     * 修改开发修改单
+     * 
+     * @param erpDevelopModifyorder 开发修改单
+     * @return 结果
+     */
+    public int updateErpDevelopModifyorder(ErpDevelopModifyorder erpDevelopModifyorder);
+
+    /**
+     * 删除开发修改单
+     * 
+     * @param developOrderId 开发修改单ID
+     * @return 结果
+     */
+    public int deleteErpDevelopModifyorderById(Long developOrderId);
+
+    /**
+     * 批量删除开发修改单
+     * 
+     * @param developOrderIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteErpDevelopModifyorderByIds(String[] developOrderIds);
+
+    /**
+     * 作废开发修改单
+     *
+     * @param developOrderId 开发修改单ID
+     * @return 结果
+     */
+    public int cancelErpDevelopModifyorderById(Long developOrderId);
+
+    /**
+     * 恢复开发修改单
+     *
+     * @param developOrderId 开发修改单ID
+     * @return 结果
+     */
+    public int restoreErpDevelopModifyorderById(Long developOrderId);
+}

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

@@ -0,0 +1,75 @@
+package com.ruoyi.erp.service;
+
+import java.util.List;
+import com.ruoyi.erp.domain.ErpDevelopModifyorder;
+
+/**
+ * 开发修改单Service接口
+ * 
+ * @author 刘晓旭
+ * @date 2024-04-18
+ */
+public interface IErpDevelopModifyorderService 
+{
+    /**
+     * 查询开发修改单
+     * 
+     * @param developOrderId 开发修改单ID
+     * @return 开发修改单
+     */
+    public ErpDevelopModifyorder selectErpDevelopModifyorderById(Long developOrderId);
+
+    /**
+     * 查询开发修改单列表
+     * 
+     * @param erpDevelopModifyorder 开发修改单
+     * @return 开发修改单集合
+     */
+    public List<ErpDevelopModifyorder> selectErpDevelopModifyorderList(ErpDevelopModifyorder erpDevelopModifyorder);
+
+    /**
+     * 新增开发修改单
+     * 
+     * @param erpDevelopModifyorder 开发修改单
+     * @return 结果
+     */
+    public int insertErpDevelopModifyorder(ErpDevelopModifyorder erpDevelopModifyorder);
+
+    /**
+     * 修改开发修改单
+     * 
+     * @param erpDevelopModifyorder 开发修改单
+     * @return 结果
+     */
+    public int updateErpDevelopModifyorder(ErpDevelopModifyorder erpDevelopModifyorder);
+
+    /**
+     * 批量删除开发修改单
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteErpDevelopModifyorderByIds(String ids);
+
+    /**
+     * 删除开发修改单信息
+     * 
+     * @param developOrderId 开发修改单ID
+     * @return 结果
+     */
+    public int deleteErpDevelopModifyorderById(Long developOrderId);
+
+    /**
+     * 作废开发修改单
+     * @param developOrderId 开发修改单ID
+     * @return
+     */
+    int cancelErpDevelopModifyorderById(Long developOrderId);
+
+    /**
+     * 恢复开发修改单
+     * @param developOrderId 开发修改单ID
+     * @return
+     */
+    int restoreErpDevelopModifyorderById(Long developOrderId);
+}

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

@@ -0,0 +1,126 @@
+package com.ruoyi.erp.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.ShiroUtils;
+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;
+
+/**
+ * 开发修改单Service业务层处理
+ * 
+ * @author 刘晓旭
+ * @date 2024-04-18
+ */
+@Service
+public class ErpDevelopModifyorderServiceImpl implements IErpDevelopModifyorderService 
+{
+    @Autowired
+    private ErpDevelopModifyorderMapper erpDevelopModifyorderMapper;
+
+    /**
+     * 查询开发修改单
+     * 
+     * @param developOrderId 开发修改单ID
+     * @return 开发修改单
+     */
+    @Override
+    public ErpDevelopModifyorder selectErpDevelopModifyorderById(Long developOrderId)
+    {
+        return erpDevelopModifyorderMapper.selectErpDevelopModifyorderById(developOrderId);
+    }
+
+    /**
+     * 查询开发修改单列表
+     * 
+     * @param erpDevelopModifyorder 开发修改单
+     * @return 开发修改单
+     */
+    @Override
+    public List<ErpDevelopModifyorder> selectErpDevelopModifyorderList(ErpDevelopModifyorder erpDevelopModifyorder)
+    {
+        return erpDevelopModifyorderMapper.selectErpDevelopModifyorderList(erpDevelopModifyorder);
+    }
+
+    /**
+     * 新增开发修改单
+     * 
+     * @param erpDevelopModifyorder 开发修改单
+     * @return 结果
+     */
+    @Override
+    public int insertErpDevelopModifyorder(ErpDevelopModifyorder erpDevelopModifyorder)
+    {
+        String loginName = ShiroUtils.getLoginName();
+        erpDevelopModifyorder.setCreateBy(loginName);
+        erpDevelopModifyorder.setCreateTime(DateUtils.getNowDate());
+        return erpDevelopModifyorderMapper.insertErpDevelopModifyorder(erpDevelopModifyorder);
+    }
+
+    /**
+     * 修改开发修改单
+     * 
+     * @param erpDevelopModifyorder 开发修改单
+     * @return 结果
+     */
+    @Override
+    public int updateErpDevelopModifyorder(ErpDevelopModifyorder erpDevelopModifyorder)
+    {
+        String loginName = ShiroUtils.getLoginName();
+        erpDevelopModifyorder.setUpdateBy(loginName);
+        erpDevelopModifyorder.setUpdateTime(DateUtils.getNowDate());
+        return erpDevelopModifyorderMapper.updateErpDevelopModifyorder(erpDevelopModifyorder);
+    }
+
+    /**
+     * 删除开发修改单对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteErpDevelopModifyorderByIds(String ids)
+    {
+        return erpDevelopModifyorderMapper.deleteErpDevelopModifyorderByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除开发修改单信息
+     * 
+     * @param developOrderId 开发修改单ID
+     * @return 结果
+     */
+    @Override
+    public int deleteErpDevelopModifyorderById(Long developOrderId)
+    {
+        return erpDevelopModifyorderMapper.deleteErpDevelopModifyorderById(developOrderId);
+    }
+
+    /**
+     * 作废开发修改单
+     *
+     * @param developOrderId 开发修改单ID
+     * @return 结果
+     */
+    @Override
+    public int cancelErpDevelopModifyorderById(Long developOrderId)
+    {
+        return erpDevelopModifyorderMapper.cancelErpDevelopModifyorderById(developOrderId);
+    }
+
+    /**
+     * 恢复开发修改单信息
+     *
+     * @param developOrderId 开发修改单ID
+     * @return 结果
+     */
+    @Override
+    public int restoreErpDevelopModifyorderById(Long developOrderId)
+    {
+        return erpDevelopModifyorderMapper.restoreErpDevelopModifyorderById(developOrderId);
+    }
+}

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

@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.erp.mapper.ErpDevelopModifyorderMapper">
+    
+    <resultMap type="ErpDevelopModifyorder" id="ErpDevelopModifyorderResult">
+        <result property="developOrderId"    column="develop_order_id"    />
+        <result property="developOderCode"    column="develop_oder_code"    />
+        <result property="materialNo"    column="material_no"    />
+        <result property="purchaseStorageStatus"    column="purchase_storage_status"    />
+        <result property="qualityStatus"    column="quality_status"    />
+        <result property="auditStatus"    column="audit_status"    />
+        <result property="completeStatus"    column="complete_status"    />
+        <result property="finshStatus"    column="finsh_status"    />
+        <result property="useStatus"    column="use_status"    />
+        <result property="materialName"    column="material_name"    />
+        <result property="materialType"    column="material_type"    />
+        <result property="materialPhotoUrl"    column="material_photo_url"    />
+        <result property="materialUnit"    column="material_unit"    />
+        <result property="materialBrand"    column="material_brand"    />
+        <result property="materialDescribe"    column="material_describe"    />
+        <result property="materialProcessMode"    column="material_process_mode"    />
+        <result property="userId"    column="user_id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="userName"    column="user_name"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectErpDevelopModifyorderVo">
+        select develop_order_id, develop_oder_code, 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_mode, user_id, create_by, create_time, user_name, update_by, update_time, remark from erp_develop_modifyorder
+    </sql>
+
+    <select id="selectErpDevelopModifyorderList" parameterType="ErpDevelopModifyorder" resultMap="ErpDevelopModifyorderResult">
+        <include refid="selectErpDevelopModifyorderVo"/>
+        <where>  
+            <if test="developOderCode != null  and developOderCode != ''"> and develop_oder_code = #{developOderCode}</if>
+            <if test="materialNo != null  and materialNo != ''"> and material_no = #{materialNo}</if>
+            <if test="auditStatus != null  and auditStatus != ''"> and audit_status = #{auditStatus}</if>
+            <if test="finshStatus != null  and finshStatus != ''"> and finsh_status = #{finshStatus}</if>
+            <if test="materialName != null  and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="createTime != null "> and create_time = #{createTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectErpDevelopModifyorderById" parameterType="Long" resultMap="ErpDevelopModifyorderResult">
+        <include refid="selectErpDevelopModifyorderVo"/>
+        where develop_order_id = #{developOrderId}
+    </select>
+        
+    <insert id="insertErpDevelopModifyorder" parameterType="ErpDevelopModifyorder" useGeneratedKeys="true" keyProperty="developOrderId">
+        insert into erp_develop_modifyorder
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="developOderCode != null">develop_oder_code,</if>
+            <if test="materialNo != null">material_no,</if>
+            <if test="purchaseStorageStatus != null">purchase_storage_status,</if>
+            <if test="qualityStatus != null">quality_status,</if>
+            <if test="auditStatus != null">audit_status,</if>
+            <if test="completeStatus != null">complete_status,</if>
+            <if test="finshStatus != null">finsh_status,</if>
+            <if test="useStatus != null">use_status,</if>
+            <if test="materialName != null">material_name,</if>
+            <if test="materialType != null">material_type,</if>
+            <if test="materialPhotoUrl != null">material_photo_url,</if>
+            <if test="materialUnit != null">material_unit,</if>
+            <if test="materialBrand != null">material_brand,</if>
+            <if test="materialDescribe != null">material_describe,</if>
+            <if test="materialProcessMode != null">material_process_mode,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="userName != null">user_name,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="developOderCode != null">#{developOderCode},</if>
+            <if test="materialNo != null">#{materialNo},</if>
+            <if test="purchaseStorageStatus != null">#{purchaseStorageStatus},</if>
+            <if test="qualityStatus != null">#{qualityStatus},</if>
+            <if test="auditStatus != null">#{auditStatus},</if>
+            <if test="completeStatus != null">#{completeStatus},</if>
+            <if test="finshStatus != null">#{finshStatus},</if>
+            <if test="useStatus != null">#{useStatus},</if>
+            <if test="materialName != null">#{materialName},</if>
+            <if test="materialType != null">#{materialType},</if>
+            <if test="materialPhotoUrl != null">#{materialPhotoUrl},</if>
+            <if test="materialUnit != null">#{materialUnit},</if>
+            <if test="materialBrand != null">#{materialBrand},</if>
+            <if test="materialDescribe != null">#{materialDescribe},</if>
+            <if test="materialProcessMode != null">#{materialProcessMode},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="userName != null">#{userName},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateErpDevelopModifyorder" parameterType="ErpDevelopModifyorder">
+        update erp_develop_modifyorder
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="developOderCode != null">develop_oder_code = #{developOderCode},</if>
+            <if test="materialNo != null">material_no = #{materialNo},</if>
+            <if test="purchaseStorageStatus != null">purchase_storage_status = #{purchaseStorageStatus},</if>
+            <if test="qualityStatus != null">quality_status = #{qualityStatus},</if>
+            <if test="auditStatus != null">audit_status = #{auditStatus},</if>
+            <if test="completeStatus != null">complete_status = #{completeStatus},</if>
+            <if test="finshStatus != null">finsh_status = #{finshStatus},</if>
+            <if test="useStatus != null">use_status = #{useStatus},</if>
+            <if test="materialName != null">material_name = #{materialName},</if>
+            <if test="materialType != null">material_type = #{materialType},</if>
+            <if test="materialPhotoUrl != null">material_photo_url = #{materialPhotoUrl},</if>
+            <if test="materialUnit != null">material_unit = #{materialUnit},</if>
+            <if test="materialBrand != null">material_brand = #{materialBrand},</if>
+            <if test="materialDescribe != null">material_describe = #{materialDescribe},</if>
+            <if test="materialProcessMode != null">material_process_mode = #{materialProcessMode},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="userName != null">user_name = #{userName},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where develop_order_id = #{developOrderId}
+    </update>
+
+    <delete id="deleteErpDevelopModifyorderById" parameterType="Long">
+        delete from erp_develop_modifyorder where develop_order_id = #{developOrderId}
+    </delete>
+
+    <delete id="deleteErpDevelopModifyorderByIds" parameterType="String">
+        delete from erp_develop_modifyorder where develop_order_id in 
+        <foreach item="developOrderId" collection="array" open="(" separator="," close=")">
+            #{developOrderId}
+        </foreach>
+    </delete>
+
+    <update id="cancelErpDevelopModifyorderById" parameterType="Long">
+        update erp_develop_modifyorder set del_flag = '1' where develop_order_id = #{developOrderId}
+    </update>
+
+    <update id="restoreErpDevelopModifyorderById" parameterType="Long">
+        update erp_develop_modifyorder set del_flag = '0' where develop_order_id = #{developOrderId}
+    </update>
+
+</mapper>

ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html

@@ -0,0 +1,147 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增开发修改单')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-developModifyOrder-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">开发修改单号：</label>
+                <div class="col-sm-8">
+                    <input name="developOderCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">料号：</label>
+                <div class="col-sm-8">
+                    <input name="materialNo" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">采购入库状态：</label>
+                <div class="col-sm-8">
+                    <select name="purchaseStorageStatus" class="form-control m-b" th:with="type=${@dict.getType('eceiptStatus')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">品质状态：</label>
+                <div class="col-sm-8">
+                    <select name="qualityStatus" class="form-control m-b" th:with="type=${@dict.getType('qualityStatus')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">审核状态：</label>
+                <div class="col-sm-8">
+                    <select name="auditStatus" class="form-control m-b" th:with="type=${@dict.getType('auditStatus')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">确认状态：</label>
+                <div class="col-sm-8">
+                    <select name="completeStatus" class="form-control m-b" th:with="type=${@dict.getType('completeStatus')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">完成状态：</label>
+                <div class="col-sm-8">
+                    <select name="finshStatus" class="form-control m-b" th:with="type=${@dict.getType('finshStatus')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">使用状态：</label>
+                <div class="col-sm-8">
+                    <select name="useStatus" class="form-control m-b" th:with="type=${@dict.getType('useStatus')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料名称：</label>
+                <div class="col-sm-8">
+                    <input name="materialName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料类型：</label>
+                <div class="col-sm-8">
+                    <input name="materialType" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">图片：</label>
+                <div class="col-sm-8">
+                    <input name="materialPhotoUrl" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">单位：</label>
+                <div class="col-sm-8">
+                    <input name="materialUnit" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">品牌：</label>
+                <div class="col-sm-8">
+                    <input name="materialBrand" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">描述：</label>
+                <div class="col-sm-8">
+                    <input name="materialDescribe" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">加工方式：</label>
+                <div class="col-sm-8">
+                    <input name="materialProcessMode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">工程员：</label>
+                <div class="col-sm-8">
+                    <select name="userId" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">工程员姓名：</label>
+                <div class="col-sm-8">
+                    <input name="userName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注信息：</label>
+                <div class="col-sm-8">
+                    <input name="remark" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "erp/developModifyOrder"
+        $("#form-developModifyOrder-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-developModifyOrder-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/detail.html

@@ -0,0 +1,148 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改开发修改单')" />
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-developModifyOrder-detail" th:object="${erpDevelopModifyorder}">
+        <input name="developOrderId" th:field="*{developOrderId}" type="hidden">
+        <div class="form-group">
+            <label class="col-sm-3 control-label">开发修改单号：</label>
+            <div class="col-sm-8">
+                <input name="developOderCode" th:field="*{developOderCode}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">料号：</label>
+            <div class="col-sm-8">
+                <input name="materialNo" th:field="*{materialNo}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">采购入库状态：</label>
+            <div class="col-sm-8">
+                <select name="purchaseStorageStatus" class="form-control m-b" th:with="type=${@dict.getType('eceiptStatus')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{purchaseStorageStatus}"></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">品质状态：</label>
+            <div class="col-sm-8">
+                <select name="qualityStatus" class="form-control m-b" th:with="type=${@dict.getType('qualityStatus')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{qualityStatus}"></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">审核状态：</label>
+            <div class="col-sm-8">
+                <select name="auditStatus" class="form-control m-b" th:with="type=${@dict.getType('auditStatus')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{auditStatus}"></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">确认状态：</label>
+            <div class="col-sm-8">
+                <select name="completeStatus" class="form-control m-b" th:with="type=${@dict.getType('completeStatus')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{completeStatus}"></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">完成状态：</label>
+            <div class="col-sm-8">
+                <select name="finshStatus" class="form-control m-b" th:with="type=${@dict.getType('finshStatus')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{finshStatus}"></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">使用状态：</label>
+            <div class="col-sm-8">
+                <select name="useStatus" class="form-control m-b" th:with="type=${@dict.getType('useStatus')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{useStatus}"></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">物料名称：</label>
+            <div class="col-sm-8">
+                <input name="materialName" th:field="*{materialName}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">物料类型：</label>
+            <div class="col-sm-8">
+                <input name="materialType" th:field="*{materialType}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">图片：</label>
+            <div class="col-sm-8">
+                <input name="materialPhotoUrl" th:field="*{materialPhotoUrl}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">单位：</label>
+            <div class="col-sm-8">
+                <input name="materialUnit" th:field="*{materialUnit}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">品牌：</label>
+            <div class="col-sm-8">
+                <input name="materialBrand" th:field="*{materialBrand}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">描述：</label>
+            <div class="col-sm-8">
+                <input name="materialDescribe" th:field="*{materialDescribe}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">加工方式：</label>
+            <div class="col-sm-8">
+                <input name="materialProcessMode" th:field="*{materialProcessMode}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">工程员：</label>
+            <div class="col-sm-8">
+                <select name="userId" class="form-control m-b">
+                    <option value="">所有</option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">工程员姓名：</label>
+            <div class="col-sm-8">
+                <input name="userName" th:field="*{userName}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">备注信息：</label>
+            <div class="col-sm-8">
+                <input name="remark" th:field="*{remark}" class="form-control" type="text">
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<script th:inline="javascript">
+    var prefix = ctx + "erp/developModifyOrder";
+    $("#form-developModifyOrder-detail").validate({
+        focusCleanup: true
+    });
+
+    function submitHandler() {
+        if ($.validate.form()) {
+            $.operate.save(prefix + "/detail", $('#form-developModifyOrder-detail').serialize());
+        }
+    }
+</script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html

@@ -0,0 +1,229 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('开发修改单列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>开发修改单号：</label>
+                                <input type="text" name="developOderCode"/>
+                            </li>
+                            <li>
+                                <label>料号：</label>
+                                <input type="text" name="materialNo"/>
+                            </li>
+                            <li>
+                                <label>物料名称：</label>
+                                <input type="text" name="materialName"/>
+                            </li>
+                            <li>
+                                <label>审核状态：</label>
+                                <select name="auditStatus" th:with="type=${@dict.getType('auditStatus')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>工程员：</label>
+                                <select name="userId">
+                                    <option value="">所有</option>
+                                    <option value="-1">代码生成请选择字典属性</option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>完成状态：</label>
+                                <select name="finshStatus" th:with="type=${@dict.getType('finshStatus')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>录入时间：</label>
+                                <input type="text" class="time-input" placeholder="请选择录入时间" name="createTime"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="erp:developModifyOrder:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="erp:developModifyOrder:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="erp:developModifyOrder:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="erp:developModifyOrder:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('erp:developModifyOrder:edit')}]];
+        var detailFlag = [[${@permission.hasPermi('erp:developModifyOrder:detail')}]];
+        var removeFlag = [[${@permission.hasPermi('erp:developModifyOrder:remove')}]];
+        var cancelFlag = [[${@permission.hasPermi('erp:developModifyOrder:cancel')}]];
+        var restoreFlag = [[${@permission.hasPermi('erp:developModifyOrder:restore')}]];
+        var purchaseStorageStatusDatas = [[${@dict.getType('eceiptStatus')}]];
+        var qualityStatusDatas = [[${@dict.getType('qualityStatus')}]];
+        var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
+        var completeStatusDatas = [[${@dict.getType('completeStatus')}]];
+        var finshStatusDatas = [[${@dict.getType('finshStatus')}]];
+        var useStatusDatas = [[${@dict.getType('useStatus')}]];
+        var prefix = ctx + "erp/developModifyOrder";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                detailUrl: prefix + "/detail/{id}",
+                removeUrl: prefix + "/remove",
+                cancelUrl: prefix + "/cancel/{id}",
+                restoreUrl: prefix + "/restore/{id}",
+                exportUrl: prefix + "/export",
+                modalName: "开发修改单",
+                columns: [{
+                    checkbox: true
+                },
+                    {
+                        title: '开发修改单ID',
+                        field: 'developOrderId',
+                        visible: false
+                    },
+                    {
+                        title: '审核状态',
+                        field: 'auditStatus',
+                        formatter: function (value, row, index) {
+                            return $.table.selectDictLabel(auditStatusDatas, value);
+                        }
+                    },
+                    {
+                        title: '完成状态',
+                        field: 'finshStatus',
+                        formatter: function (value, row, index) {
+                            return $.table.selectDictLabel(finshStatusDatas, value);
+                        }
+                    },
+                    {
+                        title: '确认状态',
+                        field: 'completeStatus',
+                        formatter: function (value, row, index) {
+                            return $.table.selectDictLabel(completeStatusDatas, value);
+                        }
+                    },
+                    {
+                        title: '开发修改单号',
+                        field: 'developOderCode',
+                    },
+                    {
+                        title: '采购入库状态',
+                        field: 'purchaseStorageStatus',
+                        formatter: function (value, row, index) {
+                            return $.table.selectDictLabel(purchaseStorageStatusDatas, value);
+                        }
+                    },
+                    {
+                        title: '品质状态',
+                        field: 'qualityStatus',
+                        formatter: function (value, row, index) {
+                            return $.table.selectDictLabel(qualityStatusDatas, value);
+                        }
+                    },
+                    {
+                        title: '工程员',
+                        field: 'userId',
+                    },
+                    {
+                        title: '料号',
+                        field: 'materialNo',
+                    },
+                    {
+                        title: '图片',
+                        field: 'materialPhotoUrl',
+                    },
+                    {
+                        title: '物料名称',
+                        field: 'materialName',
+                    },
+                    {
+                        title: '物料类型',
+                        field: 'materialType',
+                    },
+                    {
+                        title: '单位',
+                        field: 'materialUnit',
+                    },
+                    {
+                        title: '品牌',
+                        field: 'materialBrand',
+                    },
+                    {
+                        title: '描述',
+                        field: 'materialDescribe',
+                    },
+                    {
+                        title: '加工方式',
+                        field: 'materialProcessMode',
+                    },
+
+                    {
+                        title: '录入时间',
+                        field: 'createTime',
+                    },
+                    {
+                        title: '更新人',
+                        field: 'updateBy',
+                    },
+                    {
+                        title: '上次更新时间',
+                        field: 'updateTime',
+                    },
+
+                // {
+                //     title: '使用状态',
+                //     field: 'useStatus',
+                //     formatter: function(value, row, index) {
+                //        return $.table.selectDictLabel(useStatusDatas, value);
+                //     }
+                // },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.developOrderId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.developOrderId + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.developOrderId + '\')"><i class="fa fa-remove"></i>删除</a> ');
+                        if(row.delFlag == '0'){
+                            actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> ');
+                        }else{
+                            actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i>恢复</a> ');
+                        }
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/edit.html

@@ -0,0 +1,148 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改开发修改单')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-developModifyOrder-edit" th:object="${erpDevelopModifyorder}">
+            <input name="developOrderId" th:field="*{developOrderId}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">开发修改单号：</label>
+                <div class="col-sm-8">
+                    <input name="developOderCode" th:field="*{developOderCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">料号：</label>
+                <div class="col-sm-8">
+                    <input name="materialNo" th:field="*{materialNo}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">采购入库状态：</label>
+                <div class="col-sm-8">
+                    <select name="purchaseStorageStatus" class="form-control m-b" th:with="type=${@dict.getType('eceiptStatus')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{purchaseStorageStatus}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">品质状态：</label>
+                <div class="col-sm-8">
+                    <select name="qualityStatus" class="form-control m-b" th:with="type=${@dict.getType('qualityStatus')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{qualityStatus}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">审核状态：</label>
+                <div class="col-sm-8">
+                    <select name="auditStatus" class="form-control m-b" th:with="type=${@dict.getType('auditStatus')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{auditStatus}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">确认状态：</label>
+                <div class="col-sm-8">
+                    <select name="completeStatus" class="form-control m-b" th:with="type=${@dict.getType('completeStatus')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{completeStatus}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">完成状态：</label>
+                <div class="col-sm-8">
+                    <select name="finshStatus" class="form-control m-b" th:with="type=${@dict.getType('finshStatus')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{finshStatus}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">使用状态：</label>
+                <div class="col-sm-8">
+                    <select name="useStatus" class="form-control m-b" th:with="type=${@dict.getType('useStatus')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{useStatus}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料名称：</label>
+                <div class="col-sm-8">
+                    <input name="materialName" th:field="*{materialName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料类型：</label>
+                <div class="col-sm-8">
+                    <input name="materialType" th:field="*{materialType}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">图片：</label>
+                <div class="col-sm-8">
+                    <input name="materialPhotoUrl" th:field="*{materialPhotoUrl}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">单位：</label>
+                <div class="col-sm-8">
+                    <input name="materialUnit" th:field="*{materialUnit}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">品牌：</label>
+                <div class="col-sm-8">
+                    <input name="materialBrand" th:field="*{materialBrand}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">描述：</label>
+                <div class="col-sm-8">
+                    <input name="materialDescribe" th:field="*{materialDescribe}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">加工方式：</label>
+                <div class="col-sm-8">
+                    <input name="materialProcessMode" th:field="*{materialProcessMode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">工程员：</label>
+                <div class="col-sm-8">
+                    <select name="userId" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">工程员姓名：</label>
+                <div class="col-sm-8">
+                    <input name="userName" th:field="*{userName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注信息：</label>
+                <div class="col-sm-8">
+                    <input name="remark" th:field="*{remark}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "erp/developModifyOrder";
+        $("#form-developModifyOrder-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-developModifyOrder-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>