二级代码修复
This commit is contained in:
@@ -4,6 +4,7 @@ import cn.hutool.json.JSONUtil;
|
|||||||
import com.fizz.business.anno.OpcMessageHandlerType;
|
import com.fizz.business.anno.OpcMessageHandlerType;
|
||||||
import com.fizz.business.constants.enums.L1OperateMatEnum;
|
import com.fizz.business.constants.enums.L1OperateMatEnum;
|
||||||
import com.fizz.business.constants.enums.OpcMessageType;
|
import com.fizz.business.constants.enums.OpcMessageType;
|
||||||
|
import com.fizz.business.domain.msg.EntryMovementMessage;
|
||||||
import com.fizz.business.domain.msg.ExitCutMessage;
|
import com.fizz.business.domain.msg.ExitCutMessage;
|
||||||
import com.fizz.business.dto.ExitCoilInfoDTO;
|
import com.fizz.business.dto.ExitCoilInfoDTO;
|
||||||
import com.fizz.business.dto.MatmapDTO;
|
import com.fizz.business.dto.MatmapDTO;
|
||||||
@@ -16,6 +17,8 @@ import lombok.RequiredArgsConstructor;
|
|||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
|
||||||
import static com.fizz.business.constants.enums.DeviceEnum.TR;
|
import static com.fizz.business.constants.enums.DeviceEnum.TR;
|
||||||
|
|
||||||
@Component
|
@Component
|
||||||
@@ -27,7 +30,8 @@ public class ExitCutHandler implements OpcMessageHandler<ExitCutMessage> {
|
|||||||
// 注入 PdoExCoilService
|
// 注入 PdoExCoilService
|
||||||
private final PdoExCoilService pdoExCoilService;
|
private final PdoExCoilService pdoExCoilService;
|
||||||
private final TrackService trackService;
|
private final TrackService trackService;
|
||||||
|
@Resource
|
||||||
|
private OpcReceiverHandler opcReceiverHandler;
|
||||||
@Override
|
@Override
|
||||||
public void handle(ExitCutMessage message) {
|
public void handle(ExitCutMessage message) {
|
||||||
// 1. 获取卷取机 (TR) 上的物料信息
|
// 1. 获取卷取机 (TR) 上的物料信息
|
||||||
@@ -50,12 +54,22 @@ public class ExitCutHandler implements OpcMessageHandler<ExitCutMessage> {
|
|||||||
pdoExCoilService.saveExCoil(exitCoilInfo);
|
pdoExCoilService.saveExCoil(exitCoilInfo);
|
||||||
|
|
||||||
if (exitCoilInfo.isLastFlag()) {
|
if (exitCoilInfo.isLastFlag()) {
|
||||||
|
|
||||||
trackService.l1OperateMat(L1OperateMatForm.builder()
|
trackService.l1OperateMat(L1OperateMatForm.builder()
|
||||||
.trIdx(TR.getIdx())
|
.trIdx(TR.getIdx())
|
||||||
.entryMatId(trMatmap.getMatId())
|
.entryMatId(trMatmap.getMatId())
|
||||||
.planId(trMatmap.getPlanId())
|
.planId(trMatmap.getPlanId())
|
||||||
.operation(L1OperateMatEnum.PRODUCT)
|
.operation(L1OperateMatEnum.PRODUCT)
|
||||||
.build());
|
.build());
|
||||||
|
|
||||||
|
// wangyu 配合二级发一个甩尾信号 01全甩一下
|
||||||
|
EntryMovementMessage msg = new EntryMovementMessage();
|
||||||
|
msg.setCounter(message.getCounter());
|
||||||
|
msg.setMaterialPlaceSource(0);
|
||||||
|
msg.setMaterialPlaceDestination(200);
|
||||||
|
opcReceiverHandler.onMessageReceived(OpcMessageType.ENTRY_MOVEMENT,msg);
|
||||||
|
msg.setMaterialPlaceSource(1);
|
||||||
|
opcReceiverHandler.onMessageReceived(OpcMessageType.ENTRY_MOVEMENT,msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
log.info("成功处理 EXIT_CUT 消息,已保存成品卷: " + exitCoilInfo.getExitMatId());
|
log.info("成功处理 EXIT_CUT 消息,已保存成品卷: " + exitCoilInfo.getExitMatId());
|
||||||
|
|||||||
Reference in New Issue
Block a user