#

zzgtfwq

1 天以前 a38d955f816eb64f297cd587b507defd5839892e

#

 src/main/java/com/zy/asrs/entity/WrkMast.java

@@ -491,4 +491,16 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
    }

    public Integer getStaNoSou$() {
        switch (sourceStaNo){
            case 118:
            case 121:
            case 122:
            case 218:
            case 221:
            case 222:
                return sourceStaNo+1;
        }
        return staNo;
    }
}

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -221,7 +221,7 @@
//                        LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
                        barcodeThread.setBarcode("");
                        staProtocol.setWorkNo(wrkMast.getWrkNo());
                        staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
                        staProtocol.setStaNo(wrkMast.getStaNoSou$().shortValue());

                        devpThread.setPakMk(staProtocol.getSiteId(), false,238);
                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
@@ -330,7 +330,7 @@

                            // 更新站点信息 且 下发plc命令
                            staProtocol.setWorkNo(dto.getWorkNo());
                            staProtocol.setStaNo(dto.getStaNo().shortValue());
                            staProtocol.setStaNo(dto.getStaNoSou$(dto.getStaNo(),staProtocol.getSiteId()).shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), false,4087);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            if (!result) {

 src/main/java/com/zy/common/model/LocTypeDto.java

@@ -34,11 +34,7 @@
//        if (staProtocol.isHigh() == staProtocol.isLow()) {
//            throw new CoolException("plc高低检测异常");
//        }
        if (staProtocol.getSiteId() == 106 || staProtocol.getSiteId() == 159){
            this.locType1 = 2; // 高库位
        }else {
            this.locType1 = 1; // 低库位
        }
        this.locType1 = 2; // 高库位
    }

    /**

 src/main/java/com/zy/common/model/StartupDto.java

@@ -23,4 +23,17 @@
     */
    private Integer rgvSstaNo;

    public Integer getStaNoSou$(Integer staNoE,Integer sourceStaNo) {
        switch (sourceStaNo){
            case 118:
            case 121:
            case 122:
            case 218:
            case 221:
            case 222:
                return sourceStaNo+1;
        }
        return staNoE;
    }

}