From 3d0d9aa9d1bf7b4b5c7a85d73ceb790a2809cec8 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Tue, 3 Dec 2024 17:32:57 +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 --- .../modules/production/config/TCPClient.java | 2 +- .../controller/DailyPlanController.java | 12 ++++++ .../production/service/DailyPlanService.java | 2 + .../service/impl/AbnormalServiceImpl.java | 40 +++++++++---------- .../service/impl/DailyPlanServiceImpl.java | 22 ++++++++++ 5 files changed, 57 insertions(+), 21 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 4c0d43f..fd44a6b 100644 --- a/src/main/java/com/heai/modules/production/config/TCPClient.java +++ b/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); 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 c9e8ea3..cbdb9e9 100644 --- a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java +++ b/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 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 e7574a4..297d1d0 100644 --- a/src/main/java/com/heai/modules/production/service/DailyPlanService.java +++ b/src/main/java/com/heai/modules/production/service/DailyPlanService.java @@ -436,6 +436,8 @@ public interface DailyPlanService { List getSPBomQtyAssembly(GenerateReportData generateReportData); void linkWeighTPC(SOScheduledRoutingOutData inData); + void reLinkWeighTPC(SOScheduledRoutingOutData inData); + void closeWeighTPC(SOScheduledRoutingOutData inData); /** * @Description 取消派工单 * @Title cancelJob diff --git a/src/main/java/com/heai/modules/production/service/impl/AbnormalServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/AbnormalServiceImpl.java index 42e6f9e..1a1e04c 100644 --- a/src/main/java/com/heai/modules/production/service/impl/AbnormalServiceImpl.java +++ b/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 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 fcf854f..55f0ab3 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 @@ -1161,6 +1161,28 @@ public class DailyPlanServiceImpl implements DailyPlanService { tcpClient.start(newList); } + @Override + public void reLinkWeighTPC(SOScheduledRoutingOutData inData){ + List newList =tcpMapper.selectTCPMachine("称重"); + if(newList.size()==0){ + throw new RuntimeException("称重设备未维护到系统！"); + } + for (int i = 0; i newList =tcpMapper.selectTCPMachine("称重"); + // if(newList.size()==0){ + // throw new RuntimeException("称重设备未维护到系统！"); + // } + // + tcpClient.clearAllConnections(); + + + } @Override public SORoutingData searchLastApproveQty(GenerateReportData generateReportData){ SORoutingData result =new SORoutingData();