自动化立库仓库-WCS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zyh
15 小时以前 466cc943089116f996db0c2f249878a74fb1cc10 
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java


@@ -172,8 +172,8 @@


                        && staProtocol.isInEnable()


                        && !staProtocol.isEmptyMk()


                        && staProtocol.getWorkNo() > 9990


                        && staProtocol.getWorkNo() <9998


                        && (staProtocol.isEmptyOutType() || staProtocol.getSiteId() == 301 || staProtocol.getSiteId() == 304)


                        && staProtocol.getWorkNo() < 9998


                        && (staProtocol.getSiteId() == 307 || staProtocol.getSiteId() == 301 || staProtocol.getSiteId() == 304)


                        && staProtocol.isPakMk()) {


                    News.warnNoLog("" + mark + " - 0" + " - 开始执行");


                    Short wrkNo = 9981;


@@ -215,12 +215,6 @@


                                String errorMsg = "扫码失败，请重试";


                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));


                            }


                            log.error("输送线异常组托退回={}", errMsg);


                            staProtocol.setWorkNo(wrkNo);




                            staProtocol.setStaNo(bark);


//                        devpThread.setPakMk(staProtocol.getSiteId(), false);


                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));


                            continue;


                        }


                    } else {


@@ -235,16 +229,6 @@


                            String errorMsg = "扫码失败，请重试";


                            MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));


                        }


                        log.error("输送线异常组托退回={}", errMsg);


                        staProtocol.setWorkNo(wrkNo);




                        staProtocol.setStaNo(bark);


//                        devpThread.setPakMk(staProtocol.getSiteId(), false);


                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));


                        continue;


                    }


                    WaitPakin waitPakin = waitPakinMapper.selectByBarcode(barcode);


                    if (waitPakin == null){


                        continue;


                    }


                    // 判断重复工作档


@@ -291,7 +275,17 @@




                        SearchLocParam param = new SearchLocParam();


                        param.setBarcode(barcode);


                        param.setIoType(1);




                        WaitPakin waitPakin = new WaitPakin();


                        List<WaitPakin> waitPakinList = waitPakinMapper.selectList(new EntityWrapper<WaitPakin>()


                                .eq("zpallet", param.getBarcode())


                        );


                        if (waitPakinList.isEmpty()) {


                            param.setIoType(10);


                        } else {


                            param.setIoType(1);


                        }




                        param.setSourceStaNo(inSta.getStaNo());


                        param.setLocType1(locTypeDto.getLocType1());


                        String response = new HttpHandler.Builder()


@@ -345,25 +339,19 @@


//                            }


                        } else {


                            News.error("" + mark + " - 5" + " - 请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);


//                            staProtocol.setWorkNo((short)9992);


//                            staProtocol.setStaNo(inSta.getBackSta().shortValue());


//                            devpThread.setPakMk(staProtocol.getSiteId(), false);


//                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));


//                            if (!result) {


//                                throw new CoolException("更新plc站点信息失败");


//                            }


                            staProtocol.setWorkNo((short)9992);


                            staProtocol.setStaNo(inSta.getBackSta().shortValue());


                            devpThread.setPakMk(staProtocol.getSiteId(), false);


                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));


                            if (!result) {


                                throw new CoolException("更新plc站点信息失败");


                            }




                            // led 异常显示


                            if (ledThread != null) {


                                String errorMsg = jsonObject.getString("msg");


                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));


                            }


                            log.error("输送线异常组托退回={}", errMsg);


                            staProtocol.setWorkNo(wrkNo);




                            staProtocol.setStaNo(bark);


//                        devpThread.setPakMk(staProtocol.getSiteId(), false);


                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));


                        }




                    } catch (Exception e) {


@@ -1140,11 +1128,11 @@


            } else if (wrkMast.getStaNo() == 402) {


                ip = "172.26.4.232";


            } else if (wrkMast.getStaNo() == 307) {


                ip = "172.26.1.231";


            } else if (wrkMast.getStaNo() == 303) {


                ip = "172.26.1.232";


                ip = "172.26.1.182";


            } else if (wrkMast.getStaNo() == 301) {


                ip = "172.26.1.180";


            } else if (wrkMast.getStaNo() == 304) {


                ip = "172.26.1.233";


                ip = "172.26.1.181";


            }


            SimpleDateFormat sf = new SimpleDateFormat("yyyyMMddHHmmss");


            String newName = sf.format(new Date()) + "_" + locMast.getLocNo();


@@ -1291,7 +1279,7 @@


                if (staProtocol.isEmptyOutType() || staProtocol.getSiteId() == 301 || staProtocol.getSiteId() == 304) {


                    boo1 = true;


                }


                if (((staProtocol.getSiteId() == 301 || staProtocol.getSiteId() == 304) && staProtocol.isOutEnable()) || staProtocol.getSiteId()==307) {


                if (((staProtocol.getSiteId() == 301 || staProtocol.getSiteId() == 304) && staProtocol.isOutEnable()) || staProtocol.getSiteId() == 307) {


                    boo2 = true;


                }




@@ -1311,7 +1299,7 @@


                        break;


                    }




                    // 双深库位且浅库位有货，则需先对浅库位进行库位移转


                    // 双深库位且浅库位有货，则需先对0浅库位进行库位移转


                    if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {


                        String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getSourceLocNo());


                        LocMast shallowLoc = locMastService.selectById(shallowLocNo);


@@ -1398,7 +1386,7 @@


                        wrkMast.setModiTime(now);


                        wrkMastMapper.updateById(wrkMast);


                    }


                } else if (staProtocol.getSiteId() == 304 && staProtocol.isAutoing() && staProtocol.isLoading() && !staProtocol.isOutEnable()){


                } else if (staProtocol.getSiteId() == 304 && staProtocol.isAutoing() && staProtocol.isLoading() && !staProtocol.isOutEnable()) {


                    StaProtocol staProtocol1 = devpThread.getStation().get(301);


                    if (staProtocol1 == null) {


                        break;


@@ -2188,7 +2176,7 @@


//                        ledCommand.setTitle("并板入库");


//                        break;


                    default:


                        News.error("" + mark + " - 1" + " - 任务入出库类型错误！！！[工作号：{}] [入出库类型：{}]", wrkMast.getWrkNo(), wrkMast.getIoType());


//                        News.error("" + mark + " - 1" + " - 任务入出库类型错误！！！[工作号：{}] [入出库类型：{}]", wrkMast.getWrkNo(), wrkMast.getIoType());


                        break;


                }


                ledCommand.setSourceLocNo(wrkMast.getSourceLocNo());