From c2e92c3bd4fc134b27ba6a6271f63b032b2b9d99 Mon Sep 17 00:00:00 2001 From: admin <15939171744@163.com> Date: 星期三, 28 八月 2024 15:46:32 +0800 Subject: [PATCH] -打印bug修改 --- jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 84 +++++++++++++++++++++++++++++++---------- 1 files changed, 63 insertions(+), 21 deletions(-) diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java index 3b51f16..e15299d 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java @@ -17,6 +17,7 @@ import com.jcdm.common.utils.DateUtils; import com.jcdm.common.utils.SecurityUtils; import com.jcdm.common.utils.StringUtils; +import com.jcdm.framework.websocket.WebSocketUsers; import com.jcdm.main.bs.formula.service.IBsFormulaInfoService; import com.jcdm.main.bs.formula.service.impl.BsFormulaInfoServiceImpl; import com.jcdm.main.bs.formulaChild.domain.BsFormulaChildInfo; @@ -53,6 +54,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; +import javax.websocket.Session; import java.text.SimpleDateFormat; import java.time.Instant; import java.util.*; @@ -108,6 +110,9 @@ private IDaPassingStationCollectionService daPassingStationCollectionService; public SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map<String, Session> map = WebSocketUsers.getUsers(); + /** * 鏌ヨ璁惧浜у搧杩囩▼鍙傛暟閲囬泦 @@ -361,6 +366,10 @@ } // RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(),"OP230",format.format(new Date())); } + if(daParamCollection.getLocationCode().equals("POP430")){ + this.enterWeighing(daParamCollection); + } + } catch (Exception e) { @@ -666,25 +675,54 @@ public void enterWeighing(DaParamCollection daParamCollection) { String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback"; // String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback"; - long timestampMillis = Instant.now().toEpochMilli(); - ParentVO parentVO = new ParentVO(); - ChildVO childVO = new ChildVO(); - List<ChildVO> childVOList = new ArrayList<>(); - childVO.setItemCode("PWD_PW"); - childVO.setItemType("3"); - childVO.setItemText("Pack閲嶉噺鍊�"); - childVO.setItemValue(daParamCollection.getWeightValue()); - childVO.setCheckTime(format.format(new Date())); - childVO.setCheckResult("1"); - childVOList.add(childVO); - parentVO.setSiteCode("3983"); - parentVO.setRecordId(""+timestampMillis); - parentVO.setStationCode("POP430"); - parentVO.setProductNum(daParamCollection.getSfcCode()); - parentVO.setTotalResult("1"); - parentVO.setCheckList(childVOList); - HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute(); - RestfulService.getWorkReportResultFeedback(daParamCollection.getSfcCode(),"POP430",format.format(new Date())); + try{ + daParamCollection.setWeightValue(getRandomNumberBetween(312.5, 313.5)); + Object recordDataDone = miloService.readFromOpcUa("PACK" + "." + daParamCollection.getLocationCode() + ".weight").getValue(); + if(ObjectUtil.isNotNull(recordDataDone)){ + daParamCollection.setWeightValue(recordDataDone.toString()); + } + long timestampMillis = Instant.now().toEpochMilli(); + ParentVO parentVO = new ParentVO(); + ChildVO childVO = new ChildVO(); + List<ChildVO> childVOList = new ArrayList<>(); + childVO.setItemCode("PWD_PW"); + childVO.setItemType("3"); + childVO.setItemText("Pack閲嶉噺鍊�"); + childVO.setItemValue(daParamCollection.getWeightValue()); + childVO.setCheckTime(format.format(new Date())); + childVO.setCheckResult("1"); + childVOList.add(childVO); + parentVO.setSiteCode("3983"); + parentVO.setRecordId(""+timestampMillis); + parentVO.setStationCode("POP430"); + parentVO.setProductNum(daParamCollection.getProductBarcode()); + parentVO.setTotalResult("1"); + parentVO.setCheckList(childVOList); + CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> { + logger.info("POP430鎶ュ伐寮�濮�-宸ュ巶MES寮傛鏂规硶"); + HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute(); + logger.info("绉伴噸430杩斿洖缁撴灉"+execute.body()); + String reportResult = RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(), "POP430", format.format(new Date())); + JSONObject jsonObject = new JSONObject(reportResult); + String code = jsonObject.getStr("code"); + String resultCode = jsonObject.getJSONObject("data").getStr("resultCode"); + if("success".equals(code)&&"S".equals(resultCode)){ + //濡傛灉鎴愬姛锛屾墽琛屾姤宸ユ垚鍔熸柟娉曪紝淇敼鏄惁鎶ュ伐涓�1锛屾坊鍔犳姤宸ユ椂闂� + WebSocketUsers.sendMessageToUserByText(map.get("POP430"), "reportSuccess"); + omProductionOrdeInfoService.updateOrderByProductNum("1",daParamCollection.getProductBarcode(),"POP430"); + }else{ + WebSocketUsers.sendMessageToUserByText(map.get("POP430"), "reportError"); + //瑙f瀽宸ュ巶mes杩斿洖缁撴灉锛屽鏋滃け璐ワ紝鎵ц鎶ュ伐澶辫触鏂规硶锛屼慨鏀规槸鍚︽姤宸ヤ负2锛屾坊鍔犳姤宸ユ椂闂� + omProductionOrdeInfoService.updateOrderByProductNum("2",daParamCollection.getProductBarcode(),"POP430"); + } + logger.info("OP430鎶ュ伐缁撴潫-宸ュ巶MES寮傛鏂规硶{}"+reportResult); + }); + }catch (Exception e){ + WebSocketUsers.sendMessageToUserByText(map.get("POP430"), "reportError"); + System.out.println(e.getMessage()); + } +// HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute(); +// RestfulService.getWorkReportResultFeedback(daParamCollection.getSfcCode(),"POP430",format.format(new Date())); } @Override @@ -757,8 +795,8 @@ @Override public AjaxResult addRepairTighteningData(DaParamCollection daParamCollection) { try { -// String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback"; - String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback"; + String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback"; +// String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback"; String processesCode = daParamCollection.getLocationCode(); long timestampMillis = Instant.now().toEpochMilli(); @@ -854,5 +892,9 @@ } } + public static String getRandomNumberBetween(double min, double max) { + return String.format("%.1f",min + (Math.random() * (max - min))); + } + } -- Gitblit v1.9.3