diff --git a/klp-ui/src/components/CoilSelector/index.vue b/klp-ui/src/components/CoilSelector/index.vue index b12ff919..cb0a4a13 100644 --- a/klp-ui/src/components/CoilSelector/index.vue +++ b/klp-ui/src/components/CoilSelector/index.vue @@ -63,6 +63,10 @@ + + + @@ -179,7 +183,7 @@ export default { WarehouseBirdMini, DragResizeBox }, - dicts: ['coil_itemname', 'coil_material', 'coil_manufacturer'], + dicts: ['coil_itemname', 'coil_material', 'coil_manufacturer', 'coil_quality_status'], props: { // 非触发器模式下,外部控制显隐(触发器模式下无效) visible: { diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java index 406f7756..937e49b4 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java @@ -167,6 +167,11 @@ public class WmsMaterialCoilBo extends BaseEntity { */ private String qualityStatus; + /** + * 质量状态多选查询 + */ + private String qualityStatusCsv; + /** * 切边要求 */ diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index 92ac8552..8a3f3113 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -485,6 +485,22 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { qw.in("mc.warehouse_id", warehouseIdList.stream().distinct().collect(Collectors.toList())); } + List qualityStatusList = new ArrayList<>(); + if (StringUtils.isNotBlank(bo.getQualityStatusCsv())) { + String[] qualityStatusArray = bo.getQualityStatusCsv().split(","); + for (String qualityStatusStr : qualityStatusArray) { + if (StringUtils.isNotBlank(qualityStatusStr)) { + try { + qualityStatusList.add(qualityStatusStr.trim()); + } catch (NumberFormatException ignore) { + } + } + } + } + if (!qualityStatusList.isEmpty()) { + qw.in("mc.quality_status", qualityStatusList.stream().distinct().collect(Collectors.toList())); + } + // 统一处理 nextWarehouseId 与 nextWarehouseIds: List nextWarehouseIdList = new ArrayList<>(); if (bo.getNextWarehouseId() != null) {