From e0fac38b26845f25de479783e0c76cf12a5311e0 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期五, 19 一月 2024 10:31:28 +0800
Subject: [PATCH] 修改数据采集

---
 guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/server/BOP030/impl/BOP030ServerInterfaceImpl.java |   32 +++++++-------------------------
 1 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/server/BOP030/impl/BOP030ServerInterfaceImpl.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/server/BOP030/impl/BOP030ServerInterfaceImpl.java
index 98a449a..413e49c 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/server/BOP030/impl/BOP030ServerInterfaceImpl.java
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/server/BOP030/impl/BOP030ServerInterfaceImpl.java
@@ -81,8 +81,8 @@
         String ecpStr = "";//寮傚父璁板綍鏍囪
         try{
 
-            String isHeartBeat = OPCUnit.read(opc.getBOP030_F_HEART_BEAT());
-            setHeartbeat(isHeartBeat);
+      /*      String isHeartBeat = OPCUnit.read(opc.getBOP030_F_HEART_BEAT());
+            setHeartbeat(isHeartBeat);*/
 
             if(GlobalVariable.BOP030_F_HEART_BEAT) {
                 //PC璇诲伐鍗�
@@ -100,9 +100,9 @@
                 if(isPLCFinish.equals("true")){
                     String isFinish = OPCUnit.read(opc.getBOP030_J_PC_FINISH());//PC鎿嶄綔瀹屾垚
                     if(isFinish.equals("false")){
-                        handleMaterial();
-                        handleInfo();
                         handleFinsh();
+                        handleInfo();
+                        handleMaterial();
                     }
                 }
                 handleOilState();
@@ -211,13 +211,7 @@
         logger.info("BOP030宸ヤ綅,handleInfo END锛�");
     }
     public void handleMaterial() {
-        if("".equals(S_ORDER_CODE)){
-            IN_TIME = DateTool.getLocalTimeForDate();
-            S_ORDER_CODE = OPCUnit.read(opc.getBOP030_S_ORDER_CODE());//宸ュ崟缂栧彿
-            S_PRODUCT_TYPE = OPCUnit.read(opc.getBOP030_S_PRODUCT_CODE());//浜у搧缂栧彿
-            S_PRODUCT_CODE = GlobalVariable.PRODUCT_CODE_MAP.get(S_PRODUCT_TYPE);
-            S_SFC_CODE = OPCUnit.read(opc.getBOP030_S_SFC_CODE());//鎬绘垚缂栫爜
-        }
+
         //鏌ヨ鎵规涓婃枡淇℃伅
         ProductionOrderBatchInfoParam productionOrderBatchInfoParam = new ProductionOrderBatchInfoParam();
         productionOrderBatchInfoParam.setWorkOrderNo(S_ORDER_CODE);
@@ -227,22 +221,10 @@
         for(int i=0;i<list1.size();i++){
             ProductionOrderBatchInfoResult productionOrderBatchInfoResult = list1.get(i);
 
-            //鍒ゆ柇鏄惁鏈夎宸ヤ綅
-            String[] locationCodes = productionOrderBatchInfoResult.getLocationCode().split("/");
-            logger.info("褰撳墠宸ヤ綅锛�"+locationCodes.toString());
-            boolean isLocationCode = false;
-            if(locationCodes.length>0)
-            {
-                for (int j=0;j<locationCodes.length;j++){
-                    String location = locationCodes[j];
-                    if(location.equals(LOCATION_CODE)){
-                        isLocationCode = true;
-                    }
-                }
-            }
+
 
             int remainingQuantity =  productionOrderBatchInfoResult.getResidueQuantity();//鍓╀綑鏁伴噺
-            if(remainingQuantity>0 && isLocationCode){
+            if(remainingQuantity>0 ){
                 //鏂板鐗╂枡杩芥函
                 MaterialTraceabilityParam materialTraceabilityParam = new MaterialTraceabilityParam();
                 materialTraceabilityParam.setWorkOrderNo(S_ORDER_CODE);

--
Gitblit v1.9.3