diff --git a/src/main/java/com/pro/bus/controller/ProcessController.java b/src/main/java/com/pro/bus/controller/ProcessController.java
index fe7657d2fea683db3007d60664ce66d9460e34dc..2ca501e527fc4a0c9eb7552b77876adae7305e71 100644
--- a/src/main/java/com/pro/bus/controller/ProcessController.java
+++ b/src/main/java/com/pro/bus/controller/ProcessController.java
@@ -34,6 +34,7 @@ public class ProcessController {
     @RequestMapping("rawcloth")
     public String toProcess(Model model) {
         List<Plan> plans = processService.getPlanId();
+        System.out.println(".........."+plans);
         model.addAttribute("plans", plans);
         return "bus/process";
     }
diff --git a/src/main/java/com/pro/bus/entity/Plan.java b/src/main/java/com/pro/bus/entity/Plan.java
index 0854e2fb8744c9812e6ecfcb7ff1b37ad74e0708..667bafec7488ef4b54f9d9320969ce0ffc9967c2 100644
--- a/src/main/java/com/pro/bus/entity/Plan.java
+++ b/src/main/java/com/pro/bus/entity/Plan.java
@@ -15,6 +15,7 @@ public class Plan {
     private String plan_date;       //计划下达日期
     private String plan_person;     //计划登记人
     private Integer plan_status;    //计划状态 0-未下达，1-下达
+    private Double rest_num;        //剩余产量
 
     public Integer getPlan_id() {
         return plan_id;
@@ -128,13 +129,24 @@ public class Plan {
         this.plan_status = plan_status;
     }
 
+    public Double getRest_num() {
+        return rest_num;
+    }
+
+    public void setRest_num(Double rest_num) {
+        this.rest_num = rest_num;
+    }
+
     @Override
     public String toString() {
         return "Plan{" +
                 "plan_id=" + plan_id +
-                ", standard_id=" + standard_id +
+                ", standard_id='" + standard_id + '\'' +
+                ", standard_name='" + standard_name + '\'' +
                 ", cus_id=" + cus_id +
+                ", cus_name='" + cus_name + '\'' +
                 ", co_id=" + co_id +
+                ", co_name='" + co_name + '\'' +
                 ", plan_xh=" + plan_xh +
                 ", plan_month='" + plan_month + '\'' +
                 ", plan_num=" + plan_num +
@@ -142,6 +154,7 @@ public class Plan {
                 ", plan_date='" + plan_date + '\'' +
                 ", plan_person='" + plan_person + '\'' +
                 ", plan_status=" + plan_status +
+                ", rest_num=" + rest_num +
                 '}';
     }
 }
diff --git a/src/main/java/com/pro/bus/mapper/ProcessMapper.java b/src/main/java/com/pro/bus/mapper/ProcessMapper.java
index 3f2382c889e420d8b4f2589154f012ed2fa8856d..b98f74c5341f633258b1dee0af9766a82b639a8f 100644
--- a/src/main/java/com/pro/bus/mapper/ProcessMapper.java
+++ b/src/main/java/com/pro/bus/mapper/ProcessMapper.java
@@ -20,7 +20,10 @@ public interface ProcessMapper {
      */
     List<Process> getProcess(Process process);
 
-    @Select("select plan_id from bus_plan where plan_status=1")
+    /**
+     * 获得所有计划
+     * @return
+     */
     List<Plan> getPlanId();
 
     /***
diff --git a/src/main/resources/mapper/bus/ProcessMapper.xml b/src/main/resources/mapper/bus/ProcessMapper.xml
index 13fc3f01bb02df1b38407c0b92f15a4545e6d9b3..f3d0739d69a806555b976af06f0ffe20bcdc8654 100644
--- a/src/main/resources/mapper/bus/ProcessMapper.xml
+++ b/src/main/resources/mapper/bus/ProcessMapper.xml
@@ -2,6 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.pro.bus.mapper.ProcessMapper">
+    <select id="getPlanId" resultType="com.pro.bus.entity.Plan">
+        SELECT
+            info_standard.standard_name,
+            info_color.co_name,
+            info_customer.cus_name,
+            bus_plan.plan_id,
+            bus_plan.plan_num,
+            bus_plan.plan_num-(SELECT IFNULL(SUM(group_num),0) FROM bus_process WHERE bus_process.plan_id=bus_plan.plan_id) rest_num
+            FROM
+            bus_plan
+            INNER JOIN info_color ON bus_plan.co_id = info_color.co_id
+            INNER JOIN info_customer ON bus_plan.cus_id = info_customer.cus_id
+            INNER JOIN info_standard ON bus_plan.standard_id = info_standard.standard_id
+    </select>
+
     <select id="getProcess" resultType="com.pro.bus.entity.Process">
         select * from bus_process
         <where>
diff --git a/src/main/web/WEB-INF/views/bus/process.jsp b/src/main/web/WEB-INF/views/bus/process.jsp
index 95c6fb566ddd0b6692ac511bb635956a4d777b70..9a4547020d965bdfd4a4b86c82448a691cadb07b 100644
--- a/src/main/web/WEB-INF/views/bus/process.jsp
+++ b/src/main/web/WEB-INF/views/bus/process.jsp
@@ -11,6 +11,7 @@
 <head>
     <title>Title</title>
     <link rel="stylesheet" href="../../../static/layui-2.3.0/css/layui.css">
+    <link rel="stylesheet" href="../../../static/bootstrap-4.1.1/bootstrap.min.css">
 </head>
 <style type="text/css">
     .layui-form-label {
@@ -37,20 +38,46 @@
         </div>
     </div>
 </form>
+<%--选择计划--%>
+<div style="display: none;" id="dom-select-plan">
+    <table id="planTable" class="table">
+        <tr>
+            <td>计划编号</td>
+            <td>客户名称</td>
+            <td>规格名称</td>
+            <td>花色名称</td>
+            <td>计划产量</td>
+            <td>剩余产量</td>
+            <td>操作</td>
+        </tr>
+        <c:forEach items="${plans}" var="plan">
+            <tr>
+                <td>${plan.plan_id}</td>
+                <td>${plan.cus_name}</td>
+                <td>${plan.standard_name}</td>
+                <td>${plan.co_name}</td>
+                <td>${plan.plan_num}</td>
+                <td>${plan.rest_num}</td>
+                <td style="padding-top: 9px;">
+                    <button type="button" class="layui-btn layui-btn-sm" id="bn-select-plan"><i class="layui-icon layui-icon-ok-circle"></i> 选择</button>
+                </td>
+            </tr>
+        </c:forEach>
+    </table>
+</div>
 <!-- 新增窗口内容 -->
 <div style="display: none;" id="dom-win-pro-add">
 
     <form class="layui-form" lay-filter="form-pro-add">
         <input hidden name="process_id"/>
-        <div class="layui-form-item">
+        <div class="layui-form-item" style="margin-top: 10px;">
             <label class="layui-form-label">计划编号</label>
             <div class="layui-input-block">
-                <select id="plan_id" name="plan_id" lay-filter="plan">
-                    <option value=""></option>
-                    <c:forEach items="${plans}" var="plan">
-                        <option value="${plan.plan_id}">${plan.plan_id}</option>
-                    </c:forEach>
-                </select>
+                <input placeholder="选择计划" class="layui-input" id="plan_id" name="plan_id"
+                       lay-filter="plan" onpropertychange="changePlan()"readonly>
+                <%--<select id="plan_id" name="plan_id" lay-filter="plan">--%>
+                    <%--<option value=""></option>--%>
+                <%--</select>--%>
             </div>
         </div>
         <div class="layui-form-item">
@@ -128,7 +155,9 @@
 
 
 <script>
-
+    var changePlan = function () {
+        console.log("1");
+    }
     //显示按钮是否可用
     var showBns = function(){
         var _pro_status = $('#form-pro-query select[name=process_status]').val();
@@ -333,6 +362,23 @@
 
         });//打开新增用户信息窗口结束
 
+        //选择计划
+        var planlayer
+        $("#plan_id").click(function () {
+            planlayer = layer.open({
+                type: 1,
+                title: '选择计划',
+                area: ['750px', '300px'],
+                content: $('#dom-select-plan'),
+                zIndex: 100 //将层次降低，以使sweetalert能够在layer之上
+            });
+        });
+        $("#planTable").on("click",":button",function (event) {
+            var planId = $(this).closest("tr").find("td").eq(0).text();
+            $("#plan_id").val(planId);
+            layer.close(planlayer);
+        });
+
 
         $("#group_num").keyup(function(){
             console.log($("#group_num").val());
@@ -342,7 +388,8 @@
         })
         //监听选择计划编号
 
-        form.on('select(plan)', function(data){
+
+        form.on('plan', function(data){
             //console.log(data.elem); //得到select原始DOM对象
             //console.log(data.value); //得到被选中的值
             console.log(data.value); //得到美化后的DOM对象