#

yxFwq

2024-11-28 b9613e196c9e75bc609f40324accf78d424566f5

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

@@ -10,6 +10,8 @@
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.RgvOneSign;
import com.zy.asrs.mapper.RgvOneSignMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.core.DevpThread;
import com.zy.core.News;
@@ -346,6 +348,31 @@
                        log.error("读取RGV信息失败"+e.getMessage());
                    }
                }
            }
        } else if (slave.getId()==1){
            try{
                OperateResultExOne<byte[]> resultSignOne = siemensS7Net.Read("DB293.106", (short) (16));

                int smallEmpty = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 0);// 小料空托
                int bigEmpty = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 2);// 大料空托
                int smallTurn = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 4);// 小料翻转
                int bigTurn = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 6);// 大料翻转
                int LineUp131 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 8);// 131排队
                int LineUp126 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 10);// 126排队
                int LineUp312 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 12);// 312排队
                int LineUp310 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 14);// 310排队

                updateRgvOneSign("smallEmpty",smallEmpty);
                updateRgvOneSign("bigEmpty",bigEmpty);
                updateRgvOneSign("smallTurn",smallTurn);
                updateRgvOneSign("bigTurn",bigTurn);
                updateRgvOneSign("LineUp131",LineUp131);
                updateRgvOneSign("LineUp126",LineUp126);
                updateRgvOneSign("LineUp312",LineUp312);
                updateRgvOneSign("LineUp310",LineUp310);

            } catch (Exception e){
                log.error("读取输送线数量标记出现异常："+e);
            }
        }

@@ -1040,14 +1067,32 @@
     * 设置入库标记
     */
    @Override
    public void setPakMk(Integer siteId, boolean pakMk) {
    public void setPakMk(Integer siteId, boolean pakMk,Integer i) {
        StaProtocol staProtocol = station.get(siteId);
        if (null != staProtocol) {
            log.info("锁定入库标记，站点号={};pakMk={};时间={}",siteId,pakMk,new Date());
            log.info("锁定入库标记，站点号={};pakMk={};时间={};标记={}",siteId,pakMk,new Date(),i);
            staProtocol.setPakMk(pakMk);
        }
    }

    public void updateRgvOneSign(String signType,Integer oneSign){
        RgvOneSignMapper rgvOneSignMapper = SpringUtils.getBean(RgvOneSignMapper.class);

        try{
            RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign(signType);
            if (!Cools.isEmpty(rgvOneSign)){
                rgvOneSign.setRgvOneSign(oneSign);
                rgvOneSignMapper.updateById(rgvOneSign);
            }
        } catch (Exception e){
            RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign(signType);
            if (!Cools.isEmpty(rgvOneSign)){
                rgvOneSign.setRgvOneSign(999);
                rgvOneSignMapper.updateById(rgvOneSign);
            }
        }
    }

    @Override
    public void close() {
        siemensS7Net.ConnectClose();