From f6789ac9f44a6b1f9d95421329bb1f0a7cd52d6d Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 07 三月 2025 18:37:11 +0800
Subject: [PATCH] -换型增加物料配置
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 0b93010..799e25e 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
@@ -321,7 +321,8 @@
CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
logger.info("OP100鎶ュ伐寮�濮�-宸ュ巶MES寮傛鏂规硶");
String stationCode = "M1P100";//鍥犱负涓婂眰绯荤粺鍙敮鎸�6浣嶏紝鎵�鏈夋姤宸ュ伐浣嶄负M1P100
- String reportResult = RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(), stationCode, format.format(new Date()));
+ //String reportResult = RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(), stationCode, format.format(new Date()));
+ String reportResult = OPCUaSubscription.getWorkReportResultFeedback(daParamCollection.getProductBarcode(), stationCode, format.format(new Date()));
JSONObject jsonObject = new JSONObject(reportResult);
String code = jsonObject.getStr("code");
if("success".equals(code)){
@@ -349,11 +350,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()
--
Gitblit v1.9.3