From 4e83fa344f6cba81412fb354e7f32a88a8f34fde Mon Sep 17 00:00:00 2001 From: admin <15939171744@163.com> Date: 星期二, 09 七月 2024 09:39:11 +0800 Subject: [PATCH] -切换大模组代码更改 --- jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 67 ++++++++++++++++----------------- 1 files changed, 32 insertions(+), 35 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 fa722ee..24935b5 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 @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.google.gson.Gson; import com.jcdm.common.core.domain.AjaxResult; import com.jcdm.common.utils.DateUtils; import com.jcdm.common.utils.SecurityUtils; @@ -342,15 +343,15 @@ try{ CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> { logger.info("OP230鎶ュ伐寮�濮�-宸ュ巶MES寮傛鏂规硶"); - String reportResult = RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(), "OP230", format.format(new Date())); + String reportResult = RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(), "POP230", format.format(new Date())); JSONObject jsonObject = new JSONObject(reportResult); String code = jsonObject.getStr("code"); if("success".equals(code)){ //濡傛灉鎴愬姛锛屾墽琛屾姤宸ユ垚鍔熸柟娉曪紝淇敼鏄惁鎶ュ伐涓�1锛屾坊鍔犳姤宸ユ椂闂� - omProductionOrdeInfoService.updateOrderByProductNum("1",daParamCollection.getProductBarcode(),"OP230"); + omProductionOrdeInfoService.updateOrderByProductNum("1",daParamCollection.getProductBarcode(),"POP230"); }else{ //瑙f瀽宸ュ巶mes杩斿洖缁撴灉锛屽鏋滃け璐ワ紝鎵ц鎶ュ伐澶辫触鏂规硶锛屼慨鏀规槸鍚︽姤宸ヤ负2锛屾坊鍔犳姤宸ユ椂闂� - omProductionOrdeInfoService.updateOrderByProductNum("2",daParamCollection.getProductBarcode(),"OP230"); + omProductionOrdeInfoService.updateOrderByProductNum("2",daParamCollection.getProductBarcode(),"POP230"); } logger.info("OP230鎶ュ伐缁撴潫-宸ュ巶MES寮傛鏂规硶{}"+reportResult); }); @@ -423,36 +424,26 @@ @Override public void jrmSaveCampaignTimeParameters(DaParamCollection daParamCollection) { - DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf(); - daCollectionParamConf.setProcessesCode(daParamCollection.getLocationCode()); - daCollectionParamConf.setCollectParameterId("OUTT"); - List<DaCollectionParamConf> daCollectionParamConfs = daCollectionParamConfMapper.selectDaCollectionParamConfList(daCollectionParamConf); - DaParamCollection saveData = new DaParamCollection(); - saveData.setWorkOrderNo(daParamCollection.getWorkOrderNo()); - saveData.setProductCode(daParamCollection.getProductCode()); - saveData.setLocationCode(daParamCollection.getLocationCode()); - saveData.setSfcCode(daParamCollection.getProductBarcode()); - saveData.setParamCode(daCollectionParamConfs.get(0).getCollectParameterId()); - saveData.setParamName(daCollectionParamConfs.get(0).getCollectParameterName()); - saveData.setCollectionTime(new Date()); - saveData.setParamValue(DateUtil.formatDateTime(new Date())); - daParamCollectionMapper.insertDaParamCollection(saveData); - - //鏇存柊杩囩珯璁板綍琛ㄥ嚭绔欐椂闂� + //澧炲姞杩囩珯璁板綍 DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection(); daPassingStationCollection.setWorkOrderNo(daParamCollection.getWorkOrderNo()); + daPassingStationCollection.setSfcCode(daParamCollection.getProductBarcode()); + daPassingStationCollection.setProductCode(daParamCollection.getProductCode()); daPassingStationCollection.setLocationCode(daParamCollection.getLocationCode()); - List<DaPassingStationCollection> daPassingStationCollections = daPassingStationCollectionMapper.selectDaPassingStationCollectionList(daPassingStationCollection); - daPassingStationCollections.get(0).setOutboundTime(new Date()); - int i = daPassingStationCollectionMapper.updateDaPassingStationCollection(daPassingStationCollections.get(0)); + daPassingStationCollection.setInboundTime(daParamCollection.getInboundTime()); + daPassingStationCollection.setOutboundTime(new Date()); + daPassingStationCollection.setCreateTime(new Date()); + daPassingStationCollection.setOutRsSign("1"); + boolean save = daPassingStationCollectionService.save(daPassingStationCollection); -// OPCUaSubscription.SaveParamData(daParamCollection.getProductBarcode(),"OP",daParamCollection.getLocationCode(),daParamCollection.getWorkOrderNo(),daParamCollection.getProductCode()); + //娣诲姞鍩虹鍙傛暟 + this.manualWorkstationsAddBasicParameters(daParamCollection); //缁檕pc鍙�21 try { // miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+daParamCollection.getLocationCode()+".RecordDataDone").value(21).build()); - String strA = daParamCollection.getLocationCode(); - miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+strA+".RecordDataDone").value(21).build()); + String str = daParamCollection.getLocationCode(); + miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+str+".RecordDataDone").value(21).build()); } catch (Exception e) { throw new RuntimeException(e); } @@ -571,7 +562,8 @@ logger.info("寮�濮嬫墽琛屽紓姝ユ柟娉�"); HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute(); logger.info("寮傛鏂规硶鎵ц缁撴潫"); - logger.info("鎵嬪姩宸ヤ綅浼犲伐鍘侻ES寮傛鏂规硶{}"+execute.body()); + logger.info("鎵嬪姩宸ヤ綅{}浼犲伐鍘傚叆鍙俈O{}" + stationCode,new Gson().toJson(parentVO)); + logger.info("鎵嬪姩宸ヤ綅{}浼犲伐鍘侻ES寮傛鏂规硶{}"+stationCode,execute.body()); DaParamCollectionTemp daParamCollectionTemp = new DaParamCollectionTemp(); daParamCollectionTemp.setSfcCode(packID); @@ -587,9 +579,6 @@ System.out.println(e.getMessage()); } // HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute(); - -// System.out.println(execute.body()); - System.out.println("-----------------------"+totalResult); logger.info("缁撴潫浜哄伐宸ヤ綅鎺ㄩ�佸伐鍘侻ES鏁版嵁鏂规硶-pushGeelycvMesFeedback-宸ヤ綅{}-pack鐮亄}",stationCode,packID); } @@ -657,16 +646,15 @@ CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> { logger.info("寮�濮嬫墽琛屽紓姝ユ柟娉�"); HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute(); - System.out.println(execute.body()); logger.info("寮傛鏂规硶鎵ц缁撴潫"); - logger.info("鑷姩宸ヤ綅浼犲伐鍘侻ES寮傛鏂规硶{}"+execute.body()); + logger.info("鑷姩宸ヤ綅{}浼犲伐鍘傚叆鍙俈O{}" + stationCode,new Gson().toJson(parentVO)); + logger.info("鑷姩宸ヤ綅{}浼犲伐鍘侻ES寮傛鏂规硶杩斿洖{}"+stationCode,execute.body()); }); }catch (Exception e){ System.out.println(e.getMessage()); } // HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute(); logger.info("缁撴潫宸ヤ綅{}-宸ュ巶MES鎺ㄩ�佹暟鎹柟娉旽ttpResponseSend",stationCode); - System.out.println("-----------------------"+totalResult); } logger.info("缁撴潫宸ヤ綅{}-宸ュ巶MES鎺ㄩ�佹暟鎹柟娉昦utomaticWorkstationPushGeelycvMesFeedback",stationCode); } @@ -710,7 +698,7 @@ childVOList.add(childVO); parentVO.setSiteCode("3983"); parentVO.setRecordId(""+timestampMillis); - parentVO.setStationCode("OP500"); + parentVO.setStationCode("POP430"); parentVO.setProductNum(daParamCollection.getSfcCode()); parentVO.setTotalResult("1"); parentVO.setCheckList(childVOList); @@ -726,7 +714,7 @@ // }catch (Exception e){ // System.out.println(e.getMessage()); // } - RestfulService.getWorkReportResultFeedback(daParamCollection.getSfcCode(),"OP500",format.format(new Date())); + RestfulService.getWorkReportResultFeedback(daParamCollection.getSfcCode(),"POP430",format.format(new Date())); } @Override @@ -762,10 +750,11 @@ @Override public void preInstallOut(DaParamCollection daParamCollection) { + String locationCode = daParamCollection.getLocationCode(); //澧炲姞杩囩珯璁板綍 DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection(); daPassingStationCollection.setSfcCode(daParamCollection.getProductBarcode()); - daPassingStationCollection.setLocationCode(daParamCollection.getLocationCode()); + daPassingStationCollection.setLocationCode(locationCode); daPassingStationCollection.setInboundTime(daParamCollection.getInboundTime()); daPassingStationCollection.setOutboundTime(new Date()); daPassingStationCollection.setCreateTime(new Date()); @@ -773,6 +762,14 @@ boolean save = daPassingStationCollectionService.save(daPassingStationCollection); //娣诲姞鍩虹鍙傛暟 this.manualWorkstationsAddBasicParameters(daParamCollection); + + try { + String str = "PACK."+locationCode+".RecordDataDone"; + miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(str).value(21).build()); + logger.info("棰勮宸ヤ綅鍐欏叆OPC鎴愬姛锛屽伐浣嶏細{}锛屽�納}",str,21); + } catch (Exception e) { + throw new RuntimeException(e); + } } } -- Gitblit v1.9.3