From ef4005e6beaa16766b25216b0098d33a4e0b8eb6 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期六, 17 八月 2024 12:01:57 +0800
Subject: [PATCH] 修改采集参数
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
index 1f59e18..ca019ce 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -378,7 +378,8 @@
List<OmProductionOrdeInfo> orderList = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>()
.eq(OmProductionOrdeInfo::getOrderStatus, Constants.ONE)
.eq(OmProductionOrdeInfo::getStationCode,device)//宸ヤ綅
- .eq(OmProductionOrdeInfo::getProductCode,materialCode));//浜у搧绫诲瀷
+ //.eq(OmProductionOrdeInfo::getProductCode,materialCode)
+ );//浜у搧绫诲瀷
if (CollUtil.isNotEmpty(orderList)){
Long id = orderList.get(0).getId();
productNum = orderList.get(0).getProductNum();//浜у搧鐮�
@@ -386,9 +387,9 @@
}else{
// 鏌ヨ鏈�鏂扮殑宸ュ崟淇℃伅
OmProductionOrdeInfo lastOrder = omProductionOrdeInfoService.getLastOrder();
- String facMaterialCode = Constants.facMaterialMap.get(materialCode);
- log.info("璇锋眰宸ュ巶MES宸ュ崟锛氬叆鍙俤evice{},璇锋眰宸ュ巶鐗╂枡缂栫爜facMaterialCode锛歿},浜у搧鐗╂枡缂栫爜MaterialCode{}", device, facMaterialCode,materialCode);
- String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), device,facMaterialCode);
+ //String facMaterialCode = Constants.facMaterialMap.get(materialCode);
+ log.info("璇锋眰宸ュ巶MES宸ュ崟锛氬叆鍙俤evice{},璇锋眰宸ュ巶鐗╂枡缂栫爜,浜у搧鐗╂枡缂栫爜MaterialCode{}", device,materialCode);
+ String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), device,"");
log.info("璇锋眰宸ュ巶MES宸ュ崟锛氬嚭鍙俻ack锛歿}", orderJsonString);
JSONObject jsonObject = new JSONObject(orderJsonString);
--
Gitblit v1.9.3