From 5eaa6c003d49b3d555f272ca73d7f91280a8e02f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 11 四月 2024 12:30:32 +0800
Subject: [PATCH] 代码移动到新架构

---
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java |   34 +++++++++++++++++++++++-----------
 1 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java
index 92dd63a..203bcb8 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java
@@ -1,11 +1,12 @@
 package com.mes.component;
 
 import com.mes.bigstorage.entity.BigStorageCageDetails;
-import com.mes.bigstorage.service.impl.BigStorageCageServiceImpl;
+import com.mes.bigstorage.service.BigStorageCageDetailsService;
+import com.mes.bigstorage.service.BigStorageCageService;
 import com.mes.temperingglass.entity.TemperingGlassInfo;
-import com.mes.temperingglass.service.impl.TemperingGlassInfoServiceImpl;
+import com.mes.temperingglass.service.TemperingGlassInfoService;
 import com.mes.uppattenusage.entity.GlassInfo;
-import com.mes.uppattenusage.service.impl.GlassInfoServiceImpl;
+import com.mes.uppattenusage.service.GlassInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
@@ -13,11 +14,13 @@
 public class PlcStorageCage extends Thread {
 
     @Autowired
-    private BigStorageCageServiceImpl bigStorageCageServiceImpl;
+    private BigStorageCageService bigStorageCageService;
     @Autowired
-    private TemperingGlassInfoServiceImpl temperingGlassInfoServiceImpl;
+    private BigStorageCageDetailsService bigStorageCageDetailsService;
     @Autowired
-    private GlassInfoServiceImpl glassInfoServiceImpl;
+    private TemperingGlassInfoService temperingGlassInfoService;
+    @Autowired
+    private GlassInfoService glassInfoService;
     @Override
     public void run() {
         while (this != null) {
@@ -30,29 +33,38 @@
                 if("1".equals(plcFeedReq)){
                     BigStorageCageDetails bigStorageCageDetails=new BigStorageCageDetails();
                     //浼犲叆鐜荤拑id
-                    GlassInfo glassInfo=glassInfoServiceImpl.getById(plcFeedGlassid);
+                    GlassInfo glassInfo=glassInfoService.getById(plcFeedGlassid);
 
-                    BigStorageCageDetails SlotInfo=bigStorageCageServiceImpl.FeedGlass(glassInfo,bigStorageCageDetails);
+                    BigStorageCageDetails SlotInfo=bigStorageCageService.FeedGlass(glassInfo,bigStorageCageDetails);
                     if(SlotInfo!=null){
-                        //鍙戦�佷换鍔$粰Plc
+                        //plc浠诲姟鍙戦�佸瓧
                     }
                 }
 
                 //鍑虹墖璇锋眰
                 String plcOutReq ="0";
+                boolean result=false;
                 if("1".equals(plcOutReq)){
                     //鑾峰彇閽㈠寲灏忕墖琛ㄦ湭鍑虹淇℃伅
-                    List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoServiceImpl.SelectTemperingGlassInfo();
+                    List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.SelectTemperingGlassInfo();
                     //娌℃湁鍙嚭鐨勭幓鐠冩椂
                     if(temperingGlassInfoList!=null){
                         //鏌ヨ鏄惁鏈夊皬鐗囧叏閮ㄥ埌榻愮殑閽㈠寲鐗堝浘
+                        result = bigStorageCageDetailsService.getTemperingGlass();
                     }else{
                         //缁х画褰撳墠閽㈠寲鐗堝浘鐨勪换鍔�
-                        temperingGlassInfoServiceImpl.addOutTask(temperingGlassInfoList);
+
+                        temperingGlassInfoService.addOutTask(temperingGlassInfoList);
+                        result=true;
+                    }
+                    if(result==true){
+                        //plc浠诲姟鍙戦�佸瓧
                     }
                 }
 
 
+
+
             } catch (Exception e) {
                 e.printStackTrace();
             }

--
Gitblit v1.8.0