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); }