From 0a65c6094ad3cbdae90348f2548d49e875ede1b7 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期一, 29 七月 2024 10:26:29 +0800
Subject: [PATCH] 修改采集
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 11 +++++++----
1 files changed, 7 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 389a655..62e6b49 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
@@ -309,7 +309,6 @@
public synchronized void receivingWorkOrders(String thoroughfare ,String device ,String materialCode)
{
- String paramProductNum = "";
try {
//鍏堟煡璇㈣〃涓槸鍚︽湁鍓╀綑宸ュ崟
@@ -321,8 +320,6 @@
Long id = orderList.get(0).getId();
String productNum = orderList.get(0).getProductNum();//妯＄粍鐮�
String orderNum = orderList.get(0).getWorkOrderNo();
-
- paramProductNum = productNum;
//涓嬪彂浜у搧妯＄粍鐮�
miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ModuleCode").value(productNum).build());
@@ -337,13 +334,14 @@
log.info("璇锋眰宸ュ巶MES宸ュ崟锛氬叆鍙俤evice{},materialCode锛歿}", device, materialCode);
String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "M1OP100",materialCode);
+ log.info("璇锋眰宸ュ巶MES宸ュ崟锛氬嚭鍙俻ack锛歿}", orderJsonString);
+
JSONObject jsonObject = new JSONObject(orderJsonString);
// 浠嶫SONObject涓幏鍙杁ata瀵硅薄
JSONObject dataObject = jsonObject.getJSONObject("data");
String code = jsonObject.getStr("code");
// 鍒ゆ柇鎺ュ崟鏄惁鎴愬姛
if(code.equals("success")) {
- log.info("璇锋眰宸ュ巶MES宸ュ崟锛氬叆鍙俻ack{}鍑哄弬pack锛歿}", paramProductNum, dataObject.getStr("productNum"));
OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo();
omProductionOrdeInfo.setWorkOrderNo(dataObject.getStr("productionOrderNum"));
omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum"));
@@ -1072,6 +1070,11 @@
);
if (CollUtil.isNotEmpty(list)){
for(DaCollectionParamConf conf:list){
+ //1P1S鐢熸垚
+ if(conf.getCollectParameterId().equals("OCV_1P1SMID")){
+ String result = "";
+ conf.setParamCentral(result);
+ }
ChildVO childVO = new ChildVO();
childVO.setItemCode(conf.getCollectParameterId());//鍙傛暟
childVO.setItemType(conf.getItemType());
--
Gitblit v1.9.3