From a6549ba5ab2ca08f3464f142dd4daaafdd8b5e00 Mon Sep 17 00:00:00 2001 From: longda <17868877553@163.com> Date: Tue, 14 Aug 2018 18:44:41 +0800 Subject: [PATCH] =?UTF-8?q?2018/8/14=E5=9D=AF=E5=B8=83=E5=87=86=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pro/bus/controller/ProcessController.java | 6 +-- .../com/pro/bus/mapper/ProcessMapper.java | 10 +---- .../com/pro/bus/service/ProcessService.java | 4 +- .../bus/service/impl/ProcessServiceImpl.java | 12 ++--- .../resources/mapper/bus/ProcessMapper.xml | 40 ++++++++++------- src/main/web/WEB-INF/views/bus/process.jsp | 45 ++++++++++++++----- 6 files changed, 69 insertions(+), 48 deletions(-) diff --git a/src/main/java/com/pro/bus/controller/ProcessController.java b/src/main/java/com/pro/bus/controller/ProcessController.java index 1fffc5b..fe7657d 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 2a148fa..3f2382c 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 getProcess(Process process); - @Select("select co_id,co_name from info_color where co_status=55") - List getColorName(); - @Select("select cus_id,cus_name from info_customer where cus_status=55") - List getCustomerName(); - @Select("select standard_id,standard_name from info_standard where standard_status=55") - List getStandardName(); @Select("select plan_id from bus_plan where plan_status=1") List 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 eae6a7b..a6cc14b 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 21c2220..8d63ba2 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 924a894..7111179 100644 --- a/src/main/resources/mapper/bus/ProcessMapper.xml +++ b/src/main/resources/mapper/bus/ProcessMapper.xml @@ -31,7 +31,9 @@ process_id = #{process_id}, + plan_id = #{plan_id}, + process_cus = #{process_cus}, @@ -110,6 +112,27 @@ + + update bus_process @@ -121,21 +144,4 @@ - - \ 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 0d62a47..148d11b 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 @@
- @@ -56,20 +56,20 @@
- +
- +
- +
@@ -96,14 +96,14 @@
- +
- +
@@ -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({ -- Gitee