*

L

18 小时以前 741d8fea137649dd5a45d94f2573ca1bb8297c1f

 src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java

@@ -54,6 +54,7 @@
    private String erpUrl = "10.10.11.100:8580";
//    @Value("${srHangJia.reportOutPath}")
    private String reportOutPath = "mes/wms-service/inStorageEndReport";
    private String reportOutTrayCompound = "mes/wms-service/trayCompound";

    public ReturnT<String> start(int staNo) {
        try{
@@ -146,6 +147,72 @@
        return FAIL;
    }

    public ReturnT<String> start3(int staNo) {
        try{
            Date now = new Date();
            BasDevp basDevp = basDevpService.selectById(staNo);
            if (Cools.isEmpty(basDevp) || basDevp.getReportSign()==1){
                return FAIL;
            }
            SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 2);
            StaProtocol staProtocol = devpThread.getStation().get(staNo);
            if (staProtocol == null) {
                return FAIL;
            } else {
                staProtocol = staProtocol.clone();
            }

            if (!Cools.isEmpty(basDevp) && basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()!=0){ //上传前工作号跟电控约定为9992中控(桁架)：码垛完成下发入库信息（你可以自定义）
                if (staProtocol.isAutoing() && staProtocol.getWorkNo()!=0){
                    WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", staProtocol.getWorkNo()));
                    if (Cools.isEmpty(wrkMast)) return FAIL;
                    if (wrkMast.getIoType()==1 || wrkMast.getIoType()==10) return FAIL;
                    if (wrkMast.getSheetNo()!=null && wrkMast.getSheetNo().equals("2")) return FAIL;
                    List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
                    WrkDetl wrkDetl = null;
                    if (Cools.isEmpty(wrkDetls) || wrkDetls.isEmpty()){
//                        return FAIL;
                        wrkDetl = new WrkDetl();
                        wrkDetl.setMatnr("1");
                        wrkDetl.setBatch("1");
                        wrkDetl.setModel("1");
                        wrkDetl.setSpecs("1");
                        wrkDetl.setWeight(1.0);
                    } else {
                        wrkDetl = wrkDetls.get(0);
                    }
                    log.error("1楼翻转半成品倒料信息上传，站点状态："+JSON.toJSONString(staProtocol));
                    log.error("1楼翻转半成品倒料信息上传，工作号："+JSON.toJSONString(wrkMast));
                    StaEscalationParam staEscalationParam = new StaEscalationParam();
                    staEscalationParam.setDevNo(staNo);
                    staEscalationParam.setIoType(wrkMast.getIoTypeMes$());
                    staEscalationParam.setMatnr(wrkDetl.getMatnr());
                    staEscalationParam.setBatch(wrkDetl.getBatch());
                    staEscalationParam.setOrderNo(wrkDetl.getSpecs());
                    staEscalationParam.setTaskNo(wrkDetl.getModel());
                    staEscalationParam.setWeight(wrkDetl.getWeight());
                    staEscalationParam.setWrkno(Cools.isEmpty(wrkDetl.getWrkNo()) ? "0":wrkDetl.getWrkNo().toString());
                    ReturnT<String> result = postMesData(reportOutTrayCompound,staEscalationParam);
                    if (result.getCode()==200){
                        wrkMast.setSheetNo("2");
                        wrkMastService.updateById(wrkMast);
                        basDevp.setReportSign(1);
                        basDevpService.updateById(basDevp);
                        return SUCCESS;
                    } else {
                        LedErrorThreadUtil.ledErrorThread("1楼翻转半成品倒料信息上传!站点号："+staNo,4, LedErrorAreaType.ONE_OTHER.getDesc());
                        log.error("1楼翻转半成品倒料信息上传！站点号："+staNo);
                    }
                }
            }
        }catch (Exception e){
            LedErrorThreadUtil.ledErrorThread("翻转上传异常!站点号："+staNo,4, LedErrorAreaType.ONE_OTHER.getDesc());
            log.error("异常4！！！"+e);
            return FAIL;
        }
        return FAIL;
    }

    private ReturnT<String> postMesData(String erpPath,Object combParam){
        if(combParam != null){
            String response = "";