feat(warning): 添加产线类型字段支持告警功能
- 在 WmsMaterialWarning 实体中新增 actionType 字段 - 在 WmsMaterialWarningBo 和 WmsMaterialWarningVo 中添加 actionType 属性 - 更新 WmsMaterialWarningMapper.xml 映射文件以包含 actionType 字段 - 在 WmsMaterialWarningServiceImpl 中注入 WmsCoilPendingActionMapper - 实现告警查询时根据产线类型过滤的功能 - 在告警插入前查询并设置对应的产线类型信息 - 完善告警服务中的厚度和长度检查逻辑
This commit is contained in:
@@ -2137,6 +2137,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
||||
baseMapper.insert(newCoil);
|
||||
|
||||
// 检查长度/厚度偏差并插入告警
|
||||
newCoilBo.setActionId(bo.getCoilId());
|
||||
materialWarningService.checkAndInsertWarnings(newCoil, newCoilBo);
|
||||
|
||||
newCoils.add(newCoil);
|
||||
@@ -2287,6 +2288,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
||||
baseMapper.insert(newCoil);
|
||||
|
||||
// 检查长度/厚度偏差并插入告警
|
||||
bo.setActionId(bo.getNewCoils().get(0).getActionId());
|
||||
materialWarningService.checkAndInsertWarnings(newCoil, bo);
|
||||
|
||||
newCoils.add(newCoil);
|
||||
@@ -3603,6 +3605,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
||||
for (WmsMaterialCoilBo originalCoilBo : bo.getNewCoils()) {
|
||||
if (originalCoilBo.getCoilId() == null) {
|
||||
continue;
|
||||
}else {
|
||||
bo.setActionId(coilToActionIdMap.get(originalCoilBo.getCoilId()));
|
||||
}
|
||||
if (!coilIdSet.add(originalCoilBo.getCoilId())) {
|
||||
throw new RuntimeException("参与合卷的钢卷中存在重复,相同的钢卷不能进行合卷操作");
|
||||
@@ -5143,6 +5147,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
||||
baseMapper.insert(childCoil);
|
||||
|
||||
// 检查长度/厚度偏差并插入告警
|
||||
childCoilBo.setActionId(pendingActionId);
|
||||
materialWarningService.checkAndInsertWarnings(childCoil, childCoilBo);
|
||||
|
||||
// 插入子钢卷的异常信息
|
||||
|
||||
Reference in New Issue
Block a user