孚能

野心家

2023-06-13 eb5e61b0f85c78455caa4e0ba54245aff982ba3d

孚能

 src/main/java/com/zy/asrs/domain/enums/PackStatusType.java

@@ -33,16 +33,16 @@
        if(fireStatus == 1){
            return LOC_ERROR;
        } else if (locSts.equals("F") || locSts.equals("R") || locSts.equals("D")){
            if (packStatus == 1){
                return LOC_WAIT_TESTINT;
            if (packStatus == 1 || locSts.equals("F")){
                return LOC_WAIT_TESTINT;//待测
            } else if (packStatus == 2){
                return LOC_TESTING;
            } else if (packStatus == 5){
                return LOC_STAY;
            } else if (packStatus == 6){
                return LOC_STAY_OVER;
                return LOC_TESTING;     //测试中
            } else if (packStatus == 3){
                return LOC_STAY;        //OK
            } else if (packStatus == 4){
                return LOC_STAY_OVER;   //NG
            }else {
                return LOC_EMPTY;
                return LOC_EMPTY;       //
            }
        } else if (locSts.equals("O") || locSts.equals("S")){
            return LOC_EMPTY;

 src/main/java/com/zy/asrs/entity/LocMast.java

@@ -186,7 +186,7 @@
     */
    @ApiModelProperty(value= "消防状态{0:正常,1:报警}")
    @TableField("fire_status")
    private Integer fireStatus;
    private Integer fireStatus=0;

    /**
     * 产品状态{0:无,1:待测,2:测试中;3.测试完成;4.测试失败;5.静置中;6:静置完成;7:暂停测试;8:紧急出库;}

 src/main/java/com/zy/asrs/mapper/LocMastMapper.java

@@ -35,4 +35,6 @@
    @Select("select count(*) as count from asr_loc_mast where 1=1 and loc_sts = 'O' and loc_type1 = #{locType1} and crn_no = #{crnNo}")
    Integer selectEmptyLocCount(@Param("locType1") Short locType1, @Param("crnNo") Integer crnNo);

    LocMast selectztgx(@Param("sts1") String sts1,@Param("sts2") String sts2,@Param("count") Integer count);

}

 src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java

@@ -16,6 +16,8 @@
    List<WrkDetl> findByWorkNo(Integer workNo);
    WrkDetl devpPackNo(@Param("workNo")Integer workNo);

    WrkDetl devpPackNo1(@Param("workNo")Integer workNo);

    int updateIoTime(@Param("workNo") Integer workNo, @Param("ioTime") Date ioTime);

}

 src/main/java/com/zy/asrs/service/LocMastService.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.LocMast;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@@ -45,5 +46,12 @@
     */
    Boolean checkEmptyCount(LocMast locMast);


    /**
     * 查询在库和预约出库的测试库位
     * @param sts1 F
     * @param sts2 R
     * @param count i
     * @return
     */
    LocMast selectztgx(String sts1,String sts2,Integer count);
}

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

@@ -5,6 +5,7 @@
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.LocMastService;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;

import java.util.List;
@@ -51,5 +52,8 @@
        }
        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
    }

    @Override
    public LocMast selectztgx(String sts1,String sts2,Integer count){
        return this.baseMapper.selectztgx(sts1,sts2,count);
    }
}

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

@@ -38,6 +38,7 @@
import com.zy.core.thread.SiemensCrnThread;
import com.zy.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
@@ -50,6 +51,7 @@
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;


