huojin
/
ZW_MultiSelect
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
暴炳林 2025-01-13 15:45:21 +08:00
parent b841d010d1
commit 39a6e9d1d6
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wms-vue/src/main.js
View File

@ -8,7 +8,7 @@ import VueRouter from "vue-router";
import router from "@/router/router"; import router from "@/router/router";
import store from "@/store/store"; import store from "@/store/store";
Vue.prototype.$axios=axios; 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://192.68.2.88:8081';
// Vue.prototype.$httpUrl='http://10.1.112.23:8083'; // Vue.prototype.$httpUrl='http://10.1.112.23:8083';
Vue.config.productionTip = false; Vue.config.productionTip = false;

4
wms/src/main/java/com/yc/wms/controller/RQTaskModel.java
View File

@ -15,9 +15,9 @@ public class RQTaskModel implements Serializable{
// 料号 // 料号
private String liaohao; private String liaohao;
// 工作站 // 工作站
private String gzz; private String gzz="";
// 原工作站 // 原工作站
private String oldGzz; private String oldGzz="";
// 容器 // 容器
private String rqh; private String rqh;
// 物料 // 物料

19
wms/src/main/java/com/yc/wms/controller/RongQiController.java
View File

@ -152,10 +152,13 @@ public class RongQiController {
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
if (i==0){ if (i==0){
groupedByGzz = listRqh.stream() groupedByGzz = listRqh.stream()
.filter(task -> task.getOldGzz() != null)
.collect(Collectors.groupingBy(RQTaskModel::getOldGzz)); .collect(Collectors.groupingBy(RQTaskModel::getOldGzz));
}else { }else {
/* 按工作站分组*/ /* 按工作站分组*/
groupedByGzz = listRqh.stream() groupedByGzz = listRqh.stream()
.filter(task -> task.getGzz() != null)
.collect(Collectors.groupingBy(RQTaskModel::getGzz)); .collect(Collectors.groupingBy(RQTaskModel::getGzz));
} }
for (String gzz : groupedByGzz.keySet()) { for (String gzz : groupedByGzz.keySet()) {
@ -175,97 +178,111 @@ public class RongQiController {
case "201": case "201":
rongQi.setG201(taskCount); rongQi.setG201(taskCount);
rqLtList.get(i).setG201(rqLtList.get(i).getG201()+gzzCount); 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().setTaskCount(rongQiMz.getG201().getTaskCount()+taskCount);
rongQiMz.getG201().setLxCount(rongQiMz.getG201().getLxCount()+1); rongQiMz.getG201().setLxCount(rongQiMz.getG201().getLxCount()+1);
break; break;
case "202": case "202":
rongQi.setG202(taskCount); rongQi.setG202(taskCount);
rqLtList.get(i).setG202(rqLtList.get(i).getG202()+gzzCount); 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().setTaskCount(rongQiMz.getG202().getTaskCount()+taskCount);
rongQiMz.getG202().setLxCount(rongQiMz.getG202().getLxCount()+1); rongQiMz.getG202().setLxCount(rongQiMz.getG202().getLxCount()+1);
break; break;
case "203": case "203":
rongQi.setG203(taskCount); rongQi.setG203(taskCount);
rqLtList.get(i).setG203(rqLtList.get(i).getG203()+gzzCount); 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().setTaskCount(rongQiMz.getG203().getTaskCount()+taskCount);
rongQiMz.getG203().setLxCount(rongQiMz.getG203().getLxCount()+1); rongQiMz.getG203().setLxCount(rongQiMz.getG203().getLxCount()+1);
break; break;
case "204": case "204":
rongQi.setG204(taskCount); rongQi.setG204(taskCount);
rqLtList.get(i).setG204(rqLtList.get(i).getG204()+gzzCount); 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().setTaskCount(rongQiMz.getG204().getTaskCount()+taskCount);
rongQiMz.getG204().setLxCount(rongQiMz.getG204().getLxCount()+1); rongQiMz.getG204().setLxCount(rongQiMz.getG204().getLxCount()+1);
break; break;
case "205": case "205":
rongQi.setG205(taskCount); rongQi.setG205(taskCount);
rqLtList.get(i).setG205(rqLtList.get(i).getG205()+gzzCount); 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().setTaskCount(rongQiMz.getG205().getTaskCount()+taskCount);
rongQiMz.getG205().setLxCount(rongQiMz.getG205().getLxCount()+1); rongQiMz.getG205().setLxCount(rongQiMz.getG205().getLxCount()+1);
break; break;
case "206": case "206":
rongQi.setG206(taskCount); rongQi.setG206(taskCount);
rqLtList.get(i).setG206(rqLtList.get(i).getG206()+gzzCount); 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().setTaskCount(rongQiMz.getG206().getTaskCount()+taskCount);
rongQiMz.getG206().setLxCount(rongQiMz.getG206().getLxCount()+1); rongQiMz.getG206().setLxCount(rongQiMz.getG206().getLxCount()+1);
break; break;
case "207": case "207":
rongQi.setG207(taskCount); rongQi.setG207(taskCount);
rqLtList.get(i).setG207(rqLtList.get(i).getG207()+gzzCount); 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().setTaskCount(rongQiMz.getG207().getTaskCount()+taskCount);
rongQiMz.getG207().setLxCount(rongQiMz.getG207().getLxCount()+1); rongQiMz.getG207().setLxCount(rongQiMz.getG207().getLxCount()+1);
break; break;
case "208": case "208":
rongQi.setG208(taskCount); rongQi.setG208(taskCount);
rqLtList.get(i).setG208(rqLtList.get(i).getG208()+gzzCount); 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().setTaskCount(rongQiMz.getG208().getTaskCount()+taskCount);
rongQiMz.getG208().setLxCount(rongQiMz.getG208().getLxCount()+1); rongQiMz.getG208().setLxCount(rongQiMz.getG208().getLxCount()+1);
break; break;
case "209": case "209":
rongQi.setG209(taskCount); rongQi.setG209(taskCount);
rqLtList.get(i).setG209(rqLtList.get(i).getG209()+gzzCount); 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().setTaskCount(rongQiMz.getG209().getTaskCount()+taskCount);
rongQiMz.getG209().setLxCount(rongQiMz.getG209().getLxCount()+1); rongQiMz.getG209().setLxCount(rongQiMz.getG209().getLxCount()+1);
break; break;
case "210": case "210":
rongQi.setG210(taskCount); rongQi.setG210(taskCount);
rqLtList.get(i).setG210(rqLtList.get(i).getG210()+gzzCount); 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().setTaskCount(rongQiMz.getG210().getTaskCount()+taskCount);
rongQiMz.getG210().setLxCount(rongQiMz.getG210().getLxCount()+1); rongQiMz.getG210().setLxCount(rongQiMz.getG210().getLxCount()+1);
break; break;
case "211": case "211":
rongQi.setG211(taskCount); rongQi.setG211(taskCount);
rqLtList.get(i).setG211(rqLtList.get(i).getG211()+gzzCount); 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().setTaskCount(rongQiMz.getG211().getTaskCount()+taskCount);
rongQiMz.getG211().setLxCount(rongQiMz.getG211().getLxCount()+1); rongQiMz.getG211().setLxCount(rongQiMz.getG211().getLxCount()+1);
break; break;
case "212": case "212":
rongQi.setG212(taskCount); rongQi.setG212(taskCount);
rqLtList.get(i).setG212(rqLtList.get(i).getG212()+gzzCount); 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().setTaskCount(rongQiMz.getG212().getTaskCount()+taskCount);
rongQiMz.getG212().setLxCount(rongQiMz.getG212().getLxCount()+1); rongQiMz.getG212().setLxCount(rongQiMz.getG212().getLxCount()+1);
break; break;
case "213": case "213":
rongQi.setG213(taskCount); rongQi.setG213(taskCount);
rqLtList.get(i).setG213(rqLtList.get(i).getG213()+gzzCount); 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().setTaskCount(rongQiMz.getG213().getTaskCount()+taskCount);
rongQiMz.getG213().setLxCount(rongQiMz.getG213().getLxCount()+1); rongQiMz.getG213().setLxCount(rongQiMz.getG213().getLxCount()+1);
break; break;
case "214": case "214":
rongQi.setG214(taskCount); rongQi.setG214(taskCount);
rqLtList.get(i).setG214(rqLtList.get(i).getG214()+gzzCount); 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().setTaskCount(rongQiMz.getG214().getTaskCount()+taskCount);
rongQiMz.getG214().setLxCount(rongQiMz.getG214().getLxCount()+1); rongQiMz.getG214().setLxCount(rongQiMz.getG214().getLxCount()+1);
break; break;
case "215": case "215":
rongQi.setG215(taskCount); rongQi.setG215(taskCount);
rqLtList.get(i).setG215(rqLtList.get(i).getG215()+gzzCount); 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().setTaskCount(rongQiMz.getG215().getTaskCount()+taskCount);
rongQiMz.getG215().setLxCount(rongQiMz.getG215().getLxCount()+1); rongQiMz.getG215().setLxCount(rongQiMz.getG215().getLxCount()+1);
break; break;
default: default:
break; break;
} }
rqLtList.get(i).setTotal(rqLtList.get(i).getTotal()+gzzCount);
} }
} }
rqList.add(rongQi); rqList.add(rongQi);

2
wms/src/main/resources/application.yml
View File

@ -1,5 +1,5 @@
server: server:
port: 8083 port: 8084
# url: jdbc:sqlserver://47.100.54.81:1433;DatabaseName=zwwms # url: jdbc:sqlserver://47.100.54.81:1433;DatabaseName=zwwms
# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver # driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# username: super # username: super