1

zhang

6 天以前 046d390a6ad2f689f1f0650ba50fec8461ef3a8d

 src/main/java/com/zy/asrs/controller/TVController.java

@@ -315,26 +315,26 @@
        List<WrkMast> wrkMastList2 = null;
        switch (ledId) {
            case 1:
                wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1014, 1022, 1025));
                wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1013, 1021, 1024));
                wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1012));
                wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1011));
                break;
            case 2:
                wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1012, 1022, 1025));
                wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1011, 1021, 1024));
                wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1014));
                wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1013));
                break;
            case 3:
                wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1012, 1014, 1025));
                wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1011, 1013, 1024));
                wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1022));
                wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1021));
                break;
            case 4:
                wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1012, 1014, 1022));
                wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1011, 1013, 1021));
                wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1025));
                wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1024));
                break;
            default:
                break;
        }
        if (!Cools.isEmpty(wrkMastList1)) {
            String msg = "站点在入库;";
            String msg = "站点在入库";
            Set<Integer> set = new HashSet<>();
            for (WrkMast wrkMast : wrkMastList1) {
                set.add(wrkMast.getSourceStaNo());
@@ -342,10 +342,10 @@
            return R.ok().add(set.toString() + msg);
        }
        if (!Cools.isEmpty(wrkMastList2)) {
            String msg = "站点在出库;";
            String msg = "站点在出库";
            Set<Integer> set = new HashSet<>();
            for (WrkMast wrkMast : wrkMastList2) {
                set.add(wrkMast.getSourceStaNo());
                set.add(wrkMast.getStaNo());
            }
            return R.ok().add(set.toString() + msg);
        }