refactor(wms/mes): 统一多场景查询逻辑,移除关键字混搜
1. 移除所有多字段关键字混搜,改为各筛选字段独立查询 2. 调整excel导出相关逻辑,优化文件名处理与导入模板 3. 修复物料导入的类型解析与token获取逻辑 4. 更新依赖与前端页面文案、筛选参数
This commit is contained in:
@@ -98,7 +98,6 @@ func listZonesHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
status := r.URL.Query().Get("status")
|
||||
startDate := r.URL.Query().Get("startDate")
|
||||
endDate := r.URL.Query().Get("endDate")
|
||||
keyword := r.URL.Query().Get("keyword") // 兼容旧版,作为区域编码/名称兜底
|
||||
|
||||
q := ctx.EntClient.Zone.Query()
|
||||
if zoneCode != "" {
|
||||
@@ -111,14 +110,6 @@ func listZonesHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
if status != "" {
|
||||
q = q.Where(zone.StatusEQ(status))
|
||||
}
|
||||
if keyword != "" {
|
||||
q = q.Where(
|
||||
zone.Or(
|
||||
zone.ZoneCodeContainsFold(keyword),
|
||||
zone.ZoneNameContainsFold(keyword),
|
||||
),
|
||||
)
|
||||
}
|
||||
if startDate != "" {
|
||||
if t, err := time.ParseInLocation("2006-01-02", startDate, time.Local); err == nil {
|
||||
q = q.Where(zone.CreatedAtGTE(t.Unix()))
|
||||
|
||||
Reference in New Issue
Block a user