From 5b544fc8d6029a71669b3992c5cfea9a044aaf3f Mon Sep 17 00:00:00 2001 From: cl <418351270@qq.com> Date: 星期四, 04 七月 2024 16:39:29 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 45 +++++++++++++++++++++++++++------------------ 1 files changed, 27 insertions(+), 18 deletions(-) diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java index 441cda2..7bc63c6 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java +++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java @@ -255,11 +255,8 @@ String paramProductNum = ""; try { // 鏌ヨ鏈�鏂扮殑宸ュ崟淇℃伅 - List<OmProductionOrdeInfo> list = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>().orderByAsc(OmProductionOrdeInfo::getCreateTime)); - if(list.size() > 0){ - paramProductNum = list.get(list.size()-1).getProductNum(); - } - String orderJsonString = RestfulService.getProductionWorkOrderRequest(paramProductNum, "OP230"); + OmProductionOrdeInfo lastOrder = omProductionOrdeInfoService.getLastOrder(); + String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "OP230"); JSONObject jsonObject = new JSONObject(orderJsonString); // 浠嶫SONObject涓幏鍙杁ata瀵硅薄 JSONObject dataObject = jsonObject.getJSONObject("data"); @@ -527,8 +524,11 @@ */ private static Integer saveParamCollection(String thoroughfare, String device,List<String> cellCodeList){ Integer result = 21;//杩斿洖缁撴灉 - List<List<ChildVO>> mesList = new ArrayList<>();//瀛樺偍4涓數鑺殑鍙戦�佺粰MES鐨勫�� - + List<ChildVO> mesChildList1 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist1 + List<ChildVO> mesChildList2 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist2 + List<ChildVO> mesChildList3 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist3 + List<ChildVO> mesChildList4 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist4 + List<ChildVO> mesChildList0 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist4 try { //鏌ヨ鍙傛暟閰嶇疆琛� List<DaCollectionParamConf> list = collectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>() @@ -565,7 +565,6 @@ //绗竴涓數鑺殑鏁版嵁 if (CollUtil.isNotEmpty(paramCollectionList1) && !cellCodeList.get(0).isEmpty()) { - List<ChildVO> mesChildList1 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist1 for (int i = 0; i < paramCollectionList1.size(); i++) { DaParamCollection daParamCollection = new DaParamCollection(); daParamCollection.setSfcCode(cellCodeList.get(0));//鐢佃姱鐮� @@ -590,10 +589,9 @@ childVO.setCheckTime(new Date().toString()); mesChildList1.add(childVO); } - mesList.add(0, mesChildList1); + } if (CollUtil.isNotEmpty(paramCollectionList2) && !cellCodeList.get(1).isEmpty()) { - List<ChildVO> mesChildList2 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist2 for (int i = 0; i < paramCollectionList2.size(); i++) { DaParamCollection daParamCollection = new DaParamCollection(); @@ -619,10 +617,8 @@ childVO.setCheckTime(new Date().toString()); mesChildList2.add(childVO); } - mesList.add(1, mesChildList2); } if (CollUtil.isNotEmpty(paramCollectionList3) && !cellCodeList.get(2).isEmpty()) { - List<ChildVO> mesChildList3 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist3 for (int i = 0; i < paramCollectionList3.size(); i++) { DaParamCollection daParamCollection = new DaParamCollection(); daParamCollection.setSfcCode(cellCodeList.get(2));//鐢佃姱鐮� @@ -647,10 +643,8 @@ childVO.setCheckTime(new Date().toString()); mesChildList3.add(childVO); } - mesList.add(2, mesChildList3); } if (CollUtil.isNotEmpty(paramCollectionList4)&& !cellCodeList.get(3).isEmpty()) { - List<ChildVO> mesChildList4 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist4 for (int i = 0; i < paramCollectionList4.size(); i++) { DaParamCollection daParamCollection = new DaParamCollection(); daParamCollection.setSfcCode(cellCodeList.get(3));//鐢佃姱鐮� @@ -675,14 +669,12 @@ childVO.setCheckTime(new Date().toString()); mesChildList4.add(childVO); } - mesList.add(3, mesChildList4); } //鍏叡鍙傛暟 if (CollUtil.isNotEmpty(paramCollectionList0)) { for (int i = 0; i < cellCodeList.size(); i++) {//寰幆4涓數鑺� if(!cellCodeList.get(i).isEmpty()){ - List<ChildVO> mesChildList0 = new ArrayList<>();//灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist0 for (int j = 0; j < paramCollectionList0.size(); j++) { DaParamCollection daParamCollection = new DaParamCollection(); daParamCollection.setSfcCode(cellCodeList.get(i));//鐢佃姱鐮� @@ -710,7 +702,6 @@ childVO.setCheckTime(new Date().toString()); mesChildList0.add(childVO); } - mesList.add(i, mesChildList0); } //mesList.get(i).addAll(mesChildList0); @@ -732,7 +723,24 @@ for (int i = 0; i < cellCodeList.size(); i++) {//寰幆4涓數鑺� if(!cellCodeList.get(i).isEmpty()){ parentVO.setProductNum(cellCodeList.get(i));//鐢佃姱鐮� - parentVO.setCheckList(mesList.get(i));//鍙傛暟 + //灏佽缁欏伐鍘侻ES鍙戦�佺殑childlist4 + List<ChildVO> mesChildList = new ArrayList<>(mesChildList0); + switch (i) { + case 0 : + mesChildList.addAll(mesChildList1); + break; + case 1 : + mesChildList.addAll(mesChildList2); + break; + case 2 : + mesChildList.addAll(mesChildList3); + break; + case 3 : + mesChildList.addAll(mesChildList4); + break; + + } + parentVO.setCheckList(mesChildList);//鍙傛暟 //CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> { log.info("鎵ц宸ュ巶MES鏂规硶start锛屼紶鍏ユ暟鎹細{}",parentVO); HttpResponse execute = HttpRequest.post(orderLineUrl).body(JSONUtil.toJsonStr(parentVO)).execute(); @@ -742,6 +750,7 @@ }); } }catch (Exception e) { + log.error(e.getMessage()); throw new RuntimeException(e); } return result; -- Gitblit v1.9.3