feat: 大屏多订单改为同屏并列展示,物料申请新增跨工位借料来源并移除工单完成日期

This commit is contained in:
SunYF
2026-11-02 19:17:05 +08:00
parent 0c03d32682
commit fd2f0e2767
77 changed files with 1773 additions and 664 deletions
+21 -2
View File
@@ -23,6 +23,8 @@ const (
CfgDisplayStockRefresh = "display.stock.refresh" // 概览刷新间隔(秒)
CfgDisplayCallsRefresh = "display.calls.refresh" // 备料叫料池刷新间隔(秒)
CfgDisplayAgeBuckets = "display.age.buckets" // 库龄分档阈值(天,逗号分隔 3 档,升序)
// MES 对接(2026-11-02:页面可配,保存即生效;空=回退 yaml 配置)
CfgMesBaseURL = "mes.base.url" // MES 服务地址(如 http://127.0.0.1:8888)
)
var wmsSettingsDefaults = map[string]string{
@@ -51,6 +53,7 @@ type SettingsVO struct {
DisplayStockRefresh int `json:"displayStockRefresh"` // 库存大屏概览刷新间隔(秒)
DisplayCallsRefresh int `json:"displayCallsRefresh"` // 备料叫料池刷新间隔(秒)
DisplayAgeBuckets string `json:"displayAgeBuckets"` // 库龄分档阈值(天,逗号分隔 3 档)
MesBaseURL string `json:"mesBaseURL"` // MES 服务地址(空=用配置文件默认)
}
func cfgStr(kv map[string]string, key, def string) string {
@@ -100,8 +103,9 @@ func SettingsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
DisplayStockRefresh: cfgInt(kv, CfgDisplayStockRefresh, 5),
DisplayCallsRefresh: cfgInt(kv, CfgDisplayCallsRefresh, 10),
DisplayAgeBuckets: cfgStr(kv, CfgDisplayAgeBuckets, wmsSettingsDefaults[CfgDisplayAgeBuckets]),
}
ok(w, vo)
MesBaseURL: strings.TrimRight(cfgStr(kv, CfgMesBaseURL, ""), "/"),
}
ok(w, vo)
}
}
@@ -148,6 +152,18 @@ func SaveSettingsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
fail(w, http.StatusBadRequest, "库龄分档阈值需为逗号分隔的 3 个升序天数(如 30,90,180),各档 1~3650")
return
}
// MES 服务地址:留空=回退配置文件默认;填了必须 http(s):// 开头(2026-11-02)
mesURL := strings.TrimRight(strings.TrimSpace(req.MesBaseURL), "/")
if mesURL != "" {
if !strings.HasPrefix(mesURL, "http://") && !strings.HasPrefix(mesURL, "https://") {
fail(w, http.StatusBadRequest, "MES 服务地址需以 http:// 或 https:// 开头(如 http://127.0.0.1:8888)")
return
}
if len(mesURL) > 200 {
fail(w, http.StatusBadRequest, "MES 服务地址过长(≤200 字)")
return
}
}
kv := map[string]string{
CfgArchiveRemindDays: strconv.Itoa(req.ArchiveRemindDays),
CfgArchiveBackupPath: strings.TrimSpace(req.ArchiveBackupPath),
@@ -159,6 +175,7 @@ func SaveSettingsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
CfgDisplayStockRefresh: strconv.Itoa(req.DisplayStockRefresh),
CfgDisplayCallsRefresh: strconv.Itoa(req.DisplayCallsRefresh),
CfgDisplayAgeBuckets: strconv.Itoa(buckets[0]) + "," + strconv.Itoa(buckets[1]) + "," + strconv.Itoa(buckets[2]),
CfgMesBaseURL: mesURL,
}
for k, v := range kv {
if err := upsertConfig(ctx, k, v, ""); err != nil {
@@ -166,6 +183,8 @@ func SaveSettingsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return
}
}
// MES 地址热生效(空=回退配置文件默认)
ctx.Mes.SetBaseURL(mesURL)
ok(w, map[string]any{"ok": true})
}
}