#

lsh

2023-12-19 9050b1c218f0d3753a8a36edc2a014bf820c466b

#

 src/main/java/com/zy/asrs/controller/CrnController.java

@@ -91,7 +91,11 @@
            vo.setStatus(1);    //  状态
            Task task = MessageQueue.peek(SlaveType.Crn, crn.getId());
            if (task != null) {
                vo.setCommand(JSON.toJSONString((CrnCommand)task.getData()));
                try{
                    vo.setCommand(JSON.toJSONString((CrnCommand)task.getData()));
                } catch (Exception e){

                }
            }
        }
        return R.ok().add(list);

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

@@ -1080,9 +1080,11 @@
        }
        for (WrkMast wm: wrkMasts) {
            LocMast sourceSta1 = locMastService.selectById(wm.getSourceLocNo());
            if(sourceSta1.getCtnKind()==1){
                wrkMast=wm;
                break;
            if (!Cools.isEmpty(sourceSta1.getCtnKind())){
                if(sourceSta1.getCtnKind()==1){
                    wrkMast=wm;
                    break;
                }
            }
        }
        // 获取源库位信息
@@ -2370,20 +2372,20 @@
                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                if(null != devpThread){
                    for (int i = 0; i < 48; i++){
                        log.info("2367行程序开始运行，第"+i+"次");
//                        log.info("2367行程序开始运行，第"+i+"次");
                        boolean fig=false;
                        //查询在库和预约出库
                        LocMast locMast=locMastService.selectztgx("F","R",i);
                        if(!Cools.isEmpty(locMast)){
                            log.info("2372行程序开始运行，查询测试档");
//                            log.info("2372行程序开始运行，查询测试档");
                            TestMast testMast=testMastService.selectOne(new EntityWrapper<TestMast>()
                                    .eq("loc_no",locMast.getLocNo())
                                    .eq("user_id",locMast.getBarcode()));
                            if(Cools.isEmpty(testMast)){
                                log.info("2377行程序开始运行，测试档为空，跳过");
//                                log.info("2377行程序开始运行，测试档为空，跳过");
                                continue;
                            }
                            log.info("2380行程序开始运行，测试档不为空，下一步");
//                            log.info("2380行程序开始运行，测试档不为空，下一步");
                            //devpThread.startSignal[i][0]
                            //0:空,1:启动中,2:工作中,3:自动暂停,4:正常完成(OK),5:异常停止(NG),6:在线,7:离线,8:空闲