From 4a51067b4612f348f602c33b82355afa7fc24e54 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期三, 04 九月 2024 08:34:14 +0800
Subject: [PATCH] 修改报工接口

---
 jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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 0e7f9a8..6b5a617 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
@@ -166,7 +166,7 @@
                             result = 16;//鐢佃姱鎸′綅涓虹┖
                         }else{
                             String cellGear = cellGearObjcet.toString();
-                            /*List<String> cellCodeList = readCellCodeList(thoroughfare, device);
+                      /*      List<String> cellCodeList = readCellCodeList(thoroughfare, device);
                             result = checkCellGear(thoroughfare, device,cellCodeList,cellGear);//鏍¢獙鐢佃姱鎸′綅鍜岀粍鍒�*/
                         }
                         miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build());
@@ -879,12 +879,12 @@
                         cellStatus = 1;
                     }else {
                         cellStatus = 2;
-                        result = 17;//鎸′綅鏍¢獙涓嶅悎鏍�
+                        result = 16;//鎸′綅鏍¢獙涓嶅悎鏍�
                     }
-                }else {
+                }/*else {
                     cellStatus = 2;
                     result = 17;//鏌ヤ笉鍒拌鏍¢獙鐨勬尅浣�
-                }
+                }*/
                 miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_"+(i+1)).value(cellStatus).build());
             }
         }
@@ -1050,7 +1050,7 @@
         try {
             String url = Constants.FACTORY_EMS_UAT_GET_RUL + "workReportResultFeedback?siteCode="+Constants.FACTORY_EMS_SITE_CODE+"&stationCode="+stationCode+"&productNum="+productNum+"&confirmTime="+confirmTime;
             HttpResponse response = HttpRequest.get(url).execute();
-            HttpRequest httpRequest = HttpRequest.get(url);
+           /* HttpRequest httpRequest = HttpRequest.get(url);*/
             result =  response.body();
         }catch (Exception e){
             throw new RuntimeException(e);

--
Gitblit v1.9.3