#

野心家

2023-09-08 d42bf48692d89c3539e4119a909f6a59a126db0b

#

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

@@ -96,6 +96,8 @@

    @Value("${test.url}")
    private String testUrl;
    @Autowired
    private WrkMastService wrkMastService;

    /**
     * 组托
@@ -907,6 +909,7 @@
                        break;
//                        return;
                    }


                    // 1.堆垛机开始移动
                    CrnCommand crnCommand = new CrnCommand();
@@ -2348,6 +2351,7 @@
                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                if(null != devpThread){
                    for (int i = 0; i < 48; i++){
                        boolean fig=false;
                        //查询在库和预约出库
                        LocMast locMast=locMastService.selectztgx("F","R",i);
                        if(!Cools.isEmpty(locMast)){
@@ -2365,12 +2369,32 @@

                            //testMast.setStatus
                            //"状态 0: 待申请  1: 申请中  2: 已复核 3:测试中 4:完成 5:移库 6:火警"
                            if(devpThread.startSignal[i][0]==1){
                            if(devpThread.startSignal[i][0]==8){
                                testMast.setStatus(1);
                                locMast.setPackStatus(1);
                                testMast.setModiTime(new Date());
                            }else if(devpThread.startSignal[i][0]==2){
                            }else if(devpThread.startSignal[i][0]==2 && locMast.getPackStatus()!=2){
                                testMast.setStatus(3);
                                locMast.setPackStatus(2);
                                testMast.setModiTime(new Date());
                                //NG转OK需要还原源库位和目标库位状态，OK转NG 删除任务档
                                WrkMast wrkMast=wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no",locMast.getLocNo()));
                                if(!Cools.isEmpty(wrkMast)){
                                    if(wrkMast.getIoType()==11){
                                        LocMast locMast1=locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",wrkMast.getLocNo()));
                                        locMast1.setLocSts("O");
                                        locMastService.update(locMast1,new EntityWrapper<LocMast>().eq("loc_no",wrkMast.getLocNo()));
                                    }
                                    wrkMastMapper.delete(new EntityWrapper<WrkMast>().eq("source_loc_no",locMast.getLocNo()));
                                    locMast.setLocSts("F");
                                    wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("zpallet",locMast.getBarcode()));
                                    if(!locMastService.update(locMast,new EntityWrapper<LocMast>()
                                            .eq("channel",i+1))){
                                        log.error("修改测试库位状态失败"+locMast.getLocNo(),locMast);
                                    }else{
                                        fig=true;
                                    }
                                }
                            }else if(devpThread.startSignal[i][0]==3){
                                locMast.setPackStatus(7);
                                testMast.setModiTime(new Date());
@@ -2397,10 +2421,12 @@
                                    log.error("修改启动按钮状态，测试库位状态失败"+locMast.getLocNo(),locMast);
                                }
                            }else if(!locMast.getLocSts().equals("R")){
                                if(!locMastService.update(locMast,new EntityWrapper<LocMast>()
                                        .eq("loc_sts","F")
                                        .eq("channel",i+1))){
                                    log.error("修改测试库位状态失败"+locMast.getLocNo(),locMast);
                                if(!fig){
                                    if(!locMastService.update(locMast,new EntityWrapper<LocMast>()
                                            .eq("loc_sts","F")
                                            .eq("channel",i+1))){
                                        log.error("修改测试库位状态失败"+locMast.getLocNo(),locMast);
                                    }
                                }
                                if(!testMastService.update(testMast,new EntityWrapper<TestMast>()
                                        .eq("loc_no",locMast.getLocNo())
@@ -2410,12 +2436,18 @@
                            }
                        }
                    }
                    //当充放电库位为O空库位时
                    //库位状态改为8空闲
                    //给PLC写消防信号
                    for (int i=0;i<48;i++){
                        LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",i+1));
                        TestMast testMast=testMastService.selectOne(new EntityWrapper<TestMast>()
                                .eq("loc_no",locMast.getLocNo())
                                .eq("user_id",locMast.getBarcode()));
                        if(locMast.getLocSts().equals("O")&&devpThread.startSignal[i][0]!=8){
                            Thread.sleep(1000);
                            MessageQueue.offer(SlaveType.Devp, 1, new Task(6,locMast.getChannel()-1));
                        }
                        try{
                            if(locMast.getFireStatus()!=devpThread.startSignal[i][1]){
                                messageQueueOffer2(i,(short)((int)locMast.getFireStatus()),SlaveType.Devp, devp.getId());
@@ -2436,6 +2468,8 @@
                        }
                    }



                }

            }

 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -89,6 +89,12 @@
                        StaProtocol staProtocol2 = (StaProtocol)task.getData();
                        siemensS7Net.Write("DB108.0" + staProtocol2.getSiteId(), staProtocol2.getStaNo()==1);
                        break;
                    //测试库出库，库位状态改为8
                    case 6:
                        String data = task.getData()+"";
                        Byte coun=8;
                        siemensS7Net.Write("DB38.0" + data, coun);
                        break;
                    //复位测试信号
                    case 3:
                        StaProtocol staProtocol = (StaProtocol) task.getData();

 src/main/resources/application.yml

@@ -34,7 +34,7 @@
  enable: false

wms:
  url: localhost:8080/fnwms
  url: 10.12.55.200:8080/fnwms

# 下位机配置
wcs-slave:

 src/main/resources/mapper/LocMastMapper.xml

@@ -34,6 +34,9 @@
        <result column="mk" property="mk" />
        <result column="barcode" property="barcode" />
        <result column="ctn_no" property="ctnNo" />
        <result column="pack_status" property="packStatus" />
        <result column="fire_status" property="fireStatus" />
        <result column="fire_no" property="fireNo" />
        <result column="channel" property="channel" />

    </resultMap>

 src/main/webapp/views/monitor/index.html

@@ -93,7 +93,7 @@
            document.msExitFullscreen();
        }
    }
    let url = 'http://192.168.4.188:8088/fnwms'
    let url = 'http://10.12.55.200:8080/fnwms'
    var item = [{locNo: '1',locSts: '1',mk: '1',packStatus$: '1'}]
    var year = '2020';
    var month = '05';
@@ -157,13 +157,12 @@
        $('#bar-hour').text(hour);
        $('#bar-minute').text(minute);
        $('#bar-second').text(second);
        $('#bar-week').text(week);
    }
    /**
     * 获取时间
     */
    function getDate() {
        http.get("http://localhost:9090/fnwcs/monitor/date", null, function (res) {
        http.get("http://10.12.55.200:8080/fnwcs/monitor/date", null, function (res) {
            if (res.code === 200){
                year = res.data.year;
                month = res.data.month;
@@ -212,7 +211,7 @@
                        color: '#FFF'
                    }
                },
                data: ['其他', '测试库位', '静置库位', '测试前暂存库为', '测试失败库位']
                data: ['测试库位', '静置库位', '暂存库位', 'NG库位']
            }
        ],
        yAxis: [