From cf6bff3922bbd0624b98834f6ea85c8e619e564f Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期二, 16 一月 2024 12:45:46 +0800
Subject: [PATCH] 修改数据采集

---
 guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/server/COP010/impl/COP010ServerInterfaceImpl.java |   83 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 81 insertions(+), 2 deletions(-)

diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/server/COP010/impl/COP010ServerInterfaceImpl.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/server/COP010/impl/COP010ServerInterfaceImpl.java
index eee5d99..a105e5c 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/server/COP010/impl/COP010ServerInterfaceImpl.java
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/server/COP010/impl/COP010ServerInterfaceImpl.java
@@ -6,9 +6,14 @@
 import cn.stylefeng.guns.modular.bs.locationInfo.service.LocationInfoService;
 import cn.stylefeng.guns.modular.cm.passingStationCollection.model.params.PassingStationCollectionParam;
 import cn.stylefeng.guns.modular.cm.passingStationCollection.service.PassingStationCollectionService;
+import cn.stylefeng.guns.modular.dq.materialTraceability.model.params.MaterialTraceabilityParam;
+import cn.stylefeng.guns.modular.dq.materialTraceability.service.MaterialTraceabilityService;
 import cn.stylefeng.guns.modular.om.productionOrdeInfo.model.params.ProductionOrdeInfoParam;
 import cn.stylefeng.guns.modular.om.productionOrdeInfo.model.result.ProductionOrdeInfoResult;
 import cn.stylefeng.guns.modular.om.productionOrdeInfo.service.ProductionOrdeInfoService;
+import cn.stylefeng.guns.modular.om.productionOrderBatchInfo.model.params.ProductionOrderBatchInfoParam;
+import cn.stylefeng.guns.modular.om.productionOrderBatchInfo.model.result.ProductionOrderBatchInfoResult;
+import cn.stylefeng.guns.modular.om.productionOrderBatchInfo.service.ProductionOrderBatchInfoService;
 import cn.stylefeng.guns.modular.sc.repairManageInfo.model.params.RepairManageInfoParam;
 import cn.stylefeng.guns.modular.sc.repairManageInfo.model.result.RepairManageInfoResult;
 import cn.stylefeng.guns.modular.sc.repairManageInfo.service.RepairManageInfoService;
@@ -53,13 +58,32 @@
     private static List list = null;
     private static Group group = null;
 
+    private int count = 0;
 
-
+    /**
+     * 璁剧疆蹇冭烦鏍囧織浣嶏紝淇濆瓨鍒板叏灞�鍙橀噺
+     */
+    public void setHeartbeat(String value) {
+        if ("false".equals(value)) {
+            OPCUnit.write(opc.getCOP010_F_HEART_BEAT(), "true");
+            GlobalVariable.COP010_F_HEART_BEAT = true;
+            count = 0;
+        } else {
+            count++;
+        }
+        // 寰幆璇诲彇棰戠巼鏄細500ms涓�娆★紝濡傛灉瓒呰繃6娆★紝涔熷氨鏄�3s璁ゅ畾瓒呮椂
+        if (count > GlobalVariable.HEART_MAX_COUNT) {
+            GlobalVariable.COP010_F_HEART_BEAT = false;
+        }
+    }
 
     @Override
-    public void monitor() {
+    public synchronized void monitor() {
         String ecpStr = "";//寮傚父璁板綍鏍囪
         try{
+            String isHeartBeat = OPCUnit.read(opc.getCOP010_F_HEART_BEAT());
+            setHeartbeat(isHeartBeat);
+
 
             if(GlobalVariable.COP010_F_HEART_BEAT) {
 
@@ -83,6 +107,7 @@
                 if(isPLCFinish.equals("true")){
                     String isFinish = OPCUnit.read(opc.getCOP010_J_PC_FINISH());//PC鎿嶄綔瀹屾垚
                     if(isFinish.equals("false")){
+                        handleMaterial();
                         handleFinsh();
                     }
                 }
@@ -187,6 +212,60 @@
         }
     }
 
+    public void handleMaterial() {
+        if("".equals(S_ORDER_CODE)){
+            IN_TIME = DateTool.getLocalTimeForDate();
+            S_ORDER_CODE = OPCUnit.read(opc.getCOP010_S_ORDER_CODE());//宸ュ崟缂栧彿
+            S_PRODUCT_TYPE = OPCUnit.read(opc.getCOP010_S_PRODUCT_CODE());//浜у搧缂栧彿
+            S_PRODUCT_CODE = GlobalVariable.PRODUCT_CODE_MAP.get(S_PRODUCT_TYPE);
+            S_SFC_CODE = OPCUnit.read(opc.getCOP010_S_SFC_CODE());//鎬绘垚缂栫爜
+        }
+        //鏌ヨ鎵规涓婃枡淇℃伅
+        ProductionOrderBatchInfoParam productionOrderBatchInfoParam = new ProductionOrderBatchInfoParam();
+        productionOrderBatchInfoParam.setWorkOrderNo(S_ORDER_CODE);
+        productionOrderBatchInfoParam.setLocationCode(LOCATION_CODE);
+        ProductionOrderBatchInfoService productionOrderBatchInfoService = opc.productionOrderBatchInfoService;
+        List<ProductionOrderBatchInfoResult> list1 = productionOrderBatchInfoService.findListBySpec(productionOrderBatchInfoParam);
+        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){
+                //鏂板鐗╂枡杩芥函
+                MaterialTraceabilityParam materialTraceabilityParam = new MaterialTraceabilityParam();
+                materialTraceabilityParam.setWorkOrderNo(S_ORDER_CODE);
+                materialTraceabilityParam.setProductCode(S_PRODUCT_CODE);
+                materialTraceabilityParam.setProductNo(S_SFC_CODE);
+                materialTraceabilityParam.setLineCode(PRODUCTION_LINE);
+                materialTraceabilityParam.setLocationCode(LOCATION_CODE);
+                materialTraceabilityParam.setAssemblyQty(1);
+                materialTraceabilityParam.setAssemblyTime(DateTool.getLocalTimeForDate());
+                materialTraceabilityParam.setMaterialCode(productionOrderBatchInfoResult.getMaterialCode());//鐗╂枡缂栫爜
+                materialTraceabilityParam.setMaterialBatchNo(productionOrderBatchInfoResult.getBatch());//鐗╂枡鎵规
+
+                MaterialTraceabilityService materialTraceabilityService = opc.materialTraceabilityService;
+                materialTraceabilityService.add(materialTraceabilityParam);
+                //鏇存柊鍓╀綑鏁伴噺
+                productionOrderBatchInfoParam.setId(productionOrderBatchInfoResult.getId());
+                productionOrderBatchInfoParam.setResidueQuantity(remainingQuantity-1);//鍓╀綑鏁伴噺
+                productionOrderBatchInfoService.update(productionOrderBatchInfoParam);
+            }
+        }
+    }
 
     //PC瀹屾垚
     public void handleFinsh() {

--
Gitblit v1.9.3