1

zhang

10 天以前 72c06d5800d3a99dbd7002a6946be749d9264b15

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

@@ -105,6 +105,9 @@
    @Value("${loc-move.enable}")
    private boolean enable;

    @Value("${config.outloading}")
    private boolean outloading;


    public synchronized void generateStoreWrkFile() {
        try {
@@ -352,11 +355,13 @@
                }

                LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
                if (!locMast.getLocSts().equals("O") && taskWrk.getWrkSts() == 2) {
                    log.error("入库WMS分配库位{}有误，库位状态为{}", locMast.getLocNo(), locMast.getLocSts());
                    taskWrk.setWrkSts(5);
                    taskWrk.setMemo("WMS分配库位有误");
                    taskWrkService.updateById(taskWrk);
                if (!locMast.getLocSts().equals("O")) {
                    if (taskWrk.getWrkSts() == 2) {
                        log.error("入库WMS分配库位{}有误，库位状态为{}", locMast.getLocNo(), locMast.getLocSts());
                        taskWrk.setWrkSts(5);
                        taskWrk.setMemo("WMS分配库位有误");
                        taskWrkService.updateById(taskWrk);
                    }
                    continue;
                }

@@ -481,7 +486,7 @@
                    }

                    // 判断堆垛机出库站状态
                    if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
                    if (staProtocol.isAutoing() && (outloading || !staProtocol.isLoading()) && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
                            && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
                        // 命令下发区 --------------------------------------------------------------------------

@@ -874,14 +879,14 @@
                }
                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                for (DevpSlave.Sta inSta : devp.getInSta()) {
                    WrkMast pakout = wrkMastMapper.selectWorkingPakout(inSta.getBackSta());
                    TaskWrk taskWrk = taskWrkService.selectByTargetPoint(inSta.getBackSta() + "");
                    switch (inSta.getBackSta()) {
                        case 116:
                            if (pakout != null) {
                        case 101:
                            if (taskWrk != null) {
                                if (devpThread.ioModeOf1F1 != IoModeType.PAKOUT_MODE) {
                                    // 出库切换中
                                    devpThread.ioModeOf1F1 = IoModeType.PAKOUT_BOOTING;
                                    WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
                                    TaskWrk pakin = taskWrkService.selectByStartPoint(inSta.getStaNo() + "");
                                    if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
                                            && !devpThread.getStation().get(inSta.getBackSta()).isLoading()
                                            && devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) {
@@ -894,12 +899,12 @@
                                devpThread.ioModeOf1F1 = IoModeType.PAKIN_MODE;
                            }
                            break;
                        case 117:
                            if (pakout != null) {
                        case 104:
                            if (taskWrk != null) {
                                if (devpThread.ioModeOf1F2 != IoModeType.PAKOUT_MODE) {
                                    // 出库切换中
                                    devpThread.ioModeOf1F2 = IoModeType.PAKOUT_BOOTING;
                                    WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
                                    TaskWrk pakin = taskWrkService.selectByStartPoint(inSta.getStaNo() + "");
                                    if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
                                            && !devpThread.getStation().get(inSta.getBackSta()).isLoading()
                                            && devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) {
@@ -912,12 +917,12 @@
                                devpThread.ioModeOf1F2 = IoModeType.PAKIN_MODE;
                            }
                            break;
                        case 118:
                            if (pakout != null) {
                        case 107:
                            if (taskWrk != null) {
                                if (devpThread.ioModeOf1F3 != IoModeType.PAKOUT_MODE) {
                                    // 出库切换中
                                    devpThread.ioModeOf1F3 = IoModeType.PAKOUT_BOOTING;
                                    WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
                                    TaskWrk pakin = taskWrkService.selectByStartPoint(inSta.getStaNo() + "");
                                    if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
                                            && !devpThread.getStation().get(inSta.getBackSta()).isLoading()
                                            && devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) {
@@ -930,12 +935,12 @@
                                devpThread.ioModeOf1F3 = IoModeType.PAKIN_MODE;
                            }
                            break;
                        case 119:
                            if (pakout != null) {
                        case 110:
                            if (taskWrk != null) {
                                if (devpThread.ioModeOf1F4 != IoModeType.PAKOUT_MODE) {
                                    // 出库切换中
                                    devpThread.ioModeOf1F4 = IoModeType.PAKOUT_BOOTING;
                                    WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
                                    TaskWrk pakin = taskWrkService.selectByStartPoint(inSta.getStaNo() + "");
                                    if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
                                            && !devpThread.getStation().get(inSta.getBackSta()).isLoading()
                                            && devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) {
@@ -948,12 +953,12 @@
                                devpThread.ioModeOf1F4 = IoModeType.PAKIN_MODE;
                            }
                            break;
                        case 120:
                            if (pakout != null) {
                        case 113:
                            if (taskWrk != null) {
                                if (devpThread.ioModeOf1F5 != IoModeType.PAKOUT_MODE) {
                                    // 出库切换中
                                    devpThread.ioModeOf1F5 = IoModeType.PAKOUT_BOOTING;
                                    WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
                                    TaskWrk pakin = taskWrkService.selectByStartPoint(inSta.getStaNo() + "");
                                    if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
                                            && !devpThread.getStation().get(inSta.getBackSta()).isLoading()
                                            && devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) {
@@ -967,11 +972,11 @@
                            }
                            break;
                        case 203:
                            if (pakout != null) {
                            if (taskWrk != null) {
                                if (devpThread.ioModeOf2F1 != IoModeType.PAKOUT_MODE) {
                                    // 出库切换中
                                    devpThread.ioModeOf2F1 = IoModeType.PAKOUT_BOOTING;
                                    WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
                                    TaskWrk pakin = taskWrkService.selectByStartPoint(inSta.getStaNo() + "");
                                    if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
                                            && !devpThread.getStation().get(inSta.getBackSta()).isLoading()
                                            && devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) {
@@ -986,11 +991,11 @@
                            break;

                        case 207:
                            if (pakout != null) {
                            if (taskWrk != null) {
                                if (devpThread.ioModeOf2F2 != IoModeType.PAKOUT_MODE) {
                                    // 出库切换中
                                    devpThread.ioModeOf2F2 = IoModeType.PAKOUT_BOOTING;
                                    WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
                                    TaskWrk pakin = taskWrkService.selectByStartPoint(inSta.getStaNo() + "");
                                    if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
                                            && !devpThread.getStation().get(inSta.getBackSta()).isLoading()
                                            && devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) {
@@ -1005,11 +1010,11 @@
                            break;

                        case 212:
                            if (pakout != null) {
                            if (taskWrk != null) {
                                if (devpThread.ioModeOf2F3 != IoModeType.PAKOUT_MODE) {
                                    // 出库切换中
                                    devpThread.ioModeOf2F3 = IoModeType.PAKOUT_BOOTING;
                                    WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
                                    TaskWrk pakin = taskWrkService.selectByStartPoint(inSta.getStaNo() + "");
                                    if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
                                            && !devpThread.getStation().get(inSta.getBackSta()).isLoading()
                                            && devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) {