2026-09-18 18:54:54 +08:00
|
|
|
|
package handler
|
2026-08-28 15:06:01 +08:00
|
|
|
|
|
|
|
|
|
|
import (
|
|
|
|
|
|
"net/http"
|
2026-09-04 14:18:53 +08:00
|
|
|
|
"strconv"
|
2026-09-18 18:54:54 +08:00
|
|
|
|
"strings"
|
2026-08-28 15:06:01 +08:00
|
|
|
|
|
|
|
|
|
|
"bj_power_wms/ent"
|
2026-09-19 17:04:58 +08:00
|
|
|
|
"bj_power_wms/ent/inventory"
|
2026-08-28 15:06:01 +08:00
|
|
|
|
"bj_power_wms/ent/zone"
|
|
|
|
|
|
"bj_power_wms/internal/svc"
|
|
|
|
|
|
)
|
|
|
|
|
|
|
2026-09-19 10:54:15 +08:00
|
|
|
|
// 层级常量:区域(level1) → 货架(level2) → 层(level3) → 位置号(level4)
|
|
|
|
|
|
const (
|
|
|
|
|
|
zoneLevelRegion = 1
|
|
|
|
|
|
zoneLevelShelf = 2
|
|
|
|
|
|
zoneLevelLayer = 3
|
|
|
|
|
|
zoneLevelPos = 4
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
func zoneLevelName(l int) string {
|
|
|
|
|
|
switch l {
|
|
|
|
|
|
case 1:
|
|
|
|
|
|
return "区域"
|
|
|
|
|
|
case 2:
|
|
|
|
|
|
return "货架"
|
|
|
|
|
|
case 3:
|
|
|
|
|
|
return "层"
|
|
|
|
|
|
case 4:
|
|
|
|
|
|
return "位置号"
|
|
|
|
|
|
}
|
|
|
|
|
|
return "节点"
|
2026-09-18 18:54:54 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
2026-09-19 10:54:15 +08:00
|
|
|
|
// zoneNodeVO 层级节点视图对象(列表/下拉共用)
|
|
|
|
|
|
type zoneNodeVO struct {
|
|
|
|
|
|
ID int `json:"id"`
|
|
|
|
|
|
Level int `json:"level"`
|
|
|
|
|
|
Code string `json:"code"`
|
|
|
|
|
|
Name string `json:"name"`
|
|
|
|
|
|
ParentCode string `json:"parentCode"`
|
|
|
|
|
|
ZoneCode string `json:"zoneCode"`
|
|
|
|
|
|
ZoneName string `json:"zoneName"`
|
|
|
|
|
|
ShelfNo string `json:"shelfNo"`
|
|
|
|
|
|
LayerNo string `json:"layerNo"`
|
|
|
|
|
|
PositionNo string `json:"positionNo"`
|
|
|
|
|
|
Status string `json:"status"`
|
|
|
|
|
|
Description string `json:"description"`
|
|
|
|
|
|
CreatedAt int64 `json:"createdAt"`
|
2026-10-10 15:58:59 +08:00
|
|
|
|
// StockQty 本级实时库存总量(需求E/需求7):每次查询实时聚合 inventories(quantity>0 且 status∈{在库,锁定} 且非半成品),不缓存。
|
2026-09-20 14:52:36 +08:00
|
|
|
|
// level1=区域合计、level2=货架合计、level3=层合计、level4=该位置合计。
|
|
|
|
|
|
StockQty int `json:"stockQty"`
|
2026-10-10 15:58:59 +08:00
|
|
|
|
// UnshelvedQty 区域级「未分配货架」库存合计(货位为空但已填区域的合法状态,见库存口径说明);仅 level1 有意义。
|
|
|
|
|
|
UnshelvedQty int `json:"unshelvedQty"`
|
|
|
|
|
|
// IsSynthetic 是否为合成行(如「(未分配货架)」虚拟货架);合成行不可编辑/删除,仅用于展示未上架库存。
|
|
|
|
|
|
IsSynthetic bool `json:"isSynthetic"`
|
2026-09-18 18:54:54 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
2026-09-19 10:54:15 +08:00
|
|
|
|
func toZoneNodeVO(z *ent.Zone) zoneNodeVO {
|
|
|
|
|
|
return zoneNodeVO{
|
|
|
|
|
|
ID: z.ID, Level: z.Level, Code: z.Code, Name: z.Name, ParentCode: z.ParentCode,
|
|
|
|
|
|
ZoneCode: z.ZoneCode, ZoneName: z.ZoneName, ShelfNo: z.ShelfNo, LayerNo: z.LayerNo,
|
|
|
|
|
|
PositionNo: z.PositionNo, Status: z.Status, Description: z.Description, CreatedAt: z.CreatedAt,
|
|
|
|
|
|
}
|
2026-09-18 18:54:54 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
2026-09-19 10:54:15 +08:00
|
|
|
|
// listZonesHandler 按层级列出节点(4 个 Tab 各自独立分页 + 按上级筛选)
|
2026-09-20 14:52:36 +08:00
|
|
|
|
// 参数:level(必填1~4)、parentCode、zoneCode、shelfNo、layerNo、code、name、status、page、pageSize
|
2026-09-19 10:54:15 +08:00
|
|
|
|
func listZonesHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
2026-08-28 15:06:01 +08:00
|
|
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
2026-09-19 10:54:15 +08:00
|
|
|
|
level := atoi(r.URL.Query().Get("level"), 0)
|
|
|
|
|
|
if level < 1 || level > 4 {
|
|
|
|
|
|
fail(w, http.StatusBadRequest, "level 必须为 1~4")
|
2026-08-28 15:06:01 +08:00
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
page := atoi(r.URL.Query().Get("page"), 1)
|
|
|
|
|
|
pageSize := atoi(r.URL.Query().Get("pageSize"), 20)
|
|
|
|
|
|
if page <= 0 {
|
|
|
|
|
|
page = 1
|
2026-08-28 15:06:01 +08:00
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
if pageSize <= 0 {
|
|
|
|
|
|
pageSize = 20
|
2026-09-18 18:54:54 +08:00
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
if pageSize > 200 {
|
|
|
|
|
|
pageSize = 200
|
2026-09-18 18:54:54 +08:00
|
|
|
|
}
|
2026-08-28 15:06:01 +08:00
|
|
|
|
|
2026-09-19 10:54:15 +08:00
|
|
|
|
q := ctx.EntClient.Zone.Query().Where(zone.LevelEQ(level))
|
|
|
|
|
|
if pc := strings.TrimSpace(r.URL.Query().Get("parentCode")); pc != "" {
|
|
|
|
|
|
q = q.Where(zone.ParentCodeEQ(pc))
|
|
|
|
|
|
}
|
|
|
|
|
|
if zc := strings.TrimSpace(r.URL.Query().Get("zoneCode")); zc != "" {
|
|
|
|
|
|
q = q.Where(zone.ZoneCodeEQ(strings.ToUpper(zc)))
|
|
|
|
|
|
}
|
|
|
|
|
|
if sh := strings.TrimSpace(r.URL.Query().Get("shelfNo")); sh != "" {
|
|
|
|
|
|
q = q.Where(zone.ShelfNoEQ(sh))
|
|
|
|
|
|
}
|
|
|
|
|
|
if ly := strings.TrimSpace(r.URL.Query().Get("layerNo")); ly != "" {
|
|
|
|
|
|
q = q.Where(zone.LayerNoEQ(ly))
|
|
|
|
|
|
}
|
2026-09-20 14:52:36 +08:00
|
|
|
|
// 列表页禁止关键字混搜:本节点编码、名称各自独立模糊筛选(需求N)
|
|
|
|
|
|
if code := strings.TrimSpace(r.URL.Query().Get("code")); code != "" {
|
|
|
|
|
|
q = q.Where(zone.CodeContainsFold(code))
|
|
|
|
|
|
}
|
|
|
|
|
|
if name := strings.TrimSpace(r.URL.Query().Get("name")); name != "" {
|
|
|
|
|
|
q = q.Where(zone.NameContainsFold(name))
|
2026-09-19 10:54:15 +08:00
|
|
|
|
}
|
|
|
|
|
|
if st := strings.TrimSpace(r.URL.Query().Get("status")); st != "" {
|
|
|
|
|
|
q = q.Where(zone.StatusEQ(st))
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
total, err := q.Count(ctx0())
|
2026-08-28 15:06:01 +08:00
|
|
|
|
if err != nil {
|
|
|
|
|
|
fail(w, http.StatusInternalServerError, err.Error())
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
rows, err := q.Order(ent.Asc("code"), ent.Asc("id")).
|
|
|
|
|
|
Offset((page - 1) * pageSize).Limit(pageSize).All(ctx0())
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
fail(w, http.StatusInternalServerError, err.Error())
|
2026-09-18 18:54:54 +08:00
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
list := make([]zoneNodeVO, 0, len(rows))
|
2026-10-10 15:58:59 +08:00
|
|
|
|
byZone, byShelf, byLayer, byPos, byUnshelved := zoneStockMaps(ctx)
|
2026-09-19 10:54:15 +08:00
|
|
|
|
for _, z := range rows {
|
2026-09-20 14:52:36 +08:00
|
|
|
|
vo := toZoneNodeVO(z)
|
|
|
|
|
|
zc := strings.ToLower(strings.TrimSpace(z.ZoneCode))
|
|
|
|
|
|
sh := strings.ToLower(strings.TrimSpace(z.ShelfNo))
|
|
|
|
|
|
ly := strings.TrimSpace(z.LayerNo)
|
|
|
|
|
|
switch z.Level {
|
|
|
|
|
|
case zoneLevelRegion:
|
|
|
|
|
|
vo.StockQty = byZone[zc]
|
2026-10-10 15:58:59 +08:00
|
|
|
|
vo.UnshelvedQty = byUnshelved[zc]
|
2026-09-20 14:52:36 +08:00
|
|
|
|
case zoneLevelShelf:
|
|
|
|
|
|
vo.StockQty = byShelf[zc+"|"+sh]
|
|
|
|
|
|
case zoneLevelLayer:
|
|
|
|
|
|
vo.StockQty = byLayer[zc+"|"+sh+"|"+ly]
|
|
|
|
|
|
case zoneLevelPos:
|
|
|
|
|
|
vo.StockQty = byPos[locKey(z.ZoneCode, z.ShelfNo, z.LayerNo, z.PositionNo)]
|
|
|
|
|
|
}
|
|
|
|
|
|
list = append(list, vo)
|
2026-09-19 10:54:15 +08:00
|
|
|
|
}
|
2026-10-10 15:58:59 +08:00
|
|
|
|
// 货架(level2)列表置顶固定合成行「(未分配货架)」:汇总本页所属区域的未上架库存,
|
|
|
|
|
|
// 灰显不可编辑,不参与分页计数(见库存口径说明:缺货位为合法状态)。
|
|
|
|
|
|
if level == zoneLevelShelf {
|
|
|
|
|
|
unshelvedTotal := 0
|
|
|
|
|
|
seenZc := map[string]bool{}
|
|
|
|
|
|
for _, z2 := range rows {
|
|
|
|
|
|
zc2 := strings.ToLower(strings.TrimSpace(z2.ZoneCode))
|
|
|
|
|
|
if !seenZc[zc2] {
|
|
|
|
|
|
seenZc[zc2] = true
|
|
|
|
|
|
unshelvedTotal += byUnshelved[zc2]
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
if unshelvedTotal > 0 && len(rows) > 0 {
|
|
|
|
|
|
synth := zoneNodeVO{
|
|
|
|
|
|
Level: zoneLevelShelf,
|
|
|
|
|
|
Code: "",
|
|
|
|
|
|
Name: "(未分配货架)",
|
|
|
|
|
|
ZoneCode: rows[0].ZoneCode,
|
|
|
|
|
|
ZoneName: rows[0].ZoneName,
|
|
|
|
|
|
Status: "启用",
|
|
|
|
|
|
StockQty: unshelvedTotal,
|
|
|
|
|
|
IsSynthetic: true,
|
|
|
|
|
|
}
|
|
|
|
|
|
list = append([]zoneNodeVO{synth}, list...)
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
// 区域(level1)列表置顶固定合成行「(未分区)」:zone_code 为空的库存合计(入库不强制货位的合法状态),
|
|
|
|
|
|
// 与货架级「(未分配货架)」同款处理:灰显不可编辑,不参与分页计数;使区域维护页与区域汇总/库位明细的「未分区」行对账一致。
|
|
|
|
|
|
if level == zoneLevelRegion {
|
|
|
|
|
|
if unpartitioned := byZone[""]; unpartitioned > 0 {
|
|
|
|
|
|
synth := zoneNodeVO{
|
|
|
|
|
|
Level: zoneLevelRegion,
|
|
|
|
|
|
Code: "",
|
|
|
|
|
|
Name: "(未分区)",
|
|
|
|
|
|
Status: "启用",
|
|
|
|
|
|
StockQty: unpartitioned,
|
|
|
|
|
|
UnshelvedQty: byUnshelved[""],
|
|
|
|
|
|
IsSynthetic: true,
|
|
|
|
|
|
}
|
|
|
|
|
|
list = append([]zoneNodeVO{synth}, list...)
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
ok(w, map[string]any{"total": total, "list": list, "page": page, "pageSize": pageSize})
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2026-09-18 18:54:54 +08:00
|
|
|
|
|
2026-10-10 15:58:59 +08:00
|
|
|
|
// zoneStockMaps 实时聚合各级库存总量(需求E):一次扫描在库 inventories(quantity>0 且 status∈{在库,锁定} 且非半成品),
|
2026-09-20 14:52:36 +08:00
|
|
|
|
// 分别按 区域 / 区域+货架 / 区域+货架+层 / 完整四级货位 累加,供四级列表展示实时库存。
|
2026-10-10 15:58:59 +08:00
|
|
|
|
// byUnshelved 为区域级「未分配货架」库存合计(货位为空但已填区域的合法状态),供未上架标识与合成行使用。
|
2026-09-20 14:52:36 +08:00
|
|
|
|
// 键归一与 locKey 一致:区域/货架小写,层/位置原样 trim。
|
2026-10-10 15:58:59 +08:00
|
|
|
|
func zoneStockMaps(ctx *svc.ServiceContext) (byZone, byShelf, byLayer, byPos, byUnshelved map[string]int) {
|
|
|
|
|
|
byZone, byShelf, byLayer, byPos, byUnshelved = map[string]int{}, map[string]int{}, map[string]int{}, map[string]int{}, map[string]int{}
|
2026-09-20 14:52:36 +08:00
|
|
|
|
invs, err := ctx.EntClient.Inventory.Query().
|
2026-10-10 15:58:59 +08:00
|
|
|
|
Where(inventory.QuantityGT(0), inventory.StatusIn("在库", "锁定"), inventory.CategoryNEQ(invCatSemi)).All(ctx0())
|
2026-09-20 14:52:36 +08:00
|
|
|
|
if err != nil {
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
for _, iv := range invs {
|
|
|
|
|
|
zc := strings.ToLower(strings.TrimSpace(iv.ZoneCode))
|
|
|
|
|
|
sh := strings.ToLower(strings.TrimSpace(iv.ShelfNo))
|
|
|
|
|
|
ly := strings.TrimSpace(iv.LayerNo)
|
|
|
|
|
|
byZone[zc] += iv.Quantity
|
|
|
|
|
|
byShelf[zc+"|"+sh] += iv.Quantity
|
|
|
|
|
|
byLayer[zc+"|"+sh+"|"+ly] += iv.Quantity
|
|
|
|
|
|
byPos[locKey(iv.ZoneCode, iv.ShelfNo, iv.LayerNo, iv.PositionNo)] += iv.Quantity
|
2026-10-10 15:58:59 +08:00
|
|
|
|
if sh == "" {
|
|
|
|
|
|
byUnshelved[zc] += iv.Quantity
|
|
|
|
|
|
}
|
2026-09-20 14:52:36 +08:00
|
|
|
|
}
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-09-21 10:48:53 +08:00
|
|
|
|
// zoneNodeReq 新建层级节点请求。
|
|
|
|
|
|
// 父级以完整路径给出(区域→货架→层),后端据此精确定位父级,避免仅凭 code 跨父级歧义。
|
2026-09-19 10:54:15 +08:00
|
|
|
|
type zoneNodeReq struct {
|
2026-09-21 10:48:53 +08:00
|
|
|
|
Level int `json:"level"`
|
|
|
|
|
|
Code string `json:"code"`
|
|
|
|
|
|
Name string `json:"name"`
|
|
|
|
|
|
ZoneCode string `json:"zoneCode"` // 所属区域编码(level>=2 必填)
|
|
|
|
|
|
ShelfNo string `json:"shelfNo"` // 所属货架号(level>=3 必填)
|
|
|
|
|
|
LayerNo string `json:"layerNo"` // 所属层号(level=4 必填)
|
|
|
|
|
|
Remark string `json:"remark"`
|
2026-09-19 10:54:15 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
2026-09-21 10:48:53 +08:00
|
|
|
|
// createZoneNodeHandler 新建层级节点(按完整路径 区域→货架→层 精确定位父级并写冗余路径)。
|
|
|
|
|
|
// 父级必须存在且不能为空;位置号(level4)必须挂在已存在的层下(不再有“无层默认位置”)。
|
2026-09-19 10:54:15 +08:00
|
|
|
|
func createZoneNodeHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
|
|
|
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
|
|
|
|
var req zoneNodeReq
|
|
|
|
|
|
if err := parseJSON(r, &req); err != nil {
|
|
|
|
|
|
fail(w, http.StatusBadRequest, "参数错误")
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
req.Code = strings.TrimSpace(req.Code)
|
|
|
|
|
|
req.Name = strings.TrimSpace(req.Name)
|
2026-09-21 10:48:53 +08:00
|
|
|
|
req.ZoneCode = strings.ToUpper(strings.TrimSpace(req.ZoneCode))
|
|
|
|
|
|
req.ShelfNo = strings.TrimSpace(req.ShelfNo)
|
|
|
|
|
|
req.LayerNo = strings.TrimSpace(req.LayerNo)
|
2026-09-19 10:54:15 +08:00
|
|
|
|
req.Remark = strings.TrimSpace(req.Remark)
|
|
|
|
|
|
if req.Level < 1 || req.Level > 4 {
|
|
|
|
|
|
fail(w, http.StatusBadRequest, "level 必须为 1~4")
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
if req.Code == "" {
|
|
|
|
|
|
fail(w, http.StatusBadRequest, "编码必填")
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
if req.Level == 1 {
|
|
|
|
|
|
req.Code = strings.ToUpper(req.Code)
|
|
|
|
|
|
if req.Name == "" {
|
|
|
|
|
|
fail(w, http.StatusBadRequest, "区域名称必填")
|
2026-09-17 12:49:07 +08:00
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-08-28 15:06:01 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
2026-09-21 10:48:53 +08:00
|
|
|
|
// 逐级解析父级:父级必须已存在,路径(区域+货架+层)唯一确定,避免仅凭 code 跨父级歧义。
|
2026-09-19 10:54:15 +08:00
|
|
|
|
var zoneCode, shelfNo, layerNo, parentCode string
|
|
|
|
|
|
switch req.Level {
|
|
|
|
|
|
case 1:
|
|
|
|
|
|
zoneCode = req.Code
|
|
|
|
|
|
parentCode = ""
|
|
|
|
|
|
case 2:
|
2026-09-21 10:48:53 +08:00
|
|
|
|
if req.ZoneCode == "" {
|
2026-09-19 10:54:15 +08:00
|
|
|
|
fail(w, http.StatusBadRequest, "请选择所属区域")
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-09-21 10:48:53 +08:00
|
|
|
|
reg, err := ctx.EntClient.Zone.Query().Where(zone.LevelEQ(1), zone.CodeEQ(req.ZoneCode)).Only(ctx0())
|
2026-09-18 18:54:54 +08:00
|
|
|
|
if err != nil {
|
2026-09-21 10:48:53 +08:00
|
|
|
|
fail(w, http.StatusBadRequest, "所属区域不存在:"+req.ZoneCode)
|
2026-09-19 10:54:15 +08:00
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
zoneCode = reg.ZoneCode
|
|
|
|
|
|
shelfNo = req.Code
|
2026-09-21 10:48:53 +08:00
|
|
|
|
parentCode = reg.Code
|
2026-09-19 10:54:15 +08:00
|
|
|
|
case 3:
|
2026-09-21 10:48:53 +08:00
|
|
|
|
if req.ZoneCode == "" || req.ShelfNo == "" {
|
|
|
|
|
|
fail(w, http.StatusBadRequest, "请选择所属区域与货架")
|
2026-09-18 18:54:54 +08:00
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-09-21 10:48:53 +08:00
|
|
|
|
sh, err := ctx.EntClient.Zone.Query().
|
|
|
|
|
|
Where(zone.LevelEQ(2), zone.ZoneCodeEQ(req.ZoneCode), zone.CodeEQ(req.ShelfNo)).Only(ctx0())
|
2026-09-19 10:54:15 +08:00
|
|
|
|
if err != nil {
|
2026-09-21 10:48:53 +08:00
|
|
|
|
fail(w, http.StatusBadRequest, "所属货架不存在:"+req.ZoneCode+"/"+req.ShelfNo)
|
2026-09-19 10:54:15 +08:00
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
zoneCode = sh.ZoneCode
|
|
|
|
|
|
shelfNo = sh.ShelfNo
|
|
|
|
|
|
layerNo = req.Code
|
2026-09-21 10:48:53 +08:00
|
|
|
|
parentCode = sh.Code
|
2026-09-19 10:54:15 +08:00
|
|
|
|
case 4:
|
2026-09-21 10:48:53 +08:00
|
|
|
|
if req.ZoneCode == "" || req.ShelfNo == "" || req.LayerNo == "" {
|
|
|
|
|
|
fail(w, http.StatusBadRequest, "请选择所属层")
|
2026-09-19 10:54:15 +08:00
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-09-21 10:48:53 +08:00
|
|
|
|
ly, err := ctx.EntClient.Zone.Query().
|
|
|
|
|
|
Where(zone.LevelEQ(3), zone.ZoneCodeEQ(req.ZoneCode), zone.ShelfNoEQ(req.ShelfNo), zone.CodeEQ(req.LayerNo)).Only(ctx0())
|
2026-09-19 10:54:15 +08:00
|
|
|
|
if err != nil {
|
2026-09-21 10:48:53 +08:00
|
|
|
|
fail(w, http.StatusBadRequest, "所属层不存在:"+req.ZoneCode+"/"+req.ShelfNo+"/"+req.LayerNo)
|
2026-09-19 10:54:15 +08:00
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-09-21 10:48:53 +08:00
|
|
|
|
zoneCode = ly.ZoneCode
|
|
|
|
|
|
shelfNo = ly.ShelfNo
|
|
|
|
|
|
layerNo = ly.Code
|
|
|
|
|
|
parentCode = ly.Code
|
2026-09-19 10:54:15 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 唯一性:同层级 + 同区域 + 同货架 + 同层 + 同编码 不可重复
|
|
|
|
|
|
dup, _ := ctx.EntClient.Zone.Query().
|
|
|
|
|
|
Where(zone.LevelEQ(req.Level), zone.ZoneCodeEQ(zoneCode),
|
|
|
|
|
|
zone.ShelfNoEQ(shelfNo), zone.LayerNoEQ(layerNo), zone.CodeEQ(req.Code)).
|
|
|
|
|
|
Exist(ctx0())
|
|
|
|
|
|
if dup {
|
|
|
|
|
|
fail(w, http.StatusConflict, "该编码已存在:"+req.Code)
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
create := ctx.EntClient.Zone.Create().
|
|
|
|
|
|
SetLevel(req.Level).SetCode(req.Code).SetParentCode(parentCode).
|
|
|
|
|
|
SetZoneCode(zoneCode).SetNillableShelfNo(strPtr(shelfNo)).
|
|
|
|
|
|
SetNillableLayerNo(strPtr(layerNo)).SetNillablePositionNo(strPtr(req.Code)).
|
2026-09-20 14:52:36 +08:00
|
|
|
|
SetStatus("启用").SetNillableDescription(strPtr(req.Remark)).
|
|
|
|
|
|
SetName(req.Name) // 四级均可有名称(需求E)
|
2026-09-19 10:54:15 +08:00
|
|
|
|
if req.Level == 1 {
|
2026-09-20 14:52:36 +08:00
|
|
|
|
create.SetZoneName(req.Name) // 区域名称冗余,兼容 stock.go 区域名映射
|
2026-09-19 10:54:15 +08:00
|
|
|
|
}
|
|
|
|
|
|
z, err := create.Save(ctx0())
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
fail(w, http.StatusInternalServerError, err.Error())
|
|
|
|
|
|
return
|
2026-08-28 15:06:01 +08:00
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
|
|
|
|
|
|
ctx.EventLog.Write(ctx0(), "zone.create", r.Header.Get("X-Username"), "zone", req.Code,
|
|
|
|
|
|
"新建"+zoneLevelName(req.Level)+" "+req.Code, nil)
|
|
|
|
|
|
ok(w, toZoneNodeVO(z))
|
2026-08-28 15:06:01 +08:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-09-19 10:54:15 +08:00
|
|
|
|
type zoneNodeUpdateReq struct {
|
2026-09-20 14:53:14 +08:00
|
|
|
|
ID int `json:"id"`
|
|
|
|
|
|
Name string `json:"name"`
|
|
|
|
|
|
Remark string `json:"remark"`
|
|
|
|
|
|
Status string `json:"status"`
|
2026-09-19 10:54:15 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
2026-09-20 14:52:36 +08:00
|
|
|
|
// updateZoneNodeHandler 编辑节点(四级均可改名称/备注/启用停用;区域额外同步 zone_name 冗余)。
|
|
|
|
|
|
// 需求E:不删只停用,无删除入口;名称与备注全级可维护。
|
2026-09-19 10:54:15 +08:00
|
|
|
|
func updateZoneNodeHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
2026-09-01 13:49:44 +08:00
|
|
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
2026-09-19 10:54:15 +08:00
|
|
|
|
var req zoneNodeUpdateReq
|
2026-09-18 18:54:54 +08:00
|
|
|
|
if err := parseJSON(r, &req); err != nil {
|
2026-09-01 13:49:44 +08:00
|
|
|
|
fail(w, http.StatusBadRequest, "参数错误")
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
if req.ID <= 0 {
|
|
|
|
|
|
fail(w, http.StatusBadRequest, "id 必填")
|
2026-09-01 13:49:44 +08:00
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
z, err := ctx.EntClient.Zone.Get(ctx0(), req.ID)
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
fail(w, http.StatusNotFound, "节点不存在")
|
2026-09-18 18:54:54 +08:00
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
status := req.Status
|
|
|
|
|
|
if status == "" {
|
2026-09-19 10:54:15 +08:00
|
|
|
|
status = z.Status
|
2026-09-18 18:54:54 +08:00
|
|
|
|
}
|
|
|
|
|
|
if status != "启用" && status != "停用" {
|
|
|
|
|
|
fail(w, http.StatusBadRequest, "状态取值非法")
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-09-20 14:52:36 +08:00
|
|
|
|
upd := ctx.EntClient.Zone.UpdateOneID(req.ID).SetStatus(status).
|
|
|
|
|
|
SetName(strings.TrimSpace(req.Name)).
|
|
|
|
|
|
SetNillableDescription(strPtr(strings.TrimSpace(req.Remark)))
|
2026-09-19 10:54:15 +08:00
|
|
|
|
if z.Level == 1 {
|
2026-09-20 14:52:36 +08:00
|
|
|
|
upd.SetZoneName(strings.TrimSpace(req.Name)) // 区域名称冗余同步
|
2026-09-17 12:49:07 +08:00
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
if _, err := upd.Save(ctx0()); err != nil {
|
|
|
|
|
|
fail(w, http.StatusInternalServerError, err.Error())
|
2026-09-01 13:49:44 +08:00
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
ctx.EventLog.Write(ctx0(), "zone.update", r.Header.Get("X-Username"), "zone", z.Code,
|
|
|
|
|
|
"编辑"+zoneLevelName(z.Level)+" "+z.Code, nil)
|
|
|
|
|
|
ok(w, map[string]any{"id": req.ID})
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2026-09-18 18:54:54 +08:00
|
|
|
|
|
2026-09-19 10:54:15 +08:00
|
|
|
|
// listZonesForPicker 库位下拉(兼容 + 层级两用):
|
|
|
|
|
|
// - 不带 level:返回所有启用位置号(level4)扁平结构(兼容 Outbound/Stocktake/Inventory 旧调用)
|
|
|
|
|
|
// - 带 level:返回该层级节点(用于入库页区域→货架→层→位置 级联下拉)
|
2026-09-20 14:53:14 +08:00
|
|
|
|
//
|
2026-09-19 17:04:58 +08:00
|
|
|
|
// locKey 四级货位比较键:区域/货架忽略大小写(存量数据存在 z01/Z01 混用),层/位置原样。
|
|
|
|
|
|
func locKey(zoneCode, shelfNo, layerNo, positionNo string) string {
|
|
|
|
|
|
return strings.ToLower(strings.TrimSpace(zoneCode)) + "|" +
|
|
|
|
|
|
strings.ToLower(strings.TrimSpace(shelfNo)) + "|" +
|
|
|
|
|
|
strings.TrimSpace(layerNo) + "|" + strings.TrimSpace(positionNo)
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// vacantZoneHandler 同区空位推荐:返回指定区域(不传 zoneCode 则不限区域)内「未被库存占用」的位置节点(level=4)。
|
|
|
|
|
|
// 用途:入库选中物料后,若该物料无历史库位(新物料),自动推荐同区空位,替代人工逐个挑选货架/层/位置。
|
|
|
|
|
|
// 占用判定:inventories 中 quantity>0 且 status 非「出库/报废」的记录,其四级货位视为已占用。
|
|
|
|
|
|
func vacantZoneHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
|
|
|
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
|
|
|
|
wantZone := strings.ToLower(strings.TrimSpace(r.URL.Query().Get("zoneCode")))
|
|
|
|
|
|
limit := atoi(r.URL.Query().Get("limit"), 20)
|
|
|
|
|
|
if limit <= 0 || limit > 200 {
|
|
|
|
|
|
limit = 20
|
|
|
|
|
|
}
|
|
|
|
|
|
rows, err := ctx.EntClient.Zone.Query().
|
|
|
|
|
|
Where(zone.LevelEQ(zoneLevelPos), zone.StatusEQ("启用")).
|
|
|
|
|
|
Order(ent.Asc("zone_code"), ent.Asc("shelf_no"), ent.Asc("layer_no"), ent.Asc("code")).
|
|
|
|
|
|
All(ctx0())
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
fail(w, http.StatusInternalServerError, err.Error())
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
occupied := map[string]bool{}
|
|
|
|
|
|
if invs, ierr := ctx.EntClient.Inventory.Query().
|
|
|
|
|
|
Where(inventory.QuantityGT(0), inventory.StatusNotIn("出库", "报废")).
|
|
|
|
|
|
All(ctx0()); ierr == nil {
|
|
|
|
|
|
for _, iv := range invs {
|
|
|
|
|
|
occupied[locKey(iv.ZoneCode, iv.ShelfNo, iv.LayerNo, iv.PositionNo)] = true
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
list := make([]map[string]any, 0, limit)
|
|
|
|
|
|
for _, z := range rows {
|
|
|
|
|
|
if wantZone != "" && strings.ToLower(z.ZoneCode) != wantZone {
|
|
|
|
|
|
continue
|
|
|
|
|
|
}
|
|
|
|
|
|
if occupied[locKey(z.ZoneCode, z.ShelfNo, z.LayerNo, z.PositionNo)] {
|
|
|
|
|
|
continue
|
|
|
|
|
|
}
|
|
|
|
|
|
list = append(list, map[string]any{
|
|
|
|
|
|
"zoneCode": z.ZoneCode, "zoneName": z.ZoneName, "shelfNo": z.ShelfNo,
|
|
|
|
|
|
"layerNo": z.LayerNo, "positionNo": z.PositionNo, "name": z.Name, "code": z.Code,
|
|
|
|
|
|
})
|
|
|
|
|
|
if len(list) >= limit {
|
|
|
|
|
|
break
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
ok(w, list)
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-09-19 10:54:15 +08:00
|
|
|
|
func listZonesForPicker(ctx *svc.ServiceContext) http.HandlerFunc {
|
|
|
|
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
|
|
|
|
level := atoi(r.URL.Query().Get("level"), 0)
|
|
|
|
|
|
status := strings.TrimSpace(r.URL.Query().Get("status"))
|
|
|
|
|
|
if level == 0 {
|
|
|
|
|
|
q := ctx.EntClient.Zone.Query().Where(zone.LevelEQ(4))
|
|
|
|
|
|
if status == "" {
|
|
|
|
|
|
q = q.Where(zone.StatusEQ("启用"))
|
|
|
|
|
|
} else {
|
|
|
|
|
|
q = q.Where(zone.StatusEQ(status))
|
2026-09-18 18:54:54 +08:00
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
rows, err := q.Order(ent.Asc("code")).All(ctx0())
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
fail(w, http.StatusInternalServerError, err.Error())
|
2026-09-18 18:54:54 +08:00
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
list := make([]map[string]any, 0, len(rows))
|
|
|
|
|
|
for _, z := range rows {
|
|
|
|
|
|
list = append(list, map[string]any{
|
|
|
|
|
|
"zoneCode": z.ZoneCode, "zoneName": z.ZoneName, "shelfNo": z.ShelfNo,
|
|
|
|
|
|
"layerNo": z.LayerNo, "positionNo": z.PositionNo, "name": z.Name, "code": z.Code,
|
|
|
|
|
|
})
|
2026-09-18 18:54:54 +08:00
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
ok(w, list)
|
|
|
|
|
|
return
|
2026-09-18 18:54:54 +08:00
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
q := ctx.EntClient.Zone.Query().Where(zone.LevelEQ(level))
|
|
|
|
|
|
if pc := strings.TrimSpace(r.URL.Query().Get("parentCode")); pc != "" {
|
|
|
|
|
|
q = q.Where(zone.ParentCodeEQ(pc))
|
2026-09-18 18:54:54 +08:00
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
if zc := strings.TrimSpace(r.URL.Query().Get("zoneCode")); zc != "" {
|
|
|
|
|
|
q = q.Where(zone.ZoneCodeEQ(strings.ToUpper(zc)))
|
2026-09-18 18:54:54 +08:00
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
if sh := strings.TrimSpace(r.URL.Query().Get("shelfNo")); sh != "" {
|
|
|
|
|
|
q = q.Where(zone.ShelfNoEQ(sh))
|
2026-09-03 14:20:37 +08:00
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
if ly := strings.TrimSpace(r.URL.Query().Get("layerNo")); ly != "" {
|
|
|
|
|
|
q = q.Where(zone.LayerNoEQ(ly))
|
2026-09-03 14:20:37 +08:00
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
if status == "" {
|
|
|
|
|
|
q = q.Where(zone.StatusEQ("启用"))
|
|
|
|
|
|
} else {
|
2026-09-03 14:20:37 +08:00
|
|
|
|
q = q.Where(zone.StatusEQ(status))
|
|
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
rows, err := q.Order(ent.Asc("code")).All(ctx0())
|
2026-09-01 13:49:44 +08:00
|
|
|
|
if err != nil {
|
|
|
|
|
|
fail(w, http.StatusInternalServerError, err.Error())
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
list := make([]map[string]any, 0, len(rows))
|
2026-09-18 18:54:54 +08:00
|
|
|
|
for _, z := range rows {
|
2026-09-19 10:54:15 +08:00
|
|
|
|
list = append(list, map[string]any{
|
|
|
|
|
|
"id": z.ID, "level": z.Level, "code": z.Code, "name": z.Name,
|
|
|
|
|
|
"parentCode": z.ParentCode, "zoneCode": z.ZoneCode, "shelfNo": z.ShelfNo, "layerNo": z.LayerNo,
|
2026-09-18 18:54:54 +08:00
|
|
|
|
})
|
|
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
ok(w, list)
|
2026-09-01 13:49:44 +08:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-09-19 10:54:15 +08:00
|
|
|
|
type zoneBatchGenReq struct {
|
|
|
|
|
|
ZoneCode string `json:"zoneCode"`
|
|
|
|
|
|
ShelfNo string `json:"shelfNo"`
|
2026-09-21 10:48:53 +08:00
|
|
|
|
LayerStart int `json:"layerStart"` // level=3 批量生成层:层范围起
|
|
|
|
|
|
LayerEnd int `json:"layerEnd"` // level=3 批量生成层:层范围止
|
2026-10-26 16:32:35 +08:00
|
|
|
|
LayerNo string `json:"layerNo"` // level=4 批量生成位置号:层号(放开字母+数字,层节点不存在时自动创建)
|
2026-09-19 10:54:15 +08:00
|
|
|
|
PosStart int `json:"posStart"`
|
|
|
|
|
|
PosEnd int `json:"posEnd"`
|
2026-10-26 16:32:35 +08:00
|
|
|
|
Count int `json:"count"` // level=4 批量生成位置号:生成数量(从「该层最大位置号+1」起连续生成)
|
2026-09-21 10:48:53 +08:00
|
|
|
|
Level int `json:"level"` // 3=批量生成层(level3) 4=批量生成位置号(level4,默认,需指定已存在的层)
|
2026-09-19 10:54:15 +08:00
|
|
|
|
Preview bool `json:"preview"`
|
2026-10-08 13:09:53 +08:00
|
|
|
|
Layers []zoneBatchLayerName `json:"layers"` // level=3 提交时携带预览表中(可能手改过的)层名称,非空则优先采用
|
|
|
|
|
|
Positions []zoneBatchPosName `json:"positions"` // level=4 提交时携带预览表中(可能手改过的)位置名称,非空则优先采用
|
2026-09-29 14:55:03 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// zoneBatchLayerName 批量生成层:前端预览后手改的层名称(layerNo→layerName)
|
|
|
|
|
|
type zoneBatchLayerName struct {
|
|
|
|
|
|
LayerNo string `json:"layerNo"`
|
|
|
|
|
|
LayerName string `json:"layerName"`
|
2026-09-19 10:54:15 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
2026-10-08 13:09:53 +08:00
|
|
|
|
// zoneBatchPosName 批量生成位置号:前端预览后手改的位置名称(positionNo→positionName)
|
|
|
|
|
|
type zoneBatchPosName struct {
|
|
|
|
|
|
PositionNo string `json:"positionNo"`
|
|
|
|
|
|
PositionName string `json:"positionName"`
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-09-20 18:25:44 +08:00
|
|
|
|
// batchGenerateHandler 批量生成库位节点:选区域→货架→范围,先预览后提交。
|
2026-09-21 10:48:53 +08:00
|
|
|
|
// level=3:只生成「层」节点(按层范围);level=4(默认):在「已存在的具体层」下生成「位置号」节点。
|
|
|
|
|
|
// 批量生成只生成自己这一级,绝不自动创建父级;已存在的节点跳过不重复建。
|
2026-09-19 10:54:15 +08:00
|
|
|
|
func batchGenerateHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
2026-09-01 13:49:44 +08:00
|
|
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
2026-09-19 10:54:15 +08:00
|
|
|
|
var req zoneBatchGenReq
|
|
|
|
|
|
if err := parseJSON(r, &req); err != nil {
|
|
|
|
|
|
fail(w, http.StatusBadRequest, "参数错误")
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
req.ZoneCode = strings.ToUpper(strings.TrimSpace(req.ZoneCode))
|
|
|
|
|
|
req.ShelfNo = strings.TrimSpace(req.ShelfNo)
|
|
|
|
|
|
if req.ZoneCode == "" || req.ShelfNo == "" {
|
|
|
|
|
|
fail(w, http.StatusBadRequest, "请选择区域与货架")
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-09-20 18:25:44 +08:00
|
|
|
|
level := req.Level
|
|
|
|
|
|
if level != 3 {
|
|
|
|
|
|
level = 4
|
|
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
sh, err := ctx.EntClient.Zone.Query().Where(zone.LevelEQ(2), zone.ZoneCodeEQ(req.ZoneCode), zone.CodeEQ(req.ShelfNo)).Only(ctx0())
|
2026-08-28 15:06:01 +08:00
|
|
|
|
if err != nil {
|
2026-09-19 10:54:15 +08:00
|
|
|
|
fail(w, http.StatusBadRequest, "货架不存在:"+req.ZoneCode+"/"+req.ShelfNo)
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
zoneCode := sh.ZoneCode
|
|
|
|
|
|
|
2026-09-21 10:48:53 +08:00
|
|
|
|
// ---------- level=3:批量生成层节点(父级货架必须已存在,只生成层自己) ----------
|
2026-09-20 18:25:44 +08:00
|
|
|
|
if level == 3 {
|
2026-09-21 10:48:53 +08:00
|
|
|
|
if req.LayerStart < 0 || req.LayerEnd < req.LayerStart {
|
|
|
|
|
|
fail(w, http.StatusBadRequest, "层起止不合法(起始需 ≤ 结束,且 ≥ 0)")
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
layers := make([]int, 0)
|
|
|
|
|
|
for l := req.LayerStart; l <= req.LayerEnd; l++ {
|
|
|
|
|
|
layers = append(layers, l)
|
|
|
|
|
|
}
|
2026-09-20 18:25:44 +08:00
|
|
|
|
if len(layers) > 2000 {
|
|
|
|
|
|
fail(w, http.StatusBadRequest, "一次最多生成 2000 个层,请缩小范围")
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
type genLayer struct {
|
|
|
|
|
|
LayerNo string `json:"layerNo"`
|
|
|
|
|
|
LayerName string `json:"layerName"`
|
|
|
|
|
|
Exists bool `json:"exists"`
|
|
|
|
|
|
}
|
2026-09-29 14:55:03 +08:00
|
|
|
|
// 手改层名称优先:前端预览后可点击层名称修改,提交时按 layerNo 带回
|
|
|
|
|
|
nameByNo := make(map[string]string, len(req.Layers))
|
|
|
|
|
|
for _, ly := range req.Layers {
|
|
|
|
|
|
no := strings.TrimSpace(ly.LayerNo)
|
|
|
|
|
|
nm := strings.TrimSpace(ly.LayerName)
|
|
|
|
|
|
if no != "" && nm != "" {
|
|
|
|
|
|
nameByNo[no] = nm
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2026-09-20 18:25:44 +08:00
|
|
|
|
layerList := make([]genLayer, 0, len(layers))
|
|
|
|
|
|
for _, l := range layers {
|
|
|
|
|
|
ls := strconv.Itoa(l)
|
|
|
|
|
|
exists, _ := ctx.EntClient.Zone.Query().
|
|
|
|
|
|
Where(zone.LevelEQ(3), zone.ZoneCodeEQ(zoneCode), zone.ShelfNoEQ(req.ShelfNo), zone.CodeEQ(ls)).Exist(ctx0())
|
2026-09-29 14:55:03 +08:00
|
|
|
|
name := req.ShelfNo + "架" + ls + "层"
|
|
|
|
|
|
if v, ok := nameByNo[ls]; ok {
|
|
|
|
|
|
name = v
|
|
|
|
|
|
}
|
|
|
|
|
|
layerList = append(layerList, genLayer{LayerNo: ls, LayerName: name, Exists: exists})
|
2026-09-20 18:25:44 +08:00
|
|
|
|
}
|
|
|
|
|
|
if req.Preview {
|
|
|
|
|
|
ok(w, map[string]any{"preview": true, "level": 3, "list": layerList, "total": len(layerList)})
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
createdL, skippedL := 0, 0
|
|
|
|
|
|
for _, it := range layerList {
|
|
|
|
|
|
if it.Exists {
|
|
|
|
|
|
skippedL++
|
|
|
|
|
|
continue
|
|
|
|
|
|
}
|
|
|
|
|
|
if _, err := ctx.EntClient.Zone.Create().
|
|
|
|
|
|
SetLevel(3).SetCode(it.LayerNo).SetParentCode(req.ShelfNo).
|
|
|
|
|
|
SetZoneCode(zoneCode).SetShelfNo(req.ShelfNo).SetLayerNo(it.LayerNo).
|
|
|
|
|
|
SetName(it.LayerName).SetStatus("启用").Save(ctx0()); err != nil {
|
|
|
|
|
|
fail(w, http.StatusInternalServerError, "创建层失败: "+err.Error())
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
createdL++
|
|
|
|
|
|
}
|
|
|
|
|
|
ctx.EventLog.Write(ctx0(), "zone.batch", r.Header.Get("X-Username"), "zone", req.ShelfNo,
|
|
|
|
|
|
"批量生成层 "+req.ZoneCode+"/"+req.ShelfNo+" 层"+strconv.Itoa(req.LayerStart)+"-"+strconv.Itoa(req.LayerEnd)+
|
|
|
|
|
|
":新建"+strconv.Itoa(createdL)+" 跳过"+strconv.Itoa(skippedL), nil)
|
|
|
|
|
|
ok(w, map[string]any{"preview": false, "level": 3, "created": createdL, "skipped": skippedL, "total": len(layers)})
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-10-26 16:32:35 +08:00
|
|
|
|
// ---------- level=4:批量生成位置号(层号放开字母+数字,按最近编码序号+1 生成 N 个) ----------
|
|
|
|
|
|
layerNo := strings.ToUpper(strings.TrimSpace(req.LayerNo))
|
2026-09-21 10:48:53 +08:00
|
|
|
|
if layerNo == "" {
|
2026-10-26 16:32:35 +08:00
|
|
|
|
fail(w, http.StatusBadRequest, "请填写层号")
|
2026-09-21 10:48:53 +08:00
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-10-26 16:32:35 +08:00
|
|
|
|
if req.Count <= 0 {
|
|
|
|
|
|
fail(w, http.StatusBadRequest, "请填写生成数量(≥1)")
|
2026-09-21 10:48:53 +08:00
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-10-26 16:32:35 +08:00
|
|
|
|
if req.Count > 2000 {
|
|
|
|
|
|
fail(w, http.StatusBadRequest, "一次最多生成 2000 个位置,请缩小数量")
|
2026-09-21 10:48:53 +08:00
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-10-26 16:32:35 +08:00
|
|
|
|
// 层号放开:该层节点不存在则自动创建(作为位置号的父级)
|
|
|
|
|
|
if exist, _ := ctx.EntClient.Zone.Query().Where(zone.LevelEQ(3), zone.ZoneCodeEQ(zoneCode), zone.ShelfNoEQ(req.ShelfNo), zone.CodeEQ(layerNo)).Exist(ctx0()); !exist {
|
|
|
|
|
|
if _, err := ctx.EntClient.Zone.Create().SetLevel(3).SetCode(layerNo).SetParentCode(req.ShelfNo).SetZoneCode(zoneCode).SetShelfNo(req.ShelfNo).SetLayerNo(layerNo).SetName(req.ShelfNo + "架" + layerNo + "层").SetStatus("启用").Save(ctx0()); err != nil {
|
|
|
|
|
|
fail(w, http.StatusInternalServerError, "自动创建层失败: "+err.Error())
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
}
|
2026-10-26 16:32:35 +08:00
|
|
|
|
// 最近编码序号:该层下已存在的最大位置号(按整数解析,非整数忽略)
|
|
|
|
|
|
maxNo := 0
|
|
|
|
|
|
cur, _ := ctx.EntClient.Zone.Query().Where(zone.LevelEQ(4), zone.ZoneCodeEQ(zoneCode), zone.ShelfNoEQ(req.ShelfNo), zone.LayerNoEQ(layerNo)).All(ctx0())
|
|
|
|
|
|
for _, p := range cur {
|
|
|
|
|
|
if n, err := strconv.Atoi(p.Code); err == nil && n > maxNo {
|
|
|
|
|
|
maxNo = n
|
|
|
|
|
|
}
|
2026-08-28 15:06:01 +08:00
|
|
|
|
}
|
2026-10-26 16:32:35 +08:00
|
|
|
|
// 预览:从 maxNo+1 起连续生成 N 个,标注是否已存在(按层号+位置号去重跳过)
|
2026-09-19 10:54:15 +08:00
|
|
|
|
type genItem struct {
|
|
|
|
|
|
LayerNo string `json:"layerNo"`
|
|
|
|
|
|
PositionNo string `json:"positionNo"`
|
|
|
|
|
|
PositionName string `json:"positionName"`
|
|
|
|
|
|
Exists bool `json:"exists"`
|
|
|
|
|
|
}
|
2026-10-26 16:32:35 +08:00
|
|
|
|
preview := make([]genItem, 0, req.Count)
|
|
|
|
|
|
for i := 1; i <= req.Count; i++ {
|
|
|
|
|
|
ps := strconv.Itoa(maxNo + i)
|
|
|
|
|
|
exists, _ := ctx.EntClient.Zone.Query().Where(zone.LevelEQ(4), zone.ZoneCodeEQ(zoneCode), zone.ShelfNoEQ(req.ShelfNo), zone.LayerNoEQ(layerNo), zone.CodeEQ(ps)).Exist(ctx0())
|
2026-09-21 10:48:53 +08:00
|
|
|
|
preview = append(preview, genItem{LayerNo: layerNo, PositionNo: ps, PositionName: req.ShelfNo + "架" + layerNo + "层" + ps + "位", Exists: exists})
|
2026-09-19 10:54:15 +08:00
|
|
|
|
}
|
|
|
|
|
|
if req.Preview {
|
|
|
|
|
|
ok(w, map[string]any{"preview": true, "list": preview, "total": len(preview)})
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-10-26 16:32:35 +08:00
|
|
|
|
// 提交:创建不存在的位置号(按层号+位置号去重跳过);手改位置名称优先采用
|
2026-10-08 13:09:53 +08:00
|
|
|
|
nameByPos := make(map[string]string, len(req.Positions))
|
|
|
|
|
|
for _, pn := range req.Positions {
|
|
|
|
|
|
no := strings.TrimSpace(pn.PositionNo)
|
|
|
|
|
|
nm := strings.TrimSpace(pn.PositionName)
|
|
|
|
|
|
if no != "" && nm != "" {
|
|
|
|
|
|
nameByPos[no] = nm
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2026-09-19 10:54:15 +08:00
|
|
|
|
created, skipped := 0, 0
|
2026-10-26 16:32:35 +08:00
|
|
|
|
for i := 1; i <= req.Count; i++ {
|
|
|
|
|
|
ps := strconv.Itoa(maxNo + i)
|
|
|
|
|
|
if exist, _ := ctx.EntClient.Zone.Query().Where(zone.LevelEQ(4), zone.ZoneCodeEQ(zoneCode), zone.ShelfNoEQ(req.ShelfNo), zone.LayerNoEQ(layerNo), zone.CodeEQ(ps)).Exist(ctx0()); exist {
|
2026-09-21 10:48:53 +08:00
|
|
|
|
skipped++
|
|
|
|
|
|
continue
|
2026-09-19 10:54:15 +08:00
|
|
|
|
}
|
2026-10-08 13:09:53 +08:00
|
|
|
|
name := req.ShelfNo + "架" + layerNo + "层" + ps + "位"
|
|
|
|
|
|
if v, ok := nameByPos[ps]; ok {
|
|
|
|
|
|
name = v
|
|
|
|
|
|
}
|
2026-10-26 16:32:35 +08:00
|
|
|
|
if _, err := ctx.EntClient.Zone.Create().SetLevel(4).SetCode(ps).SetParentCode(layerNo).SetZoneCode(zoneCode).SetShelfNo(req.ShelfNo).SetLayerNo(layerNo).SetPositionNo(ps).SetName(name).SetStatus("启用").Save(ctx0()); err != nil {
|
2026-09-21 10:48:53 +08:00
|
|
|
|
fail(w, http.StatusInternalServerError, "创建位置失败: "+err.Error())
|
|
|
|
|
|
return
|
2026-09-19 10:54:15 +08:00
|
|
|
|
}
|
2026-09-21 10:48:53 +08:00
|
|
|
|
created++
|
2026-09-19 10:54:15 +08:00
|
|
|
|
}
|
|
|
|
|
|
ctx.EventLog.Write(ctx0(), "zone.batch", r.Header.Get("X-Username"), "zone", req.ShelfNo,
|
2026-09-21 10:48:53 +08:00
|
|
|
|
"批量生成位置 "+req.ZoneCode+"/"+req.ShelfNo+" 层"+layerNo+
|
2026-10-26 16:32:35 +08:00
|
|
|
|
" 从"+(strconv.Itoa(maxNo+1))+"起生成"+strconv.Itoa(req.Count)+"个:新建"+strconv.Itoa(created)+" 跳过"+strconv.Itoa(skipped), nil)
|
|
|
|
|
|
ok(w, map[string]any{"preview": false, "created": created, "skipped": skipped, "total": req.Count})
|
|
|
|
|
|
|
2026-09-19 10:54:15 +08:00
|
|
|
|
}
|
2026-09-17 12:49:07 +08:00
|
|
|
|
}
|