From 18cb51817380016c4024f9f462ea91b57bfa40f9 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 07 三月 2025 18:39:37 +0800
Subject: [PATCH] -工单物料配置表
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 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 89ae472..41b41d5 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
@@ -58,6 +58,8 @@
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
+import static org.apache.commons.lang3.SystemUtils.getUserName;
+
/**
* 璁惧浜у搧杩囩▼鍙傛暟閲囬泦Service涓氬姟灞傚鐞�
*
@@ -350,11 +352,13 @@
//鍗婅嚜鍔ㄥ伐浣嶏紝鍏堝皢鑷姩鏁版嵁淇濆瓨鍒版暟鎹簱
public void saveParameters(DaParamCollection daParamCollection) {
+ OmProductionOrdeInfo omProductionOrdeInfo = omProductionOrdeInfoService.selectOrderByProductNum(daParamCollection.getProductBarcode());
//娣诲姞鑷姩宸ヤ綅鍙傛暟鏁版嵁
//鏌ヨ鍙傛暟閰嶇疆琛�
List<DaCollectionParamConf> list = daCollectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
.eq(DaCollectionParamConf::getProcessesCode, daParamCollection.getLocationCode())//宸ヤ綅
.eq(DaCollectionParamConf::getWhetherToCollect, Constants.ONE)//鏄惁閲囬泦
+ .eq(DaCollectionParamConf::getProductModel,omProductionOrdeInfo.getProductModel())
);//绫诲瀷
List<String> collectAddressList = list.stream()
@@ -397,12 +401,47 @@
saveParamListTemp.add(collectionTemp);//灏佽鍙傛暟閲囬泦list
}
+
+ //娣诲姞鍩虹鍙傛暟(鐧婚檰浜轰俊鎭�)
+// try {
+// addCollectParamBasicData(daParamCollection.getLocationCode(),daParamCollection.getProductBarcode());
+// }catch (Exception e){
+// throw new RuntimeException(e);
+// }
//鎻掑叆鍙傛暟閲囬泦琛�
daParamCollectionService.insertBatch(saveParamList);
//鎻掑叆鍙傛暟閲囬泦琛�
daParamCollectionTempService.insertBatch(saveParamListTemp);
}
}
+
+ public void addCollectParamBasicData(String stationCode,String modelCode){
+ List<DaCollectionParamConf> confList = daCollectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
+ .like(DaCollectionParamConf::getCollectParameterId, "YGBH")
+ .eq(DaCollectionParamConf::getProcessesCode, stationCode)
+ );
+ if(!confList.isEmpty()){
+ DaCollectionParamConf daCollectionParamConf = confList.get(0);
+ DaParamCollection collection = new DaParamCollection();
+ collection.setSfcCode(modelCode);//妯＄粍鐮�
+ collection.setParamCode(daCollectionParamConf.getCollectParameterId());//鍙傛暟缂栫爜
+ collection.setParamName(daCollectionParamConf.getCollectParameterName());//鍙傛暟鍚嶇О
+ collection.setParamValue(getUserName());//鍙傛暟鍊�
+ collection.setLocationCode(stationCode);//宸ヤ綅
+ collection.setCollectionTime(new Date());//閲囬泦鏃堕棿
+ daParamCollectionService.save(collection);
+
+ DaParamCollectionTemp collectionTemp = new DaParamCollectionTemp();
+ collectionTemp.setSfcCode(modelCode);//妯＄粍鐮�
+ collectionTemp.setParamCode(daCollectionParamConf.getCollectParameterId());//鍙傛暟缂栫爜
+ collectionTemp.setParamName(daCollectionParamConf.getCollectParameterName());//鍙傛暟鍚嶇О
+ collectionTemp.setParamValue(getUserName());//鍙傛暟鍊�
+ collectionTemp.setLocationCode(stationCode);//宸ヤ綅
+ collectionTemp.setCollectionTime(new Date());//閲囬泦鏃堕棿
+ daParamCollectionTempService.save(collectionTemp);
+ }
+ }
+
@Override
public void insertBatch(List<DaParamCollection> confList){
try{
@@ -543,6 +582,12 @@
@Override
public void pushGeelycvMesFeedback(String packID, String stationCode) {
+ //娣诲姞鍩虹鍙傛暟(鐧婚檰浜轰俊鎭�)
+ try {
+ addCollectParamBasicData(stationCode,packID);
+ }catch (Exception e){
+ throw new RuntimeException(e);
+ }
logger.info("杩涘叆浜哄伐宸ヤ綅鎺ㄩ�佸伐鍘侻ES鏁版嵁鏂规硶-pushGeelycvMesFeedback-宸ヤ綅{}-pack鐮亄}",stationCode,packID);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String totalResult = "0";
--
Gitblit v1.9.3