diff --git a/src/main/java/com/pro/bus/controller/PretreatmentController.java b/src/main/java/com/pro/bus/controller/PretreatmentController.java index c574bab543235a752bcb8e82ca7322d81a848db9..2ae4f3bf1b8ca6ad5bbc625ada922e362d782f78 100644 --- a/src/main/java/com/pro/bus/controller/PretreatmentController.java +++ b/src/main/java/com/pro/bus/controller/PretreatmentController.java @@ -34,7 +34,15 @@ public class PretreatmentController { } return "bus/pretreatment"; } - + @RequiresPermissions("/bus/pretreatment") + @RequestMapping(value="/m_pretreatment",method= RequestMethod.GET) + @ResponseBody + public PageInfo m_pretreatment(Process process,@RequestParam(value = "page") Integer page,@RequestParam(value = "rows") Integer rows){ + PageHelper.startPage(page,rows); + List processes = pretreatmentService.getPretreatment(process); + PageInfo processPageInfo = new PageInfo(processes); + return processPageInfo; + } /*** * 获取前处理信息 * @param page diff --git a/src/main/java/com/pro/bus/controller/ProcessController.java b/src/main/java/com/pro/bus/controller/ProcessController.java index c61c6d01ff95c65bd21fed9f9ed9ba9dc7134b22..b757732a2209f29035868732888b0b4dc2bac3d2 100644 --- a/src/main/java/com/pro/bus/controller/ProcessController.java +++ b/src/main/java/com/pro/bus/controller/ProcessController.java @@ -141,13 +141,11 @@ public class ProcessController { */ @RequiresPermissions("/bus/rawcloth") @RequestMapping( - value="cfmProcessStatus/{process_id}/{process_status}", + value="cfmProcessStatus/{process_id}/{process_status}/{pretreat_num}", method=RequestMethod.PUT) @ResponseBody - public Result cfmStatus(@PathVariable Integer process_id, @PathVariable String process_status){ + public Result cfmStatus(@PathVariable Integer process_id, @PathVariable String process_status,@PathVariable Double pretreat_num){ Process process = new Process(); - Process process1 = processService.getProcessById(process_id); - Double pretreat_num = process1.getGroup_num(); Subject subject = SecurityUtils.getSubject(); User user = (User) subject.getSession().getAttribute("user"); SimpleDateFormat dataFormat = new SimpleDateFormat("yyyy-MM-dd"); diff --git a/src/main/java/com/pro/info/controller/ColorController.java b/src/main/java/com/pro/info/controller/ColorController.java index 01d170f9fb05abc42d655c7fa8bbdcd29c0c7d05..13b7edd262d22f5ff65349436acbcbed794848c5 100644 --- a/src/main/java/com/pro/info/controller/ColorController.java +++ b/src/main/java/com/pro/info/controller/ColorController.java @@ -43,7 +43,6 @@ public class ColorController { PageHelper.startPage(page,limit); List colors = colorService.getColor(color); - System.out.println(colors.size()); Map map = new HashMap(); PageInfo pageInfo = new PageInfo(colors); map.put("code",0); diff --git a/src/main/resources/mapper/bus/Pretreatment.xml b/src/main/resources/mapper/bus/Pretreatment.xml index b746ee474ccbd88981ff2b6c1b46737899a5a63a..8fac1765bb299854bab01b969260820aff706dd5 100644 --- a/src/main/resources/mapper/bus/Pretreatment.xml +++ b/src/main/resources/mapper/bus/Pretreatment.xml @@ -27,7 +27,9 @@ ) ) - process_status='05' or process_status='10' + + or process_status=#{process_status} + and plan_type = #{plan_type} diff --git a/src/main/web/WEB-INF/views/bus/pretreatment.jsp b/src/main/web/WEB-INF/views/bus/pretreatment.jsp index 5e4be0e43903a28e048071484cbc0469ff99b683..d164a58479f65c6c7dd61ea482422453596c2fd8 100644 --- a/src/main/web/WEB-INF/views/bus/pretreatment.jsp +++ b/src/main/web/WEB-INF/views/bus/pretreatment.jsp @@ -34,6 +34,13 @@ + +
+ +
@@ -44,63 +51,10 @@
-
- -
- -
-
-
- -
- -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
@@ -139,6 +93,10 @@ var layer = layui.layer; var form = layui.form; var laydate = layui.laydate; + var p_pretreat_num; + var maxNum; + var minNum; + // var g_group_num; //日历插件 lay('.test-item').each(function () { @@ -221,13 +179,25 @@ var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值） var tr = obj.tr; //获得当前行 tr 的DOM对象 if (layEvent === 'pre_edit') { //编辑 - - opr.ajaxWithConfirm({ - title: "您确定完成前处理吗?", - url: 'cfmProcessStatus/' + data.process_id + '/10', - method: 'put', + opr.ajax({ + url: 'getProcessById/' + data.process_id, + method: 'get', layer: layer, - layuiTableIns: preTable + responseOkHandler: function (process) { + + //form-u-upd是表单的lay-filter值 + form.val("form-pre-add", process); + p_pretreat_num = process.group_num; + $("#pretreat_num").prop("max",p_pretreat_num*1.1); + $("#pretreat_num").prop("min",p_pretreat_num*0.9); + layerIdx = layer.open({ + type: 1, + title: '修改坯布准备信息', + area: ['500px', '400px'], + content: $('#dom-win-pre-add'), + zIndex: 100 //将层次降低，以使sweetalert能够在layer之上 + }); + } }); } else if (layEvent === 'pre_quxiao') { // opr.ajaxWithConfirm({ @@ -269,18 +239,36 @@ //console.log(data.othis); //得到美化后的DOM对象 $('#bn-pre-query').click(); }); + form.on('select(select-pre-query-pre-status)', function (data) { + //console.log(data.elem); //得到select原始DOM对象 + //console.log(data.value); //得到被选中的值 + //console.log(data.othis); //得到美化后的DOM对象 + $('#bn-pre-query').click(); + }); + $("#pretreat_num").keyup(function () { + maxNum = p_pretreat_num*1.1; + minNum = p_pretreat_num*0.9; + // console.log($("#pretreat_num").val()); + // console.log(maxNum) + if ($("#pretreat_num").val() > maxNum) { + $("#pretreat_num").val(maxNum); + } else if ($("#pretreat_num").val() < minNum) { + $("#pretreat_num").val(minNum); + + } + }) //监听新增表单提交。bn-pro-do-add是新增表单中提交按钮的lay-filter值 form.on('submit(bn-pre-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.process_id); opr.ajax({ - url: 'save', - data: data.field, - method: 'post', + url: 'cfmProcessStatus/' + data.field.process_id + '/10/' + data.field.pretreat_num, + data: JSON.stringify(data.field), + method: 'put', + contentType: 'application/json;charset=UTF-8', layer: layer, layuiTableIns: preTable, responseOkHandler: function (result) { diff --git a/src/main/web/WEB-INF/views/bus/process.jsp b/src/main/web/WEB-INF/views/bus/process.jsp index 8b4479cfef40f4addf311d774f040189f06aa54f..3a1ef2b617a1a076ccc13158d96b4c7980ddf10f 100644 --- a/src/main/web/WEB-INF/views/bus/process.jsp +++ b/src/main/web/WEB-INF/views/bus/process.jsp @@ -32,7 +32,7 @@ -
+
diff --git a/src/main/web/WEB-INF/views/mobile/pretreatment.jsp b/src/main/web/WEB-INF/views/mobile/pretreatment.jsp new file mode 100644 index 0000000000000000000000000000000000000000..904ad788cafba9f7500fbfe6b8537c6e29101f66 --- /dev/null +++ b/src/main/web/WEB-INF/views/mobile/pretreatment.jsp @@ -0,0 +1,425 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + + + 生产过程云信息系统-主页 + + + + +
+ +
+ +
+
+ + 待前处理 + 已前处理 + +
+ + + + + + + +
+
+
组号{{ pro.process_id }}
+
类型： +
白布
+
染色布
+
无底印花
+
有底印花
+
+ +
+
+
+
客户
+
{{ pro.process_cus }}
+
+
+
规格
+
{{ pro.process_std }}
+
+
+
花色号
+
{{ pro.process_color }}
+
+
+
投坯
+
{{ pro.group_num }}
米
+
+
+
+ 完成前处理 +
+
+ + + + + + + +
+
+
组号{{ pro.process_id }}
+
类型： +
白布
+
染色布
+
无底印花
+
有底印花
+
+ +
+
+
+
客户
+
{{ pro.process_cus }}
+
+
+
规格
+
{{ pro.process_std }}
+
+
+
花色号
+
{{ pro.process_color }}
+
+
+
投坯
+
{{ pro.group_num }}
米
+
+
+
前处理
米
+
{{ pro.pretreat_num }}
+
+
+
+ 完成前处理 +
+
+ + + + + + +
+ + + + + + + + + \ No newline at end of file