#

zjj

2024-11-13 24fb51443ddd4d65b21b3fc9e6aa012530cc8669

#

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

@@ -349,6 +349,13 @@
                        log.error(staProtocol.getStaNo()+"站点，空桶，非法目标站！！！！！！"+staProtocol.getStaNoEnd().toString());
                        continue;
                    }
                    // 判断是否满足入库条件
                    if (staProtocol.isAutoing()
                            && staProtocol.isLoading()
                            && staProtocol.isInEnable()
                            && !staProtocol.isEmptyMk()
                            && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() > 9990)
                            && staProtocol.isPakMk()) {
                    Integer workNo1 = commonService.getWorkNo(3);
                    Date now = new Date();
                    // 保存工作档
@@ -387,6 +394,8 @@
                    if (!result) {
                        throw new CoolException("更新plc站点信息失败");
                    }
                    }

                    continue;
                }

@@ -2817,7 +2826,7 @@
                            sta1 = Utils.getRgvEndStaNo(rgvSlave.getId(),wrkMast.getStaNo());
                            Integer staNo = Utils.getStaNo(rgvSlave.getId(), (int) sta1);
                            BasDevp devp = basDevpService.selectById(staNo);
                            if (devp.getWrkNo()!=0 || devp.getLoading().equals("Y")){
                            if (devp.getWrkNo()!=0 || Cools.isEmpty(devp.getLoading()) || devp.getLoading().equals("Y")){
                                continue;
                            }
                            work1 = true;
@@ -2846,7 +2855,7 @@
                            }
                            Integer staNo = Utils.getStaNo(rgvSlave.getId(), (int) sta1);
                            BasDevp devp = basDevpService.selectById(staNo);
                            if (devp.getWrkNo()!=0 || devp.getLoading().equals("Y")){
                            if (devp.getWrkNo()!=0 || Cools.isEmpty(devp.getLoading()) || devp.getLoading().equals("Y")){
                                continue;
                            }
                            workNo1 = commonService.getWorkNo(3);
@@ -2891,7 +2900,7 @@
                        }
                        Integer staNo = Utils.getStaNo(rgvSlave.getId(), (int) sta1);
                        BasDevp devp = basDevpService.selectById(staNo);
                        if (devp.getWrkNo()!=0 || devp.getLoading().equals("Y")){
                        if (devp.getWrkNo()!=0 || Cools.isEmpty(devp.getLoading()) || devp.getLoading().equals("Y")){
                            continue;
                        }
                        work1 = true;
@@ -2944,7 +2953,7 @@
                                sta2 = Utils.getRgvEndStaNo(rgvSlave.getId(),wrkMast.getStaNo());
                                Integer staNo = Utils.getStaNo(rgvSlave.getId(), (int) sta2);
                                BasDevp devp2 = basDevpService.selectById(staNo);
                                if (devp2.getWrkNo()!=0 || devp2.getLoading().equals("Y")){
                                if (devp2.getWrkNo()!=0 || Cools.isEmpty(devp2.getLoading()) || devp2.getLoading().equals("Y")){
                                    continue;
                                }

@@ -2972,7 +2981,7 @@
                                }
                                Integer staNo = Utils.getStaNo(rgvSlave.getId(), (int) sta2);
                                BasDevp devp2 = basDevpService.selectById(staNo);
                                if (devp2.getWrkNo()!=0 || devp2.getLoading().equals("Y")){
                                if (devp2.getWrkNo()!=0 || Cools.isEmpty(devp2.getLoading()) || devp2.getLoading().equals("Y")){
                                    continue;
                                }
                                workNo2 = commonService.getWorkNo(3);
@@ -3018,7 +3027,7 @@
                            }
                            Integer staNo = Utils.getStaNo(rgvSlave.getId(), (int) sta2);
                            BasDevp devp2 = basDevpService.selectById(staNo);
                            if (devp2.getWrkNo()!=0 || devp2.getLoading().equals("Y")){
                            if (devp2.getWrkNo()!=0 || Cools.isEmpty(devp2.getLoading()) || devp2.getLoading().equals("Y")){
                                continue;
                            }


 src/main/java/com/zy/asrs/utils/Utils.java

@@ -83,6 +83,7 @@
        rgv3Map.put(3007,3001);rgv3Map.put(3012,3001);
        rgv3Map.put(1022,2402);rgv3Map.put(1025,2402);
        rgv3Map.put(1016,2402);rgv3Map.put(1019,2402);
        rgv3Map.put(2001,2402);
        switch (rgvNo){
            case 1:
                return getRgvStaNo(rgvNo,rgv1Map.get(staNo));

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

@@ -418,12 +418,13 @@
                StaProtocol staProtocol06 = station.get(3006);
                short a11171 = siemensS7Net.getByteTransform().TransInt16(result37new.Content, 0);
                short a11172 = siemensS7Net.getByteTransform().TransInt16(result37new.Content, 2);
                staProtocol11.setStaNoEnd(a11171);
                staProtocol11.setBan(a11172==1);

                short a11173 = siemensS7Net.getByteTransform().TransInt16(result37new.Content, 4);
                short a11174 = siemensS7Net.getByteTransform().TransInt16(result37new.Content, 6);
                staProtocol06.setStaNoEnd(a11173);
                staProtocol06.setBan(a11174==1);
                staProtocol11.setStaNoEnd(a11173);
                staProtocol11.setBan(a11171==1);
                staProtocol06.setStaNoEnd(a11174);
                staProtocol06.setBan(a11172==1);
            }
        }