From 6b3b0bbef242997de2f6665dce91964c4ca4a92e Mon Sep 17 00:00:00 2001 From: zhangchao <zc857179121@qq.com> Date: 星期六, 02 十一月 2024 10:44:00 +0800 Subject: [PATCH] 单据数据传递给u8通了;代码中//TODO 张超注释的,上线时需要打开注释 --- src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java | 1 + src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 28 +++++++++------------------- src/main/java/com/zy/asrs/controller/OpenController.java | 20 ++++++++++---------- src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 1 + src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 8 ++++---- src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 2 +- 6 files changed, 26 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index 875c707..c718860 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -123,7 +123,7 @@ case "MO": mappingPakInOrderParam(param, true, "閾跺骇濮斿鐢熶骇璁㈠崟"); if (!Cools.isEmpty(param.getChildren())) { - mappingOrderParamChild(param, false, "閾跺骇濮斿鐢熶骇鏉愭枡鍑哄簱鍗�"); + mappingOrderParamChild(param, false, "閾跺骇濮斿鏉愭枡鍑哄簱鍗�"); } break; case "OM": @@ -211,15 +211,15 @@ mappingPakOutOrderParam(param, true, "閾跺骇閲囪喘鍏ュ簱鍗�"); break; case "MO": - mappingPakInOrderParam(param, true, "閾跺骇濮斿鐢熶骇璁㈠崟"); - if (!Cools.isEmpty(param.getChildren())) { - mappingOrderParamChild(param, false, "閾跺骇濮斿鐢熶骇鏉愭枡鍑哄簱鍗�"); - } - break; - case "OM": mappingPakInOrderParam(param, true, "閾跺骇鐢熶骇璁㈠崟"); if (!Cools.isEmpty(param.getChildren())) { mappingOrderParamChild(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�"); + } + break; + case "OM": + mappingPakInOrderParam(param, true, "閾跺骇濮斿鐢熶骇璁㈠崟"); + if (!Cools.isEmpty(param.getChildren())) { + mappingOrderParamChild(param, false, "閾跺骇濮斿鏉愭枡鍑哄簱鍗�"); } break; case "閲囪喘鍏ュ簱鍗曢��璐�": @@ -307,7 +307,7 @@ //鐢熸垚鍗曟嵁鏄庣粏 OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl(); - Synchro.Copy(param,orderDetl); + Synchro.Copy(param, orderDetl); //orderDetl.setcInvCode(param.getCInvCode()); //orderDetl.setiQuantity(param.getIQuantity()); orderDetl.setCDefine22(param.getIvouchrowno()); @@ -368,6 +368,7 @@ List<OrderProdSyncParam.ChildInfo> child = param.getChildren(); Synchro.Copy(param, orderSyncParam); + orderSyncParam.set鎿嶄綔绯荤粺鍙�(param.get鎿嶄綔绯荤粺鍙�()); orderSyncParam.setCPOID(child.get(0).getOrderNoT()); orderSyncParam.setDdate(param.getOrderTime()); @@ -380,8 +381,7 @@ orderDetl.setCDefine22(param.getIvouchrowno()); orderDetl.setCsocode(param.getCsocode()); orderDetl.setId(childInfo.getIds()); - orderDetl.setIvouchrowno(childInfo.getIvouchrowno()); - + //orderDetl.setIvouchrowno(childInfo.getIvouchrowno()); orderDetls.add(orderDetl); } orderSyncParam.setChildren(orderDetls); diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java index b92d180..b253cfd 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java @@ -144,11 +144,11 @@ //String barcode = agvLocDetls.get(0).getSuppCode(); String containerCode = taskDto.getLocDtos().get(0).getContainerCode(); - + AgvLocMast agvLocMast = agvLocMastService.selectById(sourceLocNo); //鍒ゆ柇鏄惁鍏ㄦ澘鍑哄簱 int ioType = isPakOut(sourceLocNo,taskDto) ? 101 : 103; //鐢熸垚宸ヤ綔妗� - AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)),null); + AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)),agvLocMast.getPltType()); //鐢熸垚宸ヤ綔妗f槑缁� long flowId = snowflakeIdWorker.nextId(); taskDto.getLocDtos().forEach(locDto -> { @@ -250,11 +250,11 @@ //String barcode = agvLocDetls.get(0).getSuppCode(); String containerCode = taskDto.getLocDtos().get(0).getContainerCode(); - + AgvLocMast agvLocMast = agvLocMastService.selectById(sourceLocNo); //鍒ゆ柇鏄惁鍏ㄦ澘鍑哄簱 int ioType = 107; //鐢熸垚宸ヤ綔妗� - AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)),null); + AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)),agvLocMast.getPltType()); //鐢熸垚宸ヤ綔妗f槑缁� long flowId = snowflakeIdWorker.nextId(); taskDto.getLocDtos().forEach(locDto -> { diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java index 31f28f8..64fc99d 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -504,6 +504,7 @@ wrkMast.setCrnNo(outMost?outCrnNo:locMast.getCrnNo()); wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯 wrkMast.setStaNo(stnNo); // 鐩爣绔� + wrkMast.setPltType(locMast.getPltType()); if(ioType == 101 && taskDto.getStaNo()>=300){ wrkMast.setSourceStaNo(346); // 婧愮珯 wrkMast.setStaNo(346); // 鐩爣绔� diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java index a7dcc13..b37336e 100644 --- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java +++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java @@ -87,6 +87,7 @@ try{ agvWrkMastHandler.completedCarryWrk(agvWrkMast); } catch (Exception e){ + //e.printStackTrace(); log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负206,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage()); } }); diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java index b226a86..a176161 100644 --- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java @@ -375,6 +375,7 @@ wrkMast.setAppeTime(now); wrkMast.setModiUser(9527L); wrkMast.setModiTime(now); + wrkMast.setPltType(agvWrkMast.getPltType()); wrkMast.setLogErrMemo("completedCarryWrk"); if (!agvWrkMastService.insertByIncrease(wrkMast)) { throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�"); @@ -425,6 +426,7 @@ reportMes(agvWrkMast, agvWrkDetlListOld); return SUCCESS; } + @Transactional public ReturnT<String> completedCarryWrk2(AgvWrkMast agvWrkMast) { @@ -479,7 +481,8 @@ } catch (Exception e) { log.error("" + e.getMessage()); } - reportMes(agvWrkMast, agvWrkDetlListOld); + //TODO 寮犺秴 + //reportMes(agvWrkMast, agvWrkDetlListOld); return SUCCESS; } @@ -826,18 +829,13 @@ boolean success = false; try { - response = new HttpHandler.Builder() - .setUri(url) - .setPath(path) - .setHeaders(headParam) - .setJson(JSONObject.toJSONString(requestParam)) - .setHttps(true) - .build() - .doPost(); + response = new HttpHandler.Builder().setUri(url).setPath(path).setHeaders(headParam).setJson(JSONObject.toJSONString(requestParam)).setHttps(true).build().doPost(); JSONObject jsonObject = JSON.parseObject(response); if (Cools.isEmpty(jsonObject.get("code")) || Integer.parseInt(jsonObject.get("code").toString()) != 200) { - throw new CoolException(jsonObject.get("dsc").toString()); + log.info("mes鎺ュ彛璋冪敤澶辫触锛岃繑鍥炰俊鎭細" + jsonObject); + //TODO 寮犺秴 + //throw new CoolException("mes鎺ュ彛璋冪敤澶辫触锛岃繑鍥炰俊鎭�:" + jsonObject); } success = true; return jsonObject; @@ -854,15 +852,7 @@ log.error(e.getMessage()); throw new CoolException(e.getMessage()); } finally { - apiLogService.save( - namespace, - url + path, - appkey, - ip, - JSON.toJSONString(JSONObject.toJSONString(requestParam)), - response, - success - ); + apiLogService.save(namespace, url + path, appkey, ip, JSON.toJSONString(JSONObject.toJSONString(requestParam)), response, success); } } diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java index fb9bfd8..6afc605 100644 --- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java @@ -92,7 +92,7 @@ @Transactional public void timelyStart(Order order) { - List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�", "閾跺骇濮斿鏉愭枡鍑哄簱鍗�","閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�")); + List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�", "閾跺骇濮斿鏉愭枡鍑哄簱鍗�", "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�")); DocType docType = docTypeService.selectById(order.getDocType()); if (docNames.contains(docType.getDocName())) { -- Gitblit v1.9.1