订单管理添加校验，产品需求管理初始化。

ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiProductRequireController.java

@@ -0,0 +1,126 @@
+package com.ruoyi.busi.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.busi.domain.BusiProductRequire;
+import com.ruoyi.busi.service.IBusiProductRequireService;
+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 WangCL
+ * @date 2021-12-22
+ */
+@Controller
+@RequestMapping("/busi/productRequire")
+public class BusiProductRequireController extends BaseController
+{
+    private String prefix = "busi/productRequire";
+
+    @Autowired
+    private IBusiProductRequireService busiProductRequireService;
+
+    @RequiresPermissions("busi:productRequire:view")
+    @GetMapping()
+    public String productRequire()
+    {
+        return prefix + "/productRequire";
+    }
+
+    /**
+     * 查询产品需求列表
+     */
+    @RequiresPermissions("busi:productRequire:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(BusiProductRequire busiProductRequire)
+    {
+        startPage();
+        List<BusiProductRequire> list = busiProductRequireService.selectBusiProductRequireList(busiProductRequire);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出产品需求列表
+     */
+    @RequiresPermissions("busi:productRequire:export")
+    @Log(title = "产品需求", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(BusiProductRequire busiProductRequire)
+    {
+        List<BusiProductRequire> list = busiProductRequireService.selectBusiProductRequireList(busiProductRequire);
+        ExcelUtil<BusiProductRequire> util = new ExcelUtil<BusiProductRequire>(BusiProductRequire.class);
+        return util.exportExcel(list, "产品需求数据");
+    }
+
+    /**
+     * 新增产品需求
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存产品需求
+     */
+    @RequiresPermissions("busi:productRequire:add")
+    @Log(title = "产品需求", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(BusiProductRequire busiProductRequire)
+    {
+        return toAjax(busiProductRequireService.insertBusiProductRequire(busiProductRequire));
+    }
+
+    /**
+     * 修改产品需求
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") String id, ModelMap mmap)
+    {
+        BusiProductRequire busiProductRequire = busiProductRequireService.selectBusiProductRequireById(id);
+        mmap.put("busiProductRequire", busiProductRequire);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存产品需求
+     */
+    @RequiresPermissions("busi:productRequire:edit")
+    @Log(title = "产品需求", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(BusiProductRequire busiProductRequire)
+    {
+        return toAjax(busiProductRequireService.updateBusiProductRequire(busiProductRequire));
+    }
+
+    /**
+     * 删除产品需求
+     */
+    @RequiresPermissions("busi:productRequire:remove")
+    @Log(title = "产品需求", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(busiProductRequireService.deleteBusiProductRequireByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiMaterialRequire.java

@@ -0,0 +1,111 @@
+package com.ruoyi.busi.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;
+
+/**
+ * 物料需求对象 busi_material_require
+ * 
+ * @author WangCL
+ * @date 2021-12-22
+ */
+public class BusiMaterialRequire extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID主键 */
+    private String id;
+
+    /** 产品需求 */
+    @Excel(name = "产品需求")
+    private String productRequireId;
+
+    /** 数量 */
+    @Excel(name = "数量")
+    private Long amount;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+
+    /** 颜色 */
+    @Excel(name = "颜色")
+    private String color;
+
+    /** 类型 */
+    @Excel(name = "类型")
+    private String classify;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setProductRequireId(String productRequireId) 
+    {
+        this.productRequireId = productRequireId;
+    }
+
+    public String getProductRequireId() 
+    {
+        return productRequireId;
+    }
+    public void setAmount(Long amount) 
+    {
+        this.amount = amount;
+    }
+
+    public Long getAmount() 
+    {
+        return amount;
+    }
+    public void setUnit(String unit) 
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit() 
+    {
+        return unit;
+    }
+    public void setColor(String color) 
+    {
+        this.color = color;
+    }
+
+    public String getColor() 
+    {
+        return color;
+    }
+    public void setClassify(String classify) 
+    {
+        this.classify = classify;
+    }
+
+    public String getClassify() 
+    {
+        return classify;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("productRequireId", getProductRequireId())
+            .append("amount", getAmount())
+            .append("unit", getUnit())
+            .append("color", getColor())
+            .append("classify", getClassify())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiProductRequire.java

@@ -1,5 +1,6 @@
 package com.ruoyi.busi.domain;
 
+import java.util.List;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -11,7 +12,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 产品需求对象 busi_product_require
  * 
  * @author WangCL
- * @date 2021-12-21
+ * @date 2021-12-22
  */
 public class BusiProductRequire extends BaseEntity
 {
@@ -41,6 +42,9 @@ public class BusiProductRequire extends BaseEntity
     @Excel(name = "截止日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date endDate;
 
+    /** 物料需求信息 */
+    private List<BusiMaterialRequire> busiMaterialRequireList;
+
     public void setId(String id) 
     {
         this.id = id;
@@ -96,6 +100,16 @@ public class BusiProductRequire extends BaseEntity
         return endDate;
     }
 
+    public List<BusiMaterialRequire> getBusiMaterialRequireList()
+    {
+        return busiMaterialRequireList;
+    }
+
+    public void setBusiMaterialRequireList(List<BusiMaterialRequire> busiMaterialRequireList)
+    {
+        this.busiMaterialRequireList = busiMaterialRequireList;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -109,6 +123,7 @@ public class BusiProductRequire extends BaseEntity
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("endDate", getEndDate())
+            .append("busiMaterialRequireList", getBusiMaterialRequireList())
             .toString();
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiProductRequireMapper.java

@@ -0,0 +1,87 @@
+package com.ruoyi.busi.mapper;
+
+import java.util.List;
+import com.ruoyi.busi.domain.BusiProductRequire;
+import com.ruoyi.busi.domain.BusiMaterialRequire;
+
+/**
+ * 产品需求Mapper接口
+ * 
+ * @author WangCL
+ * @date 2021-12-22
+ */
+public interface BusiProductRequireMapper 
+{
+    /**
+     * 查询产品需求
+     * 
+     * @param id 产品需求主键
+     * @return 产品需求
+     */
+    public BusiProductRequire selectBusiProductRequireById(String id);
+
+    /**
+     * 查询产品需求列表
+     * 
+     * @param busiProductRequire 产品需求
+     * @return 产品需求集合
+     */
+    public List<BusiProductRequire> selectBusiProductRequireList(BusiProductRequire busiProductRequire);
+
+    /**
+     * 新增产品需求
+     * 
+     * @param busiProductRequire 产品需求
+     * @return 结果
+     */
+    public int insertBusiProductRequire(BusiProductRequire busiProductRequire);
+
+    /**
+     * 修改产品需求
+     * 
+     * @param busiProductRequire 产品需求
+     * @return 结果
+     */
+    public int updateBusiProductRequire(BusiProductRequire busiProductRequire);
+
+    /**
+     * 删除产品需求
+     * 
+     * @param id 产品需求主键
+     * @return 结果
+     */
+    public int deleteBusiProductRequireById(String id);
+
+    /**
+     * 批量删除产品需求
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBusiProductRequireByIds(String[] ids);
+
+    /**
+     * 批量删除物料需求
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBusiMaterialRequireByProductRequireIds(String[] ids);
+    
+    /**
+     * 批量新增物料需求
+     * 
+     * @param busiMaterialRequireList 物料需求列表
+     * @return 结果
+     */
+    public int batchBusiMaterialRequire(List<BusiMaterialRequire> busiMaterialRequireList);
+    
+
+    /**
+     * 通过产品需求主键删除物料需求信息
+     * 
+     * @param id 产品需求ID
+     * @return 结果
+     */
+    public int deleteBusiMaterialRequireByProductRequireId(String id);
+}

ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProductRequireService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.busi.service;
+
+import java.util.List;
+import com.ruoyi.busi.domain.BusiProductRequire;
+
+/**
+ * 产品需求Service接口
+ * 
+ * @author WangCL
+ * @date 2021-12-22
+ */
+public interface IBusiProductRequireService 
+{
+    /**
+     * 查询产品需求
+     * 
+     * @param id 产品需求主键
+     * @return 产品需求
+     */
+    public BusiProductRequire selectBusiProductRequireById(String id);
+
+    /**
+     * 查询产品需求列表
+     * 
+     * @param busiProductRequire 产品需求
+     * @return 产品需求集合
+     */
+    public List<BusiProductRequire> selectBusiProductRequireList(BusiProductRequire busiProductRequire);
+
+    /**
+     * 新增产品需求
+     * 
+     * @param busiProductRequire 产品需求
+     * @return 结果
+     */
+    public int insertBusiProductRequire(BusiProductRequire busiProductRequire);
+
+    /**
+     * 修改产品需求
+     * 
+     * @param busiProductRequire 产品需求
+     * @return 结果
+     */
+    public int updateBusiProductRequire(BusiProductRequire busiProductRequire);
+
+    /**
+     * 批量删除产品需求
+     * 
+     * @param ids 需要删除的产品需求主键集合
+     * @return 结果
+     */
+    public int deleteBusiProductRequireByIds(String ids);
+
+    /**
+     * 删除产品需求信息
+     * 
+     * @param id 产品需求主键
+     * @return 结果
+     */
+    public int deleteBusiProductRequireById(String id);
+}

ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProductRequireServiceImpl.java

@@ -0,0 +1,134 @@
+package com.ruoyi.busi.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import com.ruoyi.common.utils.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
+import com.ruoyi.busi.domain.BusiMaterialRequire;
+import com.ruoyi.busi.mapper.BusiProductRequireMapper;
+import com.ruoyi.busi.domain.BusiProductRequire;
+import com.ruoyi.busi.service.IBusiProductRequireService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 产品需求Service业务层处理
+ * 
+ * @author WangCL
+ * @date 2021-12-22
+ */
+@Service
+public class BusiProductRequireServiceImpl implements IBusiProductRequireService 
+{
+    @Autowired
+    private BusiProductRequireMapper busiProductRequireMapper;
+
+    /**
+     * 查询产品需求
+     * 
+     * @param id 产品需求主键
+     * @return 产品需求
+     */
+    @Override
+    public BusiProductRequire selectBusiProductRequireById(String id)
+    {
+        return busiProductRequireMapper.selectBusiProductRequireById(id);
+    }
+
+    /**
+     * 查询产品需求列表
+     * 
+     * @param busiProductRequire 产品需求
+     * @return 产品需求
+     */
+    @Override
+    public List<BusiProductRequire> selectBusiProductRequireList(BusiProductRequire busiProductRequire)
+    {
+        return busiProductRequireMapper.selectBusiProductRequireList(busiProductRequire);
+    }
+
+    /**
+     * 新增产品需求
+     * 
+     * @param busiProductRequire 产品需求
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int insertBusiProductRequire(BusiProductRequire busiProductRequire)
+    {
+        busiProductRequire.setCreateTime(DateUtils.getNowDate());
+        int rows = busiProductRequireMapper.insertBusiProductRequire(busiProductRequire);
+        insertBusiMaterialRequire(busiProductRequire);
+        return rows;
+    }
+
+    /**
+     * 修改产品需求
+     * 
+     * @param busiProductRequire 产品需求
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int updateBusiProductRequire(BusiProductRequire busiProductRequire)
+    {
+        busiProductRequire.setUpdateTime(DateUtils.getNowDate());
+        busiProductRequireMapper.deleteBusiMaterialRequireByProductRequireId(busiProductRequire.getId());
+        insertBusiMaterialRequire(busiProductRequire);
+        return busiProductRequireMapper.updateBusiProductRequire(busiProductRequire);
+    }
+
+    /**
+     * 批量删除产品需求
+     * 
+     * @param ids 需要删除的产品需求主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteBusiProductRequireByIds(String ids)
+    {
+        busiProductRequireMapper.deleteBusiMaterialRequireByProductRequireIds(Convert.toStrArray(ids));
+        return busiProductRequireMapper.deleteBusiProductRequireByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除产品需求信息
+     * 
+     * @param id 产品需求主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBusiProductRequireById(String id)
+    {
+        busiProductRequireMapper.deleteBusiMaterialRequireByProductRequireId(id);
+        return busiProductRequireMapper.deleteBusiProductRequireById(id);
+    }
+
+    /**
+     * 新增物料需求信息
+     * 
+     * @param busiProductRequire 产品需求对象
+     */
+    public void insertBusiMaterialRequire(BusiProductRequire busiProductRequire)
+    {
+        List<BusiMaterialRequire> busiMaterialRequireList = busiProductRequire.getBusiMaterialRequireList();
+        String id = busiProductRequire.getId();
+        if (StringUtils.isNotNull(busiMaterialRequireList))
+        {
+            List<BusiMaterialRequire> list = new ArrayList<BusiMaterialRequire>();
+            for (BusiMaterialRequire busiMaterialRequire : busiMaterialRequireList)
+            {
+                busiMaterialRequire.setProductRequireId(id);
+                list.add(busiMaterialRequire);
+            }
+            if (list.size() > 0)
+            {
+                busiProductRequireMapper.batchBusiMaterialRequire(list);
+            }
+        }
+    }
+}

ruoyi-admin/src/main/resources/mapper/busi/BusiProductRequireMapper.xml

@@ -0,0 +1,129 @@
+<?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.busi.mapper.BusiProductRequireMapper">
+    
+    <resultMap type="BusiProductRequire" id="BusiProductRequireResult">
+        <result property="id"    column="id"    />
+        <result property="orderId"    column="order_id"    />
+        <result property="amount"    column="amount"    />
+        <result property="size"    column="size"    />
+        <result property="color"    column="color"    />
+        <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="endDate"    column="end_date"    />
+    </resultMap>
+
+    <resultMap id="BusiProductRequireBusiMaterialRequireResult" type="BusiProductRequire" extends="BusiProductRequireResult">
+        <collection property="busiMaterialRequireList" notNullColumn="sub_id" javaType="java.util.List" resultMap="BusiMaterialRequireResult" />
+    </resultMap>
+
+    <resultMap type="BusiMaterialRequire" id="BusiMaterialRequireResult">
+        <result property="id"    column="sub_id"    />
+        <result property="productRequireId"    column="sub_product_require_id"    />
+        <result property="amount"    column="sub_amount"    />
+        <result property="unit"    column="sub_unit"    />
+        <result property="color"    column="sub_color"    />
+        <result property="classify"    column="sub_classify"    />
+        <result property="createBy"    column="sub_create_by"    />
+        <result property="createTime"    column="sub_create_time"    />
+        <result property="updateBy"    column="sub_update_by"    />
+        <result property="updateTime"    column="sub_update_time"    />
+    </resultMap>
+
+    <sql id="selectBusiProductRequireVo">
+        select id, order_id, amount, size, color, create_by, create_time, update_by, update_time, end_date from busi_product_require
+    </sql>
+
+    <select id="selectBusiProductRequireList" parameterType="BusiProductRequire" resultMap="BusiProductRequireResult">
+        <include refid="selectBusiProductRequireVo"/>
+        <where>  
+            <if test="orderId != null  and orderId != ''"> and order_id like concat('%', #{orderId}, '%')</if>
+            <if test="size != null  and size != ''"> and size = #{size}</if>
+            <if test="color != null  and color != ''"> and color = #{color}</if>
+        </where>
+    </select>
+    
+    <select id="selectBusiProductRequireById" parameterType="String" resultMap="BusiProductRequireBusiMaterialRequireResult">
+        select a.id, a.order_id, a.amount, a.size, a.color, a.create_by, a.create_time, a.update_by, a.update_time, a.end_date,
+            b.id as sub_id, b.product_require_id as sub_product_require_id, b.amount as sub_amount, b.unit as sub_unit, b.color as sub_color, b.classify as sub_classify, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time
+        from busi_product_require a
+        left join busi_material_require b on b.product_require_id = a.id
+        where a.id = #{id}
+    </select>
+        
+    <insert id="insertBusiProductRequire" parameterType="BusiProductRequire" useGeneratedKeys="true" keyProperty="id">
+        insert into busi_product_require
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderId != null and orderId != ''">order_id,</if>
+            <if test="amount != null">amount,</if>
+            <if test="size != null and size != ''">size,</if>
+            <if test="color != null and color != ''">color,</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="endDate != null">end_date,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderId != null and orderId != ''">#{orderId},</if>
+            <if test="amount != null">#{amount},</if>
+            <if test="size != null and size != ''">#{size},</if>
+            <if test="color != null and color != ''">#{color},</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="endDate != null">#{endDate},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBusiProductRequire" parameterType="BusiProductRequire">
+        update busi_product_require
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderId != null and orderId != ''">order_id = #{orderId},</if>
+            <if test="amount != null">amount = #{amount},</if>
+            <if test="size != null and size != ''">size = #{size},</if>
+            <if test="color != null and color != ''">color = #{color},</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="endDate != null">end_date = #{endDate},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBusiProductRequireById" parameterType="String">
+        delete from busi_product_require where id = #{id}
+    </delete>
+
+    <delete id="deleteBusiProductRequireByIds" parameterType="String">
+        delete from busi_product_require where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+    <delete id="deleteBusiMaterialRequireByProductRequireIds" parameterType="String">
+        delete from busi_material_require where product_require_id in 
+        <foreach item="productRequireId" collection="array" open="(" separator="," close=")">
+            #{productRequireId}
+        </foreach>
+    </delete>
+
+    <delete id="deleteBusiMaterialRequireByProductRequireId" parameterType="String">
+        delete from busi_material_require where product_require_id = #{productRequireId}
+    </delete>
+
+    <insert id="batchBusiMaterialRequire">
+        insert into busi_material_require( id, product_require_id, amount, unit, color, classify, create_by, create_time, update_by, update_time) values
+		<foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.id}, #{item.productRequireId}, #{item.amount}, #{item.unit}, #{item.color}, #{item.classify}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+</mapper>

ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js

@@ -1669,9 +1669,14 @@ var table = {
                 return json;
             },
             // 数据字典转下拉框
-            dictToSelect: function(datas, value, name) {
+            dictToSelect: function(datas, value, name, disabled) {
                 var actions = [];
-                actions.push($.common.sprintf("<select class='form-control' name='%s'>", name));
+                if(disabled){
+                    actions.push($.common.sprintf("<select class='form-control' disabled name='%s'>", name));
+                }else{
+                    actions.push($.common.sprintf("<select class='form-control' name='%s'>", name));
+                }
+
                 $.each(datas, function(index, dict) {
                     actions.push($.common.sprintf("<option value='%s'", dict.dictValue));
                     if (dict.dictValue == ('' + value)) {

ruoyi-admin/src/main/resources/templates/busi/order/add.html

@@ -2,6 +2,7 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <head>
     <th:block th:include="include :: header('新增订单')" />
+    <th:block th:include="include :: datetimepicker-css" />
 </head>
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
@@ -27,9 +28,9 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">订单价格：</label>
+                <label class="col-sm-3 control-label is-required ">订单价格：</label>
                 <div class="col-sm-8">
-                    <input name="price" class="form-control" type="text" required>
+                    <input name="price" class="form-control number" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
@@ -43,7 +44,7 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label is-required" title="分料时，布匹长度由米转换为件时使用">转换比例(米/件)：<i class="fa fa-question-circle-o"></i></label>
                 <div class="col-sm-8">
-                    <input name="ratio" class="form-control" type="text" required>
+                    <input name="ratio" class="form-control number" type="text" required>
                 </div>
             </div>
           <div class="form-group hidden">
@@ -68,6 +69,7 @@
         </form>
     </div>
     <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
     <script th:inline="javascript">
         var prefix = ctx + "busi/order"
         var sizeDatas = [[${@dict.getType('busi_size')}]];
@@ -77,8 +79,10 @@
         });
 
         function submitHandler() {
+            console.log($('#form-order-add').serialize());
+            // return;
             if ($.validate.form()) {
-                $.operate.save(prefix + "/add", $('#form-order-add').serialize());
+                // $.operate.save(prefix + "/add", $('#form-order-add').serialize());
             }
         }
 
@@ -107,7 +111,7 @@
                     align: 'center',
                     title: '数量',
                     formatter: function(value, row, index) {
-                        var html = $.common.sprintf("<input class='form-control' type='text' name='busiProductRequireList[%s].amount' value='%s'>", index, value);
+                        var html = $.common.sprintf("<input class='form-control required digits' type='text' name='busiProductRequireList[%s].amount' value='%s'>", index, value);
                         return html;
                     }
                 },
@@ -134,7 +138,7 @@
                     align: 'center',
                     title: '截止日期',
                     formatter: function(value, row, index) {
-                        var html = $.common.sprintf("<input class='form-control' type='text' name='busiProductRequireList[%s].endDate' value='%s'>", index, value);
+                        var html = $.common.sprintf("<input class='form-control endDate required'  readonly type='text' name='busiProductRequireList[%s].endDate' value='%s'>", index, value);
                         return html;
                     }
                 
@@ -157,6 +161,12 @@
                     endDate: ""
                 }
             });
+            $(".endDate").datetimepicker({
+                format: "yyyy-mm-dd",
+                minView: "month",
+                startDate: new Date(),
+                autoclose: true
+            });
         }
 
         /*客户公司选择*/

ruoyi-admin/src/main/resources/templates/busi/order/edit.html

@@ -119,7 +119,7 @@
                     title: '尺码',
                     formatter: function(value, row, index) {
                         var name = $.common.sprintf("busiProductRequireList[%s].size", index);
-                        return $.common.dictToSelect(sizeDatas, value, name);
+                        return $.common.dictToSelect(sizeDatas, value, name, true);
                     }
                 },
                 {
@@ -128,7 +128,7 @@
                     title: '颜色',
                     formatter: function(value, row, index) {
                         var name = $.common.sprintf("busiProductRequireList[%s].color", index);
-                        return $.common.dictToSelect(colorDatas, value, name);
+                        return $.common.dictToSelect(colorDatas, value, name, true);
                     }
                 },
                 {

ruoyi-admin/src/main/resources/templates/busi/productRequire/add.html

@@ -0,0 +1,160 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增产品需求')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-productRequire-add">
+            <h4 class="form-header h4">产品需求信息</h4>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">订单名称：</label>
+                <div class="col-sm-8">
+                    <input name="orderId" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">数量：</label>
+                <div class="col-sm-8">
+                    <input name="amount" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">尺码：</label>
+                <div class="col-sm-8">
+                    <select name="size" class="form-control m-b" th:with="type=${@dict.getType('busi_size')}" required>
+                        <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 is-required">颜色：</label>
+                <div class="col-sm-8">
+                    <select name="color" class="form-control m-b" th:with="type=${@dict.getType('busi_color')}" required>
+                        <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 is-required">截止日期：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="endDate" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <h4 class="form-header h4">物料需求信息</h4>
+            <div class="row">
+                <div class="col-sm-12">
+                    <button type="button" class="btn btn-white btn-sm" onclick="addColumn()"><i class="fa fa-plus"> 增加</i></button>
+                    <button type="button" class="btn btn-white btn-sm" onclick="sub.delColumn()"><i class="fa fa-minus"> 删除</i></button>
+                    <div class="col-sm-12 select-table table-striped">
+                        <table id="bootstrap-table"></table>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "busi/productRequire"
+        var unitDatas = [[${@dict.getType('busi_material_unit')}]];
+        var colorDatas = [[${@dict.getType('busi_color')}]];
+        var classifyDatas = [[${@dict.getType('busi_material_type')}]];
+        $("#form-productRequire-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-productRequire-add').serialize());
+            }
+        }
+
+        $("input[name='endDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $(function() {
+            var options = {
+                pagination: false,
+                showSearch: false,
+                showRefresh: false,
+                showToggle: false,
+                showColumns: false,
+                sidePagination: "client",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'index',
+                    align: 'center',
+                    title: "序号",
+                    formatter: function (value, row, index) {
+                    	var columnIndex = $.common.sprintf("<input type='hidden' name='index' value='%s'>", $.table.serialNumber(index));
+                    	return columnIndex + $.table.serialNumber(index);
+                    }
+                },
+                {
+                    field: 'amount',
+                    align: 'center',
+                    title: '数量',
+                    formatter: function(value, row, index) {
+                        var html = $.common.sprintf("<input class='form-control' type='text' name='busiMaterialRequireList[%s].amount' value='%s'>", index, value);
+                        return html;
+                    }
+                },
+                {
+                    field: 'unit',
+                    align: 'center',
+                    title: '单位',
+                    formatter: function(value, row, index) {
+                        var name = $.common.sprintf("busiMaterialRequireList[%s].unit", index);
+                        return $.common.dictToSelect(unitDatas, value, name);
+                    }
+                },
+                {
+                    field: 'color',
+                    align: 'center',
+                    title: '颜色',
+                    formatter: function(value, row, index) {
+                        var name = $.common.sprintf("busiMaterialRequireList[%s].color", index);
+                        return $.common.dictToSelect(colorDatas, value, name);
+                    }
+                },
+                {
+                    field: 'classify',
+                    align: 'center',
+                    title: '类型',
+                    formatter: function(value, row, index) {
+                        var name = $.common.sprintf("busiMaterialRequireList[%s].classify", index);
+                        return $.common.dictToSelect(classifyDatas, value, name);
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+
+        function addColumn() {
+            var count = $("#" + table.options.id).bootstrapTable('getData').length;
+            sub.editColumn();
+        	
+            $("#" + table.options.id).bootstrapTable('insertRow', {
+                index: count,
+                row: {
+                    index: $.table.serialNumber(count),
+                    amount: "",
+                    unit: "",
+                    color: "",
+                    classify: ""
+                }
+            });
+        }
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/busi/productRequire/edit.html

@@ -0,0 +1,162 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改产品需求')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-productRequire-edit" th:object="${busiProductRequire}">
+            <h4 class="form-header h4">产品需求信息</h4>
+            <input name="id" th:field="*{id}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">订单名称：</label>
+                <div class="col-sm-8">
+                    <input name="orderId" th:field="*{orderId}" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">数量：</label>
+                <div class="col-sm-8">
+                    <input name="amount" th:field="*{amount}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">尺码：</label>
+                <div class="col-sm-8">
+                    <select name="size" class="form-control m-b" th:with="type=${@dict.getType('busi_size')}" required>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{size}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">颜色：</label>
+                <div class="col-sm-8">
+                    <select name="color" class="form-control m-b" th:with="type=${@dict.getType('busi_color')}" required>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{color}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">截止日期：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="endDate" th:value="${#dates.format(busiProductRequire.endDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <h4 class="form-header h4">物料需求信息</h4>
+            <div class="row">
+                <div class="col-sm-12">
+                    <button type="button" class="btn btn-white btn-sm" onclick="addColumn()"><i class="fa fa-plus"> 增加</i></button>
+                    <button type="button" class="btn btn-white btn-sm" onclick="sub.delColumn()"><i class="fa fa-minus"> 删除</i></button>
+                    <div class="col-sm-12 select-table table-striped">
+                        <table id="bootstrap-table"></table>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "busi/productRequire";
+        var unitDatas = [[${@dict.getType('busi_material_unit')}]];
+        var colorDatas = [[${@dict.getType('busi_color')}]];
+        var classifyDatas = [[${@dict.getType('busi_material_type')}]];
+        $("#form-productRequire-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-productRequire-edit').serialize());
+            }
+        }
+
+        $("input[name='endDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $(function() {
+            var options = {
+                data: [[${busiProductRequire.busiMaterialRequireList}]],
+                pagination: false,
+                showSearch: false,
+                showRefresh: false,
+                showToggle: false,
+                showColumns: false,
+                sidePagination: "client",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'index',
+                    align: 'center',
+                    title: "序号",
+                    formatter: function (value, row, index) {
+                    	var columnIndex = $.common.sprintf("<input type='hidden' name='index' value='%s'>", $.table.serialNumber(index));
+                    	return columnIndex + $.table.serialNumber(index);
+                    }
+                },
+                {
+                    field: 'amount',
+                    align: 'center',
+                    title: '数量',
+                    formatter: function(value, row, index) {
+                        var html = $.common.sprintf("<input class='form-control' type='text' name='busiMaterialRequireList[%s].amount' value='%s'>", index, value);
+                        return html;
+                    }
+				},
+                {
+                    field: 'unit',
+                    align: 'center',
+                    title: '单位',
+                    formatter: function(value, row, index) {
+                        var name = $.common.sprintf("busiMaterialRequireList[%s].unit", index);
+                        return $.common.dictToSelect(unitDatas, value, name);
+                    }
+                },
+                {
+                    field: 'color',
+                    align: 'center',
+                    title: '颜色',
+                    formatter: function(value, row, index) {
+                        var name = $.common.sprintf("busiMaterialRequireList[%s].color", index);
+                        return $.common.dictToSelect(colorDatas, value, name);
+                    }
+                },
+                {
+                    field: 'classify',
+                    align: 'center',
+                    title: '类型',
+                    formatter: function(value, row, index) {
+                        var name = $.common.sprintf("busiMaterialRequireList[%s].classify", index);
+                        return $.common.dictToSelect(classifyDatas, value, name);
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+
+        function addColumn() {
+            var count = $("#" + table.options.id).bootstrapTable('getData').length;
+            sub.editColumn();
+        	
+            $("#" + table.options.id).bootstrapTable('insertRow', {
+                index: count,
+                row: {
+                    index: $.table.serialNumber(count),
+                    amount: "",
+                    unit: "",
+                    color: "",
+                    classify: ""
+        	    }
+            });
+        }
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/busi/productRequire/productRequire.html

@@ -0,0 +1,124 @@
+<!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="orderId"/>
+                            </li>
+                            <li>
+                                <label>尺码：</label>
+                                <select name="size" th:with="type=${@dict.getType('busi_size')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>颜色：</label>
+                                <select name="color" th:with="type=${@dict.getType('busi_color')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </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="busi:productRequire:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="busi:productRequire:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="busi:productRequire:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="busi:productRequire: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('busi:productRequire:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('busi:productRequire:remove')}]];
+        var sizeDatas = [[${@dict.getType('busi_size')}]];
+        var colorDatas = [[${@dict.getType('busi_color')}]];
+        var prefix = ctx + "busi/productRequire";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "产品需求",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'id',
+                    title: 'ID主键',
+                    visible: false
+                },
+                {
+                    field: 'orderId',
+                    title: '订单名称'
+                },
+                {
+                    field: 'amount',
+                    title: '数量'
+                },
+                {
+                    field: 'size',
+                    title: '尺码',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(sizeDatas, value);
+                    }
+                },
+                {
+                    field: 'color',
+                    title: '颜色',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(colorDatas, value);
+                    }
+                },
+                {
+                    field: 'endDate',
+                    title: '截止日期'
+                },
+                {
+                    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.id + '\')"><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.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

sql/tmp.sql

@@ -94,3 +94,28 @@ values('订单删除', @parentId, '4',  '#',  'F', '0', 'busi:order:remove',
 
 insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
 values('订单导出', @parentId, '5',  '#',  'F', '0', 'busi:order:export',       '#', 'admin', sysdate(), '', null, '');
+
+
+
+-- 菜单 SQL
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('产品需求', '119', '1', '/busi/productRequire', 'C', '0', 'busi:productRequire:view', '#', 'admin', sysdate(), '', null, '产品需求菜单');
+
+-- 按钮父菜单ID
+SELECT @parentId := LAST_INSERT_ID();
+
+-- 按钮 SQL
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('产品需求查询', @parentId, '1',  '#',  'F', '0', 'busi:productRequire:list',         '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('产品需求新增', @parentId, '2',  '#',  'F', '0', 'busi:productRequire:add',          '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('产品需求修改', @parentId, '3',  '#',  'F', '0', 'busi:productRequire:edit',         '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('产品需求删除', @parentId, '4',  '#',  'F', '0', 'busi:productRequire:remove',       '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('产品需求导出', @parentId, '5',  '#',  'F', '0', 'busi:productRequire:export',       '#', 'admin', sysdate(), '', null, '');