[feat] 工程管理

开发修改单实体类新增 开发修改单详情集合
新增开发修改单详情domain
新增开发修改单详情service
新增开发修改单详情serviceImpl
新增开发修改单详情mapper

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

@@ -7,6 +7,7 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 开发修改单对象 erp_develop_modifyorder
@@ -83,7 +84,7 @@ public class ErpDevelopModifyorder extends BaseEntity
 
     /** 加工方式 */
     @Excel(name = "加工方式")
-    private String materialProcessMode;
+    private String materialProcessMethod;
 
     /** 工程员 */
     @Excel(name = "工程员")
@@ -136,6 +137,9 @@ public class ErpDevelopModifyorder extends BaseEntity
     private String restoreInstanceId;
 
 
+    /** 开发修改单详情 */
+   private List<ErpDevelopModifyorderDetail> developModifyorderDetailList;
+
     public String getMakeNo() {
         return makeNo;
     }
@@ -279,16 +283,17 @@ public class ErpDevelopModifyorder extends BaseEntity
     {
         return materialDescribe;
     }
-    public void setMaterialProcessMode(String materialProcessMode) 
-    {
-        this.materialProcessMode = materialProcessMode;
+
+
+    public String getMaterialProcessMethod() {
+        return materialProcessMethod;
     }
 
-    public String getMaterialProcessMode() 
-    {
-        return materialProcessMode;
+    public void setMaterialProcessMethod(String materialProcessMethod) {
+        this.materialProcessMethod = materialProcessMethod;
     }
-    public void setUserId(Long userId) 
+
+    public void setUserId(Long userId)
     {
         this.userId = userId;
     }
@@ -396,6 +401,14 @@ public class ErpDevelopModifyorder extends BaseEntity
         this.restoreInstanceId = restoreInstanceId;
     }
 
+    public List<ErpDevelopModifyorderDetail> getDevelopModifyorderDetailList() {
+        return developModifyorderDetailList;
+    }
+
+    public void setDevelopModifyorderDetailList(List<ErpDevelopModifyorderDetail> developModifyorderDetailList) {
+        this.developModifyorderDetailList = developModifyorderDetailList;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -415,7 +428,7 @@ public class ErpDevelopModifyorder extends BaseEntity
             .append("materialUnit", getMaterialUnit())
             .append("materialBrand", getMaterialBrand())
             .append("materialDescribe", getMaterialDescribe())
-            .append("materialProcessMode", getMaterialProcessMode())
+            .append("materialProcessMethod", getMaterialProcessMethod())
             .append("userId", getUserId())
             .append("userName", getUserName())
             .append("updateFinishTime", getUpdateFinishTime())
@@ -434,6 +447,7 @@ public class ErpDevelopModifyorder extends BaseEntity
             .append("applyUser", getApplyUser())
             .append("cancelInstanceId", getCancelInstanceId())
             .append("restoreInstanceId", getRestoreInstanceId())
+            .append("developModifyorderDetailList",getDevelopModifyorderDetailList())
             .toString();
     }
 }

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

