From b849c6d6056a6783914546fed92399472e34f9dd Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 26 七月 2024 08:32:42 +0800
Subject: [PATCH] -拧紧返修功能
---
jcdm-ui/src/views/main/cfkb/repairAndTighten/index.vue | 12 ++++++++++--
jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java | 20 ++++++++++----------
jcdm-admin/src/main/resources/application-druid.yml | 4 ++--
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 4 ++--
4 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/jcdm-admin/src/main/resources/application-druid.yml b/jcdm-admin/src/main/resources/application-druid.yml
index 51f6d02..70f56ed 100644
--- a/jcdm-admin/src/main/resources/application-druid.yml
+++ b/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
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..000f805 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
@@ -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();
diff --git a/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java b/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
index 4e32574..5dc4879 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
+++ b/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("瑙ｇ粦灏忚溅{}锛宲ack鐮佹槸{}"+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("瑙ｇ粦灏忚溅{}锛宲ack鐮佹槸{}"+one.getTrolleyYard(),one.getProductNum());
+// one.setTrolleyYard("");
+// omProductionOrdeInfoService.saveOrUpdate(one);
+// }
+// }
+// }
// try{
// CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
// logger.info("寮�濮嬫墽琛屽紓姝ユ柟娉�");
diff --git a/jcdm-ui/src/views/main/cfkb/repairAndTighten/index.vue b/jcdm-ui/src/views/main/cfkb/repairAndTighten/index.vue
index df0d4b3..3dce3ed 100644
--- a/jcdm-ui/src/views/main/cfkb/repairAndTighten/index.vue
+++ b/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(){
--
Gitblit v1.9.3