#

Junjie

4 天以前 7620bd47ec7dc59ea1f4c00e35d238d9d6e4ab53

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

@@ -233,9 +233,14 @@
                            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                                    .eq("loc_no", dto.getLocNo()));

                            short staNo = dto.getStaNo().shortValue();
                            if (inSta.getStaNo() == 1002) {
                                staNo = 2002;
                            }

                            barcodeThread.setBarcode("");
                            staProtocol.setWorkNo(dto.getWorkNo().shortValue());
                            staProtocol.setStaNo(dto.getStaNo().shortValue());
                            staProtocol.setStaNo(staNo);
                            staProtocol.setPalletSize(locMast.getLocType2());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
@@ -2199,16 +2204,16 @@

    // RGV  ===>> 执行对RGV操作
    public synchronized void rgvExecute(Integer mark) {
        ArrayList<Integer> list = new ArrayList<Integer>(){{add(1090);add(1091);}};
        ArrayList<Integer> list = new ArrayList<Integer>(){{add(2003);add(2002);}};
        for (Integer staNo : list) {
            Integer devpId = null;
            Integer rgvStaNo = null;
            if (staNo == 1090) {
            if (staNo == 2003) {
                devpId = 1;
                rgvStaNo = 1091;
                rgvStaNo = 2002;
            }else {
                devpId = 2;
                rgvStaNo = 1090;
                rgvStaNo = 2003;
            }

            SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devpId);
@@ -2224,7 +2229,7 @@

            if (staProtocol.isAutoing()
                    && staProtocol.isLoading()
                    && staProtocol.isInEnable()
//                    && staProtocol.isInEnable()
                    && staProtocol.getWorkNo() > 0
            ) {
                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
@@ -2269,17 +2274,12 @@
            }

            //  状态：等待确认 并且  任务完成位 = 1
            if (rgvProtocol.statusType == RgvStatusType.WAITING && rgvProtocol.getTaskNo1() != 0) {
            if (rgvProtocol.statusType1 == RgvStatusType.WAITING && rgvProtocol.getTaskNo1() != 0) {
                News.warnNoLog(""+mark+" - 0"+" - 开始执行对RGV工作档的完成操作");
                // 获取入库待确认工作档
                WrkMast wrkMast = wrkMastMapper.selectPakInStep3(rgvProtocol.getTaskNo1().intValue());
                if (wrkMast == null) {
                    News.error(""+mark+" - 1"+" - RGV处于等待确认且任务完成状态，但未找到工作档。RGV号={}，工作号={}", rgvSlave.getId(), rgvProtocol.getTaskNo1());
                    continue;
                }

                if (Cools.isEmpty(wrkMast.getMemo())) {
                    News.error(""+mark+" - 1"+" - RGV处于等待确认且任务完成状态，但工作档数据异常。RGV号={}，工作号={}", rgvSlave.getId(), rgvProtocol.getTaskNo1());
                    continue;
                }

@@ -2290,13 +2290,13 @@
                    //入库
                    wrkMast.setWrkSts(2L);
                    devpId = 1;
                    devpStaNo = 1090;
                    devpStaNo = 2003;
                    locNo = wrkMast.getLocNo();
                }else {
                    //出库
                    wrkMast.setWrkSts(15L);
                    devpId = 2;
                    devpStaNo = 1091;
                    devpStaNo = 2002;
                    locNo = wrkMast.getSourceLocNo();
                }

@@ -2327,6 +2327,8 @@
                    Date now = new Date();
                    wrkMast.setModiTime(now);
                    wrkMastMapper.updateById(wrkMast);

                    rgvThread.setResetFlag1(true);
                }
            }
        }