@@ -0,0 +1,227 @@
+package com.ruoyi.erp.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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_detail
+ * 
+ * @author 刘晓旭
+ * @date 2024-07-25
+ */
+public class ErpDevelopModifyorderDetail extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 开发修改单详情ID */
+    private Long developOrderDetailId;
+
+    /** 开发修改单单号 */
+    @Excel(name = "开发修改单单号")
+    private String developOderCode;
+
+    /** 生产单号 */
+    @Excel(name = "生产单号")
+    private String makeNo;
+
+    /** 料号 */
+    @Excel(name = "料号")
+    private String materialNo;
+
+    /** 物料名称 */
+    @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 materialProcessMethod;
+
+    /** BOM的id */
+    @Excel(name = "BOM的id")
+    private Integer bomId;
+
+    /** 订单数量 */
+    @Excel(name = "订单数量")
+    private Integer materialNum;
+
+    /** 修改完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "修改完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updateFinishTime;
+
+    public void setDevelopOrderDetailId(Long developOrderDetailId) 
+    {
+        this.developOrderDetailId = developOrderDetailId;
+    }
+
+    public Long getDevelopOrderDetailId() 
+    {
+        return developOrderDetailId;
+    }
+    public void setDevelopOderCode(String developOderCode) 
+    {
+        this.developOderCode = developOderCode;
+    }
+
+    public String getDevelopOderCode() 
+    {
+        return developOderCode;
+    }
+    public void setMakeNo(String makeNo) 
+    {
+        this.makeNo = makeNo;
+    }
+
+    public String getMakeNo() 
+    {
+        return makeNo;
+    }
+    public void setMaterialNo(String materialNo) 
+    {
+        this.materialNo = materialNo;
+    }
+
+    public String getMaterialNo() 
+    {
+        return materialNo;
+    }
+    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 setMaterialProcessMethod(String materialProcessMethod) 
+    {
+        this.materialProcessMethod = materialProcessMethod;
+    }
+
+    public String getMaterialProcessMethod() 
+    {
+        return materialProcessMethod;
+    }
+    public void setBomId(Integer bomId) 
+    {
+        this.bomId = bomId;
+    }
+
+    public Integer getBomId() 
+    {
+        return bomId;
+    }
+    public void setMaterialNum(Integer materialNum) 
+    {
+        this.materialNum = materialNum;
+    }
+
+    public Integer getMaterialNum() 
+    {
+        return materialNum;
+    }
+    public void setUpdateFinishTime(Date updateFinishTime) 
+    {
+        this.updateFinishTime = updateFinishTime;
+    }
+
+    public Date getUpdateFinishTime() 
+    {
+        return updateFinishTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("developOrderDetailId", getDevelopOrderDetailId())
+            .append("developOderCode", getDevelopOderCode())
+            .append("makeNo", getMakeNo())
+            .append("materialNo", getMaterialNo())
+            .append("materialName", getMaterialName())
+            .append("materialType", getMaterialType())
+            .append("materialPhotoUrl", getMaterialPhotoUrl())
+            .append("materialUnit", getMaterialUnit())
+            .append("materialBrand", getMaterialBrand())
+            .append("materialDescribe", getMaterialDescribe())
+            .append("materialProcessMethod", getMaterialProcessMethod())
+            .append("bomId", getBomId())
+            .append("materialNum", getMaterialNum())
+            .append("updateFinishTime", getUpdateFinishTime())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,77 @@
+package com.ruoyi.erp.mapper;
+
+import java.util.List;
+import com.ruoyi.erp.domain.ErpDevelopModifyorderDetail;
+
+/**
+ * 开发修改单详情Mapper接口
+ * 
+ * @author 刘晓旭
+ * @date 2024-07-25
+ */
+public interface ErpDevelopModifyorderDetailMapper 
+{
+    /**
+     * 查询开发修改单详情
+     * 
+     * @param developOrderDetailId 开发修改单详情ID
+     * @return 开发修改单详情
+     */
+    public ErpDevelopModifyorderDetail selectErpDevelopModifyorderDetailById(Long developOrderDetailId);
+
+    /**
+     * 查询开发修改单详情列表
+     * 
+     * @param erpDevelopModifyorderDetail 开发修改单详情
+     * @return 开发修改单详情集合
+     */
+    public List<ErpDevelopModifyorderDetail> selectErpDevelopModifyorderDetailList(ErpDevelopModifyorderDetail erpDevelopModifyorderDetail);
+
+    /**
+     * 新增开发修改单详情
+     * 
+     * @param erpDevelopModifyorderDetail 开发修改单详情
+     * @return 结果
+     */
+    public int insertErpDevelopModifyorderDetail(ErpDevelopModifyorderDetail erpDevelopModifyorderDetail);
+
+    /**
+     * 修改开发修改单详情
+     * 
+     * @param erpDevelopModifyorderDetail 开发修改单详情
+     * @return 结果
+     */
+    public int updateErpDevelopModifyorderDetail(ErpDevelopModifyorderDetail erpDevelopModifyorderDetail);
+
+    /**
+     * 删除开发修改单详情
+     * 
+     * @param developOrderDetailId 开发修改单详情ID
+     * @return 结果
+     */
+    public int deleteErpDevelopModifyorderDetailById(Long developOrderDetailId);
+
+    /**
+     * 批量删除开发修改单详情
+     * 
+     * @param developOrderDetailIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteErpDevelopModifyorderDetailByIds(String[] developOrderDetailIds);
+
+    /**
+     * 作废开发修改单详情
+     *
+     * @param developOrderDetailId 开发修改单详情ID
+     * @return 结果
+     */
+    public int cancelErpDevelopModifyorderDetailById(Long developOrderDetailId);
+
+    /**
+     * 恢复开发修改单详情
+     *
+     * @param developOrderDetailId 开发修改单详情ID
+     * @return 结果
+     */
+    public int restoreErpDevelopModifyorderDetailById(Long developOrderDetailId);
+}

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

