SunYF/bj_power
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(wms/mes): 统一多场景查询逻辑，移除关键字混搜

Browse Source 
1. 移除所有多字段关键字混搜，改为各筛选字段独立查询
2. 调整excel导出相关逻辑，优化文件名处理与导入模板
3. 修复物料导入的类型解析与token获取逻辑
4. 更新依赖与前端页面文案、筛选参数
This commit is contained in:
SunYF
2026-09-08 13:43:08 +08:00
parent e852c7cd37
commit 6d8bb75696
16 changed files with 141 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bj_power_mes/internal/wmsclient/client.go
+25 -13
View File
@@ -6,6 +6,7 @@ import (
"context"
"encoding/json"
"net/http"
"net/url"
"time"
)
@@ -151,12 +152,9 @@ func (c *Client) putJSON(ctx context.Context, path string, body any) error {
return nil
}
// ProductTypes 全量产品型号（item_type=3，id asc，新建在底部）。keyword/isActive 可空。
func (c *Client) ProductTypes(ctx context.Context, keyword, isActive string) ([]ProductTypeRow, error) {
// ProductTypes 全量产品型号（item_type=3，id asc，新建在底部）。isActive 可空。
func (c *Client) ProductTypes(ctx context.Context, isActive string) ([]ProductTypeRow, error) {
q := "/api/internal/product-types?"
if keyword != "" {
q += "keyword=" + keyword + "&"
}
if isActive != "" {
q += "isActive=" + isActive
}
@@ -167,11 +165,18 @@ func (c *Client) ProductTypes(ctx context.Context, keyword, isActive string) ([]
return list, nil
}
// ProductTypePage 分页+搜索（产品型号管理页真分页）
func (c *Client) ProductTypePage(ctx context.Context, keyword, isActive string, page, pageSize int) (int64, []ProductTypeRow, error) {
// ProductTypePage 分页+搜索（产品型号管理页真分页）。
// 2026-09-08 禁止关键字混搜：编码/名称/类别各自独立模糊。
func (c *Client) ProductTypePage(ctx context.Context, code, name, category, isActive string, page, pageSize int) (int64, []ProductTypeRow, error) {
q := fmt.Sprintf("/api/internal/product-types?page=%d&pageSize=%d", page, pageSize)
if keyword != "" {
q += "&keyword=" + keyword
if code != "" {
q += "&code=" + url.QueryEscape(code)
}
if name != "" {
q += "&name=" + url.QueryEscape(name)
}
if category != "" {
q += "&category=" + url.QueryEscape(category)
}
if isActive != "" {
q += "&isActive=" + isActive
@@ -205,11 +210,18 @@ func (c *Client) DeleteProductType(ctx context.Context, id int) error {
return c.post(ctx, "/api/internal/product-types/delete", map[string]any{"id": id})
}
// ExportProductTypes 拉取产品型号导出 xlsx 字节流（WMS 端执行统一导出时间规则）
func (c *Client) ExportProductTypes(ctx context.Context, keyword, isActive, startDate, endDate string) ([]byte, error) {
// ExportProductTypes 拉取产品型号导出 xlsx 字节流（WMS 端执行统一导出时间规则）。
// 编码/名称/类别各自独立模糊筛选（禁止关键字混搜）。
func (c *Client) ExportProductTypes(ctx context.Context, code, name, category, isActive, startDate, endDate string) ([]byte, error) {
q := "/api/internal/product-types/export?"
if keyword != "" {
q += "keyword=" + keyword + "&"
if code != "" {
q += "code=" + url.QueryEscape(code) + "&"
}
if name != "" {
q += "name=" + url.QueryEscape(name) + "&"
}
if category != "" {
q += "category=" + url.QueryEscape(category) + "&"
}
if isActive != "" {
q += "isActive=" + isActive + "&"