/**
 * 立体仓库WCS系统主流程业务
@@ -128,10 +130,9 @@
                } else {
                    staProtocol = staProtocol.clone();
                }

                staProtocol.setPakMk(true);
//                // 入出库模式判断
//                if ( inSta.getStaNo()==180 && devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }
                staProtocol.setPakMk(true);
                // 判断是否满足入库条件
                if (staProtocol.isAutoing() && staProtocol.isLoading()
                        && staProtocol.isInEnable()
@@ -152,7 +153,7 @@
//                    }

                    // 判断重复工作档
                    WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
                    WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode.substring(0,6));
                    if (wrkMast != null) {
                        log.error("工作档中已存在该站状态为（ 2.设备上走 ）的数据,工作号={}", wrkMast.getWrkNo());
                        continue;
@@ -168,9 +169,17 @@
                        String pack =null;//pack码
                        if(barcode.length()>6){
                            pack=barcode.substring(6);
                            if(pack.equals("00000000000000000000")){
                                log.error("没有获得Pack码",pack);
                                continue;
                            }
                    }
                        //String pack="MJY0136 0400";
                        barcode=barcode.substring(0,6);//托盘码
                        if(barcode.equals("000000")){
                            log.error("没有获得条码",barcode);
                            continue;
                        }
                        LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
                        locTypeDto.setLocType1((short)1);
                        SearchLocParam param = new SearchLocParam();
@@ -200,7 +209,7 @@
                            StartupDto dto = jsonObject.getObject("data", StartupDto.class);
                            barcodeThread.setBarcode("");
                            staProtocol.setWorkNo((short)9998);
                            staProtocol.setStaNo((short)101);
                            staProtocol.setStaNo((short)201);
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            log.error("url：{}；request：{}；response：{}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
@@ -208,7 +217,7 @@
                            StartupDto dto = jsonObject.getObject("data", StartupDto.class);
                            barcodeThread.setBarcode("");
                            staProtocol.setWorkNo((short)9998);
                            staProtocol.setStaNo((short)101);
                            staProtocol.setStaNo((short)201);
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
@@ -826,9 +835,24 @@
                    break;
//                    continue;
                }
                //查询在库信息
                LocMast locMast =locMastService.selectOne(new EntityWrapper<LocMast>()
                        .eq("loc_sts","R")
                        .eq("loc_no",wrkMast.getSourceLocNo()));
                if(Cools.isEmpty(locMast)){
                    log.error("出库 ===>> 库位中没有这笔资料",wrkMast.getSourceLocNo());
                    continue;
                }


                // 判断堆垛机出库站状态
                if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() !=null && staDetl.getCanouting().equals("Y")
                        && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
                    //测试库位出库必须要按启动按钮才能出库
                    if(wrkMast.getStaNo()==206 && locMast.getCtnKind()==0){
                        log.error("出库 ===>> 等待启动出库按钮",wrkMast);
                        continue;
                    }
                    // 命令下发区 --------------------------------------------------------------------------

                    // 堆垛机控制过滤
@@ -1073,6 +1097,12 @@
            return;
        }

        //测试库位出库必须要按启动按钮才能出库
        if(sourceSta.getLocType1()==1 && sourceSta.getCtnKind()==0){
            log.error("出库 ===>> 等待启动按钮",wrkMast);
            return;
        }

        // 命令下发区 --------------------------------------------------------------------------
        CrnCommand crnCommand = new CrnCommand();
        crnCommand.setCrnNo(slave.getId()); // 堆垛机编号
@@ -1085,7 +1115,11 @@
        crnCommand.setDestinationPosX(sta.getRow1().shortValue());     // 目标库位排
        crnCommand.setDestinationPosY(sta.getBay1().shortValue());     // 目标库位列
        crnCommand.setDestinationPosZ(sta.getLev1().shortValue());     // 目标库位层
        crnCommand.setBarcode(wrkMast.getBarcode());//托盘码
        if(!sta.getLocNo().equals("0102501")){
            crnCommand.setBarcode(wrkMast.getBarcode());//托盘码
        }else {
            crnCommand.setFireStaut((short) 1);
        }
        if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
            log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
        } else {
@@ -2085,9 +2119,9 @@
                                    locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
                                    if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F")){
                                        sign=true;
                                        if (locMast.getPackStatus()==3){
                                        if (locMast.getPackStatus()==3){//测试完成
                                            newSingle=41;
                                        }else if (locMast.getPackStatus()==4){
                                        }else if (locMast.getPackStatus()==4){//测试失败
                                            newSingle=4;
                                        }else {
                                            log.info("读取通道"+(i+1)+"测试库位按钮信号:为"+devpThread.startSignal[i][0]+"通道库位pack状态信息异常"+locMast.getPackStatus());
@@ -2210,7 +2244,9 @@
                        }
                        try{
                            locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
                            messageQueueOffer2(i,(short)((int)locMast.getFireStatus()),SlaveType.Devp, devp.getId());
                            if(devpThread.startSignal[i][1]!=locMast.getFireStatus()){
                                messageQueueOffer2(i+1,(short)((int)locMast.getFireStatus()),SlaveType.Devp, devp.getId());
                            }
                        }catch (Exception e){
                            log.error("火警  ===>> 给输送线发送警报失败,通道号：", i+1);
                        }
@@ -2237,7 +2273,7 @@
    public boolean messageQueueOffer2(int i ,short newSingle,SlaveType devp,Integer id){
        //复位PLC信号，借用输送站点实体类
        StaProtocol staProtocol = new StaProtocol();
        staProtocol.setSiteId(i*2);//寄存器地址
        staProtocol.setSiteId(i);//寄存器地址
        staProtocol.setStaNo(newSingle);//修改PLC寄存器地址值,8==>0
        return MessageQueue.offer(devp, id, new Task(5, staProtocol));
    }
@@ -2255,12 +2291,12 @@
                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("fire_status", 1));
                if (!Cools.isEmpty(locMast)){
                    //报警信号写入1
                    if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(4, (short)1))) {
                    if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(4, "1"))) {
                        log.error("火警  ===>> 给堆垛机发送报警信号失败");
                    }
                } else {
                    //报警信号没有后，复位地址
                    if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(4, (short)0))) {
                    if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(4, "0"))) {
                        log.error("火警  ===>> 给堆垛机清零复位报警信号失败");
                    }
                }
@@ -2280,7 +2316,7 @@
        try {
            // 根据输送线plc遍历
            for (DevpSlave devp : slaveProperties.getDevp()) {
                BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("bas_devp",103));
                BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",103));
                if (Cools.isEmpty(basDevp)){
                    log.error("103站点查询失败-MainServiceImpl.java-2255行");
                }
@@ -2298,4 +2334,110 @@
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
        }
    }
    /**
     * 根据PLC按钮测试、完成、暂停信号，更新testMast表中status值，交由WMS系统处理
     */
    @Transactional
    public void packTest1() {
        try {
            // 根据输送线plc遍历
            for (DevpSlave devp : slaveProperties.getDevp()) {
                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                if(null != devpThread){
                    for (int i = 0; i < 48; i++){
                        //查询在库和预约出库
                        LocMast locMast=locMastService.selectztgx("F","R",i);
                        if(!Cools.isEmpty(locMast)){
                            TestMast testMast=testMastService.selectOne(new EntityWrapper<TestMast>()
                                    .eq("loc_no",locMast.getLocNo())
                                    .eq("user_id",locMast.getBarcode()));
                            if(Cools.isEmpty(testMast)){
                                continue;
                            }
                            //devpThread.startSignal[i][0]
                            //0:空,1:启动中,2:工作中,3:自动暂停,4:正常完成(OK),5:异常停止(NG),6:在线,7:离线,8:空闲

                            //locMast.setPackStatus
                            // "产品状态{0:无,1:待测,2:测试中;3.测试完成;4.测试失败;5.静置中;6:静置完成;7:暂停测试;8:紧急出库;9:在线;10:离线;11:空闲;}"

                            //testMast.setStatus
                            //"状态 0: 待申请  1: 申请中  2: 已复核 3:测试中 4:完成 5:移库 6:火警"
                            if(devpThread.startSignal[i][0]==1){
                                testMast.setStatus(1);
                                testMast.setModiTime(new Date());
                            }else if(devpThread.startSignal[i][0]==2){
                                testMast.setStatus(3);
                                testMast.setModiTime(new Date());
                            }else if(devpThread.startSignal[i][0]==3){
                                locMast.setPackStatus(7);
                                testMast.setModiTime(new Date());
                            }else if(devpThread.startSignal[i][0]==4){
                                locMast.setPackStatus(3);
                                testMast.setStatus(4);
                                testMast.setModiTime(new Date());
                            }else if(devpThread.startSignal[i][0]==5){
                                locMast.setPackStatus(4);
                                testMast.setStatus(4);
                                testMast.setModiTime(new Date());
                            }
//                            else if(devpThread.startSignal[i][0]==6||devpThread.startSignal[i][0]==7||devpThread.startSignal[i][0]==8){
//                                locMast.setPackStatus(devpThread.startSignal[i][0]+3);
//                            }
                            //通道启动按钮状态，1:可以启动出库或者移库，0:不能启动出库或者移库
                            locMast.setCtnKind(devpThread.startSignal[i][2]);
                            if(devpThread.startSignal[i][2]==1){
                                if(!locMastService.update(locMast,new EntityWrapper<LocMast>()
                                        .eq("loc_sts","R")
                                        .eq("channel",i+1))){
                                    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(!testMastService.update(testMast,new EntityWrapper<TestMast>()
                                        .eq("loc_no",locMast.getLocNo())
                                        .eq("user_id",locMast.getBarcode()))) {
                                    log.error("修改测试档状态失败" + locMast.getLocNo(), locMast);
                                }
                            }
                        }
                    }
                    //给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()));
                        try{
                            if(locMast.getFireStatus()!=devpThread.startSignal[i][1]){
                                messageQueueOffer2(i,(short)((int)locMast.getFireStatus()),SlaveType.Devp, devp.getId());
                                if(Cools.isEmpty(testMast)){
                                    continue;
                                }
                                if(locMast.getFireStatus()==1){
                                    testMast.setStatus(6);//火警
                                    if(!testMastService.update(testMast,new EntityWrapper<TestMast>()
                                            .eq("loc_no",locMast.getLocNo())
                                            .eq("user_id",locMast.getBarcode()))) {
                                        log.error("修改测试档状态失败" + locMast.getLocNo(), locMast);
                                    }
                                }
                            }
                        }catch (Exception e){
                            log.error("火警  ===>> 给输送线发送警报失败,通道号：", i+1);
                        }
                    }

                }

            }
        } catch (Exception e) {
            log.error("获得测试库位状态失败", e);
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
        }
    }
}

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

