From 1d1d6c3503fe46fc2869172e863cf817b702da8a Mon Sep 17 00:00:00 2001 From: longda <17868877553@163.com> Date: Tue, 21 Aug 2018 09:18:29 +0800 Subject: [PATCH 1/8] 2018/8/21 --- .../controller/PretreatmentController.java | 10 +++- .../pro/bus/mapper/PretreatmentMapper.java | 5 +- .../pro/bus/service/PretreatmentService.java | 4 +- .../service/impl/PretreatmentServiceImpl.java | 13 +++-- .../resources/mapper/bus/Pretreatment.xml | 46 +++++++++++++++--- .../resources/mapper/bus/ProcessMapper.xml | 12 +++-- .../web/WEB-INF/views/bus/pretreatment.jsp | 2 +- src/main/web/WEB-INF/views/mobile/home.jsp | 8 +-- .../web/WEB-INF/views/mobile/pretreatment.jsp | 25 ++++++++-- src/main/web/static/images/home.jpg | Bin 0 -> 1757 bytes src/main/web/static/images/my.jpg | Bin 0 -> 1609 bytes 11 files changed, 94 insertions(+), 31 deletions(-) create mode 100644 src/main/web/static/images/home.jpg create mode 100644 src/main/web/static/images/my.jpg diff --git a/src/main/java/com/pro/bus/controller/PretreatmentController.java b/src/main/java/com/pro/bus/controller/PretreatmentController.java index 2ae4f3b..64b5e7b 100644 --- a/src/main/java/com/pro/bus/controller/PretreatmentController.java +++ b/src/main/java/com/pro/bus/controller/PretreatmentController.java @@ -34,12 +34,20 @@ 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; } diff --git a/src/main/java/com/pro/bus/mapper/PretreatmentMapper.java b/src/main/java/com/pro/bus/mapper/PretreatmentMapper.java index c76b6ea..bc94343 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/PretreatmentService.java b/src/main/java/com/pro/bus/service/PretreatmentService.java index e0128b4..1a1309f 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/PretreatmentServiceImpl.java b/src/main/java/com/pro/bus/service/impl/PretreatmentServiceImpl.java index 9df222f..6fcb36b 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/Pretreatment.xml b/src/main/resources/mapper/bus/Pretreatment.xml index 8fac176..d48a1dc 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 53a9601..b7d44e3 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/pretreatment.jsp b/src/main/web/WEB-INF/views/bus/pretreatment.jsp index d164a58..b033af5 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/home.jsp b/src/main/web/WEB-INF/views/mobile/home.jsp index 5da64c8..bc5ea4f 100644 --- a/src/main/web/WEB-INF/views/mobile/home.jsp +++ b/src/main/web/WEB-INF/views/mobile/home.jsp @@ -48,15 +48,11 @@ - + 菜单 - - - tab2 - - + 我的 diff --git a/src/main/web/WEB-INF/views/mobile/pretreatment.jsp b/src/main/web/WEB-INF/views/mobile/pretreatment.jsp index 904ad78..b723aee 100644 --- a/src/main/web/WEB-INF/views/mobile/pretreatment.jsp +++ b/src/main/web/WEB-INF/views/mobile/pretreatment.jsp @@ -106,7 +106,10 @@
- + + <%--onclick="javascript :history.back(-1)"--%> + 返回 +
@@ -200,7 +203,7 @@
- 完成前处理 + {{ pro.pretreat_date }}完成前处理
@@ -234,6 +237,9 @@ }, methods: { + back(){ + window.location.href = "/mobile/home" + }, unpreLoadTop() {//下拉加载上一页数据 this.loadUnPreData(this.unprePage.prePage); @@ -304,7 +310,8 @@ message: result.message, iconClass: 'mint-toast-icon mintui mintui-success' }); - vm.loadUnPreData(1); + vm.loadUnPreData(vm.unprePage.pageNum); + vm.loadalPreData(vm.alprePage.pageNum); } else { vm.$toast({ message: result.message, @@ -406,10 +413,20 @@ },//methods结束 + watch:{ + + selected(currActive){ + if('un-pre'==currActive){ + this.loadUnPreData(1); + }else if('al-pre'==currActive){ + this.loadalPreData(1); + } + } + + }, mounted() { this.loadUnPreData(1);//加载待染色第一页数据 - this.loadalPreData(1);//加载待染色第一页数据 }, updated() { diff --git a/src/main/web/static/images/home.jpg b/src/main/web/static/images/home.jpg new file mode 100644 index 0000000000000000000000000000000000000000..1c7da8e029972333406575ca5b9e8e4efd8c77bb GIT binary patch literal 1757 zcmbV}c~Db#5XXPXOL!sNmx>@%1jX7^MTh|sg9mufq=JBof+%1BizsqLrBH|h1%y(? z1EgqBQEVnszzB$xGom6|6%mT$5TQZLgODa#;Ps{L*qQ#-_Pe_?JF~mL+0XvaUQ_~1 zH~DPz0XQ5Egkc6yDRA)SM(+iH#R4A#07zKP96(rx!|V^C{a`J?<8V6vOAry#NsmB) zh_D_E>w=_jpid%^Nia+{B9jdaF~R!ACPs$Fx?J~&Zd^BoxgiNA={o+K&>w*r39JI^ zA)Euio8cfc9NGr#v0aH6kq+uF;qVZFsE4gYHozKcO|kVM2#+mGBoMIfFR?lxm=VqA zFJG-^;kO%hIB4mTUU-qTU`kMtIxSq}y!c~RH|k27yT{sf z-ahL$Y}~XZATVg_w(Y^;5s`a2QPDAn5)zY=xrdMNjvdd;%Kkd%+mok?PMGG9|tJf-jsIIBKDY{ix-_qLF-XXr*dGDtuPoMQX?|soHmC0WXy&fL$K+X#u2QFQ9oipc{|+qUf02Cv`*@GUE{;yTf$4v*l%Y_)moqBN!4 zGB#9KdrOqBU{c}JF4tW+HmAyN*S)1xswelC{^lLUtPylQKTb~!=kTL7{wQe6m>IyA zT2zukQx)%cmsmr&t_K{O&IM3A zhKIbYzK1{IAbEqn3=+FV%hot42em$Vu7D zf^klZY04^XI<-IXohvK0sppsYgn%Ua*>32h7)Xebh-!VBYHGxzipG7G-yqnc$S;u% zwuFRB#JR5@tFx2tmM2(LEE^E_eYjO!vBv&b*{qth+)&djDRyz|oBhI0{=V1;^%133 z)&*1540qa(%`_k^n({@AhFg@j3J;^nZ&-;Hoi{oS-sW%iiVXYmDKEeL4#|N>|I{J2 z-YwNh!*qLpHUK+(lwA}GXndYmS`edJMnXZJEn+gA`DynI)9vu{);M11LT#gyjGMga zjQ>8O&#ivPgW00t{k}JB#~2KwBTL)tn7fq#1-*NebCjws_H?oE$`dB1JI|t@MY%m5 zyv;Sv!YaaZ*qRW}eE*u)dO0}Z#zYb2U2%wL849GisS8o?NVsxFZ%5krJ(bXmo1|$8 z9_uN&wxdy?&O2d=+*x4*Wza^|wp(KnPnllh(edleNS8pNT1yp06xh7na8JSUT5VHD zIGDp33rLeY&_lj!iu>Y~rsYxM7D0C4z+6F$utISAVfnA(>df90#)Led@zSCij!AD& zCQgmEtGbSI#!67&s+?)}{Cv9jHk0@5(iC7{VIZ-vXf%YuVR1Nd z;U%Rc@pu9rha<=k2vX9BaFVh_8EIK@FMdRPF1|ui8jr(^H~yR820+3C3qXZX>Og{o zf=DR18K@y%F$j?u>Z?!^5E_F;ED@xTg-SWZJ_Jc1W-(|qvV9(z12hRk-eO3@%DWxL zsfSREE~e+>HEhco72KcCX&N61jg=%Qey60YqP109=X+ffQ?u>n7M6B9>GlqePP_Jc zc<%Gsf57|bF~8&fCjw4}oe4i1!HPT=cPTz0@p4jf1}F1s*0rCra|#NJif@&0Z{I1e z;8i}TdibdNNmKLFme#iRj=mTDF9!zsLjvL0`0o>wZ~mB?p8v4$@zdgxX!*043k9IR zu)dM~gNuZ4Ng#iK#)-L55)nv2Bs6A=A(l*Y!yOKhS2wzdr`V?Fmo-Xi7`x9Y90`3+ zP}DRLYR!w$zL5Ppu-N}a_6_WBE&-5+P{`*&BwzzpBMOrBO2>&kQ&$25oAP9>=;KN% zJ{q)vaL3Hix*M4s?y3jLH-5!p)wFlGDQ7T^eMtTwE4XP-8QmWSG`+&qvh!Fkjd~&H z0^MQUVA!FRs$Sc2gKLm@h9Aug+-Rwpx|!A+)H2xs!l7OQk;=;9aHoW0ypg&(qVYhj zHJ25%^iGhPI++)e`kQB`4CPWxb%PoVJok1*J#Oj|#7ApcMJtH%Wga}rpC(5dPV19f zBT5`u2Ou3)iAd{^T*qbCY<7T%89o<0W?w8^DOsp*6AG^@EeH>1#dy?Pu>P zwmIr;b}g%O;zU8R>_jQ!oEsh0yEx;-bYF`#Su9)TxX$m`u$DMGX-06Z>QQ?0NMX#{ zVR^F7c=5ETk$ACE3I@ctmTbXb0-F&l_}r~!pc5?2Fzhd1k#j+H|8U=S-eFb#v3G5D zu$A6j?~#D*cAfF2CRyFH3RV|77#}P{DKMy*-eeWxF<0s5Qc)f>^*PVNft10xqnusO z!0nsy9b7phk82K=_3j?7++ZLhuwzFhRczV3GMd)u<##i>bMa95gJ0^6=3~3YcCT4i z@u#Z&co|I1rrGvw#iwtos+Iy$%k0&Ko@V04lWOEue{NvT_2p~TDY=0&D_nEJ-SrMG zAkt_afes2j9z|>XX#MpBYl<7~Etsr!y#xcPPp&Cc^NLDykq z=7QUMaOi%RDDrHy?0Va|rOUrQ4!g&C#!%7cHL#yE@05j>aJ5ert}oAGa9fRdw;Q8u zl3kunGUv5h)rjj|QwE9aDnkO_lRw4Dz#u88Kz_Gg+yb7~5#I)bh+ef?cGW@A`*By& zh{<5C?qKn8i-x*%xd7s5bL(;!H@Y-M<>F`qR~Pn%K6<$z|(l$fX6cDHt= z^PybX(0go&8rPvWtuNT7q8{OzyRxzdlNUP*rOvh4n%m5g9hab9hJVr%dp$w#(y^NG zD*F&tLCtGHOe15JDq0%zF&k0T3$I?;se^sFGh2~S$PXSCd0}WH_9eVqC9ib*1rswZ z9N9dri5GlkTi?@DeOU?GK~lOO(HBq}oaDQ73@=wmr!Y)rDNx)Loq|gb+&}Q%iq3V4 j Date: Thu, 23 Aug 2018 16:57:21 +0800 Subject: [PATCH 2/8] 2018/8/23 --- src/main/web/WEB-INF/views/mobile/home.jsp | 94 +++++++++++----------- 1 file changed, 46 insertions(+), 48 deletions(-) diff --git a/src/main/web/WEB-INF/views/mobile/home.jsp b/src/main/web/WEB-INF/views/mobile/home.jsp index bf99664..18f2a51 100644 --- a/src/main/web/WEB-INF/views/mobile/home.jsp +++ b/src/main/web/WEB-INF/views/mobile/home.jsp @@ -13,13 +13,14 @@ 生产过程信息系统-首页 - + + + +
+
+ +
+ + +
+ +
+ + +
+
+
+ + +
+ + + + + + + + + + + + + + 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 0000000..753d7bf --- /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 0000000..3d07229 --- /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 b723aee..68ae32b 100644 --- a/src/main/web/WEB-INF/views/mobile/pretreatment.jsp +++ b/src/main/web/WEB-INF/views/mobile/pretreatment.jsp @@ -115,13 +115,14 @@ 待前处理 已前处理 + 后工序 - + <%--待前处理--%> - + <%--已前处理--%> 无底印花
有底印花
-
@@ -198,17 +198,42 @@
{{ pro.group_num }}
米
-
前处理
米
-
{{ pro.pretreat_num }}
+
前处理
+
{{ pro.pretreat_num }}
米
- {{ pro.pretreat_date }}完成前处理 + 完成前处理
+ + + +
+ +
+
组号 {{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}}
+
+ +
+ + + @@ -227,13 +252,19 @@ data: { selected: 'un-pre', + unprePage: {}, unPreAllLoaded: false, unpreAutoFill: false, + alprePage: {}, alPreAllLoaded: false, alpreAutoFill: false, + doneAutofill:false, + donePage:{}, + doneAllLoaded:false, + }, methods: { @@ -311,7 +342,6 @@ iconClass: 'mint-toast-icon mintui mintui-success' }); vm.loadUnPreData(vm.unprePage.pageNum); - vm.loadalPreData(vm.alprePage.pageNum); } else { vm.$toast({ message: result.message, @@ -373,44 +403,48 @@ }); },//获得前处理数据结束 - // 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 Date: Sat, 25 Aug 2018 09:46:26 +0800 Subject: [PATCH 8/8] =?UTF-8?q?2018/8/8=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pro/bus/controller/InStoreController.java | 2 +- src/main/java/com/pro/bus/entity/Product.java | 9 +++++ .../com/pro/bus/mapper/InStoreMapper.java | 12 +++++- .../com/pro/bus/mapper/OutStoreMapper.java | 12 +++++- .../com/pro/bus/service/InStoreService.java | 6 +++ .../bus/service/impl/InStoreServiceImpl.java | 32 +++++++++------ .../bus/service/impl/OutStoreServiceImpl.java | 28 ++++++------- .../resources/mapper/bus/InStoreMapper.xml | 39 +++++++++++++++---- .../resources/mapper/bus/OutStoreMapper.xml | 15 ++++--- .../web/WEB-INF/views/mobile/outstore.jsp | 2 +- 10 files changed, 113 insertions(+), 44 deletions(-) diff --git a/src/main/java/com/pro/bus/controller/InStoreController.java b/src/main/java/com/pro/bus/controller/InStoreController.java index 8ea5eaf..57ee328 100644 --- a/src/main/java/com/pro/bus/controller/InStoreController.java +++ b/src/main/java/com/pro/bus/controller/InStoreController.java @@ -51,7 +51,7 @@ public class InStoreController { @ResponseBody public PageInfo m_instore(Store store,@RequestParam(value = "page") Integer page,@RequestParam(value = "rows") Integer rows){ PageHelper.startPage(page,rows); - List stores = inStoreService.getStore(store); + List stores = inStoreService.getMStore(store); PageInfo storePageInfo = new PageInfo(stores); return storePageInfo; } diff --git a/src/main/java/com/pro/bus/entity/Product.java b/src/main/java/com/pro/bus/entity/Product.java index a27d15d..b94438e 100644 --- a/src/main/java/com/pro/bus/entity/Product.java +++ b/src/main/java/com/pro/bus/entity/Product.java @@ -3,6 +3,7 @@ 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; //客户 @@ -13,6 +14,14 @@ 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; } diff --git a/src/main/java/com/pro/bus/mapper/InStoreMapper.java b/src/main/java/com/pro/bus/mapper/InStoreMapper.java index 6323fd2..f248519 100644 --- a/src/main/java/com/pro/bus/mapper/InStoreMapper.java +++ b/src/main/java/com/pro/bus/mapper/InStoreMapper.java @@ -22,7 +22,15 @@ public interface InStoreMapper { int updateStore(Store store); - Product getSum(Integer product_id); + Product getProductById(Integer product_id); - Store getStoreById(Integer store_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 index 4e54e9e..a1cc6f3 100644 --- a/src/main/java/com/pro/bus/mapper/OutStoreMapper.java +++ b/src/main/java/com/pro/bus/mapper/OutStoreMapper.java @@ -4,13 +4,21 @@ 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); - Product getSum(Integer product_id); int updateStatusToing(Integer product_id); - int updateStatusToed(Integer product_id); + int updateStatusToed(Integer process_id); int updateProcessStatusToing(Integer process_id); diff --git a/src/main/java/com/pro/bus/service/InStoreService.java b/src/main/java/com/pro/bus/service/InStoreService.java index d74cfac..524f619 100644 --- a/src/main/java/com/pro/bus/service/InStoreService.java +++ b/src/main/java/com/pro/bus/service/InStoreService.java @@ -12,6 +12,12 @@ public interface InStoreService { * @return */ List getStore(Store store); + /*** + * 获得手机端库存信息 + * @param store + * @return + */ + List getMStore(Store store); /*** * 修改状态 diff --git a/src/main/java/com/pro/bus/service/impl/InStoreServiceImpl.java b/src/main/java/com/pro/bus/service/impl/InStoreServiceImpl.java index 85d89a6..4ec0a3e 100644 --- a/src/main/java/com/pro/bus/service/impl/InStoreServiceImpl.java +++ b/src/main/java/com/pro/bus/service/impl/InStoreServiceImpl.java @@ -26,25 +26,33 @@ public class InStoreServiceImpl implements InStoreService { 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.getSum(product_id); - Store store1 = inStoreMapper.getStoreById(store_id); - if (product.getInsum() >= 0.0 && (product.getInsum() + store1.getStore_num()) < product.getProduct_num()) { - if (inStoreMapper.updateStore(store) > 0 && inStoreMapper.updateStatusToing(product_id) > 0 && inStoreMapper.updateProcessStatusToing(product.getProcess_id()) > 0) { + 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("入库失败"); } - } else if (product.getProduct_num().equals(product.getInsum() + store1.getStore_num())) { - if (inStoreMapper.updateStore(store) > 0 && inStoreMapper.updateStatusToed(product_id) > 0 && inStoreMapper.updateProcessStatusToed(product.getProcess_id()) > 0) { - return Result.successResult("全部入库成功"); - } else { - return Result.failResult("全部入库失败"); - } - } - 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 index b96f0f3..262f612 100644 --- a/src/main/java/com/pro/bus/service/impl/OutStoreServiceImpl.java +++ b/src/main/java/com/pro/bus/service/impl/OutStoreServiceImpl.java @@ -9,6 +9,8 @@ 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 @@ -18,21 +20,19 @@ public class OutStoreServiceImpl implements OutStoreService { @Override public Result updateStore(Store store, Integer product_id, Integer store_id) { - Product product = outStoreMapper.getSum(product_id); - Store store1 = inStoreMapper.getStoreById(store_id); - if (product.getOutsum() >= 0.0 && (product.getOutsum() + store1.getStore_num()) < product.getProduct_num()) { - if (inStoreMapper.updateStore(store) > 0 && outStoreMapper.updateStatusToing(product_id) > 0 && outStoreMapper.updateProcessStatusToing(product.getProcess_id()) > 0) { - return Result.successResult("出库成功"); - } else { - return Result.failResult("出库失败"); - } - } else if (product.getProduct_num().equals(product.getOutsum() + store1.getStore_num())) { - if (inStoreMapper.updateStore(store) > 0 && outStoreMapper.updateStatusToed(product_id) > 0 && outStoreMapper.updateProcessStatusToed(product.getProcess_id()) > 0) { - return Result.successResult("全部出库成功"); - } else { - return Result.failResult("全部出库失败"); + 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("出库失败"); } - return Result.failResult("操作不当"); } } diff --git a/src/main/resources/mapper/bus/InStoreMapper.xml b/src/main/resources/mapper/bus/InStoreMapper.xml index 63b69d4..afeeb92 100644 --- a/src/main/resources/mapper/bus/InStoreMapper.xml +++ b/src/main/resources/mapper/bus/InStoreMapper.xml @@ -14,14 +14,39 @@ - + select + store_id,product_id, + substring_index(store_cus,'|',-1) AS store_cus, + substring_index(store_std,'|',-1) AS store_std, + substring_index(store_color,'|',-1) AS store_color, + store_num,store_in_date,store_per,store_out_date,store_out_per,store_status + from bus_store + WHERE + + + store_status=#{store_status} + + + store_status='50' + + - + SELECT + bus_product.process_id, + bus_store.product_id, + bus_store.store_status + FROM + bus_product + INNER JOIN bus_store ON bus_store.product_id = bus_product.product_id + where process_id=#{process_id} and product_status=50 + + + update bus_store @@ -47,7 +72,7 @@ update bus_product set product_status='55' where product_id=#{product_id} - update bus_product set product_status='60' 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} diff --git a/src/main/resources/mapper/bus/OutStoreMapper.xml b/src/main/resources/mapper/bus/OutStoreMapper.xml index aa23bae..ba0b99b 100644 --- a/src/main/resources/mapper/bus/OutStoreMapper.xml +++ b/src/main/resources/mapper/bus/OutStoreMapper.xml @@ -2,16 +2,21 @@ - + SELECT + bus_product.process_id, + bus_store.product_id, + bus_store.store_status + FROM + bus_product + INNER JOIN bus_store ON bus_store.product_id = bus_product.product_id + where process_id=#{process_id} and product_status=60 update bus_product set product_status='65' where product_id=#{product_id} - update bus_product set product_status='70' 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} diff --git a/src/main/web/WEB-INF/views/mobile/outstore.jsp b/src/main/web/WEB-INF/views/mobile/outstore.jsp index 3d07229..b8946d4 100644 --- a/src/main/web/WEB-INF/views/mobile/outstore.jsp +++ b/src/main/web/WEB-INF/views/mobile/outstore.jsp @@ -306,7 +306,7 @@ completePre(store_id,product_id) { let result; let vm = this; - vm.$messagebox.confirm('确定入库吗').then(action => { + vm.$messagebox.confirm('确定出库吗').then(action => { axios.put('updateOutStore/' + store_id + '/70/' + product_id ) .then(function (response) { -- Gitee