#

Junjie

4 小时以前 5a56b56dc646c89669bfbc373853689d2888f103

#

 src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java

@@ -284,7 +284,7 @@
        List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
                .eq("crn_no", crnNo)
                .eq("wrk_sts", WrkStsType.NEW_OUTBOUND.sts)
                .orderBy(true, false, "batch_seq")
                .orderBy(true, true, "batch_seq")
        );

        for (WrkMast wrkMast : wrkMasts) {

 src/main/java/com/zy/core/utils/StationOperateProcessUtils.java

@@ -532,7 +532,7 @@
    public synchronized void checkStationOutOrder() {
        List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<BasDevp>());
        for (BasDevp basDevp : basDevps) {
            StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getId());
            StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
            if (stationThread == null) {
                continue;
            }
@@ -576,7 +576,7 @@
                List<WrkMast> batchWrkList = wrkMastService.list(new QueryWrapper<WrkMast>()
                        .notIn("wrk_sts", WrkStsType.STATION_RUN_COMPLETE.sts, WrkStsType.COMPLETE_OUTBOUND.sts)
                        .eq("batch", wrkMast.getBatch())
                        .orderBy(true, true, "batch")
                        .orderBy(true, true, "batch_seq")
                );
                if (batchWrkList.isEmpty()) {
                    continue;
@@ -652,7 +652,7 @@
    public synchronized void watchCircleStation() {
        List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<BasDevp>());
        for (BasDevp basDevp : basDevps) {
            StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getId());
            StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
            if (stationThread == null) {
                continue;
            }