@@ -55,7 +55,13 @@

    @Override
    public WrkDetl devpPackNo(Integer workNo) {
        return this.baseMapper.devpPackNo(workNo);
        WrkDetl wrkDetl=this.baseMapper.devpPackNo1(workNo);
        if(Cools.isEmpty(wrkDetl)){
            return this.baseMapper.devpPackNo(workNo);
        }else {
            return wrkDetl;
        }

    }

    @Override

 src/main/java/com/zy/core/MainProcess.java

@@ -67,9 +67,9 @@
//                    mainService.outOfDevp();

                    //启动、完成、暂停测试系统测试
                    mainService.packTest();
                    mainService.packTest1();
//                    //火警，给堆垛机发送火警警报
//                    mainService.fierCrn();
                    mainService.fierCrn();

                    //103站点有物下发pack码
                    mainService.packDevp();

 src/main/java/com/zy/core/model/command/CrnCommand.java

@@ -76,6 +76,9 @@

    private String barcode= "";

    //火警: 1是火警
    private short fireStaut = 0;

    public void setTaskMode(Short taskMode){
        this.taskMode = taskMode;
        this.taskModeType = CrnTaskModeType.get(taskModeType);

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

@@ -86,7 +86,12 @@
                        write(command);
                        break;
                    case 4:
                        siemensNet.Write("DB100.20", (short)task.getData());
                        if(task.getData().equals("0")){
                            siemensNet.Write("DB100.276", (short)0);
                        }else {
                            siemensNet.Write("DB100.276", (short)1);
                        }

                        break;
                    default:
                        break;
@@ -236,7 +241,7 @@
            log.error("堆垛机写入命令为空");
            return false;
        }
