From 35f98ef220829438b32286d91a85abc9d46ddb86 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 28 Dec 2024 16:41:02 +0800 Subject: [PATCH] =?UTF-8?q?=2044630=20=E8=AF=BB=E8=83=8E=E8=86=9C=E4=BF=A1?= =?UTF-8?q?=E5=8F=B7=E5=B7=A5=E6=AD=A5=EF=BC=8C=E6=97=A0=E6=B3=95=E9=80=82?= =?UTF-8?q?=E9=85=8D=E6=9F=94=E6=80=A7=E7=84=8A=E6=B5=81=E7=A8=8B=EF=BC=8C?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../step/MesManyCellTriggerJumpProcessStepService.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesManyCellTriggerJumpProcessStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesManyCellTriggerJumpProcessStepService.java index 99fbf7b..0e239d3 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesManyCellTriggerJumpProcessStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesManyCellTriggerJumpProcessStepService.java @@ -16,6 +16,7 @@ import cn.estsh.i3plus.pojo.mes.model.StationResultBean; import cn.estsh.i3plus.pojo.mes.model.StepResult; import cn.estsh.impp.framework.boot.util.SpringContextsUtil; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -24,7 +25,7 @@ import org.springframework.util.StringUtils; import java.util.List; /** - * @Description : 验证通过后所有分屏强制跳过工序工步 + * @Description : 验证通过后所有分屏强制重置工序工步 * @Author : wangjie **/ @Slf4j @@ -68,11 +69,15 @@ public class MesManyCellTriggerJumpProcessStepService extends BaseStepService { if (CollectionUtils.isEmpty(StationWebSocket.getStationWebSocketList(clientInfo))) continue; } - reqBean.setClientInfo(clientInfo); - reqBean.setInterfaceType(MesPcnConstWords.SHIPPING); - reqBean.setBusiType(MesPcnEnumUtil.ACTOR_RECEIVE_STRATEGY.WS_CMD_DO_SCAN.getCode()); - reqBean.setForceJumpProcess(true); - shippingDispatchService.sendScanQueueNextExec(reqBean); + StationRequestBean stationRequestBean = new StationRequestBean(); + BeanUtils.copyProperties(reqBean, stationRequestBean); + stationRequestBean.setWorkCenterCode(workCellExtendCfg.getWorkCenterCodeBak()); + stationRequestBean.setWorkCellCode(workCellExtendCfg.getWorkCellCodeBak()); + stationRequestBean.setClientInfo(clientInfo); + stationRequestBean.setInterfaceType(MesPcnConstWords.SHIPPING); + stationRequestBean.setBusiType(MesPcnEnumUtil.ACTOR_RECEIVE_STRATEGY.WS_CMD_DO_SCAN.getCode()); + stationRequestBean.setForceJumpProcess(true); + shippingDispatchService.sendScanQueueNextExec(stationRequestBean); }