jcdm-admin/src/main/resources/application-druid.yml
@@ -21,8 +21,8 @@ url: jdbc:sqlserver://127.0.0.1:1433;DataBaseName=Jcdm042-Mes username: sa # password: JCDM@2023 password: admin@123 # password: 1!deshine # password: admin@123 password: 1!deshine # password: 123456 jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
@@ -757,8 +757,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(); jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
@@ -102,16 +102,16 @@ daTestDeviceInterface.setCheckList(s); daTestDeviceInterface.setCreateTime(new Date()); daTestDeviceInterfaceService.save(daTestDeviceInterface); if(parentVO.getStationCode().contains("POP410")){ if(StringUtils.isNotBlank(parentVO.getProductNum())){ OmProductionOrdeInfo one = omProductionOrdeInfoService.getOne(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getProductNum, parentVO.getProductNum())); if(ObjectUtil.isNotNull(one)){ logger.info("解绑小车{},pack码是{}"+one.getTrolleyYard(),one.getProductNum()); one.setTrolleyYard(""); omProductionOrdeInfoService.saveOrUpdate(one); } } } // if(parentVO.getStationCode().contains("POP410")){ // if(StringUtils.isNotBlank(parentVO.getProductNum())){ // OmProductionOrdeInfo one = omProductionOrdeInfoService.getOne(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getProductNum, parentVO.getProductNum())); // if(ObjectUtil.isNotNull(one)){ // logger.info("解绑小车{},pack码是{}"+one.getTrolleyYard(),one.getProductNum()); // one.setTrolleyYard(""); // omProductionOrdeInfoService.saveOrUpdate(one); // } // } // } // try{ // CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> { // logger.info("开始执行异步方法"); jcdm-ui/src/views/main/cfkb/repairAndTighten/index.vue
@@ -370,8 +370,16 @@ if (valid) { console.log(this.form) addRepairTighteningData(this.form).then(response => { this.form = { screwNumber: null, torque: null, angle: null, torqueResult: null, angleResult: null, locationCode : null, sfcCode: null, }; this.$modal.msgSuccess("新增成功"); this.getList(); this.reset(); }); } @@ -461,7 +469,7 @@ console.log(tab, event); }, clearClick(){ this.$message('这是一条清除消息提示'); this.$message('清除成功!'); this.headContent.sfcCode = null }, scanCompleted(){