#
yxFwq
2024-11-28 263de79f85d11630bf24364de499218f1ff8ff21
#
4个文件已修改
92 ■■■■ 已修改文件
src/main/java/com/zy/asrs/task/ScaleEscalationScheduler.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/StaEscalationScheduler.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/ScaleEscalationScheduler.java
@@ -41,19 +41,4 @@
        }
    }
    @Scheduled(cron = "0/3 * * * * ? ")
    private void executeOverturn(){//2楼翻转倒料后回库标记清除
        int[] staNos =new int[]{126,131,310,312};
        for (int staNo : staNos){
            try{
                ReturnT<String> result = scaleEscalationHandler.start2(staNo);
                if (result.getCode()==200){
                    break;
                }
            }catch (Exception e){
                log.error("站点"+staNo+"2楼翻转倒料信息上传处理失败,异常信息:"+e);
            }
        }
    }
}
src/main/java/com/zy/asrs/task/StaEscalationScheduler.java
@@ -36,4 +36,20 @@
        }
    }
    @Scheduled(cron = "0/3 * * * * ? ")
    private void executeOverturn(){//2楼翻转倒料后回库标记清除
        int[] staNos =new int[]{126,131,310,312};
        for (int staNo : staNos){
            try{
                ReturnT<String> result = staEscalationHandler.start2(staNo);
                if (result.getCode()==200){
                    break;
                }
            }catch (Exception e){
                LedErrorThreadUtil.ledErrorThread("2楼翻转倒料后回库标记清除失败!站点号:"+staNo,4, LedErrorAreaType.ONE_OTHER.getDesc());
                log.error("站点"+staNo+"2楼翻转倒料后回库标记清除失败,异常信息:"+e);
            }
        }
    }
}
src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java
@@ -40,17 +40,9 @@
public class ScaleEscalationHandler extends AbstractHandler<String> {
    @Autowired
    private WrkMastService wrkMastService;
    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private StaDescService staDescService;
    @Autowired
    private ApiLogService apiLogService;
    @Autowired
    private BasDevpService basDevpService;
    @Autowired
    private RgvOneSignMapper rgvOneSignMapper;
//    @Value("${srHangJia.url}")
    private String erpUrl = "10.10.11.100:8580";
@@ -88,30 +80,6 @@
            }
        }catch (Exception e){
            log.error("异常2!!!"+e);
            return FAIL;
        }
        return FAIL;
    }
    public ReturnT<String> start2(int staNo) {
        try{
            RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign("sign"+staNo);
            if (Cools.isEmpty(rgvOneSign) || rgvOneSign.getRgvOneSign()!=1){
                return FAIL;
            }
            SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
            StaProtocol staProtocol = devpThread.getStation().get(staNo);
            if (staProtocol == null) {
                return FAIL;
            } else {
                staProtocol = staProtocol.clone();
            }
            if (!staProtocol.isLoading()){
                rgvOneSign.setRgvOneSign(0);
                rgvOneSignMapper.updateById(rgvOneSign);
            }
        }catch (Exception e){
            log.error("异常3!!!"+e);
            return FAIL;
        }
        return FAIL;
src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
@@ -7,8 +7,10 @@
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.LedErrorAreaType;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.RgvOneSign;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.RgvOneSignMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -42,7 +44,7 @@
    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private StaDescService staDescService;
    private RgvOneSignMapper rgvOneSignMapper;
    @Autowired
    private ApiLogService apiLogService;
    @Autowired
@@ -119,6 +121,31 @@
        return FAIL;
    }
    public ReturnT<String> start2(int staNo) {
        try{
            RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign("sign"+staNo);
            if (Cools.isEmpty(rgvOneSign) || rgvOneSign.getRgvOneSign()!=1){
                return FAIL;
            }
            SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
            StaProtocol staProtocol = devpThread.getStation().get(staNo);
            if (staProtocol == null) {
                return FAIL;
            } else {
                staProtocol = staProtocol.clone();
            }
            if (!staProtocol.isLoading()){
                rgvOneSign.setRgvOneSign(0);
                rgvOneSignMapper.updateById(rgvOneSign);
            }
        }catch (Exception e){
            log.error("异常3!!!"+e);
            return FAIL;
        }
        return FAIL;
    }
    private ReturnT<String> postMesData(String erpPath,Object combParam){
        if(combParam != null){
            String response = "";