[feat] 工程管理

新增开发修改单领料详情表实体类
新增开发修改单领料详情表Mapper
新增开发修改单领料详情表Mapper.XML
新增开发修改单领料详情表Service接口
新增开发修改单领料详情表ServiceImpl实现类

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

@@ -0,0 +1,437 @@
+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_picking_detail
+ * 
+ * @author 刘晓旭
+ * @date 2024-07-29
+ */
+public class ErpDevelopModifyorderPickingDetail extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 开发修改单领料详情ID */
+    private Long developOrderPickingDetailId;
+
+    /** 开发修改单领料单号 */
+    @Excel(name = "开发修改单领料单号")
+    private String pickingOrderCode;
+
+    /** 开发修改单单号 */
+    @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 materialModel;
+
+    /** 物料规格 */
+    @Excel(name = "物料规格")
+    private String materialSpecification;
+
+    /** 图片地址 */
+    @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;
+
+    /** 入库部门(0仓库 1采购) */
+    @Excel(name = "入库部门(0仓库 1采购)")
+    private String warehouseDept;
+
+    /** 客户期望交付时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "客户期望交付时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deliveryTime;
+
+    /** 订单数量 */
+    @Excel(name = "订单数量")
+    private Integer materialNum;
+
+    /** 用量 */
+    @Excel(name = "用量")
+    private Integer useNum;
+
+    /** 损耗率 */
+    @Excel(name = "损耗率")
+    private String lossRate;
+
+    /** 领料数量 */
+    @Excel(name = "领料数量")
+    private Integer pickNum;
+
+    /** 已领料数量 */
+    @Excel(name = "已领料数量")
+    private Integer hasPickNum;
+
+    /** 订单用量（用量*订单数量） */
+    @Excel(name = "订单用量", readConverterExp = "用=量*订单数量")
+    private Integer orderUseNum;
+
+    /** 可用库存数 */
+    @Excel(name = "可用库存数")
+    private Integer availableStockNum;
+
+    /** BOM的id */
+    @Excel(name = "BOM的id")
+    private Long bomId;
+
+    /** BOM号 */
+    @Excel(name = "BOM号")
+    private String bomNo;
+
+    /** 层级 */
+    @Excel(name = "层级")
+    private Integer level;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Integer sortNo;
+
+    /** 领料员 */
+    @Excel(name = "领料员")
+    private String pickUser;
+
+    /** 业务员 */
+    @Excel(name = "业务员")
+    private String salesUser;
+
+    public void setDevelopOrderPickingDetailId(Long developOrderPickingDetailId) 
+    {
+        this.developOrderPickingDetailId = developOrderPickingDetailId;
+    }
+
+    public Long getDevelopOrderPickingDetailId() 
+    {
+        return developOrderPickingDetailId;
+    }
+    public void setPickingOrderCode(String pickingOrderCode) 
+    {
+        this.pickingOrderCode = pickingOrderCode;
+    }
+
+    public String getPickingOrderCode() 
+    {
+        return pickingOrderCode;
+    }
+    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 setMaterialModel(String materialModel) 
+    {
+        this.materialModel = materialModel;
+    }
+
+    public String getMaterialModel() 
+    {
+        return materialModel;
+    }
+    public void setMaterialSpecification(String materialSpecification) 
+    {
+        this.materialSpecification = materialSpecification;
+    }
+
+    public String getMaterialSpecification() 
+    {
+        return materialSpecification;
+    }
+    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 setWarehouseDept(String warehouseDept) 
+    {
+        this.warehouseDept = warehouseDept;
+    }
+
+    public String getWarehouseDept() 
+    {
+        return warehouseDept;
+    }
+    public void setDeliveryTime(Date deliveryTime) 
+    {
+        this.deliveryTime = deliveryTime;
+    }
+
+    public Date getDeliveryTime() 
+    {
+        return deliveryTime;
+    }
+    public void setMaterialNum(Integer materialNum) 
+    {
+        this.materialNum = materialNum;
+    }
+
+    public Integer getMaterialNum() 
+    {
+        return materialNum;
+    }
+    public void setUseNum(Integer useNum) 
+    {
+        this.useNum = useNum;
+    }
+
+    public Integer getUseNum() 
+    {
+        return useNum;
+    }
+    public void setLossRate(String lossRate) 
+    {
+        this.lossRate = lossRate;
+    }
+
+    public String getLossRate() 
+    {
+        return lossRate;
+    }
+    public void setPickNum(Integer pickNum) 
+    {
+        this.pickNum = pickNum;
+    }
+
+    public Integer getPickNum() 
+    {
+        return pickNum;
+    }
+    public void setHasPickNum(Integer hasPickNum) 
+    {
+        this.hasPickNum = hasPickNum;
+    }
+
+    public Integer getHasPickNum() 
+    {
+        return hasPickNum;
+    }
+    public void setOrderUseNum(Integer orderUseNum) 
+    {
+        this.orderUseNum = orderUseNum;
+    }
+
+    public Integer getOrderUseNum() 
+    {
+        return orderUseNum;
+    }
+    public void setAvailableStockNum(Integer availableStockNum) 
+    {
+        this.availableStockNum = availableStockNum;
+    }
+
+    public Integer getAvailableStockNum() 
+    {
+        return availableStockNum;
+    }
+    public void setBomId(Long bomId) 
+    {
+        this.bomId = bomId;
+    }
+
+    public Long getBomId() 
+    {
+        return bomId;
+    }
+    public void setBomNo(String bomNo) 
+    {
+        this.bomNo = bomNo;
+    }
+
+    public String getBomNo() 
+    {
+        return bomNo;
+    }
+    public void setLevel(Integer level) 
+    {
+        this.level = level;
+    }
+
+    public Integer getLevel() 
+    {
+        return level;
+    }
+    public void setSortNo(Integer sortNo) 
+    {
+        this.sortNo = sortNo;
+    }
+
+    public Integer getSortNo() 
+    {
+        return sortNo;
+    }
+    public void setPickUser(String pickUser) 
+    {
+        this.pickUser = pickUser;
+    }
+
+    public String getPickUser() 
+    {
+        return pickUser;
+    }
+    public void setSalesUser(String salesUser) 
+    {
+        this.salesUser = salesUser;
+    }
+
+    public String getSalesUser() 
+    {
+        return salesUser;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("developOrderPickingDetailId", getDevelopOrderPickingDetailId())
+            .append("pickingOrderCode", getPickingOrderCode())
+            .append("developOderCode", getDevelopOderCode())
+            .append("makeNo", getMakeNo())
+            .append("materialNo", getMaterialNo())
+            .append("materialName", getMaterialName())
+            .append("materialType", getMaterialType())
+            .append("materialModel", getMaterialModel())
+            .append("materialSpecification", getMaterialSpecification())
+            .append("materialPhotoUrl", getMaterialPhotoUrl())
+            .append("materialUnit", getMaterialUnit())
+            .append("materialBrand", getMaterialBrand())
+            .append("materialDescribe", getMaterialDescribe())
+            .append("materialProcessMethod", getMaterialProcessMethod())
+            .append("warehouseDept", getWarehouseDept())
+            .append("deliveryTime", getDeliveryTime())
+            .append("materialNum", getMaterialNum())
+            .append("useNum", getUseNum())
+            .append("lossRate", getLossRate())
+            .append("pickNum", getPickNum())
+            .append("hasPickNum", getHasPickNum())
+            .append("orderUseNum", getOrderUseNum())
+            .append("availableStockNum", getAvailableStockNum())
+            .append("bomId", getBomId())
+            .append("bomNo", getBomNo())
+            .append("level", getLevel())
+            .append("sortNo", getSortNo())
+            .append("pickUser", getPickUser())
+            .append("salesUser", getSalesUser())
+            .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/ErpDevelopModifyorderPickingDetailMapper.java

@@ -0,0 +1,77 @@
+package com.ruoyi.erp.mapper;
+
+import java.util.List;
+import com.ruoyi.erp.domain.ErpDevelopModifyorderPickingDetail;
+
+/**
+ * 开发修改单领料详情Mapper接口
+ * 
+ * @author 刘晓旭
+ * @date 2024-07-29
+ */
+public interface ErpDevelopModifyorderPickingDetailMapper 
+{
+    /**
+     * 查询开发修改单领料详情
+     * 
+     * @param developOrderPickingDetailId 开发修改单领料详情ID
+     * @return 开发修改单领料详情
+     */
+    public ErpDevelopModifyorderPickingDetail selectErpDevelopModifyorderPickingDetailById(Long developOrderPickingDetailId);
+
+    /**
+     * 查询开发修改单领料详情列表
+     * 
+     * @param erpDevelopModifyorderPickingDetail 开发修改单领料详情
+     * @return 开发修改单领料详情集合
+     */
+    public List<ErpDevelopModifyorderPickingDetail> selectErpDevelopModifyorderPickingDetailList(ErpDevelopModifyorderPickingDetail erpDevelopModifyorderPickingDetail);
+
+    /**
+     * 新增开发修改单领料详情
+     * 
+     * @param erpDevelopModifyorderPickingDetail 开发修改单领料详情
+     * @return 结果
+     */
+    public int insertErpDevelopModifyorderPickingDetail(ErpDevelopModifyorderPickingDetail erpDevelopModifyorderPickingDetail);
+
+    /**
+     * 修改开发修改单领料详情
+     * 
+     * @param erpDevelopModifyorderPickingDetail 开发修改单领料详情
+     * @return 结果
+     */
+    public int updateErpDevelopModifyorderPickingDetail(ErpDevelopModifyorderPickingDetail erpDevelopModifyorderPickingDetail);
+
+    /**
+     * 删除开发修改单领料详情
+     * 
+     * @param developOrderPickingDetailId 开发修改单领料详情ID
+     * @return 结果
+     */
+    public int deleteErpDevelopModifyorderPickingDetailById(Long developOrderPickingDetailId);
+
+    /**
+     * 批量删除开发修改单领料详情
+     * 
+     * @param developOrderPickingDetailIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteErpDevelopModifyorderPickingDetailByIds(String[] developOrderPickingDetailIds);
+
+    /**
+     * 作废开发修改单领料详情
+     *
+     * @param developOrderPickingDetailId 开发修改单领料详情ID
+     * @return 结果
+     */
+    public int cancelErpDevelopModifyorderPickingDetailById(Long developOrderPickingDetailId);
+
+    /**
+     * 恢复开发修改单领料详情
+     *
+     * @param developOrderPickingDetailId 开发修改单领料详情ID
+     * @return 结果
+     */
+    public int restoreErpDevelopModifyorderPickingDetailById(Long developOrderPickingDetailId);
+}

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

@@ -0,0 +1,75 @@
+package com.ruoyi.erp.service;
+
+import java.util.List;
+import com.ruoyi.erp.domain.ErpDevelopModifyorderPickingDetail;
+
+/**
+ * 开发修改单领料详情Service接口
+ * 
+ * @author 刘晓旭
+ * @date 2024-07-29
+ */
+public interface IErpDevelopModifyorderPickingDetailService 
+{
+    /**
+     * 查询开发修改单领料详情
+     * 
+     * @param developOrderPickingDetailId 开发修改单领料详情ID
+     * @return 开发修改单领料详情
+     */
+    public ErpDevelopModifyorderPickingDetail selectErpDevelopModifyorderPickingDetailById(Long developOrderPickingDetailId);
+
+    /**
+     * 查询开发修改单领料详情列表
+     * 
+     * @param erpDevelopModifyorderPickingDetail 开发修改单领料详情
+     * @return 开发修改单领料详情集合
+     */
+    public List<ErpDevelopModifyorderPickingDetail> selectErpDevelopModifyorderPickingDetailList(ErpDevelopModifyorderPickingDetail erpDevelopModifyorderPickingDetail);
+
+    /**
+     * 新增开发修改单领料详情
+     * 
+     * @param erpDevelopModifyorderPickingDetail 开发修改单领料详情
+     * @return 结果
+     */
+    public int insertErpDevelopModifyorderPickingDetail(ErpDevelopModifyorderPickingDetail erpDevelopModifyorderPickingDetail);
+
+    /**
+     * 修改开发修改单领料详情
+     * 
+     * @param erpDevelopModifyorderPickingDetail 开发修改单领料详情
+     * @return 结果
+     */
+    public int updateErpDevelopModifyorderPickingDetail(ErpDevelopModifyorderPickingDetail erpDevelopModifyorderPickingDetail);
+
+    /**
+     * 批量删除开发修改单领料详情
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteErpDevelopModifyorderPickingDetailByIds(String ids);
+
+    /**
+     * 删除开发修改单领料详情信息
+     * 
+     * @param developOrderPickingDetailId 开发修改单领料详情ID
+     * @return 结果
+     */
+    public int deleteErpDevelopModifyorderPickingDetailById(Long developOrderPickingDetailId);
+
+    /**
+     * 作废开发修改单领料详情
+     * @param developOrderPickingDetailId 开发修改单领料详情ID
+     * @return
+     */
+    int cancelErpDevelopModifyorderPickingDetailById(Long developOrderPickingDetailId);
+
+    /**
+     * 恢复开发修改单领料详情
+     * @param developOrderPickingDetailId 开发修改单领料详情ID
+     * @return
+     */
+    int restoreErpDevelopModifyorderPickingDetailById(Long developOrderPickingDetailId);
+}

ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpDevelopModifyorderPickingDetailServiceImpl.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.ErpDevelopModifyorderPickingDetailMapper;
+import com.ruoyi.erp.domain.ErpDevelopModifyorderPickingDetail;
+import com.ruoyi.erp.service.IErpDevelopModifyorderPickingDetailService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 开发修改单领料详情Service业务层处理
+ * 
+ * @author 刘晓旭
+ * @date 2024-07-29
+ */
+@Service
+public class ErpDevelopModifyorderPickingDetailServiceImpl implements IErpDevelopModifyorderPickingDetailService 
+{
+    @Autowired
+    private ErpDevelopModifyorderPickingDetailMapper erpDevelopModifyorderPickingDetailMapper;
+
+    /**
+     * 查询开发修改单领料详情
+     * 
+     * @param developOrderPickingDetailId 开发修改单领料详情ID
+     * @return 开发修改单领料详情
+     */
+    @Override
+    public ErpDevelopModifyorderPickingDetail selectErpDevelopModifyorderPickingDetailById(Long developOrderPickingDetailId)
+    {
+        return erpDevelopModifyorderPickingDetailMapper.selectErpDevelopModifyorderPickingDetailById(developOrderPickingDetailId);
+    }
+
+    /**
+     * 查询开发修改单领料详情列表
+     * 
+     * @param erpDevelopModifyorderPickingDetail 开发修改单领料详情
+     * @return 开发修改单领料详情
+     */
+    @Override
+    public List<ErpDevelopModifyorderPickingDetail> selectErpDevelopModifyorderPickingDetailList(ErpDevelopModifyorderPickingDetail erpDevelopModifyorderPickingDetail)
+    {
+        return erpDevelopModifyorderPickingDetailMapper.selectErpDevelopModifyorderPickingDetailList(erpDevelopModifyorderPickingDetail);
+    }
+
+    /**
+     * 新增开发修改单领料详情
+     * 
+     * @param erpDevelopModifyorderPickingDetail 开发修改单领料详情
+     * @return 结果
+     */
+    @Override
+    public int insertErpDevelopModifyorderPickingDetail(ErpDevelopModifyorderPickingDetail erpDevelopModifyorderPickingDetail)
+    {
+        String loginName = ShiroUtils.getLoginName();
+        erpDevelopModifyorderPickingDetail.setCreateBy(loginName);
+        erpDevelopModifyorderPickingDetail.setCreateTime(DateUtils.getNowDate());
+        return erpDevelopModifyorderPickingDetailMapper.insertErpDevelopModifyorderPickingDetail(erpDevelopModifyorderPickingDetail);
+    }
+
+    /**
+     * 修改开发修改单领料详情
+     * 
+     * @param erpDevelopModifyorderPickingDetail 开发修改单领料详情
+     * @return 结果
+     */
+    @Override
+    public int updateErpDevelopModifyorderPickingDetail(ErpDevelopModifyorderPickingDetail erpDevelopModifyorderPickingDetail)
+    {
+        String loginName = ShiroUtils.getLoginName();
+        erpDevelopModifyorderPickingDetail.setUpdateBy(loginName);
+        erpDevelopModifyorderPickingDetail.setUpdateTime(DateUtils.getNowDate());
+        return erpDevelopModifyorderPickingDetailMapper.updateErpDevelopModifyorderPickingDetail(erpDevelopModifyorderPickingDetail);
+    }
+
+    /**
+     * 删除开发修改单领料详情对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteErpDevelopModifyorderPickingDetailByIds(String ids)
+    {
+        return erpDevelopModifyorderPickingDetailMapper.deleteErpDevelopModifyorderPickingDetailByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除开发修改单领料详情信息
+     * 
+     * @param developOrderPickingDetailId 开发修改单领料详情ID
+     * @return 结果
+     */
+    @Override
+    public int deleteErpDevelopModifyorderPickingDetailById(Long developOrderPickingDetailId)
+    {
+        return erpDevelopModifyorderPickingDetailMapper.deleteErpDevelopModifyorderPickingDetailById(developOrderPickingDetailId);
+    }
+
+    /**
+     * 作废开发修改单领料详情
+     *
+     * @param developOrderPickingDetailId 开发修改单领料详情ID
+     * @return 结果
+     */
+    @Override
+    public int cancelErpDevelopModifyorderPickingDetailById(Long developOrderPickingDetailId)
+    {
+        return erpDevelopModifyorderPickingDetailMapper.cancelErpDevelopModifyorderPickingDetailById(developOrderPickingDetailId);
+    }
+
+    /**
+     * 恢复开发修改单领料详情信息
+     *
+     * @param developOrderPickingDetailId 开发修改单领料详情ID
+     * @return 结果
+     */
+    @Override
+    public int restoreErpDevelopModifyorderPickingDetailById(Long developOrderPickingDetailId)
+    {
+        return erpDevelopModifyorderPickingDetailMapper.restoreErpDevelopModifyorderPickingDetailById(developOrderPickingDetailId);
+    }
+}

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

@@ -0,0 +1,192 @@
+<?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.ErpDevelopModifyorderPickingDetailMapper">
+    
+    <resultMap type="ErpDevelopModifyorderPickingDetail" id="ErpDevelopModifyorderPickingDetailResult">
+        <result property="developOrderPickingDetailId"    column="develop_order_picking_detail_id"    />
+        <result property="pickingOrderCode"    column="picking_order_code"    />
+        <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="materialModel"    column="material_model"    />
+        <result property="materialSpecification"    column="material_specification"    />
+        <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="warehouseDept"    column="warehouse_dept"    />
+        <result property="deliveryTime"    column="delivery_time"    />
+        <result property="materialNum"    column="material_num"    />
+        <result property="useNum"    column="use_num"    />
+        <result property="lossRate"    column="loss_rate"    />
+        <result property="pickNum"    column="pick_num"    />
+        <result property="hasPickNum"    column="has_pick_num"    />
+        <result property="orderUseNum"    column="order_use_num"    />
+        <result property="availableStockNum"    column="available_stock_num"    />
+        <result property="bomId"    column="bom_id"    />
+        <result property="bomNo"    column="bom_no"    />
+        <result property="level"    column="level"    />
+        <result property="sortNo"    column="sort_no"    />
+        <result property="pickUser"    column="pick_user"    />
+        <result property="salesUser"    column="sales_user"    />
+        <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="selectErpDevelopModifyorderPickingDetailVo">
+        select develop_order_picking_detail_id, picking_order_code, develop_oder_code, make_no, material_no, material_name, material_type, material_model, material_specification, material_photo_url, material_unit, material_brand, material_describe, material_process_method, warehouse_dept, delivery_time, material_num, use_num, loss_rate, pick_num, has_pick_num, order_use_num, available_stock_num, bom_id, bom_no, level, sort_no, pick_user, sales_user, create_by, create_time, update_by, update_time, remark from erp_develop_modifyorder_picking_detail
+    </sql>
+
+    <select id="selectErpDevelopModifyorderPickingDetailList" parameterType="ErpDevelopModifyorderPickingDetail" resultMap="ErpDevelopModifyorderPickingDetailResult">
+        <include refid="selectErpDevelopModifyorderPickingDetailVo"/>
+        <where>  
+        </where>
+    </select>
+    
+    <select id="selectErpDevelopModifyorderPickingDetailById" parameterType="Long" resultMap="ErpDevelopModifyorderPickingDetailResult">
+        <include refid="selectErpDevelopModifyorderPickingDetailVo"/>
+        where develop_order_picking_detail_id = #{developOrderPickingDetailId}
+    </select>
+        
+    <insert id="insertErpDevelopModifyorderPickingDetail" parameterType="ErpDevelopModifyorderPickingDetail" useGeneratedKeys="true" keyProperty="developOrderPickingDetailId">
+        insert into erp_develop_modifyorder_picking_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="pickingOrderCode != null">picking_order_code,</if>
+            <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="materialModel != null">material_model,</if>
+            <if test="materialSpecification != null">material_specification,</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="warehouseDept != null">warehouse_dept,</if>
+            <if test="deliveryTime != null">delivery_time,</if>
+            <if test="materialNum != null">material_num,</if>
+            <if test="useNum != null">use_num,</if>
+            <if test="lossRate != null">loss_rate,</if>
+            <if test="pickNum != null">pick_num,</if>
+            <if test="hasPickNum != null">has_pick_num,</if>
+            <if test="orderUseNum != null">order_use_num,</if>
+            <if test="availableStockNum != null">available_stock_num,</if>
+            <if test="bomId != null">bom_id,</if>
+            <if test="bomNo != null">bom_no,</if>
+            <if test="level != null">level,</if>
+            <if test="sortNo != null">sort_no,</if>
+            <if test="pickUser != null">pick_user,</if>
+            <if test="salesUser != null">sales_user,</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="pickingOrderCode != null">#{pickingOrderCode},</if>
+            <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="materialModel != null">#{materialModel},</if>
+            <if test="materialSpecification != null">#{materialSpecification},</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="warehouseDept != null">#{warehouseDept},</if>
+            <if test="deliveryTime != null">#{deliveryTime},</if>
+            <if test="materialNum != null">#{materialNum},</if>
+            <if test="useNum != null">#{useNum},</if>
+            <if test="lossRate != null">#{lossRate},</if>
+            <if test="pickNum != null">#{pickNum},</if>
+            <if test="hasPickNum != null">#{hasPickNum},</if>
+            <if test="orderUseNum != null">#{orderUseNum},</if>
+            <if test="availableStockNum != null">#{availableStockNum},</if>
+            <if test="bomId != null">#{bomId},</if>
+            <if test="bomNo != null">#{bomNo},</if>
+            <if test="level != null">#{level},</if>
+            <if test="sortNo != null">#{sortNo},</if>
+            <if test="pickUser != null">#{pickUser},</if>
+            <if test="salesUser != null">#{salesUser},</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="updateErpDevelopModifyorderPickingDetail" parameterType="ErpDevelopModifyorderPickingDetail">
+        update erp_develop_modifyorder_picking_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="pickingOrderCode != null">picking_order_code = #{pickingOrderCode},</if>
+            <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="materialModel != null">material_model = #{materialModel},</if>
+            <if test="materialSpecification != null">material_specification = #{materialSpecification},</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="warehouseDept != null">warehouse_dept = #{warehouseDept},</if>
+            <if test="deliveryTime != null">delivery_time = #{deliveryTime},</if>
+            <if test="materialNum != null">material_num = #{materialNum},</if>
+            <if test="useNum != null">use_num = #{useNum},</if>
+            <if test="lossRate != null">loss_rate = #{lossRate},</if>
+            <if test="pickNum != null">pick_num = #{pickNum},</if>
+            <if test="hasPickNum != null">has_pick_num = #{hasPickNum},</if>
+            <if test="orderUseNum != null">order_use_num = #{orderUseNum},</if>
+            <if test="availableStockNum != null">available_stock_num = #{availableStockNum},</if>
+            <if test="bomId != null">bom_id = #{bomId},</if>
+            <if test="bomNo != null">bom_no = #{bomNo},</if>
+            <if test="level != null">level = #{level},</if>
+            <if test="sortNo != null">sort_no = #{sortNo},</if>
+            <if test="pickUser != null">pick_user = #{pickUser},</if>
+            <if test="salesUser != null">sales_user = #{salesUser},</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_picking_detail_id = #{developOrderPickingDetailId}
+    </update>
+
+    <delete id="deleteErpDevelopModifyorderPickingDetailById" parameterType="Long">
+        delete from erp_develop_modifyorder_picking_detail where develop_order_picking_detail_id = #{developOrderPickingDetailId}
+    </delete>
+
+    <delete id="deleteErpDevelopModifyorderPickingDetailByIds" parameterType="String">
+        delete from erp_develop_modifyorder_picking_detail where develop_order_picking_detail_id in 
+        <foreach item="developOrderPickingDetailId" collection="array" open="(" separator="," close=")">
+            #{developOrderPickingDetailId}
+        </foreach>
+    </delete>
+
+    <update id="cancelErpDevelopModifyorderPickingDetailById" parameterType="Long">
+        update erp_develop_modifyorder_picking_detail set del_flag = '1' where develop_order_picking_detail_id = #{developOrderPickingDetailId}
+    </update>
+
+    <update id="restoreErpDevelopModifyorderPickingDetailById" parameterType="Long">
+        update erp_develop_modifyorder_picking_detail set del_flag = '0' where develop_order_picking_detail_id = #{developOrderPickingDetailId}
+    </update>
+
+</mapper>