#

yxFwq

2024-07-20 b5c365b59c5711d94dbca2fdbb883646faabfdd2

#

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

@@ -216,7 +216,7 @@
                statusList.add(1);//开进料门中
                statusList.add(3);//入硫化罐中

                if (type!=6){
                if (type!=6 && type!=3){
                    statusList.add(5);//硫化中《===》关门完成
                }
                if (type!=5  && type!=6){

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

@@ -5625,6 +5625,26 @@
                    return false;
                }

                // 获取硫化罐信息
                JarThread jarThreadOther = (JarThread) SlaveConnection.get(SlaveType.Jar, SteAndJarUtil.getRgvJarNo(jarProtocol.getJarNo()));
                JarProtocol jarProtocolOther = jarThreadOther.getJarProtocol();
                if (jarProtocolOther == null) {
                    return false;
                }
                if (jarProtocolOther.modeType != JarModeType.AUTO){
                    return false;
                }

                BasJar basJarOther = basJarMapper.selectById(jarProtocolOther.getJarNo());
                if (Cools.isEmpty(basJarOther)){
                    log.error("{}号硫化罐查询设备档案无信息！！！",jarProtocolOther.getJarNo());
                    return false;
                }

                if (!jarProtocolOther.isRightDoor()){
                    return false;
                }

                //门作业  无
                if (jarProtocol.isAutoing() && jarProtocol.jarErr==0){
                    //冷却完成上输送线

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

@@ -371,19 +371,19 @@
            }
        }

        //RGV小车
        Thread.sleep(200);
        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.160",(short)2);
        if (result3.IsSuccess) {
            Integer siteId = 2000;
            StaProtocol staProtocol = station.get(siteId);
            if (null == staProtocol) {
                staProtocol = new StaProtocol();
                staProtocol.setSiteId(siteId);
                station.put(siteId, staProtocol);
            }
            staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, 0)));
        }
//        //RGV小车
//        Thread.sleep(200);
//        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.160",(short)2);
//        if (result3.IsSuccess) {
//            Integer siteId = 2000;
//            StaProtocol staProtocol = station.get(siteId);
//            if (null == staProtocol) {
//                staProtocol = new StaProtocol();
//                staProtocol.setSiteId(siteId);
//                station.put(siteId, staProtocol);
//            }
//            staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, 0)));
//        }

        if (result.IsSuccess) {