From 82cffb7ea3786d44ab27a78750dd7d42026b8119 Mon Sep 17 00:00:00 2001 From: 86156 <823267011@qq.com> Date: Mon, 2 Feb 2026 17:59:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=9B=B4=E6=94=B9=E4=B8=BAON?= =?UTF-8?q?LINE=E5=85=A8=E9=83=A8=E4=B8=8B=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TrackServiceImpl.java | 2 +- .../service/strip/SegmentTrackerService.java | 101 ++++++++---------- 2 files changed, 44 insertions(+), 59 deletions(-) diff --git a/business/src/main/java/com/fizz/business/service/impl/TrackServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/TrackServiceImpl.java index 39fc4ac..6b814c5 100644 --- a/business/src/main/java/com/fizz/business/service/impl/TrackServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/TrackServiceImpl.java @@ -77,7 +77,7 @@ public class TrackServiceImpl implements TrackService { // NEW/READY -> ONLINE：下发张力下一设定值 if (form.getOperation() == com.fizz.business.constants.enums.L1OperateMatEnum.ONLINE) { try { - segmentTrackerService.sendDriveTensionNextOnOnline(form.getEntryMatId(), form.getPorIdx()); + segmentTrackerService.sendAllPdiOnOnline(form.getEntryMatId(), form.getPorIdx()); } catch (Exception e) { log.error("张力Next下发异常, coilId={} err={}", form.getEntryMatId(), e.toString(), e); } diff --git a/business/src/main/java/com/fizz/business/service/strip/SegmentTrackerService.java b/business/src/main/java/com/fizz/business/service/strip/SegmentTrackerService.java index bcbf328..a216f25 100644 --- a/business/src/main/java/com/fizz/business/service/strip/SegmentTrackerService.java +++ b/business/src/main/java/com/fizz/business/service/strip/SegmentTrackerService.java @@ -436,13 +436,6 @@ public class SegmentTrackerService { if (d == DeviceEnum.WELDER) { logDataService.logInfo("MATMAP-TRACK", "Coil reached welder, update plan status. coil=" + coilId + ", headPos=" + headPos); - // ONLINE -> PRODUCING：下发入口卷参数 - try { - sendEntryPdiOnProducing(coilId); - } catch (Exception ex) { - logDataService.logWarn("MATMAP-TRACK", "入口参数下发异常(PRODUCING触发), coilId=" + coilId + ", err=" + String.valueOf(ex)); - } - trackService.l1OperateMat(L1OperateMatForm.builder() .entryMatId(coilId) .planId(matmap.getPlanId()) @@ -476,74 +469,66 @@ public class SegmentTrackerService { /** * NEW/READY -> ONLINE：下发全线张力“下一设定值”(Next) */ - public void sendDriveTensionNextOnOnline(String coilId, Integer porIdx) { + private void addDriveTensionNextFields(java.util.List dataList, Integer porIdx, com.fizz.business.domain.PdiSetups setup) { + if (setup == null) { + return; + } + + if (porIdx != null && porIdx == 0) { + dataList.add(buildOpcWrite("tensionPor1Next", setup.getPorTension())); + } else if (porIdx != null && porIdx == 1) { + dataList.add(buildOpcWrite("tensionPor2Next", setup.getPorTension())); + } + + dataList.add(buildOpcWrite("tensionEnLpNext", setup.getCelTension())); + dataList.add(buildOpcWrite("tensionCleaningNext", setup.getCleanTension())); + dataList.add(buildOpcWrite("tensionGalvanizingCoolNext", setup.getPassivationTension())); + dataList.add(buildOpcWrite("tensionExLpNext", setup.getCxlTension())); + dataList.add(buildOpcWrite("tensionTlNext", setup.getLevelerEntryTension())); + dataList.add(buildOpcWrite("tensionTmExitNext", setup.getStraightenerExitTension())); + dataList.add(buildOpcWrite("tensionFuranceNext", setup.getFurTension())); + dataList.add(buildOpcWrite("tensionTrNext", setup.getTrTension())); + } + + private void addEntryPdiFields(java.util.List dataList, String coilId, com.fizz.business.vo.CrmPdiPlanVO plan) { + dataList.add(buildOpcWrite("coilId", coilId)); + dataList.add(buildOpcWrite("entryCoilWeight", plan.getEntryWeight())); + dataList.add(buildOpcWrite("entryCoilLength", plan.getEntryLength())); + dataList.add(buildOpcWrite("entryCoilWidth", plan.getEntryWidth())); + dataList.add(buildOpcWrite("entryCoilThick", plan.getEntryThick())); + dataList.add(buildOpcWrite("entryCoilInnerDia", plan.getEntryInnerDiameter())); + dataList.add(buildOpcWrite("entryCoilOuterDia", plan.getEntryOuterDiameter())); + dataList.add(buildOpcWrite("alloyCode", plan.getSteelGrade())); + dataList.add(buildOpcWrite("splitNum", plan.getSplitNum())); + } + + /** + * NEW/READY -> ONLINE：入口卷参数 + 全线张力“下一设定值”(Next) 一次性下发 + */ + public void sendAllPdiOnOnline(String coilId, Integer porIdx) { try { com.fizz.business.vo.CrmPdiPlanVO plan = crmPdiPlanService.getByCoilIdAndOperId(coilId); if (plan == null) { - logDataService.logWarn("MATMAP-TRACK", "张力Next下发跳过：未找到计划信息, coilId=" + coilId); + logDataService.logWarn("MATMAP-TRACK", "ONLINE下发跳过：未找到计划信息, coilId=" + coilId); return; } com.fizz.business.domain.PdiSetups setup = loadPdiSetup(coilId, plan.getPlanid()); if (setup == null) { - logDataService.logWarn("MATMAP-TRACK", "张力Next下发跳过：未找到pdi_setup, coilId=" + coilId); + logDataService.logWarn("MATMAP-TRACK", "ONLINE下发跳过：未找到pdi_setup, coilId=" + coilId); return; } java.util.List dataList = new java.util.ArrayList<>(); - - if (porIdx != null && porIdx == 0) { - dataList.add(buildOpcWrite("tensionPor1Next", setup.getPorTension())); - } else if (porIdx != null && porIdx == 1) { - dataList.add(buildOpcWrite("tensionPor2Next", setup.getPorTension())); - } - - dataList.add(buildOpcWrite("tensionEnLpNext", setup.getCelTension())); - dataList.add(buildOpcWrite("tensionCleaningNext", setup.getCleanTension())); - dataList.add(buildOpcWrite("tensionGalvanizingCoolNext", setup.getPassivationTension())); - dataList.add(buildOpcWrite("tensionExLpNext", setup.getCxlTension())); - dataList.add(buildOpcWrite("tensionTlNext", setup.getLevelerEntryTension())); - dataList.add(buildOpcWrite("tensionTmExitNext", setup.getStraightenerExitTension())); - dataList.add(buildOpcWrite("tensionFuranceNext", setup.getFurTension())); - dataList.add(buildOpcWrite("tensionTrNext", setup.getTrTension())); + addEntryPdiFields(dataList, coilId, plan); + addDriveTensionNextFields(dataList, porIdx, setup); OpcBatchWriteDataForm opcForm = new OpcBatchWriteDataForm(); opcForm.setDataList(dataList); boolean ok = opcDataService.batchWriteData(opcForm); - logDataService.logInfo("MATMAP-TRACK", "张力Next下发完成(ONLINE触发), coilId=" + coilId + ", ok=" + ok); + logDataService.logInfo("MATMAP-TRACK", "ONLINE下发完成(入口参数+张力Next), coilId=" + coilId + ", ok=" + ok); } catch (Exception ex) { - logDataService.logWarn("MATMAP-TRACK", "张力Next下发异常(ONLINE触发), coilId=" + coilId + ", err=" + String.valueOf(ex)); - } - } - - /** - * ONLINE -> PRODUCING：下发入口卷参数（481-490） - */ - public void sendEntryPdiOnProducing(String coilId) { - try { - com.fizz.business.vo.CrmPdiPlanVO plan = crmPdiPlanService.getByCoilIdAndOperId(coilId); - if (plan == null) { - logDataService.logWarn("MATMAP-TRACK", "入口参数下发跳过：未找到计划信息, coilId=" + coilId); - return; - } - - java.util.List dataList = new java.util.ArrayList<>(); - dataList.add(buildOpcWrite("coilId", coilId)); - dataList.add(buildOpcWrite("entryCoilWeight", plan.getEntryWeight())); - dataList.add(buildOpcWrite("entryCoilLength", plan.getEntryLength())); - dataList.add(buildOpcWrite("entryCoilWidth", plan.getEntryWidth())); - dataList.add(buildOpcWrite("entryCoilThick", plan.getEntryThick())); - dataList.add(buildOpcWrite("entryCoilInnerDia", plan.getEntryInnerDiameter())); - dataList.add(buildOpcWrite("entryCoilOuterDia", plan.getEntryOuterDiameter())); - dataList.add(buildOpcWrite("alloyCode", plan.getSteelGrade())); - dataList.add(buildOpcWrite("splitNum", plan.getSplitNum())); - - OpcBatchWriteDataForm opcForm = new OpcBatchWriteDataForm(); - opcForm.setDataList(dataList); - boolean ok = opcDataService.batchWriteData(opcForm); - logDataService.logInfo("MATMAP-TRACK", "入口参数下发完成(PRODUCING触发), coilId=" + coilId + ", ok=" + ok); - } catch (Exception ex) { - logDataService.logWarn("MATMAP-TRACK", "入口参数下发异常(PRODUCING触发), coilId=" + coilId + ", err=" + String.valueOf(ex)); + logDataService.logWarn("MATMAP-TRACK", "ONLINE下发异常(入口参数+张力Next), coilId=" + coilId + ", err=" + String.valueOf(ex)); } }