refactor(wms/mes): 统一多场景查询逻辑,移除关键字混搜
1. 移除所有多字段关键字混搜,改为各筛选字段独立查询 2. 调整excel导出相关逻辑,优化文件名处理与导入模板 3. 修复物料导入的类型解析与token获取逻辑 4. 更新依赖与前端页面文案、筛选参数
This commit is contained in:
@@ -40,7 +40,7 @@ func ListProductTypesPageHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
page := atoiDefault(q.Get("page"), 1)
|
||||
pageSize := atoiDefault(q.Get("pageSize"), 20)
|
||||
total, list, wmsOnline, err := logic.New(svcCtx).ListProductTypesPage(r.Context(),
|
||||
q.Get("keyword"), q.Get("isActive"), page, pageSize)
|
||||
q.Get("code"), q.Get("name"), q.Get("category"), q.Get("isActive"), page, pageSize)
|
||||
if err != nil {
|
||||
httpx.Fail(w, 3001, err.Error())
|
||||
return
|
||||
@@ -96,7 +96,7 @@ func ExportProductTypesHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
q := r.URL.Query()
|
||||
b, err := svcCtx.Wms.ExportProductTypes(r.Context(),
|
||||
q.Get("keyword"), q.Get("isActive"), q.Get("startDate"), q.Get("endDate"))
|
||||
q.Get("code"), q.Get("name"), q.Get("category"), q.Get("isActive"), q.Get("startDate"), q.Get("endDate"))
|
||||
if err != nil {
|
||||
httpx.Fail(w, 3002, "导出失败(WMS 不可达):"+err.Error())
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user