feat(物料管理): 添加质量状态多选查询功能
在物料管理模块中新增质量状态多选查询功能,包括: 1. 后端添加qualityStatusCsv字段支持多选查询 2. 前端CoilSelector组件增加品质多选下拉框 3. 服务层实现多选条件过滤逻辑
This commit is contained in:
@@ -63,6 +63,10 @@
|
|||||||
<el-option label="简包" value="简包" />
|
<el-option label="简包" value="简包" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="品质">
|
||||||
|
<muti-select v-model="queryParams.qualityStatusCsv" :options="dict.type.coil_quality_status" placeholder="请选择品质"
|
||||||
|
clearable />
|
||||||
|
</el-form-item>
|
||||||
<el-form-item label="实际库区" v-if="orderBy">
|
<el-form-item label="实际库区" v-if="orderBy">
|
||||||
<actual-warehouse-select v-model="queryParams.actualWarehouseId" placeholder="请选择实际库区" canSelectLevel2
|
<actual-warehouse-select v-model="queryParams.actualWarehouseId" placeholder="请选择实际库区" canSelectLevel2
|
||||||
canSelectDisabled :clearInput="false" clearable />
|
canSelectDisabled :clearInput="false" clearable />
|
||||||
@@ -179,7 +183,7 @@ export default {
|
|||||||
WarehouseBirdMini,
|
WarehouseBirdMini,
|
||||||
DragResizeBox
|
DragResizeBox
|
||||||
},
|
},
|
||||||
dicts: ['coil_itemname', 'coil_material', 'coil_manufacturer'],
|
dicts: ['coil_itemname', 'coil_material', 'coil_manufacturer', 'coil_quality_status'],
|
||||||
props: {
|
props: {
|
||||||
// 非触发器模式下,外部控制显隐(触发器模式下无效)
|
// 非触发器模式下,外部控制显隐(触发器模式下无效)
|
||||||
visible: {
|
visible: {
|
||||||
|
|||||||
@@ -167,6 +167,11 @@ public class WmsMaterialCoilBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private String qualityStatus;
|
private String qualityStatus;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 质量状态多选查询
|
||||||
|
*/
|
||||||
|
private String qualityStatusCsv;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 切边要求
|
* 切边要求
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -485,6 +485,22 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
|||||||
qw.in("mc.warehouse_id", warehouseIdList.stream().distinct().collect(Collectors.toList()));
|
qw.in("mc.warehouse_id", warehouseIdList.stream().distinct().collect(Collectors.toList()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
List<String> 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:
|
// 统一处理 nextWarehouseId 与 nextWarehouseIds:
|
||||||
List<Long> nextWarehouseIdList = new ArrayList<>();
|
List<Long> nextWarehouseIdList = new ArrayList<>();
|
||||||
if (bo.getNextWarehouseId() != null) {
|
if (bo.getNextWarehouseId() != null) {
|
||||||
|
|||||||
Reference in New Issue
Block a user