//        convertRow(command);
        //convertRow(command);
        command.setCrnNo(slave.getId());
        short[] array = new short[12];
        array[0] = command.getAckFinish();
@@ -255,7 +260,6 @@
        if (command.getAckFinish() == 0){
            OperateResult result2 = siemensNet.Write("DB100.20", command.getBarcode());
        }

        if (command.getAckFinish() == 0) {
            short commandFinish = 1;
            result = siemensNet.Write("DB100.18", commandFinish);

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

@@ -54,7 +54,7 @@
    private int barcodeSize = 2;
    public IoModeType ioMode = IoModeType.NONE;

    public int[][] startSignal = new int[48][2];
    public int[][] startSignal = new int[48][3];

    public SiemensDevpThread(DevpSlave slave) {
        this.slave = slave;
@@ -89,47 +89,47 @@
                        StaProtocol staProtocol2 = (StaProtocol)task.getData();
                        siemensS7Net.Write("DB108.0" + staProtocol2.getSiteId(), staProtocol2.getStaNo()==1);
                        break;
                    //复位测试信号
                    case 3:
                        StaProtocol staProtocol = (StaProtocol)task.getData();
                        siemensS7Net.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo());
                        break;
                    default:
                        break;
                }
                // 心跳
        //复位测试信号
        case 3:
        StaProtocol staProtocol = (StaProtocol)task.getData();
        siemensS7Net.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo());
        break;
        default:
        break;
    }
    // 心跳