@@ -0,0 +1,75 @@
+package com.ruoyi.erp.service;
+
+import java.util.List;
+import com.ruoyi.erp.domain.ErpDevelopModifyorderDetail;
+
+/**
+ * 开发修改单详情Service接口
+ * 
+ * @author 刘晓旭
+ * @date 2024-07-25
+ */
+public interface IErpDevelopModifyorderDetailService 
+{
+    /**
+     * 查询开发修改单详情
+     * 
+     * @param developOrderDetailId 开发修改单详情ID
+     * @return 开发修改单详情
+     */
+    public ErpDevelopModifyorderDetail selectErpDevelopModifyorderDetailById(Long developOrderDetailId);
+
+    /**
+     * 查询开发修改单详情列表
+     * 
+     * @param erpDevelopModifyorderDetail 开发修改单详情
+     * @return 开发修改单详情集合
+     */
+    public List<ErpDevelopModifyorderDetail> selectErpDevelopModifyorderDetailList(ErpDevelopModifyorderDetail erpDevelopModifyorderDetail);
+
+    /**
+     * 新增开发修改单详情
+     * 
+     * @param erpDevelopModifyorderDetail 开发修改单详情
+     * @return 结果
+     */
+    public int insertErpDevelopModifyorderDetail(ErpDevelopModifyorderDetail erpDevelopModifyorderDetail);
+
+    /**
+     * 修改开发修改单详情
+     * 
+     * @param erpDevelopModifyorderDetail 开发修改单详情
+     * @return 结果
+     */
+    public int updateErpDevelopModifyorderDetail(ErpDevelopModifyorderDetail erpDevelopModifyorderDetail);
+
+    /**
+     * 批量删除开发修改单详情
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteErpDevelopModifyorderDetailByIds(String ids);
+
+    /**
+     * 删除开发修改单详情信息
+     * 
+     * @param developOrderDetailId 开发修改单详情ID
+     * @return 结果
+     */
+    public int deleteErpDevelopModifyorderDetailById(Long developOrderDetailId);
+
+    /**
+     * 作废开发修改单详情
+     * @param developOrderDetailId 开发修改单详情ID
+     * @return
+     */
+    int cancelErpDevelopModifyorderDetailById(Long developOrderDetailId);
+
+    /**
+     * 恢复开发修改单详情
+     * @param developOrderDetailId 开发修改单详情ID
+     * @return
+     */
+    int restoreErpDevelopModifyorderDetailById(Long developOrderDetailId);
+}

ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpDevelopModifyorderDetailServiceImpl.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.ErpDevelopModifyorderDetailMapper;
+import com.ruoyi.erp.domain.ErpDevelopModifyorderDetail;
+import com.ruoyi.erp.service.IErpDevelopModifyorderDetailService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 开发修改单详情Service业务层处理
+ * 
+ * @author 刘晓旭
+ * @date 2024-07-25
+ */
+@Service
+public class ErpDevelopModifyorderDetailServiceImpl implements IErpDevelopModifyorderDetailService 
+{
+    @Autowired
+    private ErpDevelopModifyorderDetailMapper erpDevelopModifyorderDetailMapper;
+
+    /**
+     * 查询开发修改单详情
+     * 
+     * @param developOrderDetailId 开发修改单详情ID
+     * @return 开发修改单详情
+     */
+    @Override
+    public ErpDevelopModifyorderDetail selectErpDevelopModifyorderDetailById(Long developOrderDetailId)
+    {
+        return erpDevelopModifyorderDetailMapper.selectErpDevelopModifyorderDetailById(developOrderDetailId);
+    }
+
+    /**
+     * 查询开发修改单详情列表
+     * 
+     * @param erpDevelopModifyorderDetail 开发修改单详情
+     * @return 开发修改单详情
+     */
+    @Override
+    public List<ErpDevelopModifyorderDetail> selectErpDevelopModifyorderDetailList(ErpDevelopModifyorderDetail erpDevelopModifyorderDetail)
+    {
+        return erpDevelopModifyorderDetailMapper.selectErpDevelopModifyorderDetailList(erpDevelopModifyorderDetail);
+    }
+
+    /**
+     * 新增开发修改单详情
+     * 
+     * @param erpDevelopModifyorderDetail 开发修改单详情
+     * @return 结果
+     */
+    @Override
+    public int insertErpDevelopModifyorderDetail(ErpDevelopModifyorderDetail erpDevelopModifyorderDetail)
+    {
+        String loginName = ShiroUtils.getLoginName();
+        erpDevelopModifyorderDetail.setCreateBy(loginName);
+        erpDevelopModifyorderDetail.setCreateTime(DateUtils.getNowDate());
+        return erpDevelopModifyorderDetailMapper.insertErpDevelopModifyorderDetail(erpDevelopModifyorderDetail);
+    }
+
+    /**
+     * 修改开发修改单详情
+     * 
+     * @param erpDevelopModifyorderDetail 开发修改单详情
+     * @return 结果
+     */
+    @Override
+    public int updateErpDevelopModifyorderDetail(ErpDevelopModifyorderDetail erpDevelopModifyorderDetail)
+    {
+        String loginName = ShiroUtils.getLoginName();
+        erpDevelopModifyorderDetail.setUpdateBy(loginName);
+        erpDevelopModifyorderDetail.setUpdateTime(DateUtils.getNowDate());
+        return erpDevelopModifyorderDetailMapper.updateErpDevelopModifyorderDetail(erpDevelopModifyorderDetail);
+    }
+
+    /**
+     * 删除开发修改单详情对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteErpDevelopModifyorderDetailByIds(String ids)
+    {
+        return erpDevelopModifyorderDetailMapper.deleteErpDevelopModifyorderDetailByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除开发修改单详情信息
+     * 
+     * @param developOrderDetailId 开发修改单详情ID
+     * @return 结果
+     */
+    @Override
+    public int deleteErpDevelopModifyorderDetailById(Long developOrderDetailId)
+    {
+        return erpDevelopModifyorderDetailMapper.deleteErpDevelopModifyorderDetailById(developOrderDetailId);
+    }
+
+    /**
+     * 作废开发修改单详情
+     *
+     * @param developOrderDetailId 开发修改单详情ID
+     * @return 结果
+     */
+    @Override
+    public int cancelErpDevelopModifyorderDetailById(Long developOrderDetailId)
+    {
+        return erpDevelopModifyorderDetailMapper.cancelErpDevelopModifyorderDetailById(developOrderDetailId);
+    }
+
+    /**
+     * 恢复开发修改单详情信息
+     *
+     * @param developOrderDetailId 开发修改单详情ID
+     * @return 结果
+     */
+    @Override
+    public int restoreErpDevelopModifyorderDetailById(Long developOrderDetailId)
+    {
+        return erpDevelopModifyorderDetailMapper.restoreErpDevelopModifyorderDetailById(developOrderDetailId);
+    }
+}

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

