refactor(wms/mes): 统一多场景查询逻辑,移除关键字混搜
1. 移除所有多字段关键字混搜,改为各筛选字段独立查询 2. 调整excel导出相关逻辑,优化文件名处理与导入模板 3. 修复物料导入的类型解析与token获取逻辑 4. 更新依赖与前端页面文案、筛选参数
This commit is contained in:
@@ -245,13 +245,9 @@ func applyInboundFilters(q *ent.InboundOrderQuery, r *http.Request) *ent.Inbound
|
||||
if v := r.URL.Query().Get("inboundType"); v != "" {
|
||||
q = q.Where(inboundorder.InboundTypeEQ(v))
|
||||
}
|
||||
if v := r.URL.Query().Get("keyword"); v != "" {
|
||||
kw := v
|
||||
q = q.Where(inboundorder.Or(
|
||||
inboundorder.MaterialCodeContainsFold(kw),
|
||||
inboundorder.InboundNoContainsFold(kw),
|
||||
inboundorder.MaterialNameContainsFold(kw),
|
||||
))
|
||||
if v := r.URL.Query().Get("materialName"); v != "" {
|
||||
// 2026-09-08 用户明确:禁止"关键字"多字段混搜,各字段独立筛选
|
||||
q = q.Where(inboundorder.MaterialNameContainsFold(v))
|
||||
}
|
||||
if v := r.URL.Query().Get("startDate"); v != "" {
|
||||
if t, err := time.ParseInLocation("2006-01-02", v, time.Local); err == nil {
|
||||
|
||||
Reference in New Issue
Block a user