diff --git a/wms-vue/src/main.js b/wms-vue/src/main.js index 7682e0e..7fff3c8 100644 --- a/wms-vue/src/main.js +++ b/wms-vue/src/main.js @@ -8,7 +8,7 @@ import VueRouter from "vue-router"; import router from "@/router/router"; import store from "@/store/store"; Vue.prototype.$axios=axios; -Vue.prototype.$httpUrl='http://127.0.0.1:8083'; +Vue.prototype.$httpUrl='http://127.0.0.1:8084'; //Vue.prototype.$httpUrl='http://192.68.2.88:8081'; // Vue.prototype.$httpUrl='http://10.1.112.23:8083'; Vue.config.productionTip = false; diff --git a/wms/src/main/java/com/yc/wms/controller/RQTaskModel.java b/wms/src/main/java/com/yc/wms/controller/RQTaskModel.java index 0957718..0e7915b 100644 --- a/wms/src/main/java/com/yc/wms/controller/RQTaskModel.java +++ b/wms/src/main/java/com/yc/wms/controller/RQTaskModel.java @@ -15,9 +15,9 @@ public class RQTaskModel implements Serializable{ // 料号 private String liaohao; // 工作站 - private String gzz; + private String gzz=""; // 原工作站 - private String oldGzz; + private String oldGzz=""; // 容器 private String rqh; // 物料 diff --git a/wms/src/main/java/com/yc/wms/controller/RongQiController.java b/wms/src/main/java/com/yc/wms/controller/RongQiController.java index 16f1576..030f32b 100644 --- a/wms/src/main/java/com/yc/wms/controller/RongQiController.java +++ b/wms/src/main/java/com/yc/wms/controller/RongQiController.java @@ -152,10 +152,13 @@ public class RongQiController { for (int i = 0; i < 2; i++) { if (i==0){ groupedByGzz = listRqh.stream() + .filter(task -> task.getOldGzz() != null) .collect(Collectors.groupingBy(RQTaskModel::getOldGzz)); + }else { /* 按工作站分组*/ groupedByGzz = listRqh.stream() + .filter(task -> task.getGzz() != null) .collect(Collectors.groupingBy(RQTaskModel::getGzz)); } for (String gzz : groupedByGzz.keySet()) { @@ -175,97 +178,111 @@ public class RongQiController { case "201": rongQi.setG201(taskCount); rqLtList.get(i).setG201(rqLtList.get(i).getG201()+gzzCount); + rqLtList.get(i).setTotal(rqLtList.get(i).getTotal()+gzzCount); rongQiMz.getG201().setTaskCount(rongQiMz.getG201().getTaskCount()+taskCount); rongQiMz.getG201().setLxCount(rongQiMz.getG201().getLxCount()+1); break; case "202": rongQi.setG202(taskCount); rqLtList.get(i).setG202(rqLtList.get(i).getG202()+gzzCount); + rqLtList.get(i).setTotal(rqLtList.get(i).getTotal()+gzzCount); rongQiMz.getG202().setTaskCount(rongQiMz.getG202().getTaskCount()+taskCount); rongQiMz.getG202().setLxCount(rongQiMz.getG202().getLxCount()+1); break; case "203": rongQi.setG203(taskCount); rqLtList.get(i).setG203(rqLtList.get(i).getG203()+gzzCount); + rqLtList.get(i).setTotal(rqLtList.get(i).getTotal()+gzzCount); rongQiMz.getG203().setTaskCount(rongQiMz.getG203().getTaskCount()+taskCount); rongQiMz.getG203().setLxCount(rongQiMz.getG203().getLxCount()+1); break; case "204": rongQi.setG204(taskCount); rqLtList.get(i).setG204(rqLtList.get(i).getG204()+gzzCount); + rqLtList.get(i).setTotal(rqLtList.get(i).getTotal()+gzzCount); rongQiMz.getG204().setTaskCount(rongQiMz.getG204().getTaskCount()+taskCount); rongQiMz.getG204().setLxCount(rongQiMz.getG204().getLxCount()+1); break; case "205": rongQi.setG205(taskCount); rqLtList.get(i).setG205(rqLtList.get(i).getG205()+gzzCount); + rqLtList.get(i).setTotal(rqLtList.get(i).getTotal()+gzzCount); rongQiMz.getG205().setTaskCount(rongQiMz.getG205().getTaskCount()+taskCount); rongQiMz.getG205().setLxCount(rongQiMz.getG205().getLxCount()+1); break; case "206": rongQi.setG206(taskCount); rqLtList.get(i).setG206(rqLtList.get(i).getG206()+gzzCount); + rqLtList.get(i).setTotal(rqLtList.get(i).getTotal()+gzzCount); rongQiMz.getG206().setTaskCount(rongQiMz.getG206().getTaskCount()+taskCount); rongQiMz.getG206().setLxCount(rongQiMz.getG206().getLxCount()+1); break; case "207": rongQi.setG207(taskCount); rqLtList.get(i).setG207(rqLtList.get(i).getG207()+gzzCount); + rqLtList.get(i).setTotal(rqLtList.get(i).getTotal()+gzzCount); rongQiMz.getG207().setTaskCount(rongQiMz.getG207().getTaskCount()+taskCount); rongQiMz.getG207().setLxCount(rongQiMz.getG207().getLxCount()+1); break; case "208": rongQi.setG208(taskCount); rqLtList.get(i).setG208(rqLtList.get(i).getG208()+gzzCount); + rqLtList.get(i).setTotal(rqLtList.get(i).getTotal()+gzzCount); rongQiMz.getG208().setTaskCount(rongQiMz.getG208().getTaskCount()+taskCount); rongQiMz.getG208().setLxCount(rongQiMz.getG208().getLxCount()+1); break; case "209": rongQi.setG209(taskCount); rqLtList.get(i).setG209(rqLtList.get(i).getG209()+gzzCount); + rqLtList.get(i).setTotal(rqLtList.get(i).getTotal()+gzzCount); rongQiMz.getG209().setTaskCount(rongQiMz.getG209().getTaskCount()+taskCount); rongQiMz.getG209().setLxCount(rongQiMz.getG209().getLxCount()+1); break; case "210": rongQi.setG210(taskCount); rqLtList.get(i).setG210(rqLtList.get(i).getG210()+gzzCount); + rqLtList.get(i).setTotal(rqLtList.get(i).getTotal()+gzzCount); rongQiMz.getG210().setTaskCount(rongQiMz.getG210().getTaskCount()+taskCount); rongQiMz.getG210().setLxCount(rongQiMz.getG210().getLxCount()+1); break; case "211": rongQi.setG211(taskCount); rqLtList.get(i).setG211(rqLtList.get(i).getG211()+gzzCount); + rqLtList.get(i).setTotal(rqLtList.get(i).getTotal()+gzzCount); rongQiMz.getG211().setTaskCount(rongQiMz.getG211().getTaskCount()+taskCount); rongQiMz.getG211().setLxCount(rongQiMz.getG211().getLxCount()+1); break; case "212": rongQi.setG212(taskCount); rqLtList.get(i).setG212(rqLtList.get(i).getG212()+gzzCount); + rqLtList.get(i).setTotal(rqLtList.get(i).getTotal()+gzzCount); rongQiMz.getG212().setTaskCount(rongQiMz.getG212().getTaskCount()+taskCount); rongQiMz.getG212().setLxCount(rongQiMz.getG212().getLxCount()+1); break; case "213": rongQi.setG213(taskCount); rqLtList.get(i).setG213(rqLtList.get(i).getG213()+gzzCount); + rqLtList.get(i).setTotal(rqLtList.get(i).getTotal()+gzzCount); rongQiMz.getG213().setTaskCount(rongQiMz.getG213().getTaskCount()+taskCount); rongQiMz.getG213().setLxCount(rongQiMz.getG213().getLxCount()+1); break; case "214": rongQi.setG214(taskCount); rqLtList.get(i).setG214(rqLtList.get(i).getG214()+gzzCount); + rqLtList.get(i).setTotal(rqLtList.get(i).getTotal()+gzzCount); rongQiMz.getG214().setTaskCount(rongQiMz.getG214().getTaskCount()+taskCount); rongQiMz.getG214().setLxCount(rongQiMz.getG214().getLxCount()+1); break; case "215": rongQi.setG215(taskCount); rqLtList.get(i).setG215(rqLtList.get(i).getG215()+gzzCount); + rqLtList.get(i).setTotal(rqLtList.get(i).getTotal()+gzzCount); rongQiMz.getG215().setTaskCount(rongQiMz.getG215().getTaskCount()+taskCount); rongQiMz.getG215().setLxCount(rongQiMz.getG215().getLxCount()+1); break; default: break; } - rqLtList.get(i).setTotal(rqLtList.get(i).getTotal()+gzzCount); } } rqList.add(rongQi); diff --git a/wms/src/main/resources/application.yml b/wms/src/main/resources/application.yml index 2784178..6c02002 100644 --- a/wms/src/main/resources/application.yml +++ b/wms/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 8083 + port: 8084 # url: jdbc:sqlserver://47.100.54.81:1433;DatabaseName=zwwms # driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver # username: super