编辑
页签
{{ row.status === 'ENABLED' ? '停用' : '启用' }}
@@ -121,13 +121,15 @@
-
+
- {{ dlg.stationType === 'OFFLINE' ? '线下位(虚拟,不连 PLC)' : '线上位(连 PLC)' }}
+ 线下位(虚拟,不连 PLC,仅记录)
- {{ dlg.isBuiltin ? '内置工位类型由产线初始配置固定,不可修改。' : '非内置工位可调整类型(看板按「线下位」统计虚拟工位)。' }}
+ 新增工位均为虚拟工位(线下位),不连 PLC、仅记录上下线,类型不可选。
+ 内置工位类型由产线初始配置固定,不可修改。
+ 非内置工位可调整类型(看板按「线下位」统计虚拟工位)。
@@ -301,7 +303,7 @@ async function save() {
return ElMessage.warning(`工位${dlg.stationNo} 已存在,请换一个工位号`)
}
await request.post('/stations', {
- id: dlg.id, stationNo: dlg.stationNo, name: dlg.name, stationType: dlg.stationType
+ id: dlg.id, stationNo: dlg.stationNo, name: dlg.name, stationType: dlg.isAdd ? 'OFFLINE' : dlg.stationType
})
ElMessage.success(dlg.isAdd ? '工位已新增' : '已保存')
dlg.show = false
diff --git a/bj_power_mes/frontend/src/router/index.js b/bj_power_mes/frontend/src/router/index.js
index 289fd1c..5821471 100644
--- a/bj_power_mes/frontend/src/router/index.js
+++ b/bj_power_mes/frontend/src/router/index.js
@@ -13,8 +13,8 @@ const routes = [
{ path: 'producible-support', name: 'ProducibleSupport', component: () => import('../pages/ProducibleSupport.vue'), meta: { title: '排产支撑' } },
{ path: 'material-request', name: 'MaterialRequest', component: () => import('../pages/MaterialRequest.vue'), meta: { title: '备料单' } },
{ path: 'qty-report', name: 'QtyReport', component: () => import('../pages/QtyReport.vue'), meta: { title: '数量不符处理' } },
- { path: 'plc-send', name: 'PlcSend', component: () => import('../pages/PlcSend.vue'), meta: { title: '工位组合下发' } },
- { path: 'plc-monitor', name: 'PlcMonitor', component: () => import('../pages/PlcMonitor.vue'), meta: { title: 'PLC 手动监控' } },
+ { path: 'plc-send', name: 'PlcSend', component: () => import('../pages/PlcSend.vue'), meta: { title: '工位下发' } },
+ { path: 'plc-monitor', name: 'PlcMonitor', component: () => import('../pages/PlcMonitor.vue'), meta: { title: 'PLC管理' } },
{ path: 'process-flow', name: 'ProcessFlow', component: () => import('../pages/ProcessFlow.vue'), meta: { title: '工艺' } },
{ path: 'station', name: 'Station', component: () => import('../pages/Station.vue'), meta: { title: '工位管理' } },
{ path: 'line-management', name: 'LineManagement', component: () => import('../pages/LineManagement.vue'), meta: { title: '产线管理' } },
diff --git a/bj_power_mes/internal/db/db.go b/bj_power_mes/internal/db/db.go
index 2c7741a..def22be 100644
--- a/bj_power_mes/internal/db/db.go
+++ b/bj_power_mes/internal/db/db.go
@@ -190,6 +190,23 @@ var schemaPatchSQL = []string{
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS need_agv boolean NOT NULL DEFAULT false`,
// AGV 任务号(派车成功后回写,叫料单↔AGV 任务关联;2026-10-14 AGV 收口)
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS agv_task_no varchar(64) NOT NULL DEFAULT ''`,
+
+ // ---- 2026-11-02 AGV 点位表 agv_point(硬件级真源)----
+ // 说明:ent Schema.Create 本应建此表,但若"改 schema 后只重启 serve(不跑 migrate)"就会漏建,报 SQLSTATE 42P01。
+ // 此处显式 CREATE TABLE IF NOT EXISTS 作幂等兜底,保证任意一次 migrate/seed 都能补齐,且不影响既有库(已存在则跳过)。
+ `CREATE TABLE IF NOT EXISTS agv_point (
+ id bigint GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+ position_code varchar(255) NOT NULL,
+ name varchar(255) NOT NULL DEFAULT '',
+ is_dock boolean NOT NULL DEFAULT false,
+ dock_id bigint,
+ enabled boolean NOT NULL DEFAULT true,
+ created_at timestamp NOT NULL DEFAULT now(),
+ CONSTRAINT ux_agv_point_position UNIQUE (position_code)
+ )`,
+ // agv_point 与 dock 的强绑定(接驳台点位)由 seed/LineManagement 维护;索引补充(按 position_code 查询频繁)
+ `CREATE INDEX IF NOT EXISTS agv_point_position_code ON agv_point (position_code)`,
+ `CREATE INDEX IF NOT EXISTS agv_point_dock_id ON agv_point (dock_id)`,
// material_qty_report:处理侧字段(补发=生成 REFILL 备料单;退库=WMS 退库单;调整=仅关闭)
`ALTER TABLE material_qty_report ADD COLUMN IF NOT EXISTS handle_type varchar(16) NOT NULL DEFAULT ''`,
`ALTER TABLE material_qty_report ADD COLUMN IF NOT EXISTS handle_doc_no varchar(64) NOT NULL DEFAULT ''`,
diff --git a/bj_power_mes/internal/handler/production/agv.go b/bj_power_mes/internal/handler/production/agv.go
index 86595c7..1208748 100644
--- a/bj_power_mes/internal/handler/production/agv.go
+++ b/bj_power_mes/internal/handler/production/agv.go
@@ -84,6 +84,28 @@ func CancelAgvTaskHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
}
}
+// RetryAgvTaskHandler POST /agv/retry 重试失败/卡住的 AGV 任务(重新向 RCS 下发)。
+func RetryAgvTaskHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+ return func(w http.ResponseWriter, r *http.Request) {
+ var req struct {
+ TaskNo string `json:"taskNo"`
+ }
+ if err := httpx.ParseJSON(r, &req); err != nil || req.TaskNo == "" {
+ httpx.BadRequest(w, "缺少任务号")
+ return
+ }
+ operator := r.Header.Get("X-Username")
+ if operator == "" {
+ operator = "dispatcher"
+ }
+ if err := logic.New(svcCtx).RetryAgvTask(r.Context(), req.TaskNo, operator); err != nil {
+ httpx.Fail(w, 3310, err.Error())
+ return
+ }
+ httpx.OkMessage(w, "已重试派车", nil)
+ }
+}
+
// AgvModeHandler 返回 AGV 对接模式(mock / 真实 RCS)。
func AgvModeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
@@ -91,6 +113,44 @@ func AgvModeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
}
}
+// ListAgvPointsHandler GET /agv/points?enabledOnly=1 列出 AGV 点位(启停用管理 / 派车下拉)。
+func ListAgvPointsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+ return func(w http.ResponseWriter, r *http.Request) {
+ enabledOnly := r.URL.Query().Get("enabledOnly") == "1"
+ data, err := logic.New(svcCtx).ListAgvPoints(r.Context(), enabledOnly)
+ if err != nil {
+ httpx.Fail(w, 3308, err.Error())
+ return
+ }
+ httpx.Ok(w, data)
+ }
+}
+
+// UpdateAgvPointHandler PUT /agv/points/:id body {name, enabled}
+// 仅允许改显示名与启用状态;硬件映射 position_code / dock_id 不可改。
+func UpdateAgvPointHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+ return func(w http.ResponseWriter, r *http.Request) {
+ id := pathID(r)
+ if id <= 0 {
+ httpx.BadRequest(w, "非法的点位 ID")
+ return
+ }
+ var body struct {
+ Name string `json:"name"`
+ Enabled bool `json:"enabled"`
+ }
+ if err := httpx.ParseJSON(r, &body); err != nil {
+ httpx.BadRequest(w, "请求体解析失败")
+ return
+ }
+ if err := logic.New(svcCtx).UpdateAgvPoint(r.Context(), id, body.Name, body.Enabled); err != nil {
+ httpx.Fail(w, 3309, err.Error())
+ return
+ }
+ httpx.OkMessage(w, "已保存", nil)
+ }
+}
+
// DispatchAgvInternalHandler POST /api/internal/agv/dispatch
// WMS 仓库完成备料后调用(X-API-TOKEN):MES 据叫料单触发海康 RCS 派车。
func DispatchAgvInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
diff --git a/bj_power_mes/internal/handler/production/dock.go b/bj_power_mes/internal/handler/production/dock.go
index 8362d9e..c139ed5 100644
--- a/bj_power_mes/internal/handler/production/dock.go
+++ b/bj_power_mes/internal/handler/production/dock.go
@@ -1,6 +1,7 @@
package production
import (
+ "context"
"net/http"
"regexp"
"strconv"
@@ -8,6 +9,8 @@ import (
"bj_power_mes/common/httpx"
"bj_power_mes/ent"
+ "bj_power_mes/ent/agvpoint"
+ "bj_power_mes/ent/agvtask"
"bj_power_mes/ent/dock"
"bj_power_mes/internal/svc"
)
@@ -202,6 +205,38 @@ func isAllDigits(s string) bool {
return true
}
+// syncAgvPointForDock 维护接驳台与 AGV 点位的一一对应(硬件级强绑定)。
+// 接驳台新增/修改时,确保存在一条 is_dock=true、dock_id=该接驳台、position_code=接驳台编码 的点位;
+// position_code 与 dock_id 是硬件映射,软件不可改,这里仅做“存在性/绑定”兜底,不暴露给前端编辑。
+func syncAgvPointForDock(ctx context.Context, client *ent.Client, d *ent.Dock, name string) {
+ if d == nil {
+ return
+ }
+ // 1) 已有按 dock_id 绑定的点位 → 编码若随接驳台编码调整则同步;不覆盖用户已改名称/启用态
+ if existing, _ := client.AgvPoint.Query().Where(agvpoint.DockIDEQ(d.ID)).Only(ctx); existing != nil {
+ if existing.PositionCode != d.DockCode {
+ client.AgvPoint.UpdateOneID(existing.ID).SetPositionCode(d.DockCode).Exec(ctx)
+ }
+ return
+ }
+ // 2) 历史被删后重建:按 position_code 复用,重新绑定 dock_id(硬件映射兜底)
+ if byCode, _ := client.AgvPoint.Query().Where(agvpoint.PositionCode(d.DockCode)).Only(ctx); byCode != nil {
+ client.AgvPoint.UpdateOneID(byCode.ID).SetDockID(d.ID).SetIsDock(true).Exec(ctx)
+ return
+ }
+ // 3) 真正新建:硬件内置强绑定(仅名称默认=接驳台名、启用默认 true 可软件改)
+ ptName := name
+ if ptName == "" {
+ ptName = "接驳台 " + d.DockCode
+ }
+ client.AgvPoint.Create().
+ SetPositionCode(d.DockCode).
+ SetName(ptName).
+ SetIsDock(true).
+ SetDockID(d.ID).
+ SetEnabled(true).Save(ctx)
+}
+
// SaveDockHandler POST /docks 新增或修改接驳台(id=0 为新增)。
func SaveDockHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
@@ -238,6 +273,8 @@ func SaveDockHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
}
d = created
}
+ // 新增/修改接驳台 → 强制同步一条强绑定的 AGV 点位(硬件级一一对应闭环)
+ syncAgvPointForDock(r.Context(), svcCtx.EntClient, d, name)
httpx.Ok(w, dockRowOf(d))
}
}
@@ -263,6 +300,11 @@ func DeleteDockHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
httpx.Fail(w, 3116, "删除接驳台失败:"+err.Error())
return
}
+ // 接驳台删除 → 一并清理其强绑定的 AGV 点位,避免一一对应出现悬空绑定
+ if _, derr := svcCtx.EntClient.AgvPoint.Delete().Where(agvpoint.DockIDEQ(id)).Exec(r.Context()); derr != nil {
+ httpx.Fail(w, 3116, "删除关联 AGV 点位失败:"+derr.Error())
+ return
+ }
httpx.Ok(w, map[string]any{"id": id})
}
}
@@ -282,11 +324,28 @@ func SetDockStatusHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
httpx.BadRequest(w, "非法的启用状态(仅支持:启用 / 停用)")
return
}
- d, err := svcCtx.EntClient.Dock.UpdateOneID(req.ID).SetStatus(req.Status).Save(r.Context())
+ d, err := svcCtx.EntClient.Dock.Get(r.Context(), req.ID)
+ if err != nil {
+ httpx.Fail(w, 3117, "接驳台不存在:"+err.Error())
+ return
+ }
+ // 停用前强校验:有托盘占用 / 存在在途 AGV 任务 → 拒绝,避免误停导致在途小车失联
+ if req.Status == "DISABLED" {
+ if d.HasPallet {
+ httpx.Fail(w, 3118, "接驳台当前有托盘占用,停用前请先清空")
+ return
+ }
+ if n, nerr := svcCtx.EntClient.AgvTask.Query().
+ Where(agvtask.TargetDock(d.DockCode), agvtask.StatusIn("PENDING", "1", "2")).Count(r.Context()); nerr == nil && n > 0 {
+ httpx.Fail(w, 3119, "接驳台存在在途 AGV 任务,停用前请先取消或等待完成")
+ return
+ }
+ }
+ d2, err := svcCtx.EntClient.Dock.UpdateOneID(req.ID).SetStatus(req.Status).Save(r.Context())
if err != nil {
httpx.Fail(w, 3117, "更新接驳台状态失败:"+err.Error())
return
}
- httpx.Ok(w, dockRowOf(d))
+ httpx.Ok(w, dockRowOf(d2))
}
}
diff --git a/bj_power_mes/internal/handler/production/plc_torque_scan.go b/bj_power_mes/internal/handler/production/plc_torque_scan.go
index f092986..1f1ef84 100644
--- a/bj_power_mes/internal/handler/production/plc_torque_scan.go
+++ b/bj_power_mes/internal/handler/production/plc_torque_scan.go
@@ -42,6 +42,45 @@ func PlcSendLogsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
}
}
+// PlcSendWithdrawHandler 撤回下发(2026-11-03 断头路补全):误下发收回,仅 SENT 可撤,原因必填。
+func PlcSendWithdrawHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+ return func(w http.ResponseWriter, r *http.Request) {
+ var req struct {
+ ID int `json:"id"`
+ Reason string `json:"reason"`
+ }
+ if err := httpx.ParseJSON(r, &req); err != nil {
+ httpx.BadRequest(w, "请求体解析失败")
+ return
+ }
+ rec, err := logic.New(svcCtx).WithdrawSend(r.Context(), req.ID, req.Reason, operator(r, ""))
+ if err != nil {
+ httpx.Fail(w, 3204, err.Error())
+ return
+ }
+ httpx.Ok(w, rec)
+ }
+}
+
+// PlcSendManualDoneHandler 人工完成收口:PLC 完成信号丢失/未接入时,现场确认到位后人工放行下一条。
+func PlcSendManualDoneHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+ return func(w http.ResponseWriter, r *http.Request) {
+ var req struct {
+ ID int `json:"id"`
+ }
+ if err := httpx.ParseJSON(r, &req); err != nil {
+ httpx.BadRequest(w, "请求体解析失败")
+ return
+ }
+ rec, err := logic.New(svcCtx).ManualComplete(r.Context(), req.ID, operator(r, ""))
+ if err != nil {
+ httpx.Fail(w, 3205, err.Error())
+ return
+ }
+ httpx.Ok(w, rec)
+ }
+}
+
// ---------- 拧紧 ----------
// parseTorqueTime 兼容 RFC3339 与纯日期(YYYY-MM-DD)两种查询参数;
diff --git a/bj_power_mes/internal/handler/routes_production.go b/bj_power_mes/internal/handler/routes_production.go
index 792b548..329e91f 100644
--- a/bj_power_mes/internal/handler/routes_production.go
+++ b/bj_power_mes/internal/handler/routes_production.go
@@ -272,6 +272,10 @@ func RegisterProductionRoutes(server *rest.Server, serverCtx *svc.ServiceContext
{Method: http.MethodPost, Path: "/plc/send-process", Handler: production.PlcSendProcessHandler(serverCtx)},
{Method: http.MethodGet, Path: "/plc/send-logs", Handler: production.PlcSendLogsHandler(serverCtx)},
+ // 下发撤回(2026-11-03 断头路补全):误下发收回,仅 SENT 可撤、原因必填、留痕操作日志。
+ {Method: http.MethodPost, Path: "/plc/send-withdraw", Handler: production.PlcSendWithdrawHandler(serverCtx)},
+ // 人工完成收口:PLC 完成信号丢失/产线未接入时,现场确认到位后人工放行下一条。
+ {Method: http.MethodPost, Path: "/plc/send-manual-done", Handler: production.PlcSendManualDoneHandler(serverCtx)},
// PLC 手动监控(新菜单 produce.plc.monitor):只读点位/在途 + 手动下发(含互斥校验 + 操作日志)。
// 不另设操作权限码:本组不进 pathPermMap,仅靠前端菜单码控制可见性(任意登录用户可调)。
@@ -301,7 +305,11 @@ func RegisterProductionRoutes(server *rest.Server, serverCtx *svc.ServiceContext
{Method: http.MethodGet, Path: "/agv/tasks", Handler: production.ListAgvTasksHandler(serverCtx)},
{Method: http.MethodPost, Path: "/agv/refresh", Handler: production.RefreshAgvTasksHandler(serverCtx)},
{Method: http.MethodPost, Path: "/agv/cancel", Handler: production.CancelAgvTaskHandler(serverCtx)},
+ {Method: http.MethodPost, Path: "/agv/retry", Handler: production.RetryAgvTaskHandler(serverCtx)},
{Method: http.MethodGet, Path: "/agv/mode", Handler: production.AgvModeHandler(serverCtx)},
+ // AGV 点位管理(独立点位表:硬件映射编码/接驳台绑定不可改,仅名称/启用可改)
+ {Method: http.MethodGet, Path: "/agv/points", Handler: production.ListAgvPointsHandler(serverCtx)},
+ {Method: http.MethodPut, Path: "/agv/points/:id", Handler: production.UpdateAgvPointHandler(serverCtx)},
{Method: http.MethodPost, Path: "/torque/report", Handler: production.TorqueReportHandler(serverCtx)},
{Method: http.MethodGet, Path: "/torque/records", Handler: production.TorqueRecordsHandler(serverCtx)},
diff --git a/bj_power_mes/internal/logic/agv.go b/bj_power_mes/internal/logic/agv.go
index 0ccf1be..8b8c4c4 100644
--- a/bj_power_mes/internal/logic/agv.go
+++ b/bj_power_mes/internal/logic/agv.go
@@ -9,7 +9,9 @@ import (
"time"
"bj_power_mes/ent"
+ "bj_power_mes/ent/agvpoint"
"bj_power_mes/ent/agvtask"
+ "bj_power_mes/ent/dock"
"bj_power_mes/ent/materialrequest"
"github.com/google/uuid"
@@ -36,6 +38,21 @@ type AgvSubmitRequest struct {
}
// SubmitAgv 手动下发 AGV:按 target_dock 聚合生成任务并调 RCS。
+// AgvPointView AGV 点位视图(camelCase,与前端契约一致)。
+type AgvPointView struct {
+ ID int `json:"id"`
+ PositionCode string `json:"positionCode"`
+ Name string `json:"name"`
+ IsDock bool `json:"isDock"`
+ DockID *int `json:"dockId"`
+ DockCode string `json:"dockCode"`
+ HasPallet bool `json:"hasPallet"`
+ Enabled bool `json:"enabled"`
+ CreatedAt int64 `json:"createdAt"`
+}
+
+// SubmitAgv 手动下发 AGV:目标=AGV 点位编码(position_code),按点位聚合生成任务并调 RCS。
+// 防撞强校验:接驳台点位有托盘 → 拒派;纯点位(无传感器)由前端二次确认后放行。
func (s *Service) SubmitAgv(ctx context.Context, req AgvSubmitRequest, operator string) (int, []string, error) {
if len(req.Rows) == 0 {
return 0, nil, errors.New("请至少选择一批待发料")
@@ -44,6 +61,7 @@ func (s *Service) SubmitAgv(ctx context.Context, req AgvSubmitRequest, operator
if source == "" {
source = "DOCK21"
}
+ // 目标字段复用语义为 AGV 点位编码(position_code)
groups := map[string][]AgvSubmitRow{}
for _, row := range req.Rows {
if row.TargetDock == "" {
@@ -52,17 +70,64 @@ func (s *Service) SubmitAgv(ctx context.Context, req AgvSubmitRequest, operator
groups[row.TargetDock] = append(groups[row.TargetDock], row)
}
if len(groups) == 0 {
- return 0, nil, errors.New("所选料行缺少目标接驳台(targetDock)")
+ return 0, nil, errors.New("所选料行缺少目标点位(targetDock)")
+ }
+ // 解析点位:硬件映射 + 防撞强校验(接驳台点位有托盘拒派)
+ type resolved struct {
+ phys string // 送往 RCS 的物理目标(接驳台点位=dockCode;纯点位=position_code)
+ }
+ resolvedMap := map[string]resolved{}
+ var collide, unknown []string
+ for target := range groups {
+ pt, err := s.ctx.EntClient.AgvPoint.Query().Where(agvpoint.PositionCode(target)).Only(ctx)
+ if err != nil || pt == nil {
+ unknown = append(unknown, target)
+ continue
+ }
+ if !pt.Enabled {
+ // 点位已停用(管理员在「产线管理」禁用)→ 硬拒:停用即「AGV 不去这个点」,不提供二次确认放行
+ collide = append(collide, target)
+ continue
+ }
+ if pt.IsDock && pt.DockID != nil {
+ d, derr := s.ctx.EntClient.Dock.Get(ctx, *pt.DockID)
+ if derr != nil || d == nil {
+ unknown = append(unknown, target)
+ continue
+ }
+ if d.Status == "DISABLED" {
+ collide = append(collide, target) // 停用接驳台禁派(2026-11-03 断头路补全):同防撞口径拒派
+ continue
+ }
+ if d.HasPallet {
+ collide = append(collide, target) // 防撞拒派:接驳台有托盘
+ continue
+ }
+ resolvedMap[target] = resolved{phys: d.DockCode}
+ } else {
+ resolvedMap[target] = resolved{phys: pt.PositionCode} // 纯点位
+ }
+ }
+ if len(unknown) > 0 {
+ return 0, unknown, fmt.Errorf("目标点位不存在:%s", strings.Join(unknown, "、"))
+ }
+ if len(collide) > 0 {
+ return 0, collide, fmt.Errorf("目标接驳台有托盘或已停用,存在碰撞/失效风险,禁止派车:%s(请在「产线管理」清空托盘或恢复启用后重试)", strings.Join(collide, "、"))
}
created := 0
failed := []string{}
for target, rows := range groups {
+ r, ok := resolvedMap[target]
+ if !ok {
+ failed = append(failed, target)
+ continue
+ }
taskNo := "AGV" + strings.ToUpper(uuid.NewString()[:10])
mats, _ := json.Marshal(rows)
t, err := s.ctx.EntClient.AgvTask.Create().
SetTaskNo(taskNo).
SetSourceDock(source).
- SetTargetDock(target).
+ SetTargetDock(r.phys).
SetMaterialsJSON(string(mats)).
SetStatus("PENDING").
SetOperator(operator).
@@ -72,7 +137,7 @@ func (s *Service) SubmitAgv(ctx context.Context, req AgvSubmitRequest, operator
failed = append(failed, target)
continue
}
- if robCode, aerr := s.ctx.Agv.SubmitTask(ctx, taskNo, source, target, ""); aerr != nil {
+ if robCode, aerr := s.ctx.Agv.SubmitTask(ctx, taskNo, source, r.phys, ""); aerr != nil {
s.ctx.EntClient.AgvTask.UpdateOneID(t.ID).
SetStatus("FAILED").SetRemark("RCS下发失败: " + aerr.Error()).Exec(ctx)
failed = append(failed, target)
@@ -83,12 +148,51 @@ func (s *Service) SubmitAgv(ctx context.Context, req AgvSubmitRequest, operator
SetDispatchedAt(time.Now().Unix()).Exec(ctx)
}
s.ctx.EventLog.Write(ctx, "agv.dispatch", "", operator, "agv_task", taskNo,
- "下发AGV搬运 "+source+"→"+target, map[string]any{"rows": len(rows)})
+ "下发AGV搬运 "+source+"→"+r.phys, map[string]any{"rows": len(rows)})
created++
}
return created, failed, nil
}
+// ListAgvPoints 列出 AGV 点位(enabledOnly=true 仅返回启用项,供派车下拉)。
+func (s *Service) ListAgvPoints(ctx context.Context, enabledOnly bool) ([]AgvPointView, error) {
+ q := s.ctx.EntClient.AgvPoint.Query()
+ if enabledOnly {
+ q = q.Where(agvpoint.Enabled(true))
+ }
+ pts, err := q.Order(agvpoint.ByPositionCode()).All(ctx)
+ if err != nil {
+ return nil, err
+ }
+ docks, _ := s.ctx.EntClient.Dock.Query().All(ctx)
+ dockCodeByID := map[int]string{}
+ dockHasPallet := map[int]bool{}
+ for _, d := range docks {
+ dockCodeByID[d.ID] = d.DockCode
+ dockHasPallet[d.ID] = d.HasPallet
+ }
+ out := make([]AgvPointView, 0, len(pts))
+ for _, p := range pts {
+ v := AgvPointView{
+ ID: p.ID, PositionCode: p.PositionCode, Name: p.Name, IsDock: p.IsDock,
+ DockID: p.DockID, Enabled: p.Enabled, CreatedAt: p.CreatedAt.Unix(),
+ }
+ if p.DockID != nil {
+ v.DockCode = dockCodeByID[*p.DockID]
+ v.HasPallet = dockHasPallet[*p.DockID]
+ }
+ out = append(out, v)
+ }
+ return out, nil
+}
+
+// UpdateAgvPoint 仅允许改 name 与 enabled(硬件映射 position_code/dock_id 不可改)。
+func (s *Service) UpdateAgvPoint(ctx context.Context, id int, name string, enabled bool) error {
+ _, err := s.ctx.EntClient.AgvPoint.UpdateOneID(id).
+ SetName(name).SetEnabled(enabled).Save(ctx)
+ return err
+}
+
// LoadCallForDispatch 取叫料单用于派车(与 CompleteCall 同口径:仅 SHIPPED 状态可派车)。
func (s *Service) LoadCallForDispatch(ctx context.Context, requestNo string) (*ent.MaterialRequest, error) {
mr, err := s.ctx.EntClient.MaterialRequest.Query().
@@ -109,6 +213,15 @@ func (s *Service) DispatchAgvForCall(ctx context.Context, mr *ent.MaterialReques
if mr == nil || !mr.NeedAgv || mr.TargetDock == "" {
return nil
}
+ // 目标接驳台停用禁派(2026-11-03 断头路补全):按派车失败口径落预警,由人工改派或恢复接驳台。
+ if d, derr := s.ctx.EntClient.Dock.Query().Where(dock.DockCodeEQ(mr.TargetDock)).First(ctx); derr == nil && d != nil && d.Status == "DISABLED" {
+ err := fmt.Errorf("目标接驳台 %s 已停用,自动派车拒绝(请恢复接驳台或人工配送)", mr.TargetDock)
+ if alertErr := s.CreateAlert(ctx, "agv_dispatch_fail", "警告", mr.RequestNo,
+ "叫料单 "+mr.RequestNo+" AGV 派车失败:"+err.Error()); alertErr != nil {
+ fmt.Println("AGV 派车失败落预警异常:", alertErr)
+ }
+ return err
+ }
source := "DOCK21"
taskNo := "AGV" + strings.ToUpper(uuid.NewString()[:10])
row := AgvSubmitRow{
@@ -248,6 +361,7 @@ func (s *Service) RefreshAgvTasks(ctx context.Context) (int, error) {
upd.SetStatus("9").SetArrivedAt(time.Now().Unix())
s.ctx.EventLog.Write(ctx, "agv.arrive", "", "", "agv_task", t.TaskNo,
"AGV已到位 "+t.TargetDock, nil)
+ s.notifyDeliveredOnArrival(ctx, t)
case "5": // 取消完成
upd.SetStatus("5")
default: // 1 已创建 / 2 执行中
@@ -283,6 +397,43 @@ func (s *Service) CancelAgvTask(ctx context.Context, taskNo, reason, operator st
return nil
}
+// RetryAgvTask 重试失败/卡住的 AGV 任务:沿用原 taskNo/source/target 重新向 RCS 下发。
+// 仅允许对 FAILED 与未成功下发的 PENDING 任务重试;已结束(9/5)不可重试;目标接驳台有托盘拒派。
+func (s *Service) RetryAgvTask(ctx context.Context, taskNo, operator string) error {
+ t, err := s.ctx.EntClient.AgvTask.Query().Where(agvtask.TaskNo(taskNo)).First(ctx)
+ if err != nil {
+ return errors.New("AGV 任务不存在")
+ }
+ if t.Status == "9" || t.Status == "5" {
+ return errors.New("任务已结束,无法重试")
+ }
+ // 防撞强校验:目标接驳台点位有托盘/已停用 → 拒派(与手动派车一致)
+ if t.TargetDock != "" {
+ if pt, perr := s.ctx.EntClient.AgvPoint.Query().Where(agvpoint.PositionCode(t.TargetDock)).Only(ctx); perr == nil && pt != nil && pt.IsDock && pt.DockID != nil {
+ if d, derr := s.ctx.EntClient.Dock.Get(ctx, *pt.DockID); derr == nil && d != nil {
+ if d.HasPallet {
+ return errors.New("目标接驳台有托盘,禁止重试派车")
+ }
+ if d.Status == "DISABLED" {
+ return errors.New("目标接驳台已停用,禁止重试派车(请先在「产线管理」恢复启用)")
+ }
+ }
+ }
+ }
+ robCode, aerr := s.ctx.Agv.SubmitTask(ctx, taskNo, t.SourceDock, t.TargetDock, "")
+ if aerr != nil {
+ s.ctx.EntClient.AgvTask.UpdateOneID(t.ID).
+ SetStatus("FAILED").SetRemark("RCS重试下发失败: " + aerr.Error()).Exec(ctx)
+ return fmt.Errorf("RCS 重试下发失败: %w", aerr)
+ }
+ s.ctx.EntClient.AgvTask.UpdateOneID(t.ID).
+ SetHikTaskCode(robCode).SetStatus("1").
+ SetDispatchedAt(time.Now().Unix()).SetRemark("").Exec(ctx)
+ s.ctx.EventLog.Write(ctx, "agv.retry", "", operator, "agv_task", taskNo,
+ "重试AGV搬运 "+t.SourceDock+"→"+t.TargetDock, nil)
+ return nil
+}
+
// AgvMode 返回 AGV 对接模式(mock / 真实 RCS),供前端提示当前是否在模拟。
func (s *Service) AgvMode() map[string]any {
mock := s.ctx.Agv.Disable()
@@ -330,6 +481,36 @@ func (s *Service) ApplyAgvCallback(ctx context.Context, taskCode, method string)
if arrived {
s.ctx.EventLog.Write(ctx, "agv.arrive", "", "", "agv_task", t.TaskNo,
"AGV已到位(回调) "+t.TargetDock, map[string]any{"method": method})
+ s.notifyDeliveredOnArrival(ctx, t)
}
return nil
}
+
+// notifyDeliveredOnArrival AGV 到位 → 关联出库单回写「已送达」(2026-11-03 断头路补全:
+// 出库单状态机「已出库/已送达」此前无写者)。任务关联叫料单 → 叫料单上回写的 WMS 出库单号
+//(可多个逗号分隔)→ 通知 WMS 置已送达。best-effort:WMS 不可达只记日志,不阻断到位链路。
+func (s *Service) notifyDeliveredOnArrival(ctx context.Context, t *ent.AgvTask) {
+ if t == nil || t.RelatedRequestNo == "" || s.ctx.Wms == nil {
+ return
+ }
+ mr, mErr := s.ctx.EntClient.MaterialRequest.Query().
+ Where(materialrequest.RequestNo(t.RelatedRequestNo)).First(ctx)
+ if mErr != nil || mr == nil || mr.OutboundNo == "" {
+ return
+ }
+ nos := []string{}
+ for _, p := range strings.Split(mr.OutboundNo, ",") {
+ if p = strings.TrimSpace(p); p != "" {
+ nos = append(nos, p)
+ }
+ }
+ if len(nos) == 0 {
+ return
+ }
+ if dErr := s.ctx.Wms.DeliveredOutbound(ctx, nos); dErr != nil {
+ fmt.Println("出库单回写已送达失败(可忽略):", dErr)
+ return
+ }
+ s.ctx.EventLog.Write(ctx, "outbound.delivered", "", "AGV", "agv_task", t.TaskNo,
+ "AGV到位,出库单已回写「已送达」:"+mr.OutboundNo, nil)
+}
diff --git a/bj_power_mes/internal/logic/call.go b/bj_power_mes/internal/logic/call.go
index fb50838..3ecdd47 100644
--- a/bj_power_mes/internal/logic/call.go
+++ b/bj_power_mes/internal/logic/call.go
@@ -477,11 +477,12 @@ func (s *Service) CreateCallOrders(ctx context.Context, stationNo int, items []C
}
allowCross := s.CfgInt(ctx, CfgAllowCrossDay, 1) == 1
allowBorrow := s.CfgInt(ctx, CfgAllowBorrow, 1) == 1
- // 接驳台校验:目标接驳台必须属于该工位(一工位左L/右R 两个,真源=dock 表)
+ // 接驳台校验:目标接驳台必须属于该工位(一工位左L/右R 两个,真源=dock 表);
+ // 停用(DISABLED)接驳台不进候选(2026-11-03 断头路补全:此前只校验归属不校验启停,停用台仍可被叫料指向)
dockSet := map[string]bool{}
if dks, e := s.ctx.EntClient.Dock.Query().Where(dock.StationNo(stationNo)).All(ctx); e == nil {
for _, d := range dks {
- if d.DockCode != "" {
+ if d.DockCode != "" && d.Status != "DISABLED" {
dockSet[d.DockCode] = true
}
}
@@ -495,7 +496,7 @@ func (s *Service) CreateCallOrders(ctx context.Context, stationNo int, items []C
return 0, errors.New("请选择目标接驳台")
}
if !dockSet[it.Dock] {
- return 0, errors.New("该工位无此接驳台:" + it.Dock)
+ return 0, fmt.Errorf("接驳台 %s 不属于本工位或已停用,请在「产线管理」确认后重选", it.Dock)
}
}
tx, terr := s.ctx.EntClient.Tx(ctx)
diff --git a/bj_power_mes/internal/logic/dashboard.go b/bj_power_mes/internal/logic/dashboard.go
index 3f1b717..10dc515 100644
--- a/bj_power_mes/internal/logic/dashboard.go
+++ b/bj_power_mes/internal/logic/dashboard.go
@@ -755,11 +755,13 @@ func (s *Service) buildAlarms(ctx context.Context, today time.Time) []AlarmItem
Status: "active",
})
}
+ // 在途未完成下发(2026-11-03 断头路收口):原统计 status=TIMEOUT 但全项目无人写入 TIMEOUT,恒为 0。
+ // 改统计 SENT(已下发未收到完成信号)——超 1 条即说明产线有指令挂起,需在「工位下发」页撤回或人工完成。
if n, err := s.ctx.EntClient.PlcSendLog.Query().
- Where(plcsendlog.Status("TIMEOUT")).Count(ctx); err == nil && n > 0 {
+ Where(plcsendlog.Status("SENT")).Count(ctx); err == nil && n > 0 {
items = append(items, AlarmItem{
- ID: "plc-timeout", Level: "critical", Type: "equipment",
- Target: "PLC", Message: "存在 PLC 下发超时 " + itoa(n) + " 条", Time: fmtDashboardTime(time.Now()),
+ ID: "plc-intransit", Level: "critical", Type: "equipment",
+ Target: "PLC", Message: "存在在途未完成的工位下发 " + itoa(n) + " 条,请在「工位下发」页收口", Time: fmtDashboardTime(time.Now()),
Status: "active",
})
}
diff --git a/bj_power_mes/internal/logic/plc.go b/bj_power_mes/internal/logic/plc.go
index 2f4053e..7642cd3 100644
--- a/bj_power_mes/internal/logic/plc.go
+++ b/bj_power_mes/internal/logic/plc.go
@@ -3,6 +3,8 @@ package logic
import (
"context"
"errors"
+ "fmt"
+ "strconv"
"time"
"bj_power_mes/ent"
@@ -97,19 +99,98 @@ func (s *Service) SendProcess(ctx context.Context, req PlcSendReq, operator stri
if err != nil {
return nil, err
}
- s.ctx.EventLog.Write(ctx, "plc.send", req.OrderNo, operator, "plc_send_log", req.Sn, "工位组合下发", map[string]any{"combination": combination})
+ s.ctx.EventLog.Write(ctx, "plc.send", req.OrderNo, operator, "plc_send_log", req.Sn, "工位下发", map[string]any{"combination": combination})
- // mock 完成信号:延时后置为完成(演示"未完成不下发下一条"握手)
+ // mock 完成信号:延时后置为完成(演示"未完成不下发下一条"握手)。
+ // 条件更新(仅 SENT 才置 DONE):若记录已被人工撤回/收口,不得被模拟信号覆盖。
go func(id int) {
time.Sleep(5 * time.Second)
s.ctx.PLC.Get().AckDone(context.Background(), true)
- _, _ = s.ctx.EntClient.PlcSendLog.UpdateOneID(id).
+ _, _ = s.ctx.EntClient.PlcSendLog.Update().
+ Where(plcsendlog.ID(id), plcsendlog.StatusEQ("SENT")).
SetStatus("DONE").SetDoneTime(time.Now()).SetAck(true).Save(context.Background())
}(rec.ID)
return rec, nil
}
+// WithdrawSend 撤回下发(2026-11-03 断头路补全):把误下发的指令收回来。
+// 仅「已下发(SENT)」可撤回;已完成(DONE)/已撤回(CANCELLED) 不可撤。
+// 撤回后该条不再占用"上一条未完成不能下发下一条"的握手位,可立即重新下发正确工位码。
+func (s *Service) WithdrawSend(ctx context.Context, id int, reason, operator string) (*ent.PlcSendLog, error) {
+ if id <= 0 {
+ return nil, errors.New("下发记录 ID 无效")
+ }
+ if reason == "" {
+ return nil, errors.New("撤回原因必填(写清楚为什么撤,如:选错工件/工位)")
+ }
+ rec, err := s.ctx.EntClient.PlcSendLog.Query().Where(plcsendlog.ID(id)).First(ctx)
+ if err != nil {
+ return nil, errors.New("下发记录不存在")
+ }
+ if rec.Status != "SENT" {
+ return nil, fmt.Errorf("仅「已下发」状态可撤回(当前状态:%s)", plcSendStatusText(rec.Status))
+ }
+ updated, err := s.ctx.EntClient.PlcSendLog.Update().
+ Where(plcsendlog.ID(id), plcsendlog.StatusEQ("SENT")).
+ SetStatus("CANCELLED").SetRemark("撤回:" + reason).
+ SetDoneTime(time.Now()).Save(ctx)
+ if err != nil || updated == 0 {
+ return nil, errors.New("撤回失败:记录状态已变化,请刷新后重试")
+ }
+ s.ctx.EventLog.Write(ctx, "plc.send.withdraw", rec.OrderNo, operator, "plc_send_log", rec.Sn,
+ "撤回工位下发(工位"+strconv.Itoa(rec.StationNo)+"):"+reason, nil)
+ return s.ctx.EntClient.PlcSendLog.Get(ctx, id)
+}
+
+// ManualComplete 人工完成收口(2026-11-03 断头路补全):PLC 完成信号丢失/产线未接入时,
+// 现场确认工件实际已到位,由人工把「已下发」置为「已完成」,解除握手、放行下一条下发。
+func (s *Service) ManualComplete(ctx context.Context, id int, operator string) (*ent.PlcSendLog, error) {
+ if id <= 0 {
+ return nil, errors.New("下发记录 ID 无效")
+ }
+ rec, err := s.ctx.EntClient.PlcSendLog.Query().Where(plcsendlog.ID(id)).First(ctx)
+ if err != nil {
+ return nil, errors.New("下发记录不存在")
+ }
+ if rec.Status != "SENT" {
+ return nil, fmt.Errorf("仅「已下发」状态可人工完成(当前状态:%s)", plcSendStatusText(rec.Status))
+ }
+ remark := "人工确认完成"
+ if rec.Remark == "" {
+ remark = "人工确认完成(PLC 完成信号丢失,现场确认到位)"
+ }
+ updated, err := s.ctx.EntClient.PlcSendLog.Update().
+ Where(plcsendlog.ID(id), plcsendlog.StatusEQ("SENT")).
+ SetStatus("DONE").SetAck(true).SetDoneTime(time.Now()).
+ SetRemark(remark).
+ Save(ctx)
+ if err != nil || updated == 0 {
+ return nil, errors.New("收口失败:记录状态已变化,请刷新后重试")
+ }
+ s.ctx.EventLog.Write(ctx, "plc.send.manual_done", rec.OrderNo, operator, "plc_send_log", rec.Sn,
+ "人工确认工位"+strconv.Itoa(rec.StationNo)+"流转完成(PLC 信号未回,现场收口)", nil)
+ return s.ctx.EntClient.PlcSendLog.Get(ctx, id)
+}
+
+// plcSendStatusText 下发状态中文(前端展示同口径)
+func plcSendStatusText(s string) string {
+ switch s {
+ case "SENT":
+ return "已下发"
+ case "DONE":
+ return "已完成"
+ case "CANCELLED":
+ return "已撤回"
+ case "TIMEOUT":
+ return "已超时"
+ case "REPLY_NG":
+ return "回复异常"
+ default:
+ return s
+ }
+}
+
// ListPlcSendLogs 查询 PLC 下发日志
func (s *Service) ListPlcSendLogs(ctx context.Context, orderNo, status string) ([]*ent.PlcSendLog, error) {
q := s.ctx.EntClient.PlcSendLog.Query()
diff --git a/bj_power_mes/internal/logic/plc_monitor.go b/bj_power_mes/internal/logic/plc_monitor.go
index a7f08ac..bf0752c 100644
--- a/bj_power_mes/internal/logic/plc_monitor.go
+++ b/bj_power_mes/internal/logic/plc_monitor.go
@@ -114,13 +114,13 @@ func (s *Service) PlcMonitorMW(ctx context.Context) ([]MWState, error) {
// 3) 写 MW 寄存器;
// 4) 记操作日志(event_log,type=plc_manual_write)。
func (s *Service) PlcMonitorManualWrite(ctx context.Context, req ManualWriteReq, operator string) (*MonitorPreview, error) {
- // 1. 互斥:在途指令(工位组合下发尚未收到完成信号)
+ // 1. 互斥:在途指令(工位下发尚未收到完成信号)
inTransit, err := s.ctx.EntClient.PlcSendLog.Query().Where(plcsendlog.Status("SENT")).Exist(ctx)
if err != nil {
return nil, err
}
if inTransit {
- return nil, errors.New("存在在途指令(工位组合下发尚未收到完成信号),手动下发被拒绝,以免打断自动线")
+ return nil, errors.New("存在在途指令(工位下发尚未收到完成信号),手动下发被拒绝,以免打断自动线;可在「工位下发」页撤回或人工完成后重试")
}
// 2. 校验组合
st, stok := plc.ParseSrcType(req.SrcType)
diff --git a/bj_power_mes/internal/logic/seed.go b/bj_power_mes/internal/logic/seed.go
index 1f3f4e9..aaccd86 100644
--- a/bj_power_mes/internal/logic/seed.go
+++ b/bj_power_mes/internal/logic/seed.go
@@ -93,8 +93,8 @@ func (s *Service) Seed(ctx context.Context) error {
{"produce.producible", "排产支撑", "MENU", "/producible-support"},
{"produce.material", "叫料单", "MENU", "/material-request"},
{"produce.qty", "数量不符处理", "MENU", "/qty-report"},
- {"produce.plc", "工位组合下发", "MENU", "/plc-send"},
- {"produce.plc.monitor", "PLC 手动监控", "MENU", "/plc-monitor"},
+ {"produce.plc", "工位下发", "MENU", "/plc-send"},
+ {"produce.plc.monitor", "PLC管理", "MENU", "/plc-monitor"},
{"produce.processflow", "工艺", "MENU", "/process-flow"},
{"produce.station", "工位管理", "MENU", "/station"}, {"produce.performance", "绩效报表", "MENU", "/performance"},
// 产线管理(块 E):顶部 4 tab = 工位状态 / 缓存状态 / 接驳台维护 / 工件位置纠正。
@@ -262,6 +262,8 @@ func (s *Service) Seed(ctx context.Context) error {
seedStations(ctx, s)
// 5. 接驳台主数据(真源在 MES,2026-09-21 自 WMS 迁入;2026-10-17 块 E.2 起可在「产线管理」页维护)
seedDocks(ctx, s)
+ // 5.1 AGV 点位真源(硬件内置):接驳台点位与 dock 一一对应 + 少量纯待命/充电点位
+ seedAgvPoints(ctx, s)
// 6. 预警规则常用占位(遗留5 告警框架第一阶段):只插缺失行,enabled=false / threshold=0,
// 即"占位不启用"——由实施在预警中心按需改阈值/启用,绝不默认触发
seedAlertRules(ctx, s)
@@ -362,6 +364,45 @@ func seedDocks(ctx context.Context, s *Service) {
Save(ctx)
}
+// seedAgvPoints AGV 点位真源(硬件内置):接驳台点位 position_code= dockCode、dock_id 强绑定;
+// 另补纯待命/充电点位(is_dock=false)。仅当表为空时写入,人工改动不被覆盖。
+func seedAgvPoints(ctx context.Context, s *Service) {
+ if n, _ := s.ctx.EntClient.AgvPoint.Query().Count(ctx); n > 0 {
+ return
+ }
+ // 1) 接驳台点位:与 dock 一一对应(position_code= dockCode,dock_id 硬件内置强绑定,软件不可改)
+ docks, err := s.ctx.EntClient.Dock.Query().All(ctx)
+ if err == nil {
+ for _, d := range docks {
+ name := d.Name
+ if name == "" {
+ name = "接驳台 " + d.DockCode
+ }
+ _, _ = s.ctx.EntClient.AgvPoint.Create().
+ SetPositionCode(d.DockCode).
+ SetName(name).
+ SetIsDock(true).
+ SetDockID(d.ID).
+ SetEnabled(true).
+ Save(ctx)
+ }
+ }
+ // 2) 纯 AGV 点位(无接驳台):待命 / 充电,派车时仅做二次确认(无传感器)
+ pure := []struct{ code, name string }{
+ {"AGV-WAIT01", "AGV 待命位 1"},
+ {"AGV-WAIT02", "AGV 待命位 2"},
+ {"AGV-CHARGE01", "AGV 充电位 1"},
+ }
+ for _, p := range pure {
+ _, _ = s.ctx.EntClient.AgvPoint.Create().
+ SetPositionCode(p.code).
+ SetName(p.name).
+ SetIsDock(false).
+ SetEnabled(true).
+ Save(ctx)
+ }
+}
+
func seedStations(ctx context.Context, s *Service) {
// 工位是产线固定物理工位,一律「内置工位」:需连 PLC、按工位号顺序流转、不可改类型、不可删除、仅可改名,
// 属系统内置只读主数据(同 WMS 接驳台),故由种子初始化。12 个装配工位(1~10 带接驳台,11/12 产线末端无接驳台);
diff --git a/bj_power_mes/internal/wmsclient/client.go b/bj_power_mes/internal/wmsclient/client.go
index c71e3de..9251fbb 100644
--- a/bj_power_mes/internal/wmsclient/client.go
+++ b/bj_power_mes/internal/wmsclient/client.go
@@ -605,6 +605,12 @@ type RespError struct {
Message string // WMS 业务错误原文(可选;409 防重等场景透出,空则仅报状态码)
}
+// DeliveredOutbound 调 WMS /api/internal/outbound/delivered:AGV 到位(任务结束)后
+// 把关联出库单从「已出库」置「已送达」(幂等,已作废/已送达的跳过)。调用方 best-effort,失败仅记日志。
+func (c *Client) DeliveredOutbound(ctx context.Context, outboundNos []string) error {
+ return c.post(ctx, "/api/internal/outbound/delivered", map[string]any{"outboundNos": outboundNos})
+}
+
func (e *RespError) Error() string {
if e.Message != "" {
return "wms call failed with status " + strconv.Itoa(e.Status) + ": " + e.Message
diff --git a/bj_power_mes/public/index.html b/bj_power_mes/public/index.html
index c0896d5..181ac9c 100644
--- a/bj_power_mes/public/index.html
+++ b/bj_power_mes/public/index.html
@@ -6,8 +6,8 @@
MES 产线控制
-
-
+
+
diff --git a/bj_power_mes/schema/agv_point.go b/bj_power_mes/schema/agv_point.go
new file mode 100644
index 0000000..ecc3246
--- /dev/null
+++ b/bj_power_mes/schema/agv_point.go
@@ -0,0 +1,44 @@
+package schema
+
+import (
+ "time"
+
+ "entgo.io/ent"
+ "entgo.io/ent/dialect/entsql"
+ "entgo.io/ent/schema"
+ "entgo.io/ent/schema/field"
+ "entgo.io/ent/schema/index"
+)
+
+// AgvPoint AGV 点位(硬件级别真源)。
+// 点位编码(position_code)与接驳台的一一对应关系为硬件内置:软件层只能“启用/停用”与改显示名(name),
+// 绝对不能修改核心物理编码和绑定关系(dock_id)。
+// 纯 AGV 点位(无接驳台)用 is_dock=false 表示;派车时无传感器,仅做二次确认“请确保现场安全”。
+type AgvPoint struct {
+ ent.Schema
+}
+
+func (AgvPoint) Annotations() []schema.Annotation {
+ return []schema.Annotation{entsql.Annotation{Table: "agv_point"}, entsql.WithComments(true),
+ schema.Comment("AgvPoint AGV 点位(硬件级别真源):点位编码与接驳台一一对应,软件仅可启用/停用与改显示名。")}
+}
+
+func (AgvPoint) Fields() []ent.Field {
+ return []ent.Field{
+ field.String("position_code").Unique().MaxLen(32).Comment("AGV 点位编码(硬件映射=送往 RCS 的目标坐标,软件不可改)"),
+ field.String("name").Default("").MaxLen(64).Comment("点位显示名称(可编辑)"),
+ field.Bool("is_dock").Default(false).Comment("是否接驳台点位(true=绑定接驳台,false=纯待命/充电点位)"),
+ // 硬件内置绑定:该点位对应的接驳台 ID(is_dock=true 时强绑定,软件不可改)
+ field.Int("dock_id").Optional().Nillable().Comment("绑定的接驳台 ID(is_dock=true 时硬件内置强绑定)"),
+ field.Bool("enabled").Default(true).Comment("是否启用(可编辑)"),
+ field.Time("created_at").Default(time.Now).Immutable(),
+ }
+}
+
+func (AgvPoint) Indexes() []ent.Index {
+ return []ent.Index{
+ index.Fields("position_code").Unique(),
+ index.Fields("is_dock"),
+ index.Fields("enabled"),
+ }
+}
diff --git a/bj_power_wms/ent/migrate/schema.go b/bj_power_wms/ent/migrate/schema.go
index f1d265e..32355f7 100644
--- a/bj_power_wms/ent/migrate/schema.go
+++ b/bj_power_wms/ent/migrate/schema.go
@@ -609,6 +609,10 @@ var (
{Name: "borrow_from", Type: field.TypeJSON, Nullable: true, Comment: "跨工位借料来源 stationNo→借用量(call 备料出库专用);空=本工位自取"},
{Name: "inspection_no", Type: field.TypeString, Nullable: true, Comment: "检测单号(溯源关联检验单据)"},
{Name: "product_work_no", Type: field.TypeString, Nullable: true, Comment: "产品工号(随库存带入,出库记录展示/筛选)"},
+ {Name: "voided", Type: field.TypeBool, Comment: "是否已作废", Default: false},
+ {Name: "void_reason", Type: field.TypeString, Comment: "作废原因(必填留痕)", Default: ""},
+ {Name: "voided_by", Type: field.TypeString, Comment: "作废操作人", Default: ""},
+ {Name: "voided_at", Type: field.TypeInt64, Nullable: true, Comment: "作废时间戳"},
{Name: "created_at", Type: field.TypeInt64, Comment: "创建时间"},
}
// OutboundOrdersTable holds the schema information for the "outbound_orders" table.
diff --git a/bj_power_wms/ent/mutation.go b/bj_power_wms/ent/mutation.go
index 42b5689..2bb6419 100644
--- a/bj_power_wms/ent/mutation.go
+++ b/bj_power_wms/ent/mutation.go
@@ -17587,6 +17587,11 @@ type OutboundOrderMutation struct {
borrowFrom *map[string]int
inspection_no *string
product_work_no *string
+ voided *bool
+ void_reason *string
+ voided_by *string
+ voided_at *int64
+ addvoided_at *int64
created_at *int64
addcreated_at *int64
clearedFields map[string]struct{}
@@ -19070,6 +19075,184 @@ func (m *OutboundOrderMutation) ResetProductWorkNo() {
delete(m.clearedFields, outboundorder.FieldProductWorkNo)
}
+// SetVoided sets the "voided" field.
+func (m *OutboundOrderMutation) SetVoided(b bool) {
+ m.voided = &b
+}
+
+// Voided returns the value of the "voided" field in the mutation.
+func (m *OutboundOrderMutation) Voided() (r bool, exists bool) {
+ v := m.voided
+ if v == nil {
+ return
+ }
+ return *v, true
+}
+
+// OldVoided returns the old "voided" field's value of the OutboundOrder entity.
+// If the OutboundOrder object wasn't provided to the builder, the object is fetched from the database.
+// An error is returned if the mutation operation is not UpdateOne, or the database query fails.
+func (m *OutboundOrderMutation) OldVoided(ctx context.Context) (v bool, err error) {
+ if !m.op.Is(OpUpdateOne) {
+ return v, errors.New("OldVoided is only allowed on UpdateOne operations")
+ }
+ if m.id == nil || m.oldValue == nil {
+ return v, errors.New("OldVoided requires an ID field in the mutation")
+ }
+ oldValue, err := m.oldValue(ctx)
+ if err != nil {
+ return v, fmt.Errorf("querying old value for OldVoided: %w", err)
+ }
+ return oldValue.Voided, nil
+}
+
+// ResetVoided resets all changes to the "voided" field.
+func (m *OutboundOrderMutation) ResetVoided() {
+ m.voided = nil
+}
+
+// SetVoidReason sets the "void_reason" field.
+func (m *OutboundOrderMutation) SetVoidReason(s string) {
+ m.void_reason = &s
+}
+
+// VoidReason returns the value of the "void_reason" field in the mutation.
+func (m *OutboundOrderMutation) VoidReason() (r string, exists bool) {
+ v := m.void_reason
+ if v == nil {
+ return
+ }
+ return *v, true
+}
+
+// OldVoidReason returns the old "void_reason" field's value of the OutboundOrder entity.
+// If the OutboundOrder object wasn't provided to the builder, the object is fetched from the database.
+// An error is returned if the mutation operation is not UpdateOne, or the database query fails.
+func (m *OutboundOrderMutation) OldVoidReason(ctx context.Context) (v string, err error) {
+ if !m.op.Is(OpUpdateOne) {
+ return v, errors.New("OldVoidReason is only allowed on UpdateOne operations")
+ }
+ if m.id == nil || m.oldValue == nil {
+ return v, errors.New("OldVoidReason requires an ID field in the mutation")
+ }
+ oldValue, err := m.oldValue(ctx)
+ if err != nil {
+ return v, fmt.Errorf("querying old value for OldVoidReason: %w", err)
+ }
+ return oldValue.VoidReason, nil
+}
+
+// ResetVoidReason resets all changes to the "void_reason" field.
+func (m *OutboundOrderMutation) ResetVoidReason() {
+ m.void_reason = nil
+}
+
+// SetVoidedBy sets the "voided_by" field.
+func (m *OutboundOrderMutation) SetVoidedBy(s string) {
+ m.voided_by = &s
+}
+
+// VoidedBy returns the value of the "voided_by" field in the mutation.
+func (m *OutboundOrderMutation) VoidedBy() (r string, exists bool) {
+ v := m.voided_by
+ if v == nil {
+ return
+ }
+ return *v, true
+}
+
+// OldVoidedBy returns the old "voided_by" field's value of the OutboundOrder entity.
+// If the OutboundOrder object wasn't provided to the builder, the object is fetched from the database.
+// An error is returned if the mutation operation is not UpdateOne, or the database query fails.
+func (m *OutboundOrderMutation) OldVoidedBy(ctx context.Context) (v string, err error) {
+ if !m.op.Is(OpUpdateOne) {
+ return v, errors.New("OldVoidedBy is only allowed on UpdateOne operations")
+ }
+ if m.id == nil || m.oldValue == nil {
+ return v, errors.New("OldVoidedBy requires an ID field in the mutation")
+ }
+ oldValue, err := m.oldValue(ctx)
+ if err != nil {
+ return v, fmt.Errorf("querying old value for OldVoidedBy: %w", err)
+ }
+ return oldValue.VoidedBy, nil
+}
+
+// ResetVoidedBy resets all changes to the "voided_by" field.
+func (m *OutboundOrderMutation) ResetVoidedBy() {
+ m.voided_by = nil
+}
+
+// SetVoidedAt sets the "voided_at" field.
+func (m *OutboundOrderMutation) SetVoidedAt(i int64) {
+ m.voided_at = &i
+ m.addvoided_at = nil
+}
+
+// VoidedAt returns the value of the "voided_at" field in the mutation.
+func (m *OutboundOrderMutation) VoidedAt() (r int64, exists bool) {
+ v := m.voided_at
+ if v == nil {
+ return
+ }
+ return *v, true
+}
+
+// OldVoidedAt returns the old "voided_at" field's value of the OutboundOrder entity.
+// If the OutboundOrder object wasn't provided to the builder, the object is fetched from the database.
+// An error is returned if the mutation operation is not UpdateOne, or the database query fails.
+func (m *OutboundOrderMutation) OldVoidedAt(ctx context.Context) (v *int64, err error) {
+ if !m.op.Is(OpUpdateOne) {
+ return v, errors.New("OldVoidedAt is only allowed on UpdateOne operations")
+ }
+ if m.id == nil || m.oldValue == nil {
+ return v, errors.New("OldVoidedAt requires an ID field in the mutation")
+ }
+ oldValue, err := m.oldValue(ctx)
+ if err != nil {
+ return v, fmt.Errorf("querying old value for OldVoidedAt: %w", err)
+ }
+ return oldValue.VoidedAt, nil
+}
+
+// AddVoidedAt adds i to the "voided_at" field.
+func (m *OutboundOrderMutation) AddVoidedAt(i int64) {
+ if m.addvoided_at != nil {
+ *m.addvoided_at += i
+ } else {
+ m.addvoided_at = &i
+ }
+}
+
+// AddedVoidedAt returns the value that was added to the "voided_at" field in this mutation.
+func (m *OutboundOrderMutation) AddedVoidedAt() (r int64, exists bool) {
+ v := m.addvoided_at
+ if v == nil {
+ return
+ }
+ return *v, true
+}
+
+// ClearVoidedAt clears the value of the "voided_at" field.
+func (m *OutboundOrderMutation) ClearVoidedAt() {
+ m.voided_at = nil
+ m.addvoided_at = nil
+ m.clearedFields[outboundorder.FieldVoidedAt] = struct{}{}
+}
+
+// VoidedAtCleared returns if the "voided_at" field was cleared in this mutation.
+func (m *OutboundOrderMutation) VoidedAtCleared() bool {
+ _, ok := m.clearedFields[outboundorder.FieldVoidedAt]
+ return ok
+}
+
+// ResetVoidedAt resets all changes to the "voided_at" field.
+func (m *OutboundOrderMutation) ResetVoidedAt() {
+ m.voided_at = nil
+ m.addvoided_at = nil
+ delete(m.clearedFields, outboundorder.FieldVoidedAt)
+}
+
// SetCreatedAt sets the "created_at" field.
func (m *OutboundOrderMutation) SetCreatedAt(i int64) {
m.created_at = &i
@@ -19160,7 +19343,7 @@ func (m *OutboundOrderMutation) Type() string {
// order to get all numeric fields that were incremented/decremented, call
// AddedFields().
func (m *OutboundOrderMutation) Fields() []string {
- fields := make([]string, 0, 30)
+ fields := make([]string, 0, 34)
if m.outbound_no != nil {
fields = append(fields, outboundorder.FieldOutboundNo)
}
@@ -19248,6 +19431,18 @@ func (m *OutboundOrderMutation) Fields() []string {
if m.product_work_no != nil {
fields = append(fields, outboundorder.FieldProductWorkNo)
}
+ if m.voided != nil {
+ fields = append(fields, outboundorder.FieldVoided)
+ }
+ if m.void_reason != nil {
+ fields = append(fields, outboundorder.FieldVoidReason)
+ }
+ if m.voided_by != nil {
+ fields = append(fields, outboundorder.FieldVoidedBy)
+ }
+ if m.voided_at != nil {
+ fields = append(fields, outboundorder.FieldVoidedAt)
+ }
if m.created_at != nil {
fields = append(fields, outboundorder.FieldCreatedAt)
}
@@ -19317,6 +19512,14 @@ func (m *OutboundOrderMutation) Field(name string) (ent.Value, bool) {
return m.InspectionNo()
case outboundorder.FieldProductWorkNo:
return m.ProductWorkNo()
+ case outboundorder.FieldVoided:
+ return m.Voided()
+ case outboundorder.FieldVoidReason:
+ return m.VoidReason()
+ case outboundorder.FieldVoidedBy:
+ return m.VoidedBy()
+ case outboundorder.FieldVoidedAt:
+ return m.VoidedAt()
case outboundorder.FieldCreatedAt:
return m.CreatedAt()
}
@@ -19386,6 +19589,14 @@ func (m *OutboundOrderMutation) OldField(ctx context.Context, name string) (ent.
return m.OldInspectionNo(ctx)
case outboundorder.FieldProductWorkNo:
return m.OldProductWorkNo(ctx)
+ case outboundorder.FieldVoided:
+ return m.OldVoided(ctx)
+ case outboundorder.FieldVoidReason:
+ return m.OldVoidReason(ctx)
+ case outboundorder.FieldVoidedBy:
+ return m.OldVoidedBy(ctx)
+ case outboundorder.FieldVoidedAt:
+ return m.OldVoidedAt(ctx)
case outboundorder.FieldCreatedAt:
return m.OldCreatedAt(ctx)
}
@@ -19600,6 +19811,34 @@ func (m *OutboundOrderMutation) SetField(name string, value ent.Value) error {
}
m.SetProductWorkNo(v)
return nil
+ case outboundorder.FieldVoided:
+ v, ok := value.(bool)
+ if !ok {
+ return fmt.Errorf("unexpected type %T for field %s", value, name)
+ }
+ m.SetVoided(v)
+ return nil
+ case outboundorder.FieldVoidReason:
+ v, ok := value.(string)
+ if !ok {
+ return fmt.Errorf("unexpected type %T for field %s", value, name)
+ }
+ m.SetVoidReason(v)
+ return nil
+ case outboundorder.FieldVoidedBy:
+ v, ok := value.(string)
+ if !ok {
+ return fmt.Errorf("unexpected type %T for field %s", value, name)
+ }
+ m.SetVoidedBy(v)
+ return nil
+ case outboundorder.FieldVoidedAt:
+ v, ok := value.(int64)
+ if !ok {
+ return fmt.Errorf("unexpected type %T for field %s", value, name)
+ }
+ m.SetVoidedAt(v)
+ return nil
case outboundorder.FieldCreatedAt:
v, ok := value.(int64)
if !ok {
@@ -19624,6 +19863,9 @@ func (m *OutboundOrderMutation) AddedFields() []string {
if m.addquantity != nil {
fields = append(fields, outboundorder.FieldQuantity)
}
+ if m.addvoided_at != nil {
+ fields = append(fields, outboundorder.FieldVoidedAt)
+ }
if m.addcreated_at != nil {
fields = append(fields, outboundorder.FieldCreatedAt)
}
@@ -19641,6 +19883,8 @@ func (m *OutboundOrderMutation) AddedField(name string) (ent.Value, bool) {
return m.AddedSnMode()
case outboundorder.FieldQuantity:
return m.AddedQuantity()
+ case outboundorder.FieldVoidedAt:
+ return m.AddedVoidedAt()
case outboundorder.FieldCreatedAt:
return m.AddedCreatedAt()
}
@@ -19673,6 +19917,13 @@ func (m *OutboundOrderMutation) AddField(name string, value ent.Value) error {
}
m.AddQuantity(v)
return nil
+ case outboundorder.FieldVoidedAt:
+ v, ok := value.(int64)
+ if !ok {
+ return fmt.Errorf("unexpected type %T for field %s", value, name)
+ }
+ m.AddVoidedAt(v)
+ return nil
case outboundorder.FieldCreatedAt:
v, ok := value.(int64)
if !ok {
@@ -19751,6 +20002,9 @@ func (m *OutboundOrderMutation) ClearedFields() []string {
if m.FieldCleared(outboundorder.FieldProductWorkNo) {
fields = append(fields, outboundorder.FieldProductWorkNo)
}
+ if m.FieldCleared(outboundorder.FieldVoidedAt) {
+ fields = append(fields, outboundorder.FieldVoidedAt)
+ }
return fields
}
@@ -19828,6 +20082,9 @@ func (m *OutboundOrderMutation) ClearField(name string) error {
case outboundorder.FieldProductWorkNo:
m.ClearProductWorkNo()
return nil
+ case outboundorder.FieldVoidedAt:
+ m.ClearVoidedAt()
+ return nil
}
return fmt.Errorf("unknown OutboundOrder nullable field %s", name)
}
@@ -19923,6 +20180,18 @@ func (m *OutboundOrderMutation) ResetField(name string) error {
case outboundorder.FieldProductWorkNo:
m.ResetProductWorkNo()
return nil
+ case outboundorder.FieldVoided:
+ m.ResetVoided()
+ return nil
+ case outboundorder.FieldVoidReason:
+ m.ResetVoidReason()
+ return nil
+ case outboundorder.FieldVoidedBy:
+ m.ResetVoidedBy()
+ return nil
+ case outboundorder.FieldVoidedAt:
+ m.ResetVoidedAt()
+ return nil
case outboundorder.FieldCreatedAt:
m.ResetCreatedAt()
return nil
diff --git a/bj_power_wms/ent/outboundorder.go b/bj_power_wms/ent/outboundorder.go
index be7d943..a1bef5d 100644
--- a/bj_power_wms/ent/outboundorder.go
+++ b/bj_power_wms/ent/outboundorder.go
@@ -75,6 +75,14 @@ type OutboundOrder struct {
InspectionNo string `json:"inspectionNo,omitempty"`
// 产品工号(随库存带入,出库记录展示/筛选)
ProductWorkNo string `json:"productWorkNo,omitempty"`
+ // 是否已作废
+ Voided bool `json:"voided,omitempty"`
+ // 作废原因(必填留痕)
+ VoidReason string `json:"voidReason,omitempty"`
+ // 作废操作人
+ VoidedBy string `json:"voidedBy,omitempty"`
+ // 作废时间戳
+ VoidedAt *int64 `json:"voidedAt,omitempty"`
// 创建时间
CreatedAt int64 `json:"createdAt,omitempty"`
selectValues sql.SelectValues
@@ -87,11 +95,11 @@ func (*OutboundOrder) scanValues(columns []string) ([]any, error) {
switch columns[i] {
case outboundorder.FieldBorrowFrom:
values[i] = new([]byte)
- case outboundorder.FieldNeedAgv:
+ case outboundorder.FieldNeedAgv, outboundorder.FieldVoided:
values[i] = new(sql.NullBool)
- case outboundorder.FieldID, outboundorder.FieldManageMode, outboundorder.FieldSnMode, outboundorder.FieldQuantity, outboundorder.FieldCreatedAt:
+ case outboundorder.FieldID, outboundorder.FieldManageMode, outboundorder.FieldSnMode, outboundorder.FieldQuantity, outboundorder.FieldVoidedAt, outboundorder.FieldCreatedAt:
values[i] = new(sql.NullInt64)
- case outboundorder.FieldOutboundNo, outboundorder.FieldOutboundType, outboundorder.FieldStatus, outboundorder.FieldOutboundCategory, outboundorder.FieldOwnershipType, outboundorder.FieldOwnershipNo, outboundorder.FieldTargetStation, outboundorder.FieldOrderNo, outboundorder.FieldMaterialCode, outboundorder.FieldMaterialName, outboundorder.FieldBatchNo, outboundorder.FieldZoneCode, outboundorder.FieldShelfNo, outboundorder.FieldLayerNo, outboundorder.FieldPositionNo, outboundorder.FieldOperator, outboundorder.FieldReviewer, outboundorder.FieldTargetDock, outboundorder.FieldRemark, outboundorder.FieldBoxNo, outboundorder.FieldBoxSnList, outboundorder.FieldContractNo, outboundorder.FieldInspectionNo, outboundorder.FieldProductWorkNo:
+ case outboundorder.FieldOutboundNo, outboundorder.FieldOutboundType, outboundorder.FieldStatus, outboundorder.FieldOutboundCategory, outboundorder.FieldOwnershipType, outboundorder.FieldOwnershipNo, outboundorder.FieldTargetStation, outboundorder.FieldOrderNo, outboundorder.FieldMaterialCode, outboundorder.FieldMaterialName, outboundorder.FieldBatchNo, outboundorder.FieldZoneCode, outboundorder.FieldShelfNo, outboundorder.FieldLayerNo, outboundorder.FieldPositionNo, outboundorder.FieldOperator, outboundorder.FieldReviewer, outboundorder.FieldTargetDock, outboundorder.FieldRemark, outboundorder.FieldBoxNo, outboundorder.FieldBoxSnList, outboundorder.FieldContractNo, outboundorder.FieldInspectionNo, outboundorder.FieldProductWorkNo, outboundorder.FieldVoidReason, outboundorder.FieldVoidedBy:
values[i] = new(sql.NullString)
default:
values[i] = new(sql.UnknownType)
@@ -290,6 +298,31 @@ func (_m *OutboundOrder) assignValues(columns []string, values []any) error {
} else if value.Valid {
_m.ProductWorkNo = value.String
}
+ case outboundorder.FieldVoided:
+ if value, ok := values[i].(*sql.NullBool); !ok {
+ return fmt.Errorf("unexpected type %T for field voided", values[i])
+ } else if value.Valid {
+ _m.Voided = value.Bool
+ }
+ case outboundorder.FieldVoidReason:
+ if value, ok := values[i].(*sql.NullString); !ok {
+ return fmt.Errorf("unexpected type %T for field void_reason", values[i])
+ } else if value.Valid {
+ _m.VoidReason = value.String
+ }
+ case outboundorder.FieldVoidedBy:
+ if value, ok := values[i].(*sql.NullString); !ok {
+ return fmt.Errorf("unexpected type %T for field voided_by", values[i])
+ } else if value.Valid {
+ _m.VoidedBy = value.String
+ }
+ case outboundorder.FieldVoidedAt:
+ if value, ok := values[i].(*sql.NullInt64); !ok {
+ return fmt.Errorf("unexpected type %T for field voided_at", values[i])
+ } else if value.Valid {
+ _m.VoidedAt = new(int64)
+ *_m.VoidedAt = value.Int64
+ }
case outboundorder.FieldCreatedAt:
if value, ok := values[i].(*sql.NullInt64); !ok {
return fmt.Errorf("unexpected type %T for field created_at", values[i])
@@ -419,6 +452,20 @@ func (_m *OutboundOrder) String() string {
builder.WriteString("product_work_no=")
builder.WriteString(_m.ProductWorkNo)
builder.WriteString(", ")
+ builder.WriteString("voided=")
+ builder.WriteString(fmt.Sprintf("%v", _m.Voided))
+ builder.WriteString(", ")
+ builder.WriteString("void_reason=")
+ builder.WriteString(_m.VoidReason)
+ builder.WriteString(", ")
+ builder.WriteString("voided_by=")
+ builder.WriteString(_m.VoidedBy)
+ builder.WriteString(", ")
+ if v := _m.VoidedAt; v != nil {
+ builder.WriteString("voided_at=")
+ builder.WriteString(fmt.Sprintf("%v", *v))
+ }
+ builder.WriteString(", ")
builder.WriteString("created_at=")
builder.WriteString(fmt.Sprintf("%v", _m.CreatedAt))
builder.WriteByte(')')
diff --git a/bj_power_wms/ent/outboundorder/outboundorder.go b/bj_power_wms/ent/outboundorder/outboundorder.go
index 1ae3d3d..8498f5c 100644
--- a/bj_power_wms/ent/outboundorder/outboundorder.go
+++ b/bj_power_wms/ent/outboundorder/outboundorder.go
@@ -69,6 +69,14 @@ const (
FieldInspectionNo = "inspection_no"
// FieldProductWorkNo holds the string denoting the product_work_no field in the database.
FieldProductWorkNo = "product_work_no"
+ // FieldVoided holds the string denoting the voided field in the database.
+ FieldVoided = "voided"
+ // FieldVoidReason holds the string denoting the void_reason field in the database.
+ FieldVoidReason = "void_reason"
+ // FieldVoidedBy holds the string denoting the voided_by field in the database.
+ FieldVoidedBy = "voided_by"
+ // FieldVoidedAt holds the string denoting the voided_at field in the database.
+ FieldVoidedAt = "voided_at"
// FieldCreatedAt holds the string denoting the created_at field in the database.
FieldCreatedAt = "created_at"
// Table holds the table name of the outboundorder in the database.
@@ -107,6 +115,10 @@ var Columns = []string{
FieldBorrowFrom,
FieldInspectionNo,
FieldProductWorkNo,
+ FieldVoided,
+ FieldVoidReason,
+ FieldVoidedBy,
+ FieldVoidedAt,
FieldCreatedAt,
}
@@ -133,6 +145,12 @@ var (
DefaultSnMode int
// DefaultQuantity holds the default value on creation for the "quantity" field.
DefaultQuantity int
+ // DefaultVoided holds the default value on creation for the "voided" field.
+ DefaultVoided bool
+ // DefaultVoidReason holds the default value on creation for the "void_reason" field.
+ DefaultVoidReason string
+ // DefaultVoidedBy holds the default value on creation for the "voided_by" field.
+ DefaultVoidedBy string
// DefaultCreatedAt holds the default value on creation for the "created_at" field.
DefaultCreatedAt func() int64
)
@@ -285,6 +303,26 @@ func ByProductWorkNo(opts ...sql.OrderTermOption) OrderOption {
return sql.OrderByField(FieldProductWorkNo, opts...).ToFunc()
}
+// ByVoided orders the results by the voided field.
+func ByVoided(opts ...sql.OrderTermOption) OrderOption {
+ return sql.OrderByField(FieldVoided, opts...).ToFunc()
+}
+
+// ByVoidReason orders the results by the void_reason field.
+func ByVoidReason(opts ...sql.OrderTermOption) OrderOption {
+ return sql.OrderByField(FieldVoidReason, opts...).ToFunc()
+}
+
+// ByVoidedBy orders the results by the voided_by field.
+func ByVoidedBy(opts ...sql.OrderTermOption) OrderOption {
+ return sql.OrderByField(FieldVoidedBy, opts...).ToFunc()
+}
+
+// ByVoidedAt orders the results by the voided_at field.
+func ByVoidedAt(opts ...sql.OrderTermOption) OrderOption {
+ return sql.OrderByField(FieldVoidedAt, opts...).ToFunc()
+}
+
// ByCreatedAt orders the results by the created_at field.
func ByCreatedAt(opts ...sql.OrderTermOption) OrderOption {
return sql.OrderByField(FieldCreatedAt, opts...).ToFunc()
diff --git a/bj_power_wms/ent/outboundorder/where.go b/bj_power_wms/ent/outboundorder/where.go
index 862c5a1..f14e6ee 100644
--- a/bj_power_wms/ent/outboundorder/where.go
+++ b/bj_power_wms/ent/outboundorder/where.go
@@ -193,6 +193,26 @@ func ProductWorkNo(v string) predicate.OutboundOrder {
return predicate.OutboundOrder(sql.FieldEQ(FieldProductWorkNo, v))
}
+// Voided applies equality check predicate on the "voided" field. It's identical to VoidedEQ.
+func Voided(v bool) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldEQ(FieldVoided, v))
+}
+
+// VoidReason applies equality check predicate on the "void_reason" field. It's identical to VoidReasonEQ.
+func VoidReason(v string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldEQ(FieldVoidReason, v))
+}
+
+// VoidedBy applies equality check predicate on the "voided_by" field. It's identical to VoidedByEQ.
+func VoidedBy(v string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldEQ(FieldVoidedBy, v))
+}
+
+// VoidedAt applies equality check predicate on the "voided_at" field. It's identical to VoidedAtEQ.
+func VoidedAt(v int64) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldEQ(FieldVoidedAt, v))
+}
+
// CreatedAt applies equality check predicate on the "created_at" field. It's identical to CreatedAtEQ.
func CreatedAt(v int64) predicate.OutboundOrder {
return predicate.OutboundOrder(sql.FieldEQ(FieldCreatedAt, v))
@@ -2098,6 +2118,196 @@ func ProductWorkNoContainsFold(v string) predicate.OutboundOrder {
return predicate.OutboundOrder(sql.FieldContainsFold(FieldProductWorkNo, v))
}
+// VoidedEQ applies the EQ predicate on the "voided" field.
+func VoidedEQ(v bool) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldEQ(FieldVoided, v))
+}
+
+// VoidedNEQ applies the NEQ predicate on the "voided" field.
+func VoidedNEQ(v bool) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldNEQ(FieldVoided, v))
+}
+
+// VoidReasonEQ applies the EQ predicate on the "void_reason" field.
+func VoidReasonEQ(v string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldEQ(FieldVoidReason, v))
+}
+
+// VoidReasonNEQ applies the NEQ predicate on the "void_reason" field.
+func VoidReasonNEQ(v string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldNEQ(FieldVoidReason, v))
+}
+
+// VoidReasonIn applies the In predicate on the "void_reason" field.
+func VoidReasonIn(vs ...string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldIn(FieldVoidReason, vs...))
+}
+
+// VoidReasonNotIn applies the NotIn predicate on the "void_reason" field.
+func VoidReasonNotIn(vs ...string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldNotIn(FieldVoidReason, vs...))
+}
+
+// VoidReasonGT applies the GT predicate on the "void_reason" field.
+func VoidReasonGT(v string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldGT(FieldVoidReason, v))
+}
+
+// VoidReasonGTE applies the GTE predicate on the "void_reason" field.
+func VoidReasonGTE(v string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldGTE(FieldVoidReason, v))
+}
+
+// VoidReasonLT applies the LT predicate on the "void_reason" field.
+func VoidReasonLT(v string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldLT(FieldVoidReason, v))
+}
+
+// VoidReasonLTE applies the LTE predicate on the "void_reason" field.
+func VoidReasonLTE(v string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldLTE(FieldVoidReason, v))
+}
+
+// VoidReasonContains applies the Contains predicate on the "void_reason" field.
+func VoidReasonContains(v string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldContains(FieldVoidReason, v))
+}
+
+// VoidReasonHasPrefix applies the HasPrefix predicate on the "void_reason" field.
+func VoidReasonHasPrefix(v string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldHasPrefix(FieldVoidReason, v))
+}
+
+// VoidReasonHasSuffix applies the HasSuffix predicate on the "void_reason" field.
+func VoidReasonHasSuffix(v string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldHasSuffix(FieldVoidReason, v))
+}
+
+// VoidReasonEqualFold applies the EqualFold predicate on the "void_reason" field.
+func VoidReasonEqualFold(v string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldEqualFold(FieldVoidReason, v))
+}
+
+// VoidReasonContainsFold applies the ContainsFold predicate on the "void_reason" field.
+func VoidReasonContainsFold(v string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldContainsFold(FieldVoidReason, v))
+}
+
+// VoidedByEQ applies the EQ predicate on the "voided_by" field.
+func VoidedByEQ(v string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldEQ(FieldVoidedBy, v))
+}
+
+// VoidedByNEQ applies the NEQ predicate on the "voided_by" field.
+func VoidedByNEQ(v string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldNEQ(FieldVoidedBy, v))
+}
+
+// VoidedByIn applies the In predicate on the "voided_by" field.
+func VoidedByIn(vs ...string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldIn(FieldVoidedBy, vs...))
+}
+
+// VoidedByNotIn applies the NotIn predicate on the "voided_by" field.
+func VoidedByNotIn(vs ...string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldNotIn(FieldVoidedBy, vs...))
+}
+
+// VoidedByGT applies the GT predicate on the "voided_by" field.
+func VoidedByGT(v string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldGT(FieldVoidedBy, v))
+}
+
+// VoidedByGTE applies the GTE predicate on the "voided_by" field.
+func VoidedByGTE(v string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldGTE(FieldVoidedBy, v))
+}
+
+// VoidedByLT applies the LT predicate on the "voided_by" field.
+func VoidedByLT(v string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldLT(FieldVoidedBy, v))
+}
+
+// VoidedByLTE applies the LTE predicate on the "voided_by" field.
+func VoidedByLTE(v string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldLTE(FieldVoidedBy, v))
+}
+
+// VoidedByContains applies the Contains predicate on the "voided_by" field.
+func VoidedByContains(v string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldContains(FieldVoidedBy, v))
+}
+
+// VoidedByHasPrefix applies the HasPrefix predicate on the "voided_by" field.
+func VoidedByHasPrefix(v string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldHasPrefix(FieldVoidedBy, v))
+}
+
+// VoidedByHasSuffix applies the HasSuffix predicate on the "voided_by" field.
+func VoidedByHasSuffix(v string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldHasSuffix(FieldVoidedBy, v))
+}
+
+// VoidedByEqualFold applies the EqualFold predicate on the "voided_by" field.
+func VoidedByEqualFold(v string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldEqualFold(FieldVoidedBy, v))
+}
+
+// VoidedByContainsFold applies the ContainsFold predicate on the "voided_by" field.
+func VoidedByContainsFold(v string) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldContainsFold(FieldVoidedBy, v))
+}
+
+// VoidedAtEQ applies the EQ predicate on the "voided_at" field.
+func VoidedAtEQ(v int64) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldEQ(FieldVoidedAt, v))
+}
+
+// VoidedAtNEQ applies the NEQ predicate on the "voided_at" field.
+func VoidedAtNEQ(v int64) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldNEQ(FieldVoidedAt, v))
+}
+
+// VoidedAtIn applies the In predicate on the "voided_at" field.
+func VoidedAtIn(vs ...int64) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldIn(FieldVoidedAt, vs...))
+}
+
+// VoidedAtNotIn applies the NotIn predicate on the "voided_at" field.
+func VoidedAtNotIn(vs ...int64) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldNotIn(FieldVoidedAt, vs...))
+}
+
+// VoidedAtGT applies the GT predicate on the "voided_at" field.
+func VoidedAtGT(v int64) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldGT(FieldVoidedAt, v))
+}
+
+// VoidedAtGTE applies the GTE predicate on the "voided_at" field.
+func VoidedAtGTE(v int64) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldGTE(FieldVoidedAt, v))
+}
+
+// VoidedAtLT applies the LT predicate on the "voided_at" field.
+func VoidedAtLT(v int64) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldLT(FieldVoidedAt, v))
+}
+
+// VoidedAtLTE applies the LTE predicate on the "voided_at" field.
+func VoidedAtLTE(v int64) predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldLTE(FieldVoidedAt, v))
+}
+
+// VoidedAtIsNil applies the IsNil predicate on the "voided_at" field.
+func VoidedAtIsNil() predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldIsNull(FieldVoidedAt))
+}
+
+// VoidedAtNotNil applies the NotNil predicate on the "voided_at" field.
+func VoidedAtNotNil() predicate.OutboundOrder {
+ return predicate.OutboundOrder(sql.FieldNotNull(FieldVoidedAt))
+}
+
// CreatedAtEQ applies the EQ predicate on the "created_at" field.
func CreatedAtEQ(v int64) predicate.OutboundOrder {
return predicate.OutboundOrder(sql.FieldEQ(FieldCreatedAt, v))
diff --git a/bj_power_wms/ent/outboundorder_create.go b/bj_power_wms/ent/outboundorder_create.go
index 647dfc7..55fb22a 100644
--- a/bj_power_wms/ent/outboundorder_create.go
+++ b/bj_power_wms/ent/outboundorder_create.go
@@ -403,6 +403,62 @@ func (_c *OutboundOrderCreate) SetNillableProductWorkNo(v *string) *OutboundOrde
return _c
}
+// SetVoided sets the "voided" field.
+func (_c *OutboundOrderCreate) SetVoided(v bool) *OutboundOrderCreate {
+ _c.mutation.SetVoided(v)
+ return _c
+}
+
+// SetNillableVoided sets the "voided" field if the given value is not nil.
+func (_c *OutboundOrderCreate) SetNillableVoided(v *bool) *OutboundOrderCreate {
+ if v != nil {
+ _c.SetVoided(*v)
+ }
+ return _c
+}
+
+// SetVoidReason sets the "void_reason" field.
+func (_c *OutboundOrderCreate) SetVoidReason(v string) *OutboundOrderCreate {
+ _c.mutation.SetVoidReason(v)
+ return _c
+}
+
+// SetNillableVoidReason sets the "void_reason" field if the given value is not nil.
+func (_c *OutboundOrderCreate) SetNillableVoidReason(v *string) *OutboundOrderCreate {
+ if v != nil {
+ _c.SetVoidReason(*v)
+ }
+ return _c
+}
+
+// SetVoidedBy sets the "voided_by" field.
+func (_c *OutboundOrderCreate) SetVoidedBy(v string) *OutboundOrderCreate {
+ _c.mutation.SetVoidedBy(v)
+ return _c
+}
+
+// SetNillableVoidedBy sets the "voided_by" field if the given value is not nil.
+func (_c *OutboundOrderCreate) SetNillableVoidedBy(v *string) *OutboundOrderCreate {
+ if v != nil {
+ _c.SetVoidedBy(*v)
+ }
+ return _c
+}
+
+// SetVoidedAt sets the "voided_at" field.
+func (_c *OutboundOrderCreate) SetVoidedAt(v int64) *OutboundOrderCreate {
+ _c.mutation.SetVoidedAt(v)
+ return _c
+}
+
+// SetNillableVoidedAt sets the "voided_at" field if the given value is not nil.
+func (_c *OutboundOrderCreate) SetNillableVoidedAt(v *int64) *OutboundOrderCreate {
+ if v != nil {
+ _c.SetVoidedAt(*v)
+ }
+ return _c
+}
+
// SetCreatedAt sets the "created_at" field.
func (_c *OutboundOrderCreate) SetCreatedAt(v int64) *OutboundOrderCreate {
_c.mutation.SetCreatedAt(v)
@@ -476,6 +532,18 @@ func (_c *OutboundOrderCreate) defaults() {
v := outboundorder.DefaultQuantity
_c.mutation.SetQuantity(v)
}
+ if _, ok := _c.mutation.Voided(); !ok {
+ v := outboundorder.DefaultVoided
+ _c.mutation.SetVoided(v)
+ }
+ if _, ok := _c.mutation.VoidReason(); !ok {
+ v := outboundorder.DefaultVoidReason
+ _c.mutation.SetVoidReason(v)
+ }
+ if _, ok := _c.mutation.VoidedBy(); !ok {
+ v := outboundorder.DefaultVoidedBy
+ _c.mutation.SetVoidedBy(v)
+ }
if _, ok := _c.mutation.CreatedAt(); !ok {
v := outboundorder.DefaultCreatedAt()
_c.mutation.SetCreatedAt(v)
@@ -508,6 +576,15 @@ func (_c *OutboundOrderCreate) check() error {
if _, ok := _c.mutation.Quantity(); !ok {
return &ValidationError{Name: "quantity", err: errors.New(`ent: missing required field "OutboundOrder.quantity"`)}
}
+ if _, ok := _c.mutation.Voided(); !ok {
+ return &ValidationError{Name: "voided", err: errors.New(`ent: missing required field "OutboundOrder.voided"`)}
+ }
+ if _, ok := _c.mutation.VoidReason(); !ok {
+ return &ValidationError{Name: "void_reason", err: errors.New(`ent: missing required field "OutboundOrder.void_reason"`)}
+ }
+ if _, ok := _c.mutation.VoidedBy(); !ok {
+ return &ValidationError{Name: "voided_by", err: errors.New(`ent: missing required field "OutboundOrder.voided_by"`)}
+ }
if _, ok := _c.mutation.CreatedAt(); !ok {
return &ValidationError{Name: "created_at", err: errors.New(`ent: missing required field "OutboundOrder.created_at"`)}
}
@@ -654,6 +731,22 @@ func (_c *OutboundOrderCreate) createSpec() (*OutboundOrder, *sqlgraph.CreateSpe
_spec.SetField(outboundorder.FieldProductWorkNo, field.TypeString, value)
_node.ProductWorkNo = value
}
+ if value, ok := _c.mutation.Voided(); ok {
+ _spec.SetField(outboundorder.FieldVoided, field.TypeBool, value)
+ _node.Voided = value
+ }
+ if value, ok := _c.mutation.VoidReason(); ok {
+ _spec.SetField(outboundorder.FieldVoidReason, field.TypeString, value)
+ _node.VoidReason = value
+ }
+ if value, ok := _c.mutation.VoidedBy(); ok {
+ _spec.SetField(outboundorder.FieldVoidedBy, field.TypeString, value)
+ _node.VoidedBy = value
+ }
+ if value, ok := _c.mutation.VoidedAt(); ok {
+ _spec.SetField(outboundorder.FieldVoidedAt, field.TypeInt64, value)
+ _node.VoidedAt = &value
+ }
if value, ok := _c.mutation.CreatedAt(); ok {
_spec.SetField(outboundorder.FieldCreatedAt, field.TypeInt64, value)
_node.CreatedAt = value
@@ -1202,6 +1295,66 @@ func (u *OutboundOrderUpsert) ClearProductWorkNo() *OutboundOrderUpsert {
return u
}
+// SetVoided sets the "voided" field.
+func (u *OutboundOrderUpsert) SetVoided(v bool) *OutboundOrderUpsert {
+ u.Set(outboundorder.FieldVoided, v)
+ return u
+}
+
+// UpdateVoided sets the "voided" field to the value that was provided on create.
+func (u *OutboundOrderUpsert) UpdateVoided() *OutboundOrderUpsert {
+ u.SetExcluded(outboundorder.FieldVoided)
+ return u
+}
+
+// SetVoidReason sets the "void_reason" field.
+func (u *OutboundOrderUpsert) SetVoidReason(v string) *OutboundOrderUpsert {
+ u.Set(outboundorder.FieldVoidReason, v)
+ return u
+}
+
+// UpdateVoidReason sets the "void_reason" field to the value that was provided on create.
+func (u *OutboundOrderUpsert) UpdateVoidReason() *OutboundOrderUpsert {
+ u.SetExcluded(outboundorder.FieldVoidReason)
+ return u
+}
+
+// SetVoidedBy sets the "voided_by" field.
+func (u *OutboundOrderUpsert) SetVoidedBy(v string) *OutboundOrderUpsert {
+ u.Set(outboundorder.FieldVoidedBy, v)
+ return u
+}
+
+// UpdateVoidedBy sets the "voided_by" field to the value that was provided on create.
+func (u *OutboundOrderUpsert) UpdateVoidedBy() *OutboundOrderUpsert {
+ u.SetExcluded(outboundorder.FieldVoidedBy)
+ return u
+}
+
+// SetVoidedAt sets the "voided_at" field.
+func (u *OutboundOrderUpsert) SetVoidedAt(v int64) *OutboundOrderUpsert {
+ u.Set(outboundorder.FieldVoidedAt, v)
+ return u
+}
+
+// UpdateVoidedAt sets the "voided_at" field to the value that was provided on create.
+func (u *OutboundOrderUpsert) UpdateVoidedAt() *OutboundOrderUpsert {
+ u.SetExcluded(outboundorder.FieldVoidedAt)
+ return u
+}
+
+// AddVoidedAt adds v to the "voided_at" field.
+func (u *OutboundOrderUpsert) AddVoidedAt(v int64) *OutboundOrderUpsert {
+ u.Add(outboundorder.FieldVoidedAt, v)
+ return u
+}
+
+// ClearVoidedAt clears the value of the "voided_at" field.
+func (u *OutboundOrderUpsert) ClearVoidedAt() *OutboundOrderUpsert {
+ u.SetNull(outboundorder.FieldVoidedAt)
+ return u
+}
+
// SetCreatedAt sets the "created_at" field.
func (u *OutboundOrderUpsert) SetCreatedAt(v int64) *OutboundOrderUpsert {
u.Set(outboundorder.FieldCreatedAt, v)
@@ -1834,6 +1987,76 @@ func (u *OutboundOrderUpsertOne) ClearProductWorkNo() *OutboundOrderUpsertOne {
})
}
+// SetVoided sets the "voided" field.
+func (u *OutboundOrderUpsertOne) SetVoided(v bool) *OutboundOrderUpsertOne {
+ return u.Update(func(s *OutboundOrderUpsert) {
+ s.SetVoided(v)
+ })
+}
+
+// UpdateVoided sets the "voided" field to the value that was provided on create.
+func (u *OutboundOrderUpsertOne) UpdateVoided() *OutboundOrderUpsertOne {
+ return u.Update(func(s *OutboundOrderUpsert) {
+ s.UpdateVoided()
+ })
+}
+
+// SetVoidReason sets the "void_reason" field.
+func (u *OutboundOrderUpsertOne) SetVoidReason(v string) *OutboundOrderUpsertOne {
+ return u.Update(func(s *OutboundOrderUpsert) {
+ s.SetVoidReason(v)
+ })
+}
+
+// UpdateVoidReason sets the "void_reason" field to the value that was provided on create.
+func (u *OutboundOrderUpsertOne) UpdateVoidReason() *OutboundOrderUpsertOne {
+ return u.Update(func(s *OutboundOrderUpsert) {
+ s.UpdateVoidReason()
+ })
+}
+
+// SetVoidedBy sets the "voided_by" field.
+func (u *OutboundOrderUpsertOne) SetVoidedBy(v string) *OutboundOrderUpsertOne {
+ return u.Update(func(s *OutboundOrderUpsert) {
+ s.SetVoidedBy(v)
+ })
+}
+
+// UpdateVoidedBy sets the "voided_by" field to the value that was provided on create.
+func (u *OutboundOrderUpsertOne) UpdateVoidedBy() *OutboundOrderUpsertOne {
+ return u.Update(func(s *OutboundOrderUpsert) {
+ s.UpdateVoidedBy()
+ })
+}
+
+// SetVoidedAt sets the "voided_at" field.
+func (u *OutboundOrderUpsertOne) SetVoidedAt(v int64) *OutboundOrderUpsertOne {
+ return u.Update(func(s *OutboundOrderUpsert) {
+ s.SetVoidedAt(v)
+ })
+}
+
+// AddVoidedAt adds v to the "voided_at" field.
+func (u *OutboundOrderUpsertOne) AddVoidedAt(v int64) *OutboundOrderUpsertOne {
+ return u.Update(func(s *OutboundOrderUpsert) {
+ s.AddVoidedAt(v)
+ })
+}
+
+// UpdateVoidedAt sets the "voided_at" field to the value that was provided on create.
+func (u *OutboundOrderUpsertOne) UpdateVoidedAt() *OutboundOrderUpsertOne {
+ return u.Update(func(s *OutboundOrderUpsert) {
+ s.UpdateVoidedAt()
+ })
+}
+
+// ClearVoidedAt clears the value of the "voided_at" field.
+func (u *OutboundOrderUpsertOne) ClearVoidedAt() *OutboundOrderUpsertOne {
+ return u.Update(func(s *OutboundOrderUpsert) {
+ s.ClearVoidedAt()
+ })
+}
+
// SetCreatedAt sets the "created_at" field.
func (u *OutboundOrderUpsertOne) SetCreatedAt(v int64) *OutboundOrderUpsertOne {
return u.Update(func(s *OutboundOrderUpsert) {
@@ -2633,6 +2856,76 @@ func (u *OutboundOrderUpsertBulk) ClearProductWorkNo() *OutboundOrderUpsertBulk
})
}
+// SetVoided sets the "voided" field.
+func (u *OutboundOrderUpsertBulk) SetVoided(v bool) *OutboundOrderUpsertBulk {
+ return u.Update(func(s *OutboundOrderUpsert) {
+ s.SetVoided(v)
+ })
+}
+
+// UpdateVoided sets the "voided" field to the value that was provided on create.
+func (u *OutboundOrderUpsertBulk) UpdateVoided() *OutboundOrderUpsertBulk {
+ return u.Update(func(s *OutboundOrderUpsert) {
+ s.UpdateVoided()
+ })
+}
+
+// SetVoidReason sets the "void_reason" field.
+func (u *OutboundOrderUpsertBulk) SetVoidReason(v string) *OutboundOrderUpsertBulk {
+ return u.Update(func(s *OutboundOrderUpsert) {
+ s.SetVoidReason(v)
+ })
+}
+
+// UpdateVoidReason sets the "void_reason" field to the value that was provided on create.
+func (u *OutboundOrderUpsertBulk) UpdateVoidReason() *OutboundOrderUpsertBulk {
+ return u.Update(func(s *OutboundOrderUpsert) {
+ s.UpdateVoidReason()
+ })
+}
+
+// SetVoidedBy sets the "voided_by" field.
+func (u *OutboundOrderUpsertBulk) SetVoidedBy(v string) *OutboundOrderUpsertBulk {
+ return u.Update(func(s *OutboundOrderUpsert) {
+ s.SetVoidedBy(v)
+ })
+}
+
+// UpdateVoidedBy sets the "voided_by" field to the value that was provided on create.
+func (u *OutboundOrderUpsertBulk) UpdateVoidedBy() *OutboundOrderUpsertBulk {
+ return u.Update(func(s *OutboundOrderUpsert) {
+ s.UpdateVoidedBy()
+ })
+}
+
+// SetVoidedAt sets the "voided_at" field.
+func (u *OutboundOrderUpsertBulk) SetVoidedAt(v int64) *OutboundOrderUpsertBulk {
+ return u.Update(func(s *OutboundOrderUpsert) {
+ s.SetVoidedAt(v)
+ })
+}
+
+// AddVoidedAt adds v to the "voided_at" field.
+func (u *OutboundOrderUpsertBulk) AddVoidedAt(v int64) *OutboundOrderUpsertBulk {
+ return u.Update(func(s *OutboundOrderUpsert) {
+ s.AddVoidedAt(v)
+ })
+}
+
+// UpdateVoidedAt sets the "voided_at" field to the value that was provided on create.
+func (u *OutboundOrderUpsertBulk) UpdateVoidedAt() *OutboundOrderUpsertBulk {
+ return u.Update(func(s *OutboundOrderUpsert) {
+ s.UpdateVoidedAt()
+ })
+}
+
+// ClearVoidedAt clears the value of the "voided_at" field.
+func (u *OutboundOrderUpsertBulk) ClearVoidedAt() *OutboundOrderUpsertBulk {
+ return u.Update(func(s *OutboundOrderUpsert) {
+ s.ClearVoidedAt()
+ })
+}
+
// SetCreatedAt sets the "created_at" field.
func (u *OutboundOrderUpsertBulk) SetCreatedAt(v int64) *OutboundOrderUpsertBulk {
return u.Update(func(s *OutboundOrderUpsert) {
diff --git a/bj_power_wms/ent/outboundorder_update.go b/bj_power_wms/ent/outboundorder_update.go
index c082cf7..689e8d4 100644
--- a/bj_power_wms/ent/outboundorder_update.go
+++ b/bj_power_wms/ent/outboundorder_update.go
@@ -572,6 +572,75 @@ func (_u *OutboundOrderUpdate) ClearProductWorkNo() *OutboundOrderUpdate {
return _u
}
+// SetVoided sets the "voided" field.
+func (_u *OutboundOrderUpdate) SetVoided(v bool) *OutboundOrderUpdate {
+ _u.mutation.SetVoided(v)
+ return _u
+}
+
+// SetNillableVoided sets the "voided" field if the given value is not nil.
+func (_u *OutboundOrderUpdate) SetNillableVoided(v *bool) *OutboundOrderUpdate {
+ if v != nil {
+ _u.SetVoided(*v)
+ }
+ return _u
+}
+
+// SetVoidReason sets the "void_reason" field.
+func (_u *OutboundOrderUpdate) SetVoidReason(v string) *OutboundOrderUpdate {
+ _u.mutation.SetVoidReason(v)
+ return _u
+}
+
+// SetNillableVoidReason sets the "void_reason" field if the given value is not nil.
+func (_u *OutboundOrderUpdate) SetNillableVoidReason(v *string) *OutboundOrderUpdate {
+ if v != nil {
+ _u.SetVoidReason(*v)
+ }
+ return _u
+}
+
+// SetVoidedBy sets the "voided_by" field.
+func (_u *OutboundOrderUpdate) SetVoidedBy(v string) *OutboundOrderUpdate {
+ _u.mutation.SetVoidedBy(v)
+ return _u
+}
+
+// SetNillableVoidedBy sets the "voided_by" field if the given value is not nil.
+func (_u *OutboundOrderUpdate) SetNillableVoidedBy(v *string) *OutboundOrderUpdate {
+ if v != nil {
+ _u.SetVoidedBy(*v)
+ }
+ return _u
+}
+
+// SetVoidedAt sets the "voided_at" field.
+func (_u *OutboundOrderUpdate) SetVoidedAt(v int64) *OutboundOrderUpdate {
+ _u.mutation.ResetVoidedAt()
+ _u.mutation.SetVoidedAt(v)
+ return _u
+}
+
+// SetNillableVoidedAt sets the "voided_at" field if the given value is not nil.
+func (_u *OutboundOrderUpdate) SetNillableVoidedAt(v *int64) *OutboundOrderUpdate {
+ if v != nil {
+ _u.SetVoidedAt(*v)
+ }
+ return _u
+}
+
+// AddVoidedAt adds value to the "voided_at" field.
+func (_u *OutboundOrderUpdate) AddVoidedAt(v int64) *OutboundOrderUpdate {
+ _u.mutation.AddVoidedAt(v)
+ return _u
+}
+
+// ClearVoidedAt clears the value of the "voided_at" field.
+func (_u *OutboundOrderUpdate) ClearVoidedAt() *OutboundOrderUpdate {
+ _u.mutation.ClearVoidedAt()
+ return _u
+}
+
// SetCreatedAt sets the "created_at" field.
func (_u *OutboundOrderUpdate) SetCreatedAt(v int64) *OutboundOrderUpdate {
_u.mutation.ResetCreatedAt()
@@ -793,6 +862,24 @@ func (_u *OutboundOrderUpdate) sqlSave(ctx context.Context) (_node int, err erro
if _u.mutation.ProductWorkNoCleared() {
_spec.ClearField(outboundorder.FieldProductWorkNo, field.TypeString)
}
+ if value, ok := _u.mutation.Voided(); ok {
+ _spec.SetField(outboundorder.FieldVoided, field.TypeBool, value)
+ }
+ if value, ok := _u.mutation.VoidReason(); ok {
+ _spec.SetField(outboundorder.FieldVoidReason, field.TypeString, value)
+ }
+ if value, ok := _u.mutation.VoidedBy(); ok {
+ _spec.SetField(outboundorder.FieldVoidedBy, field.TypeString, value)
+ }
+ if value, ok := _u.mutation.VoidedAt(); ok {
+ _spec.SetField(outboundorder.FieldVoidedAt, field.TypeInt64, value)
+ }
+ if value, ok := _u.mutation.AddedVoidedAt(); ok {
+ _spec.AddField(outboundorder.FieldVoidedAt, field.TypeInt64, value)
+ }
+ if _u.mutation.VoidedAtCleared() {
+ _spec.ClearField(outboundorder.FieldVoidedAt, field.TypeInt64)
+ }
if value, ok := _u.mutation.CreatedAt(); ok {
_spec.SetField(outboundorder.FieldCreatedAt, field.TypeInt64, value)
}
@@ -1364,6 +1451,75 @@ func (_u *OutboundOrderUpdateOne) ClearProductWorkNo() *OutboundOrderUpdateOne {
return _u
}
+// SetVoided sets the "voided" field.
+func (_u *OutboundOrderUpdateOne) SetVoided(v bool) *OutboundOrderUpdateOne {
+ _u.mutation.SetVoided(v)
+ return _u
+}
+
+// SetNillableVoided sets the "voided" field if the given value is not nil.
+func (_u *OutboundOrderUpdateOne) SetNillableVoided(v *bool) *OutboundOrderUpdateOne {
+ if v != nil {
+ _u.SetVoided(*v)
+ }
+ return _u
+}
+
+// SetVoidReason sets the "void_reason" field.
+func (_u *OutboundOrderUpdateOne) SetVoidReason(v string) *OutboundOrderUpdateOne {
+ _u.mutation.SetVoidReason(v)
+ return _u
+}
+
+// SetNillableVoidReason sets the "void_reason" field if the given value is not nil.
+func (_u *OutboundOrderUpdateOne) SetNillableVoidReason(v *string) *OutboundOrderUpdateOne {
+ if v != nil {
+ _u.SetVoidReason(*v)
+ }
+ return _u
+}
+
+// SetVoidedBy sets the "voided_by" field.
+func (_u *OutboundOrderUpdateOne) SetVoidedBy(v string) *OutboundOrderUpdateOne {
+ _u.mutation.SetVoidedBy(v)
+ return _u
+}
+
+// SetNillableVoidedBy sets the "voided_by" field if the given value is not nil.
+func (_u *OutboundOrderUpdateOne) SetNillableVoidedBy(v *string) *OutboundOrderUpdateOne {
+ if v != nil {
+ _u.SetVoidedBy(*v)
+ }
+ return _u
+}
+
+// SetVoidedAt sets the "voided_at" field.
+func (_u *OutboundOrderUpdateOne) SetVoidedAt(v int64) *OutboundOrderUpdateOne {
+ _u.mutation.ResetVoidedAt()
+ _u.mutation.SetVoidedAt(v)
+ return _u
+}
+
+// SetNillableVoidedAt sets the "voided_at" field if the given value is not nil.
+func (_u *OutboundOrderUpdateOne) SetNillableVoidedAt(v *int64) *OutboundOrderUpdateOne {
+ if v != nil {
+ _u.SetVoidedAt(*v)
+ }
+ return _u
+}
+
+// AddVoidedAt adds value to the "voided_at" field.
+func (_u *OutboundOrderUpdateOne) AddVoidedAt(v int64) *OutboundOrderUpdateOne {
+ _u.mutation.AddVoidedAt(v)
+ return _u
+}
+
+// ClearVoidedAt clears the value of the "voided_at" field.
+func (_u *OutboundOrderUpdateOne) ClearVoidedAt() *OutboundOrderUpdateOne {
+ _u.mutation.ClearVoidedAt()
+ return _u
+}
+
// SetCreatedAt sets the "created_at" field.
func (_u *OutboundOrderUpdateOne) SetCreatedAt(v int64) *OutboundOrderUpdateOne {
_u.mutation.ResetCreatedAt()
@@ -1615,6 +1771,24 @@ func (_u *OutboundOrderUpdateOne) sqlSave(ctx context.Context) (_node *OutboundO
if _u.mutation.ProductWorkNoCleared() {
_spec.ClearField(outboundorder.FieldProductWorkNo, field.TypeString)
}
+ if value, ok := _u.mutation.Voided(); ok {
+ _spec.SetField(outboundorder.FieldVoided, field.TypeBool, value)
+ }
+ if value, ok := _u.mutation.VoidReason(); ok {
+ _spec.SetField(outboundorder.FieldVoidReason, field.TypeString, value)
+ }
+ if value, ok := _u.mutation.VoidedBy(); ok {
+ _spec.SetField(outboundorder.FieldVoidedBy, field.TypeString, value)
+ }
+ if value, ok := _u.mutation.VoidedAt(); ok {
+ _spec.SetField(outboundorder.FieldVoidedAt, field.TypeInt64, value)
+ }
+ if value, ok := _u.mutation.AddedVoidedAt(); ok {
+ _spec.AddField(outboundorder.FieldVoidedAt, field.TypeInt64, value)
+ }
+ if _u.mutation.VoidedAtCleared() {
+ _spec.ClearField(outboundorder.FieldVoidedAt, field.TypeInt64)
+ }
if value, ok := _u.mutation.CreatedAt(); ok {
_spec.SetField(outboundorder.FieldCreatedAt, field.TypeInt64, value)
}
diff --git a/bj_power_wms/ent/runtime.go b/bj_power_wms/ent/runtime.go
index 9067f3b..fe3f5af 100644
--- a/bj_power_wms/ent/runtime.go
+++ b/bj_power_wms/ent/runtime.go
@@ -436,8 +436,20 @@ func init() {
outboundorderDescQuantity := outboundorderFields[18].Descriptor()
// outboundorder.DefaultQuantity holds the default value on creation for the quantity field.
outboundorder.DefaultQuantity = outboundorderDescQuantity.Default.(int)
+ // outboundorderDescVoided is the schema descriptor for voided field.
+ outboundorderDescVoided := outboundorderFields[29].Descriptor()
+ // outboundorder.DefaultVoided holds the default value on creation for the voided field.
+ outboundorder.DefaultVoided = outboundorderDescVoided.Default.(bool)
+ // outboundorderDescVoidReason is the schema descriptor for void_reason field.
+ outboundorderDescVoidReason := outboundorderFields[30].Descriptor()
+ // outboundorder.DefaultVoidReason holds the default value on creation for the void_reason field.
+ outboundorder.DefaultVoidReason = outboundorderDescVoidReason.Default.(string)
+ // outboundorderDescVoidedBy is the schema descriptor for voided_by field.
+ outboundorderDescVoidedBy := outboundorderFields[31].Descriptor()
+ // outboundorder.DefaultVoidedBy holds the default value on creation for the voided_by field.
+ outboundorder.DefaultVoidedBy = outboundorderDescVoidedBy.Default.(string)
// outboundorderDescCreatedAt is the schema descriptor for created_at field.
- outboundorderDescCreatedAt := outboundorderFields[29].Descriptor()
+ outboundorderDescCreatedAt := outboundorderFields[33].Descriptor()
// outboundorder.DefaultCreatedAt holds the default value on creation for the created_at field.
outboundorder.DefaultCreatedAt = outboundorderDescCreatedAt.Default.(func() int64)
permissionFields := schema.Permission{}.Fields()
diff --git a/bj_power_wms/frontend/src/components/OutboundRecords.vue b/bj_power_wms/frontend/src/components/OutboundRecords.vue
index 73836e7..601915b 100644
--- a/bj_power_wms/frontend/src/components/OutboundRecords.vue
+++ b/bj_power_wms/frontend/src/components/OutboundRecords.vue
@@ -97,6 +97,21 @@ const detailVisible = ref(false)
function openDetail(row) { detailRow.value = row; detailVisible.value = true }
function doPrint() { window.print() }
+// 出库作废(2026-11-03 断头路补全):仅通用/科技项目出库可作废,原因必填、留痕,库存按明细回滚
+const voidVisible = ref(false)
+const voidRow = ref(null)
+const voidReason = ref('')
+function openVoid(row) { voidRow.value = row; voidReason.value = ''; voidVisible.value = true }
+async function doVoid() {
+ try {
+ const res = await request.post('/outbound/void', { outboundNo: voidRow.value.outboundNo, reason: voidReason.value.trim() })
+ ElMessage.success(`已作废并回滚库存:批次回加 ${res?.restoredQty || 0} 件、SN 恢复 ${res?.restoredSN || 0} 条`)
+ voidVisible.value = false
+ loadRecords()
+ } catch (e) { /* 拦截器已提示 */ }
+}
+const voidable = (row) => can('outbound:void') && !row.voided && (row.outboundType === 'general' || row.outboundType === 'project')
+
onMounted(loadRecords)
@@ -154,7 +169,8 @@ onMounted(loadRecords)
- {{ row.status || '已出库' }}
+ 已作废
+ {{ row.status || '已出库' }}
@@ -204,9 +220,10 @@ onMounted(loadRecords)
{{ fmtTime(row.createdAt) }}
-
+
详情
+ 作废
@@ -238,6 +255,9 @@ onMounted(loadRecords)
{{ borrowText(detailRow) }}
—(本工位自取,无借料)
+
+ 已作废 | 原因:{{ detailRow.voidReason || '-' }} | 操作人:{{ detailRow.voidedBy || '-' }} | 时间:{{ fmtTime(detailRow.voidedAt) }}
+