diff --git a/src/main/java/com/pro/bus/controller/InStoreController.java b/src/main/java/com/pro/bus/controller/InStoreController.java new file mode 100644 index 0000000000000000000000000000000000000000..57ee3280bedc34c3926bd301b390d1335cf550bb --- /dev/null +++ b/src/main/java/com/pro/bus/controller/InStoreController.java @@ -0,0 +1,104 @@ +package com.pro.bus.controller; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.pro.bus.entity.Store; +import com.pro.bus.service.InStoreService; +import com.pro.sys.entity.Result; +import com.pro.sys.entity.User; +import com.pro.utils.Utils; +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.apache.shiro.subject.Subject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/bus") +public class InStoreController { + @Autowired + private InStoreService inStoreService; + + /*** + * 去入库页面 + * @return + */ + @RequiresPermissions("/bus/store") + @RequestMapping("store") + public String toStore(@RequestHeader(value="Via",required=false) String via , @RequestHeader("user-agent") String userAgent) {//返回值为视图名称（不一定直接对应路径）){ + boolean is = Utils.isMobileDevice(via, userAgent); + if(is) { + return "mobile/instore"; + } + return "bus/instore"; + } + /*** + * 获取已包装信息的手机页面 + * @param store + * @param page + * @param rows + * @return + */ + @RequiresPermissions("/bus/store") + @RequestMapping(value="m_instore",method= RequestMethod.GET) + @ResponseBody + public PageInfo m_instore(Store store,@RequestParam(value = "page") Integer page,@RequestParam(value = "rows") Integer rows){ + PageHelper.startPage(page,rows); + List stores = inStoreService.getMStore(store); + PageInfo storePageInfo = new PageInfo(stores); + return storePageInfo; + } + + /*** + * 获取已包装的信息 + * @param page + * @param limit + * @param store + * @return + */ + @RequiresPermissions("/bus/store") + @RequestMapping(value = "getStore", method = RequestMethod.GET) + @ResponseBody + public Map getStore(@RequestParam(value = "page", defaultValue = "1") Integer page, @RequestParam(value = "limit") Integer limit, Store store) { + PageHelper.startPage(page, limit); + List stores = inStoreService.getStore(store); + Map map = new HashMap(); + PageInfo pageInfo = new PageInfo(stores); + map.put("code", 0); + map.put("data", pageInfo.getList()); + map.put("count", pageInfo.getTotal()); + map.put("msg", ""); + return map; + } + /*** + * 修改入库 + * @param store_id + * @param store_status + * @return + */ + @RequiresPermissions("/bus/store") + @RequestMapping( + value="updateStore/{store_id}/{store_status}/{product_id}", + method=RequestMethod.PUT) + @ResponseBody + public Result updateStore(@PathVariable Integer store_id, @PathVariable String store_status,@PathVariable Integer product_id){ + Store store = new Store(); + Subject subject = SecurityUtils.getSubject(); + User user = (User) subject.getSession().getAttribute("user"); + SimpleDateFormat dataFormat = new SimpleDateFormat("yyyy-MM-dd"); + store.setStore_id(store_id); + store.setStore_status(store_status); + store.setStore_in_date(dataFormat.format(new Date())); + store.setStore_per(user.getU_name()); + return inStoreService.updateStore(store,product_id,store_id); + } + + +} diff --git a/src/main/java/com/pro/bus/controller/OutStoreController.java b/src/main/java/com/pro/bus/controller/OutStoreController.java new file mode 100644 index 0000000000000000000000000000000000000000..a294170769d428624300f8803b944dacc180d05a --- /dev/null +++ b/src/main/java/com/pro/bus/controller/OutStoreController.java @@ -0,0 +1,59 @@ +package com.pro.bus.controller; + +import com.pro.bus.entity.Store; +import com.pro.bus.service.OutStoreService; +import com.pro.sys.entity.Result; +import com.pro.sys.entity.User; +import com.pro.utils.Utils; +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.apache.shiro.subject.Subject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.text.SimpleDateFormat; +import java.util.Date; + +@Controller +@RequestMapping("/bus") +public class OutStoreController { + @Autowired + private OutStoreService outStoreService; + /*** + * 去出库页面 + * @return + */ + @RequiresPermissions("/bus/out") + @RequestMapping("out") + public String toOutStore(@RequestHeader(value="Via",required=false) String via , @RequestHeader("user-agent") String userAgent) {//返回值为视图名称（不一定直接对应路径）){ + boolean is = Utils.isMobileDevice(via, userAgent); + if(is) { + return "mobile/outstore"; + } + return "bus/outstore"; + } + /*** + * 修改出库 + * @param store_id + * @param store_status + * @return + */ + @RequiresPermissions("/bus/store") + @RequestMapping( + value="updateOutStore/{store_id}/{store_status}/{product_id}", + method= RequestMethod.PUT) + @ResponseBody + public Result updateStore(@PathVariable Integer store_id, @PathVariable String store_status, @PathVariable Integer product_id){ + Store store = new Store(); + Subject subject = SecurityUtils.getSubject(); + User user = (User) subject.getSession().getAttribute("user"); + SimpleDateFormat dataFormat = new SimpleDateFormat("yyyy-MM-dd"); + store.setStore_id(store_id); + store.setStore_status(store_status); + store.setStore_out_date(dataFormat.format(new Date())); + store.setStore_out_per(user.getU_name()); + return outStoreService.updateStore(store,product_id,store_id); + } + +} diff --git a/src/main/java/com/pro/bus/controller/PretreatmentController.java b/src/main/java/com/pro/bus/controller/PretreatmentController.java index 2ae4f3bf1b8ca6ad5bbc625ada922e362d782f78..31f6c31679ea55b27a47068d74441768aef33fd5 100644 --- a/src/main/java/com/pro/bus/controller/PretreatmentController.java +++ b/src/main/java/com/pro/bus/controller/PretreatmentController.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.pro.bus.entity.Process; import com.pro.bus.service.PretreatmentService; +import com.pro.bus.service.PrintService; import com.pro.utils.Utils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -20,6 +21,8 @@ import java.util.Map; public class PretreatmentController { @Autowired private PretreatmentService pretreatmentService; + @Autowired + private PrintService printService; /*** * 去前处理页面 @@ -34,15 +37,37 @@ public class PretreatmentController { } return "bus/pretreatment"; } + + /*** + * 前处理手机端页面 + * @param process + * @param page + * @param rows + * @return + */ @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); + List processes = pretreatmentService.getMPretreatment(process); PageInfo processPageInfo = new PageInfo(processes); return processPageInfo; } + /** + * 手机端获得后工序 + * @param page + * @param rows + * @return + */ + @RequestMapping(value = "m_hou", + method = RequestMethod.GET) + @ResponseBody + public PageInfo getMhou(Integer page, Integer rows, String status) { + PageHelper.startPage(page, rows); + List list = printService.getMdone(status); + return new PageInfo(list); + } /*** * 获取前处理信息 * @param page diff --git a/src/main/java/com/pro/bus/entity/Product.java b/src/main/java/com/pro/bus/entity/Product.java index f0521ba8039f88ebf206cc9ba8dc0910baf2e438..b94438ea58b077fcdc12e1d6652391b961cf186e 100644 --- a/src/main/java/com/pro/bus/entity/Product.java +++ b/src/main/java/com/pro/bus/entity/Product.java @@ -1,7 +1,9 @@ package com.pro.bus.entity; public class Product { - + private Double insum; + private Double outsum; + private Double sumproduct_num; private Integer product_id; //成品编号 private Integer process_id; //组号 private String product_cus; //客户 @@ -12,6 +14,30 @@ public class Product { //30质检中35已质检40包装中50已包装55已部分入库60已入库65已部分交货70已交货 private String product_status; + public Double getSumproduct_num() { + return sumproduct_num; + } + + public void setSumproduct_num(Double sumproduct_num) { + this.sumproduct_num = sumproduct_num; + } + + public Double getOutsum() { + return outsum; + } + + public void setOutsum(Double outsum) { + this.outsum = outsum; + } + + public Double getInsum() { + return insum; + } + + public void setInsum(Double insum) { + this.insum = insum; + } + public Integer getProduct_id() { return product_id; } diff --git a/src/main/java/com/pro/bus/mapper/InStoreMapper.java b/src/main/java/com/pro/bus/mapper/InStoreMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..f24851987ff4082e0dd18a36f25a167e2b755100 --- /dev/null +++ b/src/main/java/com/pro/bus/mapper/InStoreMapper.java @@ -0,0 +1,36 @@ +package com.pro.bus.mapper; + +import com.pro.bus.entity.Product; +import com.pro.bus.entity.Store; +import org.mybatis.spring.annotation.MapperScan; + +import java.util.List; + +@MapperScan +public interface InStoreMapper { + List getStore(Store store); + + int saveStore(Store store); + + int updateStatusToing(Integer product_id); + + int updateStatusToed(Integer product_id); + + int updateProcessStatusToing(Integer process_id); + + int updateProcessStatusToed(Integer process_id); + + int updateStore(Store store); + + Product getProductById(Integer product_id); + + + /** + * 获取状态为未入库的，process_id相同的信息 + * @param process_id + * @return + */ + List getStoreStatus(Integer process_id); + + List getMStore(Store store); +} diff --git a/src/main/java/com/pro/bus/mapper/OutStoreMapper.java b/src/main/java/com/pro/bus/mapper/OutStoreMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..a1cc6f37ba13832442488bff70acbddef30ae419 --- /dev/null +++ b/src/main/java/com/pro/bus/mapper/OutStoreMapper.java @@ -0,0 +1,26 @@ +package com.pro.bus.mapper; + +import com.pro.bus.entity.Product; +import com.pro.bus.entity.Store; +import org.mybatis.spring.annotation.MapperScan; + +import java.util.List; + +@MapperScan +public interface OutStoreMapper { + /** + * 获取状态为全部入库的的，process_id相同的信息 + * + * @param process_id + * @return + */ + List getStoreStatus(Integer process_id); + + int updateStatusToing(Integer product_id); + + int updateStatusToed(Integer process_id); + + int updateProcessStatusToing(Integer process_id); + + int updateProcessStatusToed(Integer process_id); +} diff --git a/src/main/java/com/pro/bus/mapper/PretreatmentMapper.java b/src/main/java/com/pro/bus/mapper/PretreatmentMapper.java index c76b6eac24661c9785c9e4ec993ac2dc1e546316..bc943437a70cc0116ef99a839adcc6a157b41be4 100644 --- a/src/main/java/com/pro/bus/mapper/PretreatmentMapper.java +++ b/src/main/java/com/pro/bus/mapper/PretreatmentMapper.java @@ -13,6 +13,9 @@ public interface PretreatmentMapper { * @return */ List getPretreatment(Process process); + /*** + * 手机端获取前处理信息 + */ + List getMPretreatment(Process process); - int doPretreatment(Process process); } diff --git a/src/main/java/com/pro/bus/service/InStoreService.java b/src/main/java/com/pro/bus/service/InStoreService.java new file mode 100644 index 0000000000000000000000000000000000000000..524f6190120c081d067ccdb597051977fc5b3fa7 --- /dev/null +++ b/src/main/java/com/pro/bus/service/InStoreService.java @@ -0,0 +1,27 @@ +package com.pro.bus.service; + +import com.pro.bus.entity.Store; +import com.pro.sys.entity.Result; + +import java.util.List; + +public interface InStoreService { + /*** + * 获得库存信息 + * @param store + * @return + */ + List getStore(Store store); + /*** + * 获得手机端库存信息 + * @param store + * @return + */ + List getMStore(Store store); + + /*** + * 修改状态 + */ + Result updateStore(Store store,Integer product_id,Integer store_id); + +} diff --git a/src/main/java/com/pro/bus/service/OutStoreService.java b/src/main/java/com/pro/bus/service/OutStoreService.java new file mode 100644 index 0000000000000000000000000000000000000000..7674e68b84d6230c30213aef357ad3d330b02d59 --- /dev/null +++ b/src/main/java/com/pro/bus/service/OutStoreService.java @@ -0,0 +1,12 @@ +package com.pro.bus.service; + +import com.pro.bus.entity.Store; +import com.pro.sys.entity.Result; + +public interface OutStoreService { + /*** + * 修改出库状态 + */ + Result updateStore(Store store, Integer product_id, Integer store_id); + +} diff --git a/src/main/java/com/pro/bus/service/PretreatmentService.java b/src/main/java/com/pro/bus/service/PretreatmentService.java index e0128b4724dfa74e2affbab84bab652ea4a09ede..1a1309fe16cd5f10d0394d28c5032096ca1c1034 100644 --- a/src/main/java/com/pro/bus/service/PretreatmentService.java +++ b/src/main/java/com/pro/bus/service/PretreatmentService.java @@ -13,7 +13,7 @@ public interface PretreatmentService { */ List getPretreatment(Process process); /*** - * 前处理 + * 手机端获取前处理信息 */ - Result doPretreatment(Process process); + List getMPretreatment(Process process); } diff --git a/src/main/java/com/pro/bus/service/impl/InStoreServiceImpl.java b/src/main/java/com/pro/bus/service/impl/InStoreServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..4ec0a3e8bc32b8c21e1337720b4145b84bc5436d --- /dev/null +++ b/src/main/java/com/pro/bus/service/impl/InStoreServiceImpl.java @@ -0,0 +1,59 @@ +package com.pro.bus.service.impl; + +import com.pro.bus.entity.Product; +import com.pro.bus.entity.Store; +import com.pro.bus.mapper.InStoreMapper; +import com.pro.bus.service.InStoreService; +import com.pro.sys.entity.Result; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class InStoreServiceImpl implements InStoreService { + @Autowired + private InStoreMapper inStoreMapper; + + /** + * 获得库存信息 + * + * @param store + * @return + */ + @Override + public List getStore(Store store) { + return inStoreMapper.getStore(store); + } + + /*** + * 获取手机端信息 + * @param store + * @return + */ + @Override + public List getMStore(Store store) { + return inStoreMapper.getMStore(store); + } + + + @Override + public Result updateStore(Store store, Integer product_id, Integer store_id) { + Product product = inStoreMapper.getProductById(product_id); + List unstore = inStoreMapper.getStoreStatus(product.getProcess_id()); + if (inStoreMapper.updateStore(store) > 0) { + if (unstore.size()>1) { + inStoreMapper.updateStatusToing(product_id); + inStoreMapper.updateProcessStatusToing(product.getProcess_id()); + }else if(unstore.size()==1){ + inStoreMapper.updateStatusToed(product.getProcess_id()); + inStoreMapper.updateProcessStatusToed(product.getProcess_id()); + } + return Result.successResult("入库成功"); + } else { + return Result.failResult("入库失败"); + } + } + + +} diff --git a/src/main/java/com/pro/bus/service/impl/OutStoreServiceImpl.java b/src/main/java/com/pro/bus/service/impl/OutStoreServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..262f6122b70b93a4b4a0515f665fdff55c95f6a8 --- /dev/null +++ b/src/main/java/com/pro/bus/service/impl/OutStoreServiceImpl.java @@ -0,0 +1,38 @@ +package com.pro.bus.service.impl; + +import com.pro.bus.entity.Product; +import com.pro.bus.entity.Store; +import com.pro.bus.mapper.InStoreMapper; +import com.pro.bus.mapper.OutStoreMapper; +import com.pro.bus.service.OutStoreService; +import com.pro.sys.entity.Result; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class OutStoreServiceImpl implements OutStoreService { + @Autowired + private OutStoreMapper outStoreMapper; + @Autowired + private InStoreMapper inStoreMapper; + + @Override + public Result updateStore(Store store, Integer product_id, Integer store_id) { + Product product = inStoreMapper.getProductById(product_id); + List alstore = outStoreMapper.getStoreStatus(product.getProcess_id()); + if (inStoreMapper.updateStore(store) > 0) { + if (alstore.size() > 1) { + outStoreMapper.updateStatusToing(product_id); + outStoreMapper.updateProcessStatusToing(product.getProcess_id()); + } else if (alstore.size() == 1) { + outStoreMapper.updateStatusToed(product.getProcess_id()); + outStoreMapper.updateProcessStatusToed(product.getProcess_id()); + } + return Result.successResult("出库成功"); + } else { + return Result.failResult("出库失败"); + } + } +} diff --git a/src/main/java/com/pro/bus/service/impl/PretreatmentServiceImpl.java b/src/main/java/com/pro/bus/service/impl/PretreatmentServiceImpl.java index 9df222f7e3962223a0ed5034b7868b80489e9329..6fcb36b57be170af4f4c2e52195d8d5e847ea8c9 100644 --- a/src/main/java/com/pro/bus/service/impl/PretreatmentServiceImpl.java +++ b/src/main/java/com/pro/bus/service/impl/PretreatmentServiceImpl.java @@ -24,11 +24,14 @@ public class PretreatmentServiceImpl implements PretreatmentService { return pretreatmentMapper.getPretreatment(process); } + /*** + * 获取手机端前处理信息 + * @param process + * @return + */ @Override - public Result doPretreatment(Process process) { - if(pretreatmentMapper.doPretreatment(process)>0){ - return Result.successResult("前处理成功"); - } - return Result.failResult("前处理失败"); + public List getMPretreatment(Process process) { + return pretreatmentMapper.getMPretreatment(process); } + } diff --git a/src/main/resources/mapper/bus/InStoreMapper.xml b/src/main/resources/mapper/bus/InStoreMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..afeeb92943066b677800724ce21fd06095cf2bff --- /dev/null +++ b/src/main/resources/mapper/bus/InStoreMapper.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + update bus_store + + + store_in_date=#{store_in_date}, + + + store_per=#{store_per}, + + + store_out_date=#{store_out_date}, + + + store_out_per=#{store_out_per}, + + + store_status=#{store_status} + + + where store_id=#{store_id} + + + update bus_product set product_status='55' where product_id=#{product_id} + + + update bus_product set product_status='60' where process_id=#{process_id} + + + update bus_process set process_status='55' where process_id=#{process_id} + + + update bus_process set process_status='60' where process_id=#{process_id} + + + \ No newline at end of file diff --git a/src/main/resources/mapper/bus/OutStoreMapper.xml b/src/main/resources/mapper/bus/OutStoreMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..ba0b99b303da371347cb8147fc4b3216af3a41cf --- /dev/null +++ b/src/main/resources/mapper/bus/OutStoreMapper.xml @@ -0,0 +1,28 @@ + + + + + + + update bus_product set product_status='65' where product_id=#{product_id} + + + update bus_product set product_status='70' where process_id=#{process_id} + + + update bus_process set process_status='65' where process_id=#{process_id} + + + update bus_process set process_status='70' where process_id=#{process_id} + + + \ No newline at end of file diff --git a/src/main/resources/mapper/bus/Pretreatment.xml b/src/main/resources/mapper/bus/Pretreatment.xml index 8fac1765bb299854bab01b969260820aff706dd5..d48a1dc8ee44f7452f7a1fb45e4a7bd41ac89107 100644 --- a/src/main/resources/mapper/bus/Pretreatment.xml +++ b/src/main/resources/mapper/bus/Pretreatment.xml @@ -26,6 +26,44 @@ ) ) ) + where + + + process_status=#{process_status} + + + process_status='05' + + + + and plan_type = #{plan_type} + + + + - - update bus_process - - pretreat_num = #{pretreat_num}, - - where process_id = #{process_id} - - \ No newline at end of file diff --git a/src/main/resources/mapper/bus/ProcessMapper.xml b/src/main/resources/mapper/bus/ProcessMapper.xml index 53a9601d00fb9b5388ba8640e0053fd81dfacda1..b7d44e3db425feaeb83ef5435634fed285d3fe5f 100644 --- a/src/main/resources/mapper/bus/ProcessMapper.xml +++ b/src/main/resources/mapper/bus/ProcessMapper.xml @@ -21,9 +21,14 @@ diff --git a/src/main/web/WEB-INF/views/bus/instore.jsp b/src/main/web/WEB-INF/views/bus/instore.jsp new file mode 100644 index 0000000000000000000000000000000000000000..39bfc9e6930d037d76e5176025b09a2cd5d21a15 --- /dev/null +++ b/src/main/web/WEB-INF/views/bus/instore.jsp @@ -0,0 +1,145 @@ +<%-- + Created by IntelliJ IDEA. + User: longda + Date: 2018/8/10 + Time: 10:30 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + Title + + + + + +
+
+ +
+ + +
+ +
+ + +
+
+
+ + +
+ + + + + + + + + + + + + + diff --git a/src/main/web/WEB-INF/views/bus/pretreatment.jsp b/src/main/web/WEB-INF/views/bus/pretreatment.jsp index d164a58479f65c6c7dd61ea482422453596c2fd8..b033af5c4bca3753f301e948368fa173ea749e9a 100644 --- a/src/main/web/WEB-INF/views/bus/pretreatment.jsp +++ b/src/main/web/WEB-INF/views/bus/pretreatment.jsp @@ -192,7 +192,7 @@ $("#pretreat_num").prop("min",p_pretreat_num*0.9); layerIdx = layer.open({ type: 1, - title: '修改坯布准备信息', + title: '前处理信息', area: ['500px', '400px'], content: $('#dom-win-pre-add'), zIndex: 100 //将层次降低，以使sweetalert能够在layer之上 diff --git a/src/main/web/WEB-INF/views/mobile/instore.jsp b/src/main/web/WEB-INF/views/mobile/instore.jsp new file mode 100644 index 0000000000000000000000000000000000000000..753d7bf5658447b16fb53a51c2071a51f726c997 --- /dev/null +++ b/src/main/web/WEB-INF/views/mobile/instore.jsp @@ -0,0 +1,455 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + + + 生产过程云信息系统-主页 + + + + +
+ +
+ + <%--onclick="javascript :history.back(-1)"--%> + 返回 + +
+
+ + 待入库 + 已入库 + <%--后工序--%> + +
+ + + + <%--待入库--%> + + + +
+
+
组号{{ instore.store_id }}
+
成品编号：{{ instore.product_id }}
+ +
+
+
+
客户
+
{{ instore.store_cus }}
+
+
+
规格
+
{{ instore.store_std }}
+
+
+
花色号
+
{{ instore.store_color }}
+
+
+
数量
+
{{ instore.store_num }}
米
+
+
+
+ 入库 +
+
+ + + + <%--已入库--%> + + + +
+
+
组号{{ alstore.store_id }}
+
成品编号：{{ alstore.product_id }}
+
+
+
+
客户
+
{{ alstore.store_cus }}
+
+
+
规格
+
{{ alstore.store_std }}
+
+
+
花色号
+
{{ alstore.store_color }}
+
+
+
数量
+
{{ alstore.store_num }}
米
+
+
+
+ 已入库 +
+
+ + + + <%----%> + <%----%> + <%----%> + <%--
--%> + + <%--
--%> + <%--
组号 {{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}}
--%> + <%--
--%> + + <%--
--%> + <%----%> + + <%----%> + + + +
+ + + + + + + + + \ No newline at end of file diff --git a/src/main/web/WEB-INF/views/mobile/outstore.jsp b/src/main/web/WEB-INF/views/mobile/outstore.jsp new file mode 100644 index 0000000000000000000000000000000000000000..b8946d458b644e213631864400296f73fb3e6248 --- /dev/null +++ b/src/main/web/WEB-INF/views/mobile/outstore.jsp @@ -0,0 +1,455 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + + + 生产过程云信息系统-主页 + + + + +
+ +
+ + <%--onclick="javascript :history.back(-1)"--%> + 返回 + +
+
+ + 待出库 + 已出库 + <%--后工序--%> + +
+ + + + <%--待入库--%> + + + +
+
+
组号{{ instore.store_id }}
+
成品编号：{{ instore.product_id }}
+ +
+
+
+
客户
+
{{ instore.store_cus }}
+
+
+
规格
+
{{ instore.store_std }}
+
+
+
花色号
+
{{ instore.store_color }}
+
+
+
数量
+
{{ instore.store_num }}
米
+
+
+
+ 出库 +
+
+ + + + <%--已入库--%> + + + +
+
+
组号{{ alstore.store_id }}
+
成品编号：{{ alstore.product_id }}
+
+
+
+
客户
+
{{ alstore.store_cus }}
+
+
+
规格
+
{{ alstore.store_std }}
+
+
+
花色号
+
{{ alstore.store_color }}
+
+
+
数量
+
{{ alstore.store_num }}
米
+
+
+
+ 已出库 +
+
+ + + + <%----%> + <%----%> + <%----%> + <%--
--%> + + <%--
--%> + <%--
组号 {{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}}
--%> + <%--
--%> + + <%--
--%> + <%----%> + + <%----%> + + + +
+ + + + + + + + + \ No newline at end of file diff --git a/src/main/web/WEB-INF/views/mobile/pretreatment.jsp b/src/main/web/WEB-INF/views/mobile/pretreatment.jsp index 904ad788cafba9f7500fbfe6b8537c6e29101f66..68ae32b43b844da4f17da5b2cb1520fac193e7d0 100644 --- a/src/main/web/WEB-INF/views/mobile/pretreatment.jsp +++ b/src/main/web/WEB-INF/views/mobile/pretreatment.jsp @@ -106,19 +106,23 @@
- + + <%--onclick="javascript :history.back(-1)"--%> + 返回 +
待前处理 已前处理 + 后工序
- + <%--待前处理--%> - + <%--已前处理--%> 无底印花
有底印花
-
@@ -195,8 +198,8 @@
{{ pro.group_num }}
米
-
前处理
米
-
{{ pro.pretreat_num }}
+
前处理
+
{{ pro.pretreat_num }}
米
@@ -206,6 +209,31 @@ + + + +
+ +
+
组号 {{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}}
+
+ +
+ + + @@ -224,16 +252,25 @@ data: { selected: 'un-pre', + unprePage: {}, unPreAllLoaded: false, unpreAutoFill: false, + alprePage: {}, alPreAllLoaded: false, alpreAutoFill: false, + doneAutofill:false, + donePage:{}, + doneAllLoaded:false, + }, methods: { + back(){ + window.location.href = "/mobile/home" + }, unpreLoadTop() {//下拉加载上一页数据 this.loadUnPreData(this.unprePage.prePage); @@ -304,7 +341,7 @@ message: result.message, iconClass: 'mint-toast-icon mintui mintui-success' }); - vm.loadUnPreData(1); + vm.loadUnPreData(vm.unprePage.pageNum); } else { vm.$toast({ message: result.message, @@ -366,50 +403,67 @@ }); },//获得前处理数据结束 - // completePre(process_id) { - // let result; - // let vm = this; - // let group_num = $('#group_num').html(); - // let reg = /[^0-9.]/g; - // vm.$messagebox.prompt('请输入前处理数目', { - // inputValidator: (val) => { - // console.log(val); - // if (val === null) { - // return true; - // } - // return !(val > group_num * 1.1 || val < group_num * 0.9 || reg.test(val)) - // }, inputErrorMessage: '前处理数范围投坯数目的90%·110%，且只能输入数字' - // }).then(({value, action}) => { - // axios.put('cfmProcessStatus/' + process_id + '/10/' + value - // ) - // .then(function (response) { - // console.log(response.data); - // result = response.data; - // if (result.success) { - // vm.$toast({ - // message: result.message, - // iconClass: 'mint-toast-icon mintui mintui-success' - // }); - // vm.loadUnPreData(1); - // } else { - // vm.$toast({ - // message: result.message, - // iconClass: 'mint-toast-icon mintui mintui-field-error' - // }); - // } - // }) - // .catch(function (error) { - // console.log(error); - // }); - // }); - // },//完成前处理button + //加载后工序数据 + loaddoneData(pgNo){ + var vm = this; + this.doneAllLoaded=true; + axios + .get('m_hou',{ + params: { + page:pgNo,//页码 + rows:5,//每页允许最大记录数 + status:'10' + } + }) + .then(function (response) { + vm.donePage=response.data; + if(vm.donePage.pageNum