#

yxFwq

2024-07-16 9fc9a5d498cef94d0dae58c22609e79c4fa0f5f0

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

@@ -68,23 +68,32 @@

            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()).ne("sheet_no","2"));
                    WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", staProtocol.getWorkNo()));
                    if (Cools.isEmpty(wrkMast)) return FAIL;
                    if (wrkMast.getSheetNo()!=null && wrkMast.getSheetNo()=="2") return FAIL;
                    List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
                    WrkDetl wrkDetl = null;
                    if (Cools.isEmpty(wrkDetls) || wrkDetls.isEmpty()){
                        return FAIL;
//                        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("2楼翻转倒料信息上传时，站点状态："+JSON.toJSONString(staProtocol));
                    log.error("2楼翻转倒料信息上传时，工作号："+JSON.toJSONString(wrkMast));
                    StaEscalationParam staEscalationParam = new StaEscalationParam();
                    staEscalationParam.setDevNo(staNo);
                    staEscalationParam.setIoType(wrkMast.getIoType()==101? 1:3);
                    staEscalationParam.setMatnr(wrkDetls.get(0).getMatnr());
                    staEscalationParam.setBatch(wrkDetls.get(0).getBatch());
                    staEscalationParam.setOrderNo(wrkDetls.get(0).getSpecs());
                    staEscalationParam.setTaskNo(wrkDetls.get(0).getModel());
                    staEscalationParam.setWeight(wrkDetls.get(0).getWeight());
                    staEscalationParam.setMatnr(wrkDetl.getMatnr());
                    staEscalationParam.setBatch(wrkDetl.getBatch());
                    staEscalationParam.setOrderNo(wrkDetl.getSpecs());
                    staEscalationParam.setTaskNo(wrkDetl.getModel());
                    staEscalationParam.setWeight(wrkDetl.getWeight());
                    ReturnT<String> result = postMesData(reportOutPath,staEscalationParam);
                    if (result.getCode()==200){
                        wrkMast.setSheetNo("2");
@@ -116,7 +125,7 @@
                        .build()
                        .doPost();
                JSONObject jsonObject = JSON.parseObject(response);
                if (jsonObject.getInteger("Code")==200) {
                if (jsonObject.getInteger("code")==200) {
                    success = true;
                } else {
                    log.error("2楼翻转倒料信息上传请求接口失败！！！url：{}；request：{}；response：{}"+erpUrl+erpPath, JSON.toJSONString(combParam), response);