From bcef1c0a0a3d7e64ddbbe007bf4513db3030ab2a Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 2 Dec 2024 17:21:47 +0800
Subject: [PATCH] =?UTF-8?q?0412=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../heai/modules/production/config/TCPClient.java  |  3 ++-
 .../production/controller/DailyPlanController.java |  6 ++++++
 .../com/heai/modules/production/dao/TcpMapper.java |  4 +++-
 .../production/service/DailyPlanService.java       |  2 ++
 .../service/impl/DailyPlanServiceImpl.java         | 14 ++++++++++++++
 5 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/heai/modules/production/config/TCPClient.java b/src/main/java/com/heai/modules/production/config/TCPClient.java
index 7dad8d7..4c0d43f 100644
--- a/src/main/java/com/heai/modules/production/config/TCPClient.java
+++ b/src/main/java/com/heai/modules/production/config/TCPClient.java
@@ -68,7 +68,7 @@ public class TCPClient {
 
             if (!socket.isConnected()) {
                 log.error("连接设备失败: IP: {}, Port: {}", configData.getIp(), configData.getPort());
-                return;
+               throw new RuntimeException("连接设备失败:"+configData.getIp()+"-"+ configData.getPort() );
             }
             in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
             socketMap.put(key, socket); // 保存新连接
@@ -103,6 +103,7 @@ public class TCPClient {
         } catch (IOException e) {
             log.error("连接设备失败或读取数据时发生错误, IP: {}, Port: {}", configData.getIp(), configData.getPort(), e);
             closeConnection(key);
+            throw new RuntimeException("连接设备失败:"+configData.getIp()+"-"+ configData.getPort() );
         } finally {
             try {
                 if (in != null) {
diff --git a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
index 86f7094..c9e8ea3 100644
--- a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
+++ b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
@@ -531,6 +531,12 @@ public class DailyPlanController {
         return r;
     }
 
+    @PostMapping("/linkWeighTPC")
+    public R linkWeighTPC(@RequestBody SOScheduledRoutingOutData inData){
+         dailyPlanService.linkWeighTPC(inData);
+        return R.ok();
+    }
+
     /**
      * @Description TODO
      * @Title saveGenerateReportForSchedule
diff --git a/src/main/java/com/heai/modules/production/dao/TcpMapper.java b/src/main/java/com/heai/modules/production/dao/TcpMapper.java
index 5d0a600..ba7ee5f 100644
--- a/src/main/java/com/heai/modules/production/dao/TcpMapper.java
+++ b/src/main/java/com/heai/modules/production/dao/TcpMapper.java
@@ -5,13 +5,15 @@ import com.heai.modules.production.entity.TcpData;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Mapper
 @Repository
 public interface TcpMapper {
 
     void saveTcpData(TcpData data);
 
-    ScaleTCPConfigData selectTCPMachine(String type);
+    List<ScaleTCPConfigData> selectTCPMachine(String type);
 
 
 
diff --git a/src/main/java/com/heai/modules/production/service/DailyPlanService.java b/src/main/java/com/heai/modules/production/service/DailyPlanService.java
index 6851930..e7574a4 100644
--- a/src/main/java/com/heai/modules/production/service/DailyPlanService.java
+++ b/src/main/java/com/heai/modules/production/service/DailyPlanService.java
@@ -434,6 +434,8 @@ public interface DailyPlanService  {
     SORoutingData searchLastApproveQty(GenerateReportData generateReportData);
 
     List<SoBomData> getSPBomQtyAssembly(GenerateReportData generateReportData);
+
+    void linkWeighTPC(SOScheduledRoutingOutData inData);
     /**
      * @Description 取消派工单
      * @Title cancelJob
diff --git a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
index 9c0da2b..fcf854f 100644
--- a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
+++ b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
@@ -8,6 +8,7 @@ import com.heai.modules.app.dao.InventoryStockDao;
 import com.heai.modules.app.entity.SoBomData;
 import com.heai.modules.board.dao.BoardMapper;
 import com.heai.modules.board.entity.ViewKanbanSoHunlianPlanData;
+import com.heai.modules.production.config.TCPClient;
 import com.heai.modules.production.dao.*;
 import com.heai.modules.production.entity.*;
 import com.heai.modules.production.service.AbnormalService;
@@ -34,6 +35,10 @@ import java.util.*;
 @Service
 @Slf4j
 public class DailyPlanServiceImpl implements DailyPlanService {
+    @Autowired
+    private TCPClient tcpClient;
+    @Autowired
+    private TcpMapper tcpMapper;
     @Autowired
     private AbnormalMapper abnormalMapper;
     @Autowired
@@ -1147,6 +1152,15 @@ public class DailyPlanServiceImpl implements DailyPlanService {
         return dailyPlanMapper.getSPBomQtyAssembly(generateReportData);
     }
 
+    @Override
+    public void linkWeighTPC(SOScheduledRoutingOutData inData){
+        List<ScaleTCPConfigData> newList =tcpMapper.selectTCPMachine("称重");
+        if(newList.size()==0){
+            throw new RuntimeException("称重设备未维护到系统！");
+        }
+        tcpClient.start(newList);
+    }
+
     @Override
     public SORoutingData searchLastApproveQty(GenerateReportData generateReportData){
         SORoutingData result =new SORoutingData();