@@ -0,0 +1,132 @@
+<?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.ErpDevelopModifyorderDetailMapper">
+    
+    <resultMap type="ErpDevelopModifyorderDetail" id="ErpDevelopModifyorderDetailResult">
+        <result property="developOrderDetailId"    column="develop_order_detail_id"    />
+        <result property="developOderCode"    column="develop_oder_code"    />
+        <result property="makeNo"    column="make_no"    />
+        <result property="materialNo"    column="material_no"    />
+        <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="materialProcessMethod"    column="material_process_method"    />
+        <result property="bomId"    column="bom_id"    />
+        <result property="materialNum"    column="material_num"    />
+        <result property="updateFinishTime"    column="update_finish_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </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
+    </sql>
+
+    <select id="selectErpDevelopModifyorderDetailList" parameterType="ErpDevelopModifyorderDetail" resultMap="ErpDevelopModifyorderDetailResult">
+        <include refid="selectErpDevelopModifyorderDetailVo"/>
+        <where>  
+        </where>
+    </select>
+    
+    <select id="selectErpDevelopModifyorderDetailById" parameterType="Long" resultMap="ErpDevelopModifyorderDetailResult">
+        <include refid="selectErpDevelopModifyorderDetailVo"/>
+        where develop_order_detail_id = #{developOrderDetailId}
+    </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="makeNo != null">make_no,</if>
+            <if test="materialNo != null">material_no,</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="materialProcessMethod != null">material_process_method,</if>
+            <if test="bomId != null">bom_id,</if>
+            <if test="materialNum != null">material_num,</if>
+            <if test="updateFinishTime != null">update_finish_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</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="makeNo != null">#{makeNo},</if>
+            <if test="materialNo != null">#{materialNo},</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="materialProcessMethod != null">#{materialProcessMethod},</if>
+            <if test="bomId != null">#{bomId},</if>
+            <if test="materialNum != null">#{materialNum},</if>
+            <if test="updateFinishTime != null">#{updateFinishTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <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="makeNo != null">make_no = #{makeNo},</if>
+            <if test="materialNo != null">material_no = #{materialNo},</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="materialProcessMethod != null">material_process_method = #{materialProcessMethod},</if>
+            <if test="bomId != null">bom_id = #{bomId},</if>
+            <if test="materialNum != null">material_num = #{materialNum},</if>
+            <if test="updateFinishTime != null">update_finish_time = #{updateFinishTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</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_detail_id = #{developOrderDetailId}
+    </update>
+
+    <delete id="deleteErpDevelopModifyorderDetailById" parameterType="Long">
+        delete from erp_develop_modifyorder_detail where develop_order_detail_id = #{developOrderDetailId}
+    </delete>
+
+    <delete id="deleteErpDevelopModifyorderDetailByIds" parameterType="String">
+        delete from erp_develop_modifyorder_detail where develop_order_detail_id in 
+        <foreach item="developOrderDetailId" collection="array" open="(" separator="," close=")">
+            #{developOrderDetailId}
+        </foreach>
+    </delete>
+
+    <update id="cancelErpDevelopModifyorderDetailById" parameterType="Long">
+        update erp_develop_modifyorder_detail set del_flag = '1' where develop_order_detail_id = #{developOrderDetailId}
+    </update>
+
+    <update id="restoreErpDevelopModifyorderDetailById" parameterType="Long">
+        update erp_develop_modifyorder_detail set del_flag = '0' where develop_order_detail_id = #{developOrderDetailId}
+    </update>
+
+</mapper>

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

