From d545f19a84599c8664d3a7db87f35e02b1bf93f5 Mon Sep 17 00:00:00 2001 From: admin <15939171744@163.com> Date: 星期五, 10 五月 2024 08:33:17 +0800 Subject: [PATCH] - --- jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 insertions(+), 3 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 c4d4395..4e182b7 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 @@ -273,15 +273,44 @@ @Override public void replaceAssemblyCode(DaParamCollection daParamCollection) { List<DaParamCollection> list = daParamCollectionService.list(new LambdaQueryWrapper<DaParamCollection>() - .eq(DaParamCollection::getSfcCode, daParamCollection.getSfcCode()) - .eq(DaParamCollection::getLocationCode, daParamCollection.getLocationCode()) + .eq(DaParamCollection::getSfcCode, daParamCollection.getYzSfcCode()) ); if(list.size() > 0){ for (DaParamCollection paramCollection : list) { - paramCollection.setSfcCode(daParamCollection.getYzSfcCode()); + paramCollection.setSfcCode(daParamCollection.getSfcCode()); daParamCollectionService.saveOrUpdate(paramCollection); } } } + + @Override + public void yzAddBasicParameters(DaParamCollection daParamCollection) { + // 鍋囪杩欐槸浠庢暟鎹簱鎴栧叾浠栧湴鏂硅幏鍙栫殑鍙傛暟鏁版嵁 + Map<String, String> map = new HashMap<>(); +// map.put("GC", "鍗楁禂宸ュ巶"); +// map.put("CXBH", "Pack绾�"); +// map.put("SBBH", "璁惧001"); +// map.put("YGBH", "鍛樺伐001"); +// map.put("GDBH", daParamCollection.getWorkOrderNo()); +// map.put("CPXH", daParamCollection.getModel()); + map.put("INT", DateUtil.formatDateTime(new Date())); + + map.forEach((key, value) -> { + DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf(); + daCollectionParamConf.setProcessesCode(daParamCollection.getLocationCode()); + daCollectionParamConf.setCollectParameterId(key); + 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(value); + daParamCollectionMapper.insertDaParamCollection(saveData); + }); + } } -- Gitblit v1.9.3