feat: 完成产线与仓储系统多模块迭代升级
本次迭代覆盖MES与WMS核心业务: 1. 新增接驳台托盘传感器读取与AGV对接能力 2. 完善工单排产、备料流程与权限体系拆分 3. 优化看板接口与前端路由、样式 4. 新增操作日志、库存盘点与角色保护逻辑 5. 修复代理地址、BOM保存等已知问题
This commit is contained in:
@@ -75,6 +75,8 @@ func semiInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return
|
||||
}
|
||||
|
||||
ctx.EventLog.Write(ctx0(), "semi.inbound", r.Header.Get("X-Username"), "semi", req.Sn,
|
||||
"半成品入库 "+req.Sn, map[string]any{"materialCode": materialCode})
|
||||
ok(w, rec)
|
||||
}
|
||||
}
|
||||
@@ -112,6 +114,8 @@ func semiOutboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
SetStatus("出库").
|
||||
ExecX(ctx0())
|
||||
|
||||
ctx.EventLog.Write(ctx0(), "semi.outbound", r.Header.Get("X-Username"), "semi", req.Sn,
|
||||
"半成品出库 "+req.Sn, nil)
|
||||
ok(w, map[string]any{"sn": req.Sn, "status": "出库"})
|
||||
}
|
||||
}
|
||||
@@ -174,7 +178,26 @@ func queryLedgerHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
q = q.Where(ordermaterialledger.MaterialNameContains(materialName))
|
||||
}
|
||||
if status != "" {
|
||||
q = q.Where(ordermaterialledger.StatusEQ(status))
|
||||
// 状态枚举:待领料 / 部分领料 由「进行中 + 累计出库数」派生(表内只存 进行中/领料完结)
|
||||
// 待领料 = 进行中 且 已出库=0;部分领料 = 进行中 且 已出库>0
|
||||
switch status {
|
||||
case "待领料":
|
||||
q = q.Where(ordermaterialledger.And(
|
||||
ordermaterialledger.StatusEQ("进行中"),
|
||||
ordermaterialledger.OutQtyEQ(0),
|
||||
))
|
||||
case "部分领料":
|
||||
q = q.Where(ordermaterialledger.And(
|
||||
ordermaterialledger.StatusEQ("进行中"),
|
||||
ordermaterialledger.OutQtyGT(0),
|
||||
))
|
||||
case "领料完结":
|
||||
q = q.Where(ordermaterialledger.StatusEQ("领料完结"))
|
||||
case "进行中": // 兼容旧调用:看全部未完结
|
||||
q = q.Where(ordermaterialledger.StatusEQ("进行中"))
|
||||
default:
|
||||
q = q.Where(ordermaterialledger.StatusEQ(status))
|
||||
}
|
||||
}
|
||||
total, err := q.Count(ctx0())
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user