diff --git a/src/main/java/com/pro/bus/controller/ProcessController.java b/src/main/java/com/pro/bus/controller/ProcessController.java
index 1fffc5bec66db8c3a2b3d7c7c096d8d14f3ec4df..fe7657d2fea683db3007d60664ce66d9460e34dc 100644
--- a/src/main/java/com/pro/bus/controller/ProcessController.java
+++ b/src/main/java/com/pro/bus/controller/ProcessController.java
@@ -39,10 +39,10 @@ public class ProcessController {
     }
 
     @RequiresPermissions("/bus/rawcloth")
-    @RequestMapping("getInfoByPlan/{plan_id}")
+    @RequestMapping("getInfoByPlan/{plan_id}/{process_id}")
     @ResponseBody
-    public Process getInfoByPlan(@PathVariable("plan_id") Integer plan_id) {
-        Process process = processService.getInfoByPlan(plan_id);
+    public Process getInfoByPlan(@PathVariable("plan_id") Integer plan_id, @PathVariable("process_id")Integer process_id) {
+        Process process = processService.getInfoByPlan(plan_id,process_id);
         return process;
     }
 
diff --git a/src/main/java/com/pro/bus/mapper/ProcessMapper.java b/src/main/java/com/pro/bus/mapper/ProcessMapper.java
index 2a148faa53f3727ed40ff4a057ac9363c0920835..3f2382c889e420d8b4f2589154f012ed2fa8856d 100644
--- a/src/main/java/com/pro/bus/mapper/ProcessMapper.java
+++ b/src/main/java/com/pro/bus/mapper/ProcessMapper.java
@@ -20,12 +20,6 @@ public interface ProcessMapper {
      */
     List<Process> getProcess(Process process);
 
-    @Select("select co_id,co_name from info_color where co_status=55")
-    List<Color> getColorName();
-    @Select("select cus_id,cus_name from info_customer where cus_status=55")
-    List<Customer> getCustomerName();
-    @Select("select standard_id,standard_name from info_standard where standard_status=55")
-    List<Standard> getStandardName();
     @Select("select plan_id from bus_plan where plan_status=1")
     List<Plan> getPlanId();
 
@@ -63,12 +57,12 @@ public interface ProcessMapper {
      * @param process_status
      * @return
      */
-    int updateProcessStatus(Integer[] process_ids, String process_status);
+    int updateProcessStatus(@Param("process_ids")Integer[] process_ids,@Param("process_status")  String process_status);
 
     /**
      * 根据计划获得对应的基础信息
      * @param plan_id
      * @return
      */
-    Plan getInfoByPlan(Integer plan_id);
+    Plan getInfoByPlan(@Param("plan_id") Integer plan_id, @Param("process_id") Integer process_id);
 }
diff --git a/src/main/java/com/pro/bus/service/ProcessService.java b/src/main/java/com/pro/bus/service/ProcessService.java
index eae6a7b8d9f136cc6923e57b46473823baa55ae8..a6cc14b34e52324f6ada02e0089e66d194ae618d 100644
--- a/src/main/java/com/pro/bus/service/ProcessService.java
+++ b/src/main/java/com/pro/bus/service/ProcessService.java
@@ -45,7 +45,7 @@ public interface ProcessService {
      * @param process_status
      * @return
      */
-    Result updateProcessStatus(@Param("process_ids") Integer[] process_ids, @Param("process_status") String process_status);
+    Result updateProcessStatus( Integer[] process_ids, String process_status);
 
-    Process getInfoByPlan(Integer plan_id);
+    Process getInfoByPlan(Integer plan_id, Integer process_id);
 }
diff --git a/src/main/java/com/pro/bus/service/impl/ProcessServiceImpl.java b/src/main/java/com/pro/bus/service/impl/ProcessServiceImpl.java
index 21c22209f620f5ccf944c073a61edefbf80e1101..8d63ba222b292b400b5daaaf4424d7b3033f6a3a 100644
--- a/src/main/java/com/pro/bus/service/impl/ProcessServiceImpl.java
+++ b/src/main/java/com/pro/bus/service/impl/ProcessServiceImpl.java
@@ -86,10 +86,10 @@ public class ProcessServiceImpl implements ProcessService {
      */
     @Override
     public Result updateProcessStatus(Integer[] process_ids, String process_status) {
-        if(processMapper.updateProcessStatus(process_ids,process_status)>0){
-            return Result.successResult("状态修改成功");
-        }
-        return Result.failResult("状态修改失败");
+            if(processMapper.updateProcessStatus(process_ids,process_status)>0){
+                return Result.successResult("状态修改成功");
+            }
+            return Result.failResult("状态修改失败");
     }
 
     /**
@@ -98,8 +98,8 @@ public class ProcessServiceImpl implements ProcessService {
      * @return
      */
     @Override
-    public Process getInfoByPlan(Integer plan_id) {
-        Plan plan = processMapper.getInfoByPlan(plan_id);
+    public Process getInfoByPlan(Integer plan_id, Integer process_id) {
+        Plan plan = processMapper.getInfoByPlan(plan_id, process_id);
         if (plan != null) {
             Process process = new Process();
             process.setProcess_cus(plan.getCus_id()+"|"+plan.getCus_name());
diff --git a/src/main/resources/mapper/bus/ProcessMapper.xml b/src/main/resources/mapper/bus/ProcessMapper.xml
index 924a894c01d05d2d6691c7a431265b4994a2e672..711117960e2f91462df8a124dce838e16ea9e1eb 100644
--- a/src/main/resources/mapper/bus/ProcessMapper.xml
+++ b/src/main/resources/mapper/bus/ProcessMapper.xml
@@ -31,7 +31,9 @@
             <if test="process_id != null and process_id != ''">
                 process_id = #{process_id},
             </if>
+            <if test="plan_id != null">
             plan_id = #{plan_id},
+            </if>
             <if test="process_cus != null and process_cus != ''">
                 process_cus = #{process_cus},
             </if>
@@ -110,6 +112,27 @@
         </where>
     </delete>
 
+    <select id="getInfoByPlan" resultType="com.pro.bus.entity.Plan">
+        SELECT
+        info_standard.standard_name,
+        info_customer.cus_name,
+        info_color.co_name,
+        bus_plan.standard_id,
+        bus_plan.cus_id,
+        bus_plan.co_id,
+        (bus_plan.plan_num-(select sum(group_num) from bus_process where plan_id=#{plan_id})
+        <if test="process_id != 0">
+            +(SELECT group_num FROM bus_process WHERE process_id=#{process_id})
+        </if>
+        ) plan_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
+        where bus_plan.plan_id=#{plan_id}
+    </select>
+
     <update id="updateProcessStatus">
         update bus_process
         <set>
@@ -121,21 +144,4 @@
             </where>
         </set>
     </update>
-
-    <select id="getInfoByPlan" resultType="com.pro.bus.entity.Plan">
-        SELECT
-            info_standard.standard_name,
-            info_customer.cus_name,
-            info_color.co_name,
-            bus_plan.standard_id,
-            bus_plan.cus_id,
-            bus_plan.co_id,
-            bus_plan.plan_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
-            where bus_plan.plan_id=#{plan_id}
-    </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/web/WEB-INF/views/bus/process.jsp b/src/main/web/WEB-INF/views/bus/process.jsp
index 0d62a47798e2972cb54dcde0eaf445e54077ab2d..148d11b42a2d756c56f5801b4d9d5a905c1ab4bc 100644
--- a/src/main/web/WEB-INF/views/bus/process.jsp
+++ b/src/main/web/WEB-INF/views/bus/process.jsp
@@ -45,7 +45,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">计划编号</label>
             <div class="layui-input-block">
-                <select name="plan_id" lay-filter="plan">
+                <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>
@@ -56,20 +56,20 @@
         <div class="layui-form-item">
             <label class="layui-form-label">客户名称</label>
             <div class="layui-input-block">
-                <input class="layui-input" id="process_cus" name="process_cus" value="" readonly/>
+                <input class="layui-input" placeholder="客户名称" id="process_cus" name="process_cus" value="" readonly/>
             </div>
         </div>
 
         <div class="layui-form-item">
             <label class="layui-form-label">规格名称</label>
             <div class="layui-input-block">
-                <input class="layui-input" id="process_std" name="process_std" value="" readonly/>
+                <input class="layui-input" placeholder="规格名称" id="process_std" name="process_std" value="" readonly/>
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">花色名称</label>
             <div class="layui-input-block">
-                <input class="layui-input" id="process_color" name="process_color" value="" readonly/>
+                <input class="layui-input" placeholder="花色名称" id="process_color" name="process_color" value="" readonly/>
             </div>
         </div>
         <div class="layui-form-item">
@@ -96,14 +96,14 @@
 
         <div class="layui-form-item">
             <div class="layui-input-block">
-                <button class="layui-btn" lay-submit lay-filter="bn-pro-do-add">提交</button>
+                <button class="layui-btn" id="bn-pro-do-add" lay-submit lay-filter="bn-pro-do-add">提交</button>
                 <button type="reset" class="layui-btn layui-btn-primary">重置</button>
             </div>
         </div>
     </form>
 </div>
 <div class="layui-btn-container">
-    <button type="button" class="layui-btn" id="bn-pro-add"><i class="layui-icon">&#xe608;</i> 新增</button>
+    <button type="button" class="layui-btn" id="bn-pro-add"><i class="layui-icon">&#xe608;</i> 分组</button>
     <button class="layui-btn layui-btn-danger" id="bn-pro-del-multi"><i class="layui-icon layui-icon-delete"></i> 删除
     </button>
 </div>
@@ -148,6 +148,7 @@
         var layer = layui.layer;
         var form = layui.form;
         var laydate = layui.laydate;
+        var g_group_num;
         lay('.test-item').each(function () {
             laydate.render({
                 elem: this
@@ -214,7 +215,7 @@
                         }
                     }
                 }
-                , {toolbar: '#barDemo'}
+                , {toolbar: '#barDemo', width:"19%"}
             ]]
         });//table结束
         //监听工具条。注：tool是工具条事件名，proTable是table原始容器的属性 lay-filter属性的值
@@ -223,6 +224,7 @@
             var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
             var tr = obj.tr; //获得当前行 tr 的DOM对象
             if (layEvent === 'pro_edit') { //编辑
+
                 opr.ajax({
                     url: 'getProcessById/' + data.process_id,
                     method: 'get',
@@ -242,6 +244,20 @@
 
                     }
                 });
+
+                $.ajax({
+                    url:"getInfoByPlan/"+data.plan_id+"/"+data.process_id,
+                    method:"get",
+                    dataType:"json",
+                }).done(function (result) {
+                    if (result != null) {
+                        console.log(result);
+                        g_group_num = result.group_num;
+                        $("#group_num").prop("max",g_group_num);
+                        $("#group_num").prop("readonly","");
+                        $("#group_num").prop("placeholder","现在剩余布匹数量为"+g_group_num+"米");
+                    }
+                });
             }else if (layEvent === 'pro_del') { //删除
                 var arr = [];
                 arr.push(data.process_id);
@@ -317,7 +333,7 @@
 
         });//打开新增用户信息窗口结束
 
-        var g_group_num;
+
         $("#group_num").keyup(function(){
             console.log($("#group_num").val());
             if ($("#group_num").val() > g_group_num) {
@@ -325,12 +341,13 @@
             }
         })
         //监听选择计划编号
-        form.on('select(plan)', function(data){
+
+        form.on('select(plan)', plan = function(data){
             //console.log(data.elem); //得到select原始DOM对象
             //console.log(data.value); //得到被选中的值
             //console.log(data.othis); //得到美化后的DOM对象
             $.ajax({
-                url:"getInfoByPlan/"+data.value,
+                url:"getInfoByPlan/"+data.value+"/"+0,
                 method:"get",
                 dataType:"json",
             }).done(function (result) {
@@ -341,7 +358,11 @@
                     $("#process_std").val(result.process_std);
                     g_group_num = result.group_num;
                     $("#group_num").prop("max",g_group_num);
-                    $("#group_num").prop("readonly","")
+                    $("#group_num").prop("readonly","");
+                    $("#group_num").prop("placeholder","现在剩余布匹数量为"+g_group_num+"米");
+                    if(g_group_num==0){
+                        $('#bn-pro-do-add').prop('disabled',true).addClass("layui-btn-disabled");
+                    }
                 }
             });
         });
@@ -349,7 +370,7 @@
         form.on('submit(bn-pro-do-add)', function (data) {
             //console.log(data.elem) //被执行事件的元素DOM对象，一般为button对象
             //console.log(data.form) //被执行提交的form对象，一般在存在form标签时才会返回
-            console.log(data.field) //当前容器的全部表单字段，名值对形式：{name: value}
+            //console.log(data.field) //当前容器的全部表单字段，名值对形式：{name: value}
 
 
             opr.ajax({