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

feat: 完成区域管理、装箱功能优化与接口标准化

Browse Source 
- 新增区域状态字段与增删改查接口，支持区域启用/停用
- 重构实体字段JSON标签为camelCase格式统一接口规范
- 优化入库、盘点、装箱流程的交互与提示文案
- 新增装箱管理功能，支持合同号关联与装箱编辑
- 调整前端菜单与帮助文档适配业务场景变更
This commit is contained in:
SunYF
2026-09-01 13:49:44 +08:00
parent ea6d55b7e6
commit bb22148625
59 changed files with 2238 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bj_power_wms/internal/handler/inbound.go
+11 -2
View File
@@ -40,6 +40,10 @@ func createInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
fail(w, http.StatusBadRequest, "物料编码必填")
return
}
if req.ZoneCode == "" {
fail(w, http.StatusBadRequest, "区域必填，请先选择入库区域")
return
}
// 物料档案
m, err := ctx.EntClient.Material.Query().
@@ -73,13 +77,18 @@ func createInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
// 结构件（批次管理）
if m.ManageMode == 1 {
// 结构件走批次入库，不允许携带 SN 清单
if len(req.SnList) > 0 {
fail(w, http.StatusBadRequest, "该物料为结构件（按批次管理），不应提交 SN 清单，请使用『结构件入库』")
return
}
batchNo := req.BatchNo
if batchNo == "" {
batchNo = genBatchNo(req.MaterialCode)
}
qty := req.Quantity
if qty <= 0 {
fail(w, http.StatusBadRequest, "结构件入库 数量必填且大于0")
fail(w, http.StatusBadRequest, "数量必填且大于 0，请输入本次入库数量")
return
}
@@ -119,7 +128,7 @@ func createInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
// 精密件（SN 管理）
if m.ManageMode == 2 {
if len(req.SnList) == 0 {
fail(w, http.StatusBadRequest, "精密件入库 序列号(SN)必填")
fail(w, http.StatusBadRequest, "该物料为精密件（按 SN 管理），请至少录入 1 条序列号(SN)")
return
}
for _, sn := range req.SnList {
bj_power_wms/internal/handler/misc.go
+65 -3
View File
@@ -149,21 +149,23 @@ func querySemiHandler(ctx *svc.ServiceContext) http.HandlerFunc {
}
}
// packageBindHandler 包装绑定（箱号 ↔ SN）
// packageBindHandler 装箱绑定（箱号 ↔ SN），支持合同号
func packageBindHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
BoxNo string `json:"boxNo"`
SnList []string `json:"snList"`
MaterialCode string `json:"materialCode"`
ContractNo string `json:"contractNo"`
Operator string `json:"operator"`
Remark string `json:"remark"`
}
if err := parseJSON(r, &req); err != nil {
fail(w, http.StatusBadRequest, "参数错误")
return
}
if req.BoxNo == "" || len(req.SnList) == 0 {
fail(w, http.StatusBadRequest, "boxNo 和 snList 必填")
fail(w, http.StatusBadRequest, "箱号和 SN 清单必填")
return
}
@@ -187,7 +189,9 @@ func packageBindHandler(ctx *svc.ServiceContext) http.HandlerFunc {
SetSnList(snJSON).
SetNillableMaterialCode(strPtr(req.MaterialCode)).
SetQuantity(len(req.SnList)).
SetNillableContractNo(strPtr(req.ContractNo)).
SetNillableOperator(strPtr(req.Operator)).
SetNillableRemark(strPtr(req.Remark)).
Save(ctx0())
if err != nil {
fail(w, http.StatusInternalServerError, err.Error())
@@ -197,6 +201,38 @@ func packageBindHandler(ctx *svc.ServiceContext) http.HandlerFunc {
}
}
// packageUpdateHandler 编辑装箱（重新装箱 SN / 修改合同号等）
func packageUpdateHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
ID int `json:"id"`
SnList []string `json:"snList"`
MaterialCode string `json:"materialCode"`
ContractNo string `json:"contractNo"`
Operator string `json:"operator"`
Remark string `json:"remark"`
}
if err := parseJSON(r, &req); err != nil || req.ID <= 0 {
fail(w, http.StatusBadRequest, "参数错误")
return
}
upd := ctx.EntClient.PackageBox.UpdateOneID(req.ID)
if len(req.SnList) > 0 {
upd.SetSnList(toJSON(req.SnList)).SetQuantity(len(req.SnList))
}
upd.SetNillableMaterialCode(strPtr(req.MaterialCode)).
SetNillableContractNo(strPtr(req.ContractNo)).
SetNillableOperator(strPtr(req.Operator)).
SetNillableRemark(strPtr(req.Remark))
pkg, err := upd.Save(ctx0())
if err != nil {
fail(w, http.StatusInternalServerError, "更新装箱失败: "+err.Error())
return
}
ok(w, pkg)
}
}
// toJSON 序列化任意值为 JSON 字符串
func toJSON(v any) string {
b, err := json.Marshal(v)
@@ -206,10 +242,15 @@ func toJSON(v any) string {
return string(b)
}
// queryPackageHandler 包装查询
// queryPackageHandler 装箱查询（多条件：箱号/合同号/操作人/物料/时间范围）
func queryPackageHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
boxNo := r.URL.Query().Get("boxNo")
contractNo := r.URL.Query().Get("contractNo")
operator := r.URL.Query().Get("operator")
materialCode := r.URL.Query().Get("materialCode")
startAt := r.URL.Query().Get("startAt")
endAt := r.URL.Query().Get("endAt")
page := atoi(r.URL.Query().Get("page"), 1)
pageSize := atoi(r.URL.Query().Get("pageSize"), 20)
@@ -217,6 +258,27 @@ func queryPackageHandler(ctx *svc.ServiceContext) http.HandlerFunc {
if boxNo != "" {
q = q.Where(packagebox.BoxNoContains(boxNo))
}
if contractNo != "" {
q = q.Where(packagebox.ContractNoContains(contractNo))
}
if operator != "" {
q = q.Where(packagebox.OperatorContains(operator))
}
if materialCode != "" {
q = q.Where(packagebox.MaterialCodeEQ(materialCode))
}
if startAt != "" {
start := atoi64(startAt, 0)
if start > 0 {
q = q.Where(packagebox.CreatedAtGTE(start))
}
}
if endAt != "" {
end := atoi64(endAt, 0)
if end > 0 {
q = q.Where(packagebox.CreatedAtLTE(end))
}
}
total, err := q.Count(ctx0())
if err != nil {
fail(w, http.StatusInternalServerError, err.Error())
bj_power_wms/internal/handler/routes.go
+3
View File
@@ -78,7 +78,9 @@ func RegisterHandlers(server *rest.Server, ctx *svc.ServiceContext) {
server.AddRoutes(
[]rest.Route{
{Method: http.MethodPost, Path: "/api/zone/create", Handler: createZoneHandler(ctx)},
{Method: http.MethodPost, Path: "/api/zone/update", Handler: updateZoneHandler(ctx)},
{Method: http.MethodGet, Path: "/api/zone/list", Handler: listZonesHandler(ctx)},
{Method: http.MethodGet, Path: "/api/zone/picker", Handler: listZonesForPicker(ctx)},
},
)
@@ -105,6 +107,7 @@ func RegisterHandlers(server *rest.Server, ctx *svc.ServiceContext) {
server.AddRoutes(
[]rest.Route{
{Method: http.MethodPost, Path: "/api/package/bind", Handler: packageBindHandler(ctx)},
{Method: http.MethodPost, Path: "/api/package/update", Handler: packageUpdateHandler(ctx)},
{Method: http.MethodGet, Path: "/api/package/query", Handler: queryPackageHandler(ctx)},
},
)
bj_power_wms/internal/handler/zone.go
+76 -3
View File
@@ -21,7 +21,7 @@ func createZoneHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return
}
if req.ZoneCode == "" || req.ZoneName == "" {
fail(w, http.StatusBadRequest, "zoneCode 和 zoneName 必填")
fail(w, http.StatusBadRequest, "区域编码和区域名称必填")
return
}
@@ -41,6 +41,7 @@ func createZoneHandler(ctx *svc.ServiceContext) http.HandlerFunc {
SetZoneCode(req.ZoneCode).
SetZoneName(req.ZoneName).
SetNillableDescription(strPtr(req.Description)).
SetStatus("启用").
Save(ctx0())
if err != nil {
fail(w, http.StatusInternalServerError, err.Error())
@@ -50,10 +51,82 @@ func createZoneHandler(ctx *svc.ServiceContext) http.HandlerFunc {
}
}
// listZonesHandler 区域列表
// updateZoneHandler 编辑区域
func updateZoneHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
ID int `json:"id"`
ZoneCode string `json:"zoneCode"`
ZoneName string `json:"zoneName"`
Description string `json:"description"`
}
if err := parseJSON(r, &req); err != nil || req.ID <= 0 {
fail(w, http.StatusBadRequest, "参数错误")
return
}
if req.ZoneName == "" {
fail(w, http.StatusBadRequest, "区域名称必填")
return
}
upd := ctx.EntClient.Zone.UpdateOneID(req.ID).SetZoneName(req.ZoneName)
if req.ZoneCode != "" {
upd.SetZoneCode(req.ZoneCode)
}
upd.SetNillableDescription(strPtr(req.Description))
z, err := upd.Save(ctx0())
if err != nil {
fail(w, http.StatusInternalServerError, "更新区域失败: "+err.Error())
return
}
ok(w, z)
}
}
// listZonesHandler 区域列表（分页 + 关键字）
func listZonesHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
list, err := ctx.EntClient.Zone.Query().Order(ent.Desc("id")).All(ctx0())
page := atoi(r.URL.Query().Get("page"), 1)
pageSize := atoi(r.URL.Query().Get("pageSize"), 20)
keyword := r.URL.Query().Get("keyword")
q := ctx.EntClient.Zone.Query()
if keyword != "" {
q = q.Where(
zone.Or(
zone.ZoneCodeContains(keyword),
zone.ZoneNameContains(keyword),
),
)
}
total, err := q.Count(ctx0())
if err != nil {
fail(w, http.StatusInternalServerError, err.Error())
return
}
list, err := q.Order(ent.Desc("id")).
Offset((page - 1) * pageSize).
Limit(pageSize).
All(ctx0())
if err != nil {
fail(w, http.StatusInternalServerError, err.Error())
return
}
ok(w, map[string]any{
"total": total,
"list": list,
"page": page,
"pageSize": pageSize,
})
}
}
// listZonesForPicker 区域下拉列表（不分页，仅启用）
func listZonesForPicker(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
list, err := ctx.EntClient.Zone.Query().
Where(zone.StatusEQ("启用")).
Order(ent.Asc("id")).
All(ctx0())
if err != nil {
fail(w, http.StatusInternalServerError, err.Error())
return