From 0a926b3ce629047a88dbc65cc38ec86c43520336 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 07 三月 2025 16:33:09 +0800
Subject: [PATCH] -换型bug修改
---
jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue | 3 +++
jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue | 3 +++
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 8 ++++----
3 files changed, 10 insertions(+), 4 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 3a5d735..2215dd3 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
@@ -601,9 +601,9 @@
parentVO.setTotalResult("1");
List<ChildVO> listChildVo = new ArrayList<>();
- String productModel = "PE01B";
- OmProductionOrdeInfo orderOne = omProductionOrdeInfoService.getOne(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getProductNum, packID));
- productModel = orderOne.getProductCode();
+// String productModel = "PE01B";
+// OmProductionOrdeInfo orderOne = omProductionOrdeInfoService.getOne(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getProductNum, packID));
+// productModel = orderOne.getProductCode();
for (DaParamCollection daParamCollection : paramList) {
ChildVO childVO = new ChildVO();
@@ -612,7 +612,7 @@
// DaCollectionParamConf paramConfOne = daCollectionParamConfService.getOne(new LambdaQueryWrapper<DaCollectionParamConf>().eq(DaCollectionParamConf::getCollectParameterId, daParamCollection.getParamCode()));
List<DaCollectionParamConf> paramConfOneList = daCollectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
.eq(DaCollectionParamConf::getCollectParameterId, daParamCollection.getParamCode())
- .eq(DaCollectionParamConf::getProductModel, productModel)
+ .eq(DaCollectionParamConf::getProductModel, "PE01B")
);
DaCollectionParamConf paramConfOne = paramConfOneList.get(0);
if(paramConfOne!=null){
diff --git a/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue b/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
index 1026898..ad940b7 100644
--- a/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
@@ -297,6 +297,9 @@
}, {
value: 'PE01F',
label: 'PE01F'
+ }, {
+ value: 'PE01H',
+ label: 'PE01H'
}],
carCode: '',
showInput: false,
diff --git a/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue b/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
index f1efb91..5879247 100644
--- a/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
@@ -234,6 +234,9 @@
}, {
value: 'PE01F',
label: 'PE01F'
+ }, {
+ value: 'PE01H',
+ label: 'PE01H'
}],
showInput: true,
serialPortContent: '',
--
Gitblit v1.9.3