diff --git a/src/main/java/com/pro/bus/controller/ArrangeController.java b/src/main/java/com/pro/bus/controller/ArrangeController.java new file mode 100644 index 0000000000000000000000000000000000000000..f39163c92fcef37836eb91d630757a99194e6604 --- /dev/null +++ b/src/main/java/com/pro/bus/controller/ArrangeController.java @@ -0,0 +1,33 @@ +package com.pro.bus.controller; + +import com.pro.bus.service.ArrangeService; +import com.pro.utils.Utils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("bus") +public class ArrangeController { + @Autowired + private ArrangeService arrangeService; + + /** + * 去整理页面 + * @param via + * @param userAgent + * @return + */ + @RequestMapping("arrange") + public String toArrang(@RequestHeader(value="Via",required=false) String via , @RequestHeader("user-agent") String userAgent){ + //判断手机端登录 + boolean is = Utils.isMobileDevice(via, userAgent); + if(is) { + return "mobile/arrange"; + } + return "bus/arrange"; + } + + +} diff --git a/src/main/java/com/pro/bus/mapper/ArrangeMapper.java b/src/main/java/com/pro/bus/mapper/ArrangeMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..7803450e55c926519d780fc1e71ed87ef8aa1ffe --- /dev/null +++ b/src/main/java/com/pro/bus/mapper/ArrangeMapper.java @@ -0,0 +1,25 @@ +package com.pro.bus.mapper; + +import com.pro.bus.entity.Process; +import org.apache.ibatis.annotations.Param; +import org.mybatis.spring.annotation.MapperScan; + +import java.util.List; + +@MapperScan +public interface ArrangeMapper { + /** + * 获得整理数据 + * @param process + * @return + */ + List getArrang(Process process); + + /** + * 确认整理 + * @param process_id + * @param arrange_num + * @return + */ + int cfmarrange(@Param("process_id") Integer process_id, @Param("arrange_num") Double arrange_num, @Param("arrange_person") String arrange_person); +} diff --git a/src/main/java/com/pro/bus/mapper/PrintMapper.java b/src/main/java/com/pro/bus/mapper/PrintMapper.java index 81b4b3d609c7cfd2b73c79b1a23b0034a991ca89..616408df71b3ba426fd6186de7ccf825c6e1c063 100644 --- a/src/main/java/com/pro/bus/mapper/PrintMapper.java +++ b/src/main/java/com/pro/bus/mapper/PrintMapper.java @@ -27,4 +27,10 @@ public interface PrintMapper { * @return */ List getMPrint(Process process); + + /** + * 获得后工序 + * @return + */ + List getMdone(@Param("status") String status); } diff --git a/src/main/java/com/pro/bus/service/ArrangeService.java b/src/main/java/com/pro/bus/service/ArrangeService.java new file mode 100644 index 0000000000000000000000000000000000000000..05526827ea32db4c1351da2486a3453d0a083420 --- /dev/null +++ b/src/main/java/com/pro/bus/service/ArrangeService.java @@ -0,0 +1,24 @@ +package com.pro.bus.service; + +import com.pro.bus.entity.Process; +import com.pro.sys.entity.Result; + +import java.util.List; + +public interface ArrangeService { + + /** + * 获得整理数据 + * @param process + * @return + */ + List getArrang(Process process); + + /** + * 确认整理 + * @param process_id + * @param arrange_num + * @return + */ + Result cfmarrange(Integer process_id, Double arrange_num); +} diff --git a/src/main/java/com/pro/bus/service/PrintService.java b/src/main/java/com/pro/bus/service/PrintService.java index 39635bd11e5209aef8d42b7e40bf19e03276921f..7fa37b36eae709ddc3b6ae1e7202194cc92f3c1a 100644 --- a/src/main/java/com/pro/bus/service/PrintService.java +++ b/src/main/java/com/pro/bus/service/PrintService.java @@ -27,4 +27,10 @@ public interface PrintService { * @return */ List getMPrint(Process process); + + /** + * 获得后工序 + * @return + */ + List getMdone(String status); } diff --git a/src/main/java/com/pro/bus/service/impl/ArrangeServiceImpl.java b/src/main/java/com/pro/bus/service/impl/ArrangeServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..b11278e01be553eba56e7f788fa655f7579a1083 --- /dev/null +++ b/src/main/java/com/pro/bus/service/impl/ArrangeServiceImpl.java @@ -0,0 +1,44 @@ +package com.pro.bus.service.impl; + +import com.pro.bus.entity.Process; +import com.pro.bus.mapper.ArrangeMapper; +import com.pro.bus.service.ArrangeService; +import com.pro.sys.entity.Result; +import com.pro.sys.entity.User; +import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class ArrangeServiceImpl implements ArrangeService { + + @Autowired + private ArrangeMapper arrangeMapper; + + /** + * 获得整理数据 + * @param process + * @return + */ + @Override + public List getArrang(Process process) { + return arrangeMapper.getArrang(process); + } + + /** + * 确认整理 + * @param process_id + * @param arrange_num + * @return + */ + @Override + public Result cfmarrange(Integer process_id, Double arrange_num) { + String arrange_person = ((User)SecurityUtils.getSubject().getPrincipal()).getU_name(); + if (arrangeMapper.cfmarrange(process_id,arrange_num,arrange_person) > 0){ + return Result.successResult("整理成功"); + } + return Result.failResult("整理失败"); + } +} diff --git a/src/main/java/com/pro/bus/service/impl/PrintServiceImpl.java b/src/main/java/com/pro/bus/service/impl/PrintServiceImpl.java index 13cb85e5f8dc80a598cd146206e5fbf837f3c567..6e772551d7476ed0dd33328193e54a8034c78d81 100644 --- a/src/main/java/com/pro/bus/service/impl/PrintServiceImpl.java +++ b/src/main/java/com/pro/bus/service/impl/PrintServiceImpl.java @@ -5,10 +5,12 @@ import com.pro.bus.mapper.PrintMapper; import com.pro.bus.service.PrintService; import com.pro.sys.entity.Result; import com.pro.sys.entity.User; +import com.pro.utils.StatusEnum; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; @Service @@ -51,4 +53,19 @@ public class PrintServiceImpl implements PrintService { public List getMPrint(Process process) { return printMapper.getMPrint(process); } + + /** + * 获得后工序 + * @return + */ + @Override + public List getMdone(String status) { + List pros = printMapper.getMdone(status); + for (Process pro:pros) { + String currStatus = StatusEnum.getName(pro.getProcess_status()); + pro.setProcess_status(currStatus); + } + return pros; + } + } diff --git a/src/main/java/com/pro/mobile/controller/MobileArrangeController.java b/src/main/java/com/pro/mobile/controller/MobileArrangeController.java new file mode 100644 index 0000000000000000000000000000000000000000..72a58dba339516d21703c22c043b3548d200efae --- /dev/null +++ b/src/main/java/com/pro/mobile/controller/MobileArrangeController.java @@ -0,0 +1,68 @@ +package com.pro.mobile.controller; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.pro.bus.entity.Process; +import com.pro.bus.service.ArrangeService; +import com.pro.bus.service.PrintService; +import com.pro.sys.entity.Result; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; + +@Controller +@RequestMapping("/bus") +public class MobileArrangeController { + @Autowired + private ArrangeService arrangeService; + @Autowired + private PrintService printService; + + /** + * 获得手机端整理信息分页数据 + * @param process + * @param page + * @param rows + * @return + */ + @RequestMapping(value = "m_arrange", + method = RequestMethod.GET) + @ResponseBody + public PageInfo getMArrang(Process process, Integer page, Integer rows){ + PageHelper.startPage(page, rows); + List list = arrangeService.getArrang(process); + return new PageInfo(list); + } + + /** + * 手机确认整理 + * @param process + * @return + */ + @RequestMapping(value = "cfmarrange", + method = RequestMethod.PUT) + @ResponseBody + public Result cfmarrange(@RequestBody Process process) { + return arrangeService.cfmarrange(process.getProcess_id(),process.getArrange_num()); + } + + /** + * 获得后工序 + * @param page + * @param rows + * @return + */ + @RequestMapping(value = "m_adone", + method = RequestMethod.GET) + @ResponseBody + public PageInfo getMdone(Integer page, Integer rows, String status) { + PageHelper.startPage(page, rows); + List list = printService.getMdone(status); + return new PageInfo(list); + } +} diff --git a/src/main/java/com/pro/mobile/controller/MobilePrintController.java b/src/main/java/com/pro/mobile/controller/MobilePrintController.java index 87c87fc4c79d28fa81d37c541ccb841dea7fc2c2..f265722fd768645e2b45681c1e9497e3f6199cc9 100644 --- a/src/main/java/com/pro/mobile/controller/MobilePrintController.java +++ b/src/main/java/com/pro/mobile/controller/MobilePrintController.java @@ -27,12 +27,26 @@ public class MobilePrintController { method = RequestMethod.GET) @ResponseBody public PageInfo getMprint(Process process, Integer page, Integer rows) { - System.out.println("-------"+process+"---"+page+"---"+rows); + System.out.println("process_status"+process+"---"+page+"---"+rows); PageHelper.startPage(page, rows); List list = printService.getMPrint(process); return new PageInfo(list); } + /** + * 获得后工序 + * @param page + * @param rows + * @return + */ + @RequestMapping(value = "m_pdone", + method = RequestMethod.GET) + @ResponseBody + public PageInfo getMdone(Integer page, Integer rows, String status) { + PageHelper.startPage(page, rows); + List list = printService.getMdone(status); + return new PageInfo(list); + } /** * 手机确认印花 * @param process diff --git a/src/main/java/com/pro/utils/StatusEnum.java b/src/main/java/com/pro/utils/StatusEnum.java new file mode 100644 index 0000000000000000000000000000000000000000..4bd266b9821eda7f198e3bfe31d97948edb3d22e --- /dev/null +++ b/src/main/java/com/pro/utils/StatusEnum.java @@ -0,0 +1,127 @@ +package com.pro.utils; +/** + * 业务状态枚举 + * 00 未投坯 + * 05 已投坯 + * 10 已前处理 + * 15 已染色 + * 20 已印花 + * 25 已整理 + * 30 质检中 + * 35 已质检 + * 40 包装中 + * 50 已包装 + * 55 已部分入库 + * 60 已入库 + * 65 已部分交货 + * 70 已交货 + **/ +public enum StatusEnum { + + /** + * 未投坯 + */ + 未投坯("00","未投坯"), + + /** + * 已投坯 + */ + 已投坯("05","已投坯"), + /** + * 已前处理 + */ + 已前处理("10","已前处理"), + /** + * 已染色 + */ + 已染色("15","已染色"), + + /** + * 已印花 + */ + 已印花("20","已印花,等待整理"), + + /** + * 已整理 + */ + 已整理("25","已整理，等待质检"), + + /** + * 质检中 + */ + 质检中("30","质检中"), + + /** + * 已质检 + */ + 已质检("35","已质检,等待包装"), + + /** + * 包装中 + */ + 包装中("40","包装中"), + + /** + * 已包装 + */ + 已包装("50","已包装,等待入库"), + + /** + * 已部分入库 + */ + 已部分入库("55","已部分入库"), + + /** + * 已入库 + */ + 已入库("60","已入库"), + + /** + * 已部分交货 + */ + 已部分交货("65","已部分交货"), + + /** + * 已交货 + */ + 已交货("70","已交货"), + ; + + + + // 成员变量 + private String code; + private String name; + + // 构造方法 + private StatusEnum(String code,String name) { + this.code = code; + this.name = name; + } + + public static String getName(String code) { + for (StatusEnum status : StatusEnum.values()) { + if (status.code.equals(code)) { + return status.name; + } + } + return code; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + +} diff --git a/src/main/resources/mapper/bus/ArrangeMapper.xml b/src/main/resources/mapper/bus/ArrangeMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..ea57b189b5152c220ea765d19d965d0ba76c3fa9 --- /dev/null +++ b/src/main/resources/mapper/bus/ArrangeMapper.xml @@ -0,0 +1,55 @@ + + + + + + + + + UPDATE bus_process + SET + arrange_num = #{arrange_num}, + arrange_date = DATE(NOW()), + arrange_person = #{arrange_person}, + process_status = '25' + WHERE + process_id = #{process_id} + + \ No newline at end of file diff --git a/src/main/resources/mapper/bus/PrintMapper.xml b/src/main/resources/mapper/bus/PrintMapper.xml index ce27426da2536ea5579887ec956ffea1c909c2f3..23d5392954fd1721e134490fbd9a9af6c81782a2 100644 --- a/src/main/resources/mapper/bus/PrintMapper.xml +++ b/src/main/resources/mapper/bus/PrintMapper.xml @@ -5,6 +5,25 @@ + + bus_process.process_id, bus_process.plan_id, substring_index(bus_process.process_cus,'|',-1) process_cus, @@ -29,23 +48,7 @@ bus_process.check_date, bus_process.check_person, bus_process.process_status - FROM - bus_process - INNER JOIN bus_plan ON bus_process.plan_id = bus_plan.plan_id - WHERE - - - (process_status=#{process_status}) AND - - - (process_status='10' OR process_status='15') AND - - - bus_plan.plan_type = 3 OR - (bus_plan.plan_type = 4 AND dye_person IS NOT NULL) - - - + bus_process.process_id, bus_process.plan_id, @@ -78,7 +81,7 @@ FROM bus_process - INNER JOIN bus_plan ON plan_id = bus_plan.plan_id + INNER JOIN bus_plan ON bus_process.plan_id = bus_plan.plan_id WHERE bus_plan.plan_type = 3 OR (bus_plan.plan_type = 4 AND @@ -86,6 +89,37 @@ (process_status='10' OR process_status='15') + + UPDATE bus_process SET diff --git a/src/main/web/WEB-INF/views/mobile/arrange.jsp b/src/main/web/WEB-INF/views/mobile/arrange.jsp new file mode 100644 index 0000000000000000000000000000000000000000..cc6f4420f9c869c58cd448508eb02f886094f7e3 --- /dev/null +++ b/src/main/web/WEB-INF/views/mobile/arrange.jsp @@ -0,0 +1,427 @@ +<%-- + Created by IntelliJ IDEA. + User: lenovo + Date: 2018/8/20 + Time: 14:32 + To change this template use File | Settings | File Templates. +--%> +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> + + + + + + 生产过程云信息系统-主页 + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/web/WEB-INF/views/mobile/print.jsp b/src/main/web/WEB-INF/views/mobile/print.jsp index c22cfc6ad393def40ef09e6a666499561ac69c46..639b3b521309ceaccd5ca37c4fdb9818b2707ca4 100644 --- a/src/main/web/WEB-INF/views/mobile/print.jsp +++ b/src/main/web/WEB-INF/views/mobile/print.jsp @@ -115,7 +115,7 @@
- 返回 + 返回
@@ -123,6 +123,7 @@ 待印花 已印花 + 后工序 @@ -182,6 +183,32 @@ + + + +
+ +
+
组号 {{process.process_id}}
+
{{process.process_status}}
+
+ +
+
客户
{{process.process_cus}}
+
规格
{{process.process_std}}
+
花色号
{{process.process_color}}
+
投坯
{{process.group_num}}
+
前处理
{{process.pretreat_num}}
+
染色
{{process.dye_num}}
+
印花
{{process.print_num}}
+
整理
{{process.arrange_num}}
+
+ +
+ + + + @@ -205,6 +232,9 @@ printPage:{}, printAllLoaded:false, + donePage:{}, + doneAllLoaded:false, + autofill:false, }, methods:{ @@ -256,6 +286,32 @@ }); }, + //加载后工序数据 + loaddoneData(pgNo){ + var vm = this; + this.doneAllLoaded=true; + axios + .get('m_pdone',{ + params: { + page:pgNo,//页码 + rows:5,//每页允许最大记录数 + status:'20' + } + }) + .then(function (response) { + vm.donePage=response.data; + if(vm.donePage.pageNum