@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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="materialProcessMethod"    column="material_process_method"    />
         <result property="userId"    column="user_id"    />
         <result property="userName"    column="user_name"    />
         <result property="updateFinishTime"    column="update_finish_time"    />
@@ -44,12 +44,12 @@ 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_mode, 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_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
 
         </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_mode, 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_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
         from erp_develop_modifyorder edm
         left join sys_user su on su.user_id = edm.user_id
         <where>
@@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="materialProcessMethod != null">material_process_method,</if>
             <if test="userId != null">user_id,</if>
             <if test="updateFinishTime != null">update_finish_time,</if>
             <if test="beforeUpdateRemark != null">before_update_remark,</if>
@@ -122,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="materialProcessMethod != null">#{materialProcessMethod},</if>
             <if test="userId != null">#{userId},</if>
             <if test="updateFinishTime != null">#{updateFinishTime},</if>
             <if test="beforeUpdateRemark != null">#{beforeUpdateRemark},</if>
@@ -162,7 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="materialProcessMethod != null">material_process_method = #{materialProcessMethod},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="updateFinishTime != null">update_finish_time = #{updateFinishTime},</if>
             <if test="beforeUpdateRemark != null">before_update_remark = #{beforeUpdateRemark},</if>

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

@@ -276,15 +276,10 @@
                 },
                 columns: [
                     {
-                        field: 'id',
+                        field: 'developOrderDetailId',
                         title: '主键id',
                         visible: false
                     },
-                    {
-                        field: 'quoteId',
-                        title: '关联销售订单编号',
-                        visible: false
-                    },
                     {
                         field: 'bomId',
                         title: 'bom主键Id',