//                heartbeat();
                Thread.sleep(400);
            } catch (Exception e) {
                e.printStackTrace();
            }
} catch (Exception e) {
        e.printStackTrace();
        }

        }
    }
        }

    @Override
    public boolean connect() {
@Override
public boolean connect() {
        boolean result = false;
        siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
        siemensS7Net.setRack(slave.getRack().byteValue());
        siemensS7Net.setSlot(slave.getSlot().byteValue());
        OperateResult connect = siemensS7Net.ConnectServer();
        if(connect.IsSuccess){
            result = true;
            OutputQueue.DEVP.offer(MessageFormat.format( "【{0}】输送线plc连接成功 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
            log.info("输送线plc连接成功 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
        result = true;
        OutputQueue.DEVP.offer(MessageFormat.format( "【{0}】输送线plc连接成功 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
        log.info("输送线plc连接成功 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
        } else {
            OutputQueue.DEVP.offer(MessageFormat.format( "【{0}】输送线plc连接失败！！！ ===>> [id:{1}] [ip:{2}] [port:{3}]  [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
            log.error("输送线plc连接失败！！！ ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
        OutputQueue.DEVP.offer(MessageFormat.format( "【{0}】输送线plc连接失败！！！ ===>> [id:{1}] [ip:{2}] [port:{3}]  [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
        log.error("输送线plc连接失败！！！ ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
        }
        siemensS7Net.ConnectClose();
        return result;
    }
        }

    /**
     * 读取状态 ====> 整块plc
     */
    private void read() throws InterruptedException {
/**
 * 读取状态 ====> 整块plc
 */
private void read() throws InterruptedException {
//        // 更新入出库模式
//        updateIoMode();
        int staNoSize = staNos.size();
@@ -205,12 +205,17 @@
        }

        Thread.sleep(200);
        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.0", (short) 96);
        OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB108.0", (short) 96);
        //测试柜状态获取
        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB38.0", (short) 96);
        //启动移库按钮
        OperateResultExOne<byte[]> result6 = siemensS7Net.Read("DB102.0", (short) 96);
        //消防报警
        OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB108.0", (short) 48);
        if(result3.IsSuccess) {
            for(int i=0; i<48; i++){
                startSignal[i][0] = siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2);
                startSignal[i][1] = siemensS7Net.getByteTransform().TransInt16(result4.Content, i*2);
                startSignal[i][0] = siemensS7Net.getByteTransform().TransByte(result3.Content, i*2);//测试柜状态
                startSignal[i][1] = siemensS7Net.getByteTransform().TransBool(result4.Content, i)?1:0;//消防状态
                startSignal[i][2] = siemensS7Net.getByteTransform().TransInt16(result6.Content, i*2);//启动按钮状态
            }
        }
//        OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
@@ -251,7 +256,8 @@
     */
    private void write103(String packNo){
        try{
            OperateResult write = siemensS7Net.Write("DB109.", packNo);

            OperateResult write = siemensS7Net.Write("DB109.0", packNo);
            if (!write.IsSuccess) {
                OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线站点数据失败。输送线plc编号={1}，站点数据={2}", slave.getId(), JSON.toJSON(packNo)));
                log.error("写入输送线站点数据失败。输送线plc编号={}，站点数据={}", slave.getId(), JSON.toJSON(packNo));

 src/main/resources/mapper/LocMastMapper.xml

@@ -60,4 +60,8 @@
        ORDER BY NEWID()
    </select>

    <select id="selectztgx" resultMap="BaseResultMap">
        select  top 1 * from asr_loc_mast where loc_sts in (#{sts1},#{sts2}) and channel=#{count}+1
    </select>

</mapper>

 src/main/resources/mapper/WrkDetlMapper.xml

@@ -53,7 +53,9 @@
    <select id="devpPackNo" resultMap="BaseResultMap">
        select top 1 * from asr_wrk_detl_log where 1=1 and wrk_no = #{workNo} order by io_time desc
    </select>

    <select id="devpPackNo1" resultMap="BaseResultMap">
        select top 1 * from asr_wrk_detl where 1=1 and wrk_no = #{workNo} order by io_time desc
    </select>
    <update id="updateIoTime">
        update asr_wrk_detl
        set io_time = #{ioTime}

 src/main/webapp/views/console.html

@@ -165,9 +165,9 @@
        <span class="site machine-auto-flag" style="color:#FFFFFF; top:550px; left:300px">空库位</span>
        <span class="site machine-stock-move-flag" style="color:#FFFFFF; top:550px; left:364px">在库待测</span>
        <span class="site machine-site-move-flag" style="color:#FFFFFF; top:550px; left:442px">在库测试中</span>
        <span class="site machine-take-flag" style="color:#FFFFFF; top:550px; left:534px">在库静置中</span>
        <span class="site machine-put-flag" style="color:#FFFFFF; top:550px; left:626px">静置完成</span>
        <span class="site machine-error-flag" style="color:#FFFFFF; top:550px; left:696px">异常报警</span>
        <span class="site machine-take-flag" style="color:#FFFFFF; top:550px; left:534px">测试成功OK</span>
        <span class="site machine-put-flag" style="color:#FFFFFF; top:550px; left:626px">测试失败NG</span>
        <span class="site machine-error-flag" style="color:#FFFFFF; top:550px; left:716px">异常报警</span>
    </div>

    <div id="body">
@@ -661,10 +661,10 @@
                    for (var val in res.data) {
                        switch (res.data[val]) {
                            case "LOC_STAY_OVER" :
                                res.data[val] = "静置完成"
                                res.data[val] = "测试失败NG"
                                break;
                            case "LOC_STAY" :
                                res.data[val] = "在库静置中"
                                res.data[val] = "测试成功OK"
                                break;
                            case "LOC_WAIT_TESTINT" :
                                res.data[val] = "在库待测"