0412更新

src/main/java/com/heai/modules/production/config/TCPClient.java

@@ -124,7 +124,7 @@ public class TCPClient {
     /**
      * 清除所有连接
      */
-    private void clearAllConnections() {
+    public void clearAllConnections() {
         log.info("清除所有连接");
         for (String key : socketMap.keySet()) {
             closeConnection(key);

src/main/java/com/heai/modules/production/controller/DailyPlanController.java

@@ -536,6 +536,18 @@ public class DailyPlanController {
          dailyPlanService.linkWeighTPC(inData);
         return R.ok();
     }
+    @PostMapping("/reLinkWeighTPC")
+    public R reLinkWeighTPC(@RequestBody SOScheduledRoutingOutData inData){
+        dailyPlanService.reLinkWeighTPC(inData);
+        return R.ok();
+    }
+
+    @PostMapping("/closeWeighTPC")
+    public R closeWeighTPC(@RequestBody SOScheduledRoutingOutData inData){
+        dailyPlanService.closeWeighTPC(inData);
+        return R.ok();
+    }
+
 
     /**
      * @Description TODO

src/main/java/com/heai/modules/production/service/DailyPlanService.java

@@ -436,6 +436,8 @@ public interface DailyPlanService  {
     List<SoBomData> getSPBomQtyAssembly(GenerateReportData generateReportData);
 
     void linkWeighTPC(SOScheduledRoutingOutData inData);
+    void reLinkWeighTPC(SOScheduledRoutingOutData inData);
+    void closeWeighTPC(SOScheduledRoutingOutData inData);
     /**
      * @Description 取消派工单
      * @Title cancelJob

src/main/java/com/heai/modules/production/service/impl/AbnormalServiceImpl.java

@@ -79,7 +79,7 @@ public class AbnormalServiceImpl implements AbnormalService {
             Date date= DateUtil.getDateToDate(new Date(),"yyyy-MM-dd");
             // TaskDto taskDto=abnormalMapper.getOriginator();
             TaskDto taskDto=new TaskDto();
-            taskDto.setSite(inData.getSite());
+            taskDto.setSite("1");
             taskDto.setCreatedBy(inData.getFeedbackBy());
             taskDto.setCustomer(inData.getSeqNo().toString());
             taskDto.setProject("异常反馈");
@@ -98,25 +98,25 @@ public class AbnormalServiceImpl implements AbnormalService {
             taskDto.setTaskDetails(taskDetails);
             taskListService.saveBatchTaskList(taskDto);
         }
-        if(inData.getSeqNo()<1) {
-            SOScheduledRoutingOutData outData=new SOScheduledRoutingOutData();
-            String transNo = dailyPlanMapper.getTransNo();
-            outData.setTransNo(transNo);
-            outData.setSite(inData.getSite());
-            outData.setToTypeFlag("异常反馈检验单");
-            outData.setToTypeFlagDb("A");
-            outData.setOperatorId("");
-            outData.setsWorkCenterNo("");
-            outData.setOrderNo(abList.get(0).getAbnormalDesc());
-            //检验单加入暂停备注
-            outData.setInspectRemark(inData.getAbnormalRemark());
-            outData.setPartNo("异常反馈触发");
-            outData.setQtyRequired(new BigDecimal(inData.getAbnormalQty()));
-            outData.setSeqNo(inData.getSeqNo());
-            //硫化创建实验室检验单
-            dailyPlanMapper.saveSOOpsTransferHeaderNew(outData);
-            dailyPlanMapper.saveSOOpsTransferDetailNew(outData);
-        }
+        // if(inData.getSeqNo()<1) {
+        //     SOScheduledRoutingOutData outData=new SOScheduledRoutingOutData();
+        //     String transNo = dailyPlanMapper.getTransNo();
+        //     outData.setTransNo(transNo);
+        //     outData.setSite(inData.getSite());
+        //     outData.setToTypeFlag("异常反馈检验单");
+        //     outData.setToTypeFlagDb("A");
+        //     outData.setOperatorId("");
+        //     outData.setsWorkCenterNo("");
+        //     outData.setOrderNo(abList.get(0).getAbnormalDesc());
+        //     //检验单加入暂停备注
+        //     outData.setInspectRemark(inData.getAbnormalRemark());
+        //     outData.setPartNo("异常反馈触发");
+        //     outData.setQtyRequired(new BigDecimal(inData.getAbnormalQty()));
+        //     outData.setSeqNo(inData.getSeqNo());
+        //     //硫化创建实验室检验单
+        //     dailyPlanMapper.saveSOOpsTransferHeaderNew(outData);
+        //     dailyPlanMapper.saveSOOpsTransferDetailNew(outData);
+        // }
     }
 
     @Override

src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java

@@ -1161,6 +1161,28 @@ public class DailyPlanServiceImpl implements DailyPlanService {
         tcpClient.start(newList);
     }
 
+    @Override
+    public void reLinkWeighTPC(SOScheduledRoutingOutData inData){
+        List<ScaleTCPConfigData> newList =tcpMapper.selectTCPMachine("称重");
+        if(newList.size()==0){
+            throw new RuntimeException("称重设备未维护到系统！");
+        }
+        for (int i = 0; i <newList.size() ; i++) {
+            tcpClient.checkConnection(newList.get(i));
+        }
+
+    }
+    @Override
+    public void closeWeighTPC(SOScheduledRoutingOutData inData){
+        // List<ScaleTCPConfigData> newList =tcpMapper.selectTCPMachine("称重");
+        // if(newList.size()==0){
+        //     throw new RuntimeException("称重设备未维护到系统！");
+        // }
+        //
+        tcpClient.clearAllConnections();
+
+
+    }
     @Override
     public SORoutingData searchLastApproveQty(GenerateReportData generateReportData){
         SORoutingData result =new SORoutingData();