-换型bug修改

admin

5 天以前 0a926b3ce629047a88dbc65cc38ec86c43520336

-换型bug修改

 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){

 jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue

@@ -297,6 +297,9 @@
      }, {
        value: 'PE01F',
        label: 'PE01F'
      }, {
        value: 'PE01H',
        label: 'PE01H'
      }],
      carCode: '',
      showInput: false,

 jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue

@@ -234,6 +234,9 @@
      }, {
        value: 'PE01F',
        label: 'PE01F'
      }, {
        value: 'PE01H',
        label: 'PE01H'
      }],
      showInput: true,
      serialPortContent: '',