wcs功能完善

pjb

20 小时以前 c4b2cfbdc4b31a6e37a9b51c5f69620bd5e7841f

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

@@ -5,6 +5,7 @@
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
@@ -18,6 +19,8 @@
import com.zy.core.model.protocol.StaProtocol;
import com.zy.entity.BasDevp;
import com.zy.service.BasDevpService;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import com.zy.utils.News;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -369,6 +372,35 @@
            }
        }

        // 读1号输送线出入库模式
        if (slave.getId() == 1) {
            OperateResultExOne<byte[]> inOrOutBoundModeResult = siemensS7Net.Read("DB101.1480", (short) 2);
            if (inOrOutBoundModeResult.IsSuccess) {
                // 出入库模式
                int inOrOutMode = siemensS7Net.getByteTransform().TransInt16(inOrOutBoundModeResult.Content, 0);
                // 更新出入库模式值
                ConfigService configService = SpringUtils.getBean(ConfigService.class);
                Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "inOrOutBoundMode"));
                if (config != null) {
                    config.setValue(String.valueOf(inOrOutMode));
                    configService.updateById(config);
                }
                StaProtocol staProtocol1016 = station.get(1016);
                StaProtocol staProtocol1043 = station.get(1016);
                StaProtocol staProtocol1019 = station.get(1019);
                if(staProtocol1016 != null) {
                    staProtocol1016.setInOrOutMode(inOrOutMode);
                }
                if(staProtocol1043 != null) {
                    staProtocol1043.setInOrOutMode(inOrOutMode);
                }
                if(staProtocol1019 != null) {
                    staProtocol1019.setInOrOutMode(inOrOutMode);
                }
//                log.info("读取到出入库模式值为：{}",inOrOutMode);
            }
        }

        // 读空桶信息反馈
        if (slave.getId() == 1) {
            OperateResultExOne<byte[]> emptyBucketsResult = siemensS7Net.Read("DB101.1320", (short) (staNosErrList1.size() * 6));