feat: 来料检处置项实体与复检、日排产达成对比、PLC/WMS 传输日志

- WMS 新增「检验处置项」实体(schema + ent 生成码),配套检验记录实体调整与复检接口,完善来料检/不良退货/入库检验前端
- MES 日排产:新增达成率统计与计划对比逻辑,调整日排产前端与流程卡/工序流
- 日志与传输:MES 新增 PLC 日志与 WMS 客户端传输日志,WMS 新增 MES 客户端传输日志
- MES 其他:扫码、工单/工件、AGV 客户端与告警、产品导入等逻辑完善及前端调整
- 工位终端:上线面板/作业面板、工件 handler 与 MES 客户端调整
- 配置与文档:更新 mes-api.yaml、三端构建产物与问题记录文档
This commit is contained in:
SunYF
2026-11-16 16:42:44 +08:00
parent b32ec7c03d
commit d92ca803d5
72 changed files with 5135 additions and 1526 deletions
+8 -4
View File
@@ -191,10 +191,8 @@ func applyColumnPatches(ctx context.Context) {
// 2026-11-13 用户拍板:历史数据可以直接清空,代码里绝不自作主张改写业务历史状态。
// 原「让步接收→合格」「reject_qty 历史回填」两条 UPDATE 已删除;清空由用户手工执行
// migrations/20261113_clear_inspection_history.sql,本补丁只做幂等 ADD COLUMN / 结构迁移。
// P0-2 不合格品处置(问题记录 L135-145)
`ALTER TABLE inspection_records ADD COLUMN IF NOT EXISTS disposal_type text NOT NULL DEFAULT 'NONE'`,
`ALTER TABLE inspection_records ADD COLUMN IF NOT EXISTS disposal_remark text`,
`ALTER TABLE inspection_records ADD COLUMN IF NOT EXISTS return_tracking_no text`,
// 2026-11-16 拍板:处置下放明细子表 inspection_disposal_items,单头 disposal_type /
// disposal_remark / return_tracking_no 三列废止(见下方 DROP 补丁),不再 ADD 回来。
// D5 区域库位:货架号 / 第几层 / 位置号(手填)
`ALTER TABLE zones ADD COLUMN IF NOT EXISTS shelf_no text`,
`ALTER TABLE zones ADD COLUMN IF NOT EXISTS layer_no text`,
@@ -272,6 +270,12 @@ func applyColumnPatches(ctx context.Context) {
`ALTER TABLE materials DROP COLUMN IF EXISTS drawing_no`,
// 「简称」已按 2026-09-19 用户裁决整体删除(新增/编辑表单不再出现),存量库丢弃旧列
`ALTER TABLE materials DROP COLUMN IF EXISTS short_name`,
// 2026-11-16 拍板:检验处置下放明细子表 inspection_disposal_items(按数量分退货/返修/报废、
// 各行自带备注),单头 disposal_type / disposal_remark / return_tracking_no 三列废止并 DROP;
// 退货物流信息统一填子表行备注(非必填)。历史处置值已随行留存在子表/事件日志中。
`ALTER TABLE inspection_records DROP COLUMN IF EXISTS disposal_type`,
`ALTER TABLE inspection_records DROP COLUMN IF EXISTS disposal_remark`,
`ALTER TABLE inspection_records DROP COLUMN IF EXISTS return_tracking_no`,
// 批次号/SN 唯一约束(P2-1/P2-2):并发导入防撞号。部分唯一索引只约束非空值——
// 空串/NULL(序列号=否无SN、序列号=是有批次)不参与唯一性。
// 批次唯一索引 ux_inventories_batch_no 已改按 sn_mode=2 约束(见下方 2026-09-30 解耦补丁:先回填再重建)。
+2 -4
View File
@@ -253,7 +253,8 @@ func createInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
}
// 质量状态自动带出(客户诉求 问题记录 L129:入库记录增加 合格/不合格 列)
// 按检测单号查最近一次检验结论:合格→合格;不合格且部分入库→部分;不合格→不合格;无记录→空(未关联)
// 按检测单号查最近一次检验结论:合格→合格;不合格→不合格;无记录→空(未关联)。
// 2026-11-16 拍板:处置下放明细子表、「部分入库」不再是人工处置选项(送检判定即拆行)。
qualityStatus := ""
if req.InspectionNo != "" {
if rec, qerr := ctx.EntClient.InspectionRecord.Query().
@@ -261,9 +262,6 @@ func createInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
Order(ent.Desc("created_at"), ent.Desc("id")).
First(ctx0()); qerr == nil && rec != nil {
qualityStatus = rec.Status
if rec.Status == "不合格" && rec.DisposalType == "PARTIAL" {
qualityStatus = "部分"
}
}
}
+239 -151
View File
@@ -12,14 +12,16 @@
package handler
import (
"encoding/json"
"fmt"
"net/http"
"strings"
"strconv"
"strings"
"time"
"bj_power_wms/ent"
"bj_power_wms/ent/inboundorder"
"bj_power_wms/ent/inspectiondisposalitem"
"bj_power_wms/ent/inspectionrecord"
"bj_power_wms/ent/inventory"
"bj_power_wms/ent/material"
@@ -44,36 +46,39 @@ func resolveInspectionTarget(ctx *svc.ServiceContext, targetId string) (*ent.Inv
}
// batchFlipInspectionHandler 逐个判定批量翻转检验状态(问题记录 L150 三问题之三)
// body: { items: [ { targetId, status, inspectQty, passQty, disposalType,
// body: { items: [ { targetId, status, inspectQty, passQty, disposals: [{type, qty, remark}],
//
// returnTrackingNo, disposalRemark, ownershipType, ownershipNo,
// relatedStandard, manufacturer, checkDesc, inspector, reportNo, inspectionNo,
// batchSeq, batchTotal } ] }
// ownershipType, ownershipNo, relatedStandard, manufacturer, checkDesc, inspector,
// reportNo, inspectionNo, batchSeq, batchTotal } ] }
//
// 每个对象按自身数量写记录、按自身结论翻库存状态(修复旧版"所有记录同数量"的 bug)。
// reject_qty 后端复核 = inspectQty - passQty,不信任前端传入值。
// batchSeq/batchTotal(第几批/共几件):序列号=否(sn_mode=2)必填且均≥1;序列号=是忽略传值、落库 0=未填。
// 2026-11-16 拍板:处置方式下放明细子表——不合格项必须带 disposals 明细行
// (退货/返修/报废按数量拆分,Σqty=不合格数;备注非必填,退货物流信息也填备注),
// 提交时写子表并按行执行库存动作。运单号概念废除。
func batchFlipInspectionHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
Items []struct {
TargetId string `json:"targetId"`
Status string `json:"status"` // 合格/不合格
InspectQty int `json:"inspectQty"`
PassQty int `json:"passQty"`
DisposalType string `json:"disposalType"`
ReturnTrackingNo string `json:"returnTrackingNo"`
DisposalRemark string `json:"disposalRemark"`
OwnershipType string `json:"ownershipType"`
OwnershipNo string `json:"ownershipNo"`
RelatedStandard string `json:"relatedStandard"`
Manufacturer string `json:"manufacturer"`
CheckDesc string `json:"checkDesc"`
Inspector string `json:"inspector"`
ReportNo string `json:"reportNo"`
InspectionNo string `json:"inspectionNo"`
BatchSeq int `json:"batchSeq"`
BatchTotal int `json:"batchTotal"`
TargetId string `json:"targetId"`
Status string `json:"status"` // 合格/不合格
InspectQty int `json:"inspectQty"`
PassQty int `json:"passQty"`
Disposals []struct {
Type string `json:"type"` // RETURN/REWORK/SCRAP
Qty int `json:"qty"` // >0
Remark string `json:"remark"` // 非必填(退货物流信息也填此处)
} `json:"disposals"`
OwnershipType string `json:"ownershipType"`
OwnershipNo string `json:"ownershipNo"`
RelatedStandard string `json:"relatedStandard"`
Manufacturer string `json:"manufacturer"`
CheckDesc string `json:"checkDesc"`
Inspector string `json:"inspector"`
ReportNo string `json:"reportNo"`
InspectionNo string `json:"inspectionNo"`
BatchSeq int `json:"batchSeq"`
BatchTotal int `json:"batchTotal"`
} `json:"items"`
}
if err := parseJSON(r, &req); err != nil {
@@ -86,6 +91,11 @@ func batchFlipInspectionHandler(ctx *svc.ServiceContext) http.HandlerFunc {
}
// 预校验:每条必须含 targetId 且结论合法、能定位到库存行;任意一条失败整体拒绝(避免部分成功假闭环)
type disposalLine struct {
dt string
qty int
remark string
}
type item struct {
id string
inv *ent.Inventory
@@ -95,9 +105,7 @@ func batchFlipInspectionHandler(ctx *svc.ServiceContext) http.HandlerFunc {
inspectQty int
passQty int
rejectQty int
disposal string
retTrack string
dispRemark string
disposals []disposalLine
ownType string
ownNo string
relStd string
@@ -144,12 +152,34 @@ func batchFlipInspectionHandler(ctx *svc.ServiceContext) http.HandlerFunc {
}
// 后端复核不合格数 = 检验数 - 合格数(不信任前端)
rejectQty := inspectQty - passQty
// 2026-11-16 拍板:不合格必须有处置明细行,Σqty = 不合格数,逐行归一化校验
disposals := make([]disposalLine, 0, len(it.Disposals))
if rejectQty > 0 {
sum := 0
for _, d := range it.Disposals {
dt := disposalTypeOrNone(d.Type)
if dt == "NONE" {
fail(w, http.StatusBadRequest, fmt.Sprintf("「%s」处置明细行方式无效(仅 退货/返修/报废): %s", it.TargetId, d.Type))
return
}
if d.Qty <= 0 {
fail(w, http.StatusBadRequest, fmt.Sprintf("「%s」处置明细行数量必须大于 0", it.TargetId))
return
}
sum += d.Qty
disposals = append(disposals, disposalLine{dt: dt, qty: d.Qty, remark: strings.TrimSpace(d.Remark)})
}
if sum != rejectQty {
fail(w, http.StatusBadRequest, fmt.Sprintf("「%s」处置明细数量合计(%d)必须等于不合格数量(%d):按数量分别填退货/返修/报废", it.TargetId, sum, rejectQty))
return
}
}
// 第几批/共几件已下线(2026-11-08):前端不再采集,字段保留落库 0(schema Default(0) 不动)
batchSeq, batchTotal := 0, 0
items = append(items, item{
id: it.TargetId, inv: inv, targetType: tt, material: inv.MaterialCode,
status: it.Status, inspectQty: inspectQty, passQty: passQty, rejectQty: rejectQty,
disposal: disposalTypeOrNone(it.DisposalType), retTrack: it.ReturnTrackingNo, dispRemark: it.DisposalRemark,
disposals: disposals,
ownType: it.OwnershipType, ownNo: it.OwnershipNo, relStd: it.RelatedStandard, mfr: it.Manufacturer,
checkDesc: it.CheckDesc, inspector: it.Inspector, reportNo: it.ReportNo, inspNo: it.InspectionNo,
batchSeq: batchSeq, batchTotal: batchTotal, pw: inv.ProductWorkNo,
@@ -207,12 +237,12 @@ func batchFlipInspectionHandler(ctx *svc.ServiceContext) http.HandlerFunc {
// 2026-11-13 拍板「来料检验三维度正交重构」:
// ① 检验结论 inspection_conclusion(只答判定成什么)
// ② 数量拆分(inspectQty/passQty/rejectQty)——提交时【自动拆库存行】,不再等人工二次点处置
// ③ 不合格品处置 disposal_status 独立状态机:不合格部分一律先挂「待处置」
// ③ 不合格品处置:2026-11-16 拍板下放明细子表,提交时写处置行并按行执行库存动作
dispStatus := ""
if it.rejectQty > 0 {
dispStatus = "待处置"
dispStatus = "已处置"
}
if _, err = tx.InspectionRecord.Create().
rec, err := tx.InspectionRecord.Create().
SetTargetType(it.targetType).
SetTargetID(it.id).
SetMaterialCode(it.material).
@@ -234,17 +264,26 @@ func batchFlipInspectionHandler(ctx *svc.ServiceContext) http.HandlerFunc {
SetNillableInspector(strPtr(it.inspector)).
SetNillableReportNo(strPtr(it.reportNo)).
SetNillableInspectionNo(strPtr(it.inspNo)).
SetDisposalType(it.disposal).
SetNillableDisposalRemark(strPtr(it.dispRemark)).
SetNillableReturnTrackingNo(strPtr(it.retTrack)).
SetNillableProductWorkNo(strPtr(it.pw)).
Save(ctx0()); err != nil {
Save(ctx0())
if err != nil {
fail(w, http.StatusInternalServerError, "创建检验记录失败: "+err.Error())
return
}
// 自动拆分:原行保留「合格数 + 未检数」,不合格数单独生成 -NG 隔离行并挂「待处置」。
// 未检件不再被算成不合格(旧 dispose 用 total-passQty 的口径已废止)。
// -NG 行本身不会再进待检清单,故用后缀判断即可防重复拆分,无需额外 import。
// 处置明细行:逐行写子表(qty 按行、备注非必填)
for _, d := range it.disposals {
if _, err = tx.InspectionDisposalItem.Create().
SetRecordID(int64(rec.ID)).SetDisposeType(d.dt).SetQty(d.qty).
SetNillableRemark(strPtr(d.remark)).
SetNillableOperator(strPtr(it.inspector)).
Save(ctx0()); err != nil {
fail(w, http.StatusInternalServerError, "创建处置明细失败: "+err.Error())
return
}
}
// 库存动作:自动拆分。原行保留「合格数 + 未检数」;不合格数按处置明细行拆分——
// 批次行按处置生成多条 -NG 隔离行(退货=待退/返修=不合格在库/报废=不合格报废);
// SN/其他类单件行按唯一处置行直接翻状态。处置明细行存在时一律不再挂「待处置」。
if it.rejectQty > 0 && it.inv.SnMode == snModeBatch && !strings.HasSuffix(it.inv.BatchNo, "-NG") {
kept := it.passQty + (it.inv.Quantity - it.inspectQty)
if kept < 0 {
@@ -259,22 +298,57 @@ func batchFlipInspectionHandler(ctx *svc.ServiceContext) http.HandlerFunc {
fail(w, http.StatusInternalServerError, "拆分合格/未检数量失败: "+err.Error())
return
}
if _, err = tx.Inventory.Create().
SetManageMode(it.inv.ManageMode).SetSnMode(it.inv.SnMode).SetCategory(it.inv.Category).
SetMaterialCode(it.inv.MaterialCode).
SetNillableMaterialName(strPtr(it.inv.MaterialName)).
SetBatchNo(it.inv.BatchNo + "-NG").
SetQuantity(it.rejectQty).SetLockedQty(0).
SetQualityStatus("不合格").SetStatus("待处置").
SetNillableZoneCode(strPtr(it.inv.ZoneCode)).
SetNillableInboundNo(strPtr(it.inv.InboundNo)).
SetRemark("检验自动拆分:不合格部分(待处置)").
Save(ctx0()); err != nil {
fail(w, http.StatusInternalServerError, "生成不合格隔离行失败: "+err.Error())
// 按处置行拆 -NG 隔离行:批次号 -NG、-NG-2、-NG-3…(处置动作不同、物理同隔离区)
for di, d := range it.disposals {
ngBatch := it.inv.BatchNo + "-NG"
if di > 0 {
ngBatch = fmt.Sprintf("%s-NG-%d", it.inv.BatchNo, di+1)
}
ngQuality, ngStatus := "不合格", "在库"
ngLabel := ""
switch d.dt {
case "RETURN":
ngQuality, ngStatus = "待退", "待处置"
ngLabel = "退货处置"
case "SCRAP":
ngQuality, ngStatus = "不合格", "报废"
ngLabel = "报废处置"
case "REWORK":
ngQuality, ngStatus = "不合格", "在库"
ngLabel = "返修处置"
}
remark := fmt.Sprintf("检验自动拆分:%s×%d", ngLabel, d.qty)
if d.remark != "" {
remark += ";" + d.remark
}
if _, err = tx.Inventory.Create().
SetManageMode(it.inv.ManageMode).SetSnMode(it.inv.SnMode).SetCategory(it.inv.Category).
SetMaterialCode(it.inv.MaterialCode).
SetNillableMaterialName(strPtr(it.inv.MaterialName)).
SetBatchNo(ngBatch).
SetQuantity(d.qty).SetLockedQty(0).
SetQualityStatus(ngQuality).SetStatus(ngStatus).
SetNillableZoneCode(strPtr(it.inv.ZoneCode)).
SetNillableInboundNo(strPtr(it.inv.InboundNo)).
SetRemark(remark).
Save(ctx0()); err != nil {
fail(w, http.StatusInternalServerError, "生成不合格隔离行失败: "+err.Error())
return
}
}
} else if it.rejectQty > 0 {
// SN / 其他类单件行:处置明细只有一行(qty=1),直接翻库存行状态
d := it.disposals[0]
upd := tx.Inventory.UpdateOneID(it.inv.ID).SetQualityStatus(qualityAfterInspection(it.status, d.dt))
if d.dt == "SCRAP" {
upd = upd.SetStatus("报废")
}
if _, err = upd.Save(ctx0()); err != nil {
fail(w, http.StatusInternalServerError, "同步库存检验状态失败: "+err.Error())
return
}
} else if _, err = tx.Inventory.UpdateOneID(it.inv.ID).
SetQualityStatus(qualityAfterInspection(it.status, it.disposal)).Save(ctx0()); err != nil {
SetQualityStatus(qualityAfterInspection(it.status, "NONE")).Save(ctx0()); err != nil {
fail(w, http.StatusInternalServerError, "同步库存检验状态失败: "+err.Error())
return
}
@@ -378,9 +452,19 @@ func queryInspectionHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return
}
// 处置明细汇总(2026-11-16 处置下放明细子表):列表/历史直接展示,前端无需二次查询
dispMap := inspectionDisposalTextMap(ctx, list)
rows := make([]map[string]any, 0, len(list))
for _, rec := range list {
b, _ := json.Marshal(rec)
m := map[string]any{}
_ = json.Unmarshal(b, &m)
m["disposalLines"] = dispMap[rec.ID]
rows = append(rows, m)
}
ok(w, map[string]any{
"total": total,
"list": list,
"list": rows,
"page": page,
"pageSize": pageSize,
})
@@ -468,7 +552,9 @@ func exportInspectionHandler(ctx *svc.ServiceContext) http.HandlerFunc {
if r.URL.Query().Get("format") == "xlsx" {
// 列名按客户口径(问题记录 L150):检验说明→相关标准、检验员→记录人、检验日期→记录日期、增加归属;
// 图号=物料编码(L18 合并裁决)。2026-11-08 移除「第几批/共几件」两列(字段仍落库 0)。
headers := []string{"ID", "对象", "批次/SN", "图号", "名称", "检验类型", "结论", "检验数", "合格数", "不合格数", "相关标准", "报检单号", "检测单号", "归属单号", "生产厂家", "记录人", "备注", "记录日期"}
// 2026-11-16 增加「处置明细」列(处置下放明细子表,按行汇总退货/返修/报废数量与备注)。
headers := []string{"ID", "对象", "批次/SN", "图号", "名称", "检验类型", "结论", "检验数", "合格数", "不合格数", "相关标准", "报检单号", "检测单号", "归属单号", "生产厂家", "记录人", "备注", "记录日期", "处置明细"}
dispMap := inspectionDisposalTextMap(ctx, list)
matrix := make([][]any, 0, len(list))
for _, rec := range list {
obj := rec.TargetType
@@ -482,7 +568,7 @@ func exportInspectionHandler(ctx *svc.ServiceContext) http.HandlerFunc {
inspectionTypeLabel(rec.InspectionType), rec.Status,
rec.InspectQty, rec.PassQty, rec.RejectQty, rec.RelatedStandard, rec.ReportNo,
rec.InspectionNo, rec.OwnershipNo, rec.Manufacturer, rec.Inspector, rec.Remark,
unixFmt(rec.CreatedAt),
unixFmt(rec.CreatedAt), dispMap[rec.ID],
})
}
sendExcel(w, xlsxFilename("检验记录"), headers, matrix)
@@ -505,16 +591,54 @@ func materialCodesBySpec(ctx *svc.ServiceContext, spec string) []string {
return codes
}
// disposalTypeOrNone 处置方式归一化(需求23:不合格可转退货 / 换修(返修)/ 报废 / 部分入库)
// disposalTypeOrNone 处置方式归一化(2026-11-16 拍板:处置下放明细子表,仅 退货/返修/报废 三种;
// 「部分入库」由送检判定即拆行自动完成,不再作为人工处置选项)
func disposalTypeOrNone(v string) string {
switch v {
case "RETURN", "SCRAP", "PARTIAL", "REWORK":
case "RETURN", "SCRAP", "REWORK":
return v
default:
return "NONE"
}
}
// inspectionDisposalTextMap 处置明细汇总文本(2026-11-16 处置下放明细子表):
// 每条检验记录拼接「退货×5;返修×5」,供列表/历史/导出直接展示,无需前端二次查询。
func inspectionDisposalTextMap(ctx *svc.ServiceContext, list []*ent.InspectionRecord) map[int]string {
out := map[int]string{}
if len(list) == 0 {
return out
}
ids := make([]int64, 0, len(list))
for _, r := range list {
ids = append(ids, int64(r.ID))
}
lines, err := ctx.EntClient.InspectionDisposalItem.Query().
Where(inspectiondisposalitem.RecordIDIn(ids...)).All(ctx0())
if err != nil {
return out
}
typeName := map[string]string{"RETURN": "退货", "REWORK": "返修", "SCRAP": "报废"}
byRec := map[int][]*ent.InspectionDisposalItem{}
for _, l := range lines {
byRec[int(l.RecordID)] = append(byRec[int(l.RecordID)], l)
}
for _, r := range list {
parts := make([]string, 0, 3)
for _, l := range byRec[r.ID] {
seg := typeName[l.DisposeType] + "×" + strconv.Itoa(l.Qty)
if l.Remark != "" {
seg += "(" + l.Remark + ")"
}
parts = append(parts, seg)
}
if len(parts) > 0 {
out[r.ID] = strings.Join(parts, ";")
}
}
return out
}
// qualityAfterInspection 检验后的库存质量状态:
// 合格 → 合格(可出库);
// 退货(RETURN) → 待退(隔离);返修(REWORK)/报废/其余不合格 → 不合格(隔离,禁止上线)。
@@ -529,20 +653,22 @@ func qualityAfterInspection(status, disposalType string) string {
return "不合格"
}
// disposeInspectionHandler 不合格品处置(退货 / 报废 / 部分入库)
// POST /api/inspection/dispose body: { recordId, disposalType, disposalRemark, returnTrackingNo, operator }
// disposeInspectionHandler 不合格品处置(退货 / 返修 / 报废)——历史「待处置」记录的补处置入口。
// POST /api/inspection/dispose body: { recordId, disposalType, disposalRemark, operator }
//
// RETURN 退货 → 库存置「待退」隔离(保持数量,等待退货运单确认后出库)
// REWORK 返修 → 库存置「不合格」隔离,备注标返修,返修后走复检入口
// SCRAP 报废 → 库存置「不合格」且生命周期「报废」,退出可用库存
// PARTIAL 部分入库 → 仅批次管理:按合格数拆行(合格行入库 + 差额行隔离),数量守恒
//
// 2026-11-16 拍板:处置写明细子表 inspection_disposal_items(qty=记录不合格数、备注非必填,
// 运单号概念废除、物流信息统一填备注);单头不再存处置方式(列已 DROP)。
func disposeInspectionHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
RecordID int `json:"recordId"`
DisposalType string `json:"disposalType"`
DisposalRemark string `json:"disposalRemark"`
ReturnTrackingNo string `json:"returnTrackingNo"`
Operator string `json:"operator"`
RecordID int `json:"recordId"`
DisposalType string `json:"disposalType"`
DisposalRemark string `json:"disposalRemark"`
Operator string `json:"operator"`
}
if err := parseJSON(r, &req); err != nil || req.RecordID <= 0 {
fail(w, http.StatusBadRequest, "参数错误:recordId 必填")
@@ -550,7 +676,7 @@ func disposeInspectionHandler(ctx *svc.ServiceContext) http.HandlerFunc {
}
dt := disposalTypeOrNone(req.DisposalType)
if dt == "NONE" {
fail(w, http.StatusBadRequest, "请选择处置方式(退货/报废/部分入库)")
fail(w, http.StatusBadRequest, "请选择处置方式(退货/返修/报废)")
return
}
rec, err := ctx.EntClient.InspectionRecord.Get(ctx0(), req.RecordID)
@@ -567,10 +693,6 @@ func disposeInspectionHandler(ctx *svc.ServiceContext) http.HandlerFunc {
fail(w, http.StatusBadRequest, err.Error())
return
}
if dt == "RETURN" && req.ReturnTrackingNo == "" {
fail(w, http.StatusBadRequest, "退货处置必须填写货运单号")
return
}
tx, err := ctx.EntClient.Tx(ctx0())
if err != nil {
@@ -585,16 +707,26 @@ func disposeInspectionHandler(ctx *svc.ServiceContext) http.HandlerFunc {
}()
// 2026-11-13 拍板:三维度正交——处置状态与检验结论、数量拆分互不混用。
// 退货/换修/报废/部分入库四种处置统一推进「已处置」,不再只有 PARTIAL 推进。
// 2026-11-16 拍板:处置方式/备注下放明细子表,单头只推进处置状态。
if _, err = tx.InspectionRecord.UpdateOneID(rec.ID).
SetDisposalType(dt).
SetDisposalStatus("已处置").
SetNillableDisposalRemark(strPtr(req.DisposalRemark)).
SetNillableReturnTrackingNo(strPtr(req.ReturnTrackingNo)).
Save(ctx0()); err != nil {
fail(w, http.StatusInternalServerError, "更新处置信息失败: "+err.Error())
return
}
// 处置明细行(qty=记录不合格数;SN 单件时不合格数=1)
dispQty := rec.RejectQty
if dispQty <= 0 {
dispQty = 1
}
if _, err = tx.InspectionDisposalItem.Create().
SetRecordID(int64(rec.ID)).SetDisposeType(dt).SetQty(dispQty).
SetNillableRemark(strPtr(req.DisposalRemark)).
SetNillableOperator(strPtr(req.Operator)).
Save(ctx0()); err != nil {
fail(w, http.StatusInternalServerError, "创建处置明细失败: "+err.Error())
return
}
switch dt {
case "RETURN":
@@ -613,44 +745,6 @@ func disposeInspectionHandler(ctx *svc.ServiceContext) http.HandlerFunc {
fail(w, http.StatusInternalServerError, "更新库存状态失败: "+err.Error())
return
}
case "PARTIAL":
// 2026-11-13:处置状态已在上方统一推进;此处只做数量拆分兼容分支
// (送检判定时已自动拆分并生成隔离行,避免重复拆行 / 旧口径把未检件算成不合格)。
if rec.DisposalStatus == "待处置" {
break
}
if inv.SnMode != snModeBatch {
fail(w, http.StatusBadRequest, "部分入库仅适用于序列号=否(按数量管理)")
return
}
total := inv.Quantity
if rec.PassQty <= 0 || rec.PassQty >= total {
fail(w, http.StatusBadRequest, fmt.Sprintf("部分入库:合格数须在 0 与批次数量(%d) 之间", total))
return
}
bad := total - rec.PassQty
if _, err = tx.Inventory.UpdateOneID(inv.ID).
SetQuantity(rec.PassQty).SetQualityStatus("合格").Save(ctx0()); err != nil {
fail(w, http.StatusInternalServerError, "拆分合格批次失败: "+err.Error())
return
}
if _, err = tx.Inventory.Create().
SetManageMode(inv.ManageMode).
SetSnMode(inv.SnMode).
SetCategory(inv.Category).
SetMaterialCode(inv.MaterialCode).
SetNillableMaterialName(strPtr(inv.MaterialName)).
SetBatchNo(inv.BatchNo + "-NG").
SetQuantity(bad).SetLockedQty(0).
SetQualityStatus("不合格").
SetNillableZoneCode(strPtr(inv.ZoneCode)).
SetStatus("在库").
SetNillableInboundNo(strPtr(inv.InboundNo)).
SetRemark("不合格隔离(部分入库差额)").
Save(ctx0()); err != nil {
fail(w, http.StatusInternalServerError, "生成不合格隔离行失败: "+err.Error())
return
}
}
if err = tx.Commit(); err != nil {
@@ -685,10 +779,11 @@ func applyInventoryDispose(tx *ent.Tx, inv *ent.Inventory, dt string) error {
return fmt.Errorf("不支持的处置方式: %s", dt)
}
// createDisposeTraceRecord 处置留痕:自动生成一条「不合格」检验记录
// createDisposeTraceRecord 处置留痕:自动生成一条「不合格」检验记录 + 处置明细子表行
// (复用 batchFlipInspectionHandler 的创建模式:targetId=库存行编号、后端复核不合格数)。
// source 写入 remark 标记留痕来源(在库处置 / MES 联动),便于与来料检记录区分。
func createDisposeTraceRecord(tx *ent.Tx, inv *ent.Inventory, dt, remark, trackNo, operator, source string) error {
// 2026-11-16 拍板:处置方式/备注下放明细子表,运单号概念废除(退货物流信息填备注)。
func createDisposeTraceRecord(tx *ent.Tx, inv *ent.Inventory, dt, remark, operator, source string) error {
targetType := "BATCH"
targetId := inv.BatchNo
qty := inv.Quantity
@@ -700,7 +795,7 @@ func createDisposeTraceRecord(tx *ent.Tx, inv *ent.Inventory, dt, remark, trackN
if qty <= 0 {
qty = 1
}
_, err := tx.InspectionRecord.Create().
rec, err := tx.InspectionRecord.Create().
SetTargetType(targetType).
SetTargetID(targetId).
SetMaterialCode(inv.MaterialCode).
@@ -709,47 +804,49 @@ func createDisposeTraceRecord(tx *ent.Tx, inv *ent.Inventory, dt, remark, trackN
SetInspectQty(qty).
SetPassQty(0).
SetRejectQty(qty).
SetDisposalType(dt).
SetNillableDisposalRemark(strPtr(remark)).
SetNillableReturnTrackingNo(strPtr(trackNo)).
SetDisposalStatus("已处置").
SetNillableInspector(strPtr(operator)).
SetNillableRemark(strPtr(source)).
Save(ctx0())
if err != nil {
return err
}
_, err = tx.InspectionDisposalItem.Create().
SetRecordID(int64(rec.ID)).SetDisposeType(dt).SetQty(qty).
SetNillableRemark(strPtr(remark)).
SetNillableOperator(strPtr(operator)).
Save(ctx0())
return err
}
// inventoryDisposeHandler 在库处置:合格入库后的物料在使用中发现不合格,
// 直接从在库库存行发起处置,不再绕道补录检验记录(缺口 A)。
// POST /api/inspection/inventory-dispose body: { inventoryId, disposalType, returnTrackingNo, disposalRemark, operator, qty }
// POST /api/inspection/inventory-dispose body: { inventoryId, disposalType, disposalRemark, operator, qty }
//
// 仅接受 RETURN/REWORK/SCRAP;在库不存在部分入库场景,PARTIAL 直接报错
// 仅接受 RETURN/REWORK/SCRAP
// qty 缺省 0=整行处置(向后兼容);序列号=否 0<qty<行数量 走部分处置:
// 原行扣减余量继续在库 + 拆出处置隔离行(qty==行数量 按整行处置,避免零数量行)
// 校验:库存行存在、生命周期「在库」、数量不超行、RETURN 必填退货运单号
// 事务内:①自动生成一条「不合格」检验记录留痕 ②按处置语义翻该库存行/拆行 ③退货自动出库 ④写事件日志
// 校验:库存行存在、生命周期「在库」、数量不超行
// 事务内:①自动生成「不合格」检验记录留痕+处置明细子表行 ②按处置语义翻该库存行/拆行 ③退货自动出库 ④写事件日志
// 2026-11-16 拍板:运单号概念废除,退货物流信息统一填 disposalRemark(非必填)
func inventoryDisposeHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
InventoryID int `json:"inventoryId"`
DisposalType string `json:"disposalType"`
ReturnTrackingNo string `json:"returnTrackingNo"`
DisposalRemark string `json:"disposalRemark"`
Operator string `json:"operator"`
Qty int `json:"qty"` // 处置数量:0=整行处置(默认,向后兼容)
InventoryID int `json:"inventoryId"`
DisposalType string `json:"disposalType"`
DisposalRemark string `json:"disposalRemark"`
Operator string `json:"operator"`
Qty int `json:"qty"` // 处置数量:0=整行处置(默认,向后兼容)
}
if err := parseJSON(r, &req); err != nil || req.InventoryID <= 0 {
fail(w, http.StatusBadRequest, "参数错误:inventoryId 必填")
return
}
if req.DisposalType == "PARTIAL" {
fail(w, http.StatusBadRequest, "在库处置不支持部分入库")
return
}
dt := disposalTypeOrNone(req.DisposalType)
switch dt {
case "RETURN", "REWORK", "SCRAP":
default:
fail(w, http.StatusBadRequest, "请选择处置方式(退货/换修/报废)")
fail(w, http.StatusBadRequest, "请选择处置方式(退货/返修/报废)")
return
}
inv, err := ctx.EntClient.Inventory.Get(ctx0(), req.InventoryID)
@@ -761,10 +858,6 @@ func inventoryDisposeHandler(ctx *svc.ServiceContext) http.HandlerFunc {
fail(w, http.StatusBadRequest, "仅「在库」库存行可发起处置,当前状态:"+inv.Status)
return
}
if dt == "RETURN" && req.ReturnTrackingNo == "" {
fail(w, http.StatusBadRequest, "退货处置必须填写退货运单号")
return
}
if req.Qty < 0 || req.Qty > inv.Quantity {
fail(w, http.StatusBadRequest, "处置数量不能超过该行库存数量")
return
@@ -842,7 +935,7 @@ func inventoryDisposeHandler(ctx *svc.ServiceContext) http.HandlerFunc {
splitID = split.ID
// 留痕/单据以拆分行为数量载体(按 qty 口径,inventoryId 关联拆分行)
splitInv := *split
if err = createDisposeTraceRecord(tx, &splitInv, dt, traceRemark, req.ReturnTrackingNo, operator, "在库处置留痕"); err != nil {
if err = createDisposeTraceRecord(tx, &splitInv, dt, traceRemark, operator, "在库处置留痕"); err != nil {
fail(w, http.StatusInternalServerError, "创建留痕检验记录失败: "+err.Error())
return
}
@@ -854,7 +947,7 @@ func inventoryDisposeHandler(ctx *svc.ServiceContext) http.HandlerFunc {
}
}
} else {
if err = createDisposeTraceRecord(tx, inv, dt, req.DisposalRemark, req.ReturnTrackingNo, operator, "在库处置留痕"); err != nil {
if err = createDisposeTraceRecord(tx, inv, dt, req.DisposalRemark, operator, "在库处置留痕"); err != nil {
fail(w, http.StatusInternalServerError, "创建留痕检验记录失败: "+err.Error())
return
}
@@ -898,22 +991,21 @@ func inventoryDisposeHandler(ctx *svc.ServiceContext) http.HandlerFunc {
// internalInventoryDisposeHandler MES 质量检验(过程检/完工检)判不合格 → 联动 WMS 在库处置
// (X-API-TOKEN 内部接口,缺口 B;路由经 /api/internal/ 前缀注册,免 JWT、靠写死 token 保护)。
// POST /api/internal/inventory/dispose
// body: { materialCode, sn, batchNo, disposalType(RETURN/REWORK/SCRAP), returnTrackingNo, remark, operator }
// body: { materialCode, sn, batchNo, disposalType(RETURN/REWORK/SCRAP), remark, operator }
//
// 定位:SN 料(序列号=是 sn_mode=1)按 material_code+序列号精确唯一;批次料(序列号=否 sn_mode=2)按
// material_code+批次号定位(同批次可能多行,全部置状态)。仅操作「在库」行,0 行返回明确错误。
// 动作与在库处置同语义:RETURN→待退、REWORK→不合格、SCRAP→不合格+报废,
// 并同样生成留痕检验记录 + 事件日志。
// 并同样生成留痕检验记录+处置明细子表行 + 事件日志。2026-11-16:运单号概念废除。
func internalInventoryDisposeHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
MaterialCode string `json:"materialCode"`
Sn string `json:"sn"`
BatchNo string `json:"batchNo"`
DisposalType string `json:"disposalType"`
ReturnTrackingNo string `json:"returnTrackingNo"`
Remark string `json:"remark"`
Operator string `json:"operator"`
MaterialCode string `json:"materialCode"`
Sn string `json:"sn"`
BatchNo string `json:"batchNo"`
DisposalType string `json:"disposalType"`
Remark string `json:"remark"`
Operator string `json:"operator"`
}
if err := parseJSON(r, &req); err != nil {
fail(w, http.StatusBadRequest, "参数错误: "+err.Error())
@@ -934,10 +1026,6 @@ func internalInventoryDisposeHandler(ctx *svc.ServiceContext) http.HandlerFunc {
fail(w, http.StatusBadRequest, "处置方式仅支持 RETURN/REWORK/SCRAP")
return
}
if dt == "RETURN" && req.ReturnTrackingNo == "" {
fail(w, http.StatusBadRequest, "退货处置必须填写退货运单号")
return
}
// 定位在库库存行:sn 优先(序列号=是单件),否则按批次(序列号=否,可多行)
var rows []*ent.Inventory
@@ -976,7 +1064,7 @@ func internalInventoryDisposeHandler(ctx *svc.ServiceContext) http.HandlerFunc {
}()
for _, inv := range rows {
if err = createDisposeTraceRecord(tx, inv, dt, req.Remark, req.ReturnTrackingNo, req.Operator, "MES检验联动留痕"); err != nil {
if err = createDisposeTraceRecord(tx, inv, dt, req.Remark, req.Operator, "MES检验联动留痕"); err != nil {
fail(w, http.StatusInternalServerError, "创建留痕检验记录失败: "+err.Error())
return
}
+46 -35
View File
@@ -62,7 +62,7 @@ func createSupplierReturnOutbound(ctx *svc.ServiceContext, tx *ent.Tx, inv *ent.
// reinspectHandler 复检(换修闭环):针对「在库 + 不合格」的库存行重新判定,闭合换修 / 不合格处置的后续。
// POST /api/inspection/reinspect
// body: { inventoryId, result(pass/fail), disposalType(RETURN|SCRAP,仅 fail 时生效), returnTrackingNo, remark, operator }
// body: { inventoryId, result(pass/fail), disposalType(RETURN|SCRAP,仅 fail 时生效), remark, operator }
//
// pass → 质量置「合格」,回可用(换修 / 隔离品修复后重新上线)
// fail + RETURN → 质量置「待退」+ 自动退供应商出库(与 inventoryDisposeHandler 退货同闭环)
@@ -72,12 +72,11 @@ func createSupplierReturnOutbound(ctx *svc.ServiceContext, tx *ent.Tx, inv *ent.
func reinspectHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
InventoryID int `json:"inventoryId"`
Result string `json:"result"`
DisposalType string `json:"disposalType"`
ReturnTrackingNo string `json:"returnTrackingNo"`
Remark string `json:"remark"`
Operator string `json:"operator"`
InventoryID int `json:"inventoryId"`
Result string `json:"result"`
DisposalType string `json:"disposalType"`
Remark string `json:"remark"`
Operator string `json:"operator"`
}
if err := parseJSON(r, &req); err != nil || req.InventoryID <= 0 {
fail(w, http.StatusBadRequest, "参数错误:inventoryId 必填")
@@ -106,10 +105,7 @@ func reinspectHandler(ctx *svc.ServiceContext) http.HandlerFunc {
fail(w, http.StatusBadRequest, "复检不合格时必须选择处置方式(退货/报废)")
return
}
if dt == "RETURN" && req.ReturnTrackingNo == "" {
fail(w, http.StatusBadRequest, "退货处置必须填写退货运单号")
return
}
// 2026-11-16 拍板:运单号概念废除,退货物流信息统一填备注(非必填)
}
operator := r.Header.Get("X-Username")
if operator == "" {
@@ -128,26 +124,44 @@ func reinspectHandler(ctx *svc.ServiceContext) http.HandlerFunc {
}
}()
var recStatus, recDisposal, targetQuality string
switch req.Result {
case "pass":
recStatus = "合格"
recDisposal = ""
targetQuality = "合格"
case "fail":
dt := disposalTypeOrNone(req.DisposalType)
recStatus = "不合格"
recDisposal = dt
if dt == "RETURN" {
targetQuality = "待退"
} else {
targetQuality = "不合格"
}
var recStatus, recDisposal, targetQuality string
switch req.Result {
case "pass":
recStatus = "合格"
recDisposal = ""
targetQuality = "合格"
case "fail":
dt := disposalTypeOrNone(req.DisposalType)
recStatus = "不合格"
recDisposal = dt
if dt == "RETURN" {
targetQuality = "待退"
} else {
targetQuality = "不合格"
}
if err = createReinspectTraceRecord(tx, inv, recStatus, recDisposal, req.Remark, operator); err != nil {
fail(w, http.StatusInternalServerError, "创建复检留痕记录失败: "+err.Error())
}
traceRec, err := createReinspectTraceRecord(tx, inv, recStatus, recDisposal, req.Remark, operator)
if err != nil {
fail(w, http.StatusInternalServerError, "创建复检留痕记录失败: "+err.Error())
return
}
// 2026-11-16 拍板:处置方式下放明细子表——复检不合格留痕同步写处置行(qty=整行数量)
if recDisposal != "" {
qty := inv.Quantity
if inv.SnMode == snModeSN {
qty = 1
}
if qty <= 0 {
qty = 1
}
if _, err = tx.InspectionDisposalItem.Create().
SetRecordID(int64(traceRec.ID)).SetDisposeType(recDisposal).SetQty(qty).
SetNillableRemark(strPtr(req.Remark)).SetNillableOperator(strPtr(operator)).
Save(ctx0()); err != nil {
fail(w, http.StatusInternalServerError, "创建处置明细失败: "+err.Error())
return
}
}
upd := tx.Inventory.UpdateOneID(inv.ID)
switch targetQuality {
case "合格":
@@ -191,8 +205,9 @@ func reinspectHandler(ctx *svc.ServiceContext) http.HandlerFunc {
}
// createReinspectTraceRecord 复检留痕:生成一条与复检结果一致的检验记录
// (合格→合格记录;不合格→不合格记录并带处置方式),便于与来料检 / 在库处置记录区分。
func createReinspectTraceRecord(tx *ent.Tx, inv *ent.Inventory, status, disposal, remark, operator string) error {
// (合格→合格记录;不合格→不合格记录,处置方式写明细子表),便于与来料检 / 在库处置记录区分。
// 返回创建的记录(供处置子表行挂 record_id)。
func createReinspectTraceRecord(tx *ent.Tx, inv *ent.Inventory, status, disposal, remark, operator string) (*ent.InspectionRecord, error) {
targetType := "BATCH"
targetId := inv.BatchNo
qty := inv.Quantity
@@ -221,9 +236,5 @@ func createReinspectTraceRecord(tx *ent.Tx, inv *ent.Inventory, status, disposal
SetRejectQty(rejectQty).
SetNillableInspector(strPtr(operator)).
SetNillableRemark(strPtr("复检留痕 " + remark))
if disposal != "" {
b = b.SetNillableDisposalType(strPtr(disposal))
}
_, err := b.Save(ctx0())
return err
return b.Save(ctx0())
}
+2 -2
View File
@@ -36,7 +36,7 @@ func New(baseURL, token string) *Client {
baseURL: baseURL,
initialBaseURL: baseURL,
token: token,
hc: &http.Client{Timeout: 6 * time.Second},
hc: &http.Client{Timeout: 6 * time.Second, Transport: newLoggingTransport()},
}
}
@@ -66,7 +66,7 @@ func (c *Client) Ping(ctx context.Context) error {
return err
}
req.Header.Set("X-API-TOKEN", c.token)
cli := &http.Client{Timeout: 4 * time.Second}
cli := &http.Client{Timeout: 4 * time.Second, Transport: newLoggingTransport()}
resp, err := cli.Do(req)
if err != nil {
return fmt.Errorf("无法连接 MES(%s):%v", c.BaseURL(), err)
@@ -0,0 +1,65 @@
// transport_logging.go WMS→MES 全量 HTTP 交互日志(2026-11-16 联调)。
// http.RoundTripper 装饰器:挂在 Client.hc 与 Ping 临时 client 上,
// 所有出口(getJSON/postJSON/Ping/LookupFinishedBySN/ListMaterialRequests 等)自动全覆盖。
// 记录:请求方法/完整URL/请求体(截断)、响应状态码/响应体(截断)、传输错误。
// 前缀 [WMS→MES]。
package mesclient
import (
"bytes"
"context"
"fmt"
"io"
"net/http"
"github.com/zeromicro/go-zero/core/logx"
)
// loggingTransport 日志装饰 transport。
type loggingTransport struct{ base http.RoundTripper }
// FailHook MES 通讯失败钩子(2026-11-16):仅【传输层失败】(连不上/超时/断连)触发,
// HTTP 非 2xx 与业务码非 0 属正常业务响应不触发。main 启动时装配(落预警中心),
// 去重由回调实现方负责(窗口去重),本层只负责在错误发生时通知。
var FailHook func(ctx context.Context, method, url string, err error)
func newLoggingTransport() *loggingTransport {
return &loggingTransport{base: http.DefaultTransport}
}
func (t *loggingTransport) RoundTrip(req *http.Request) (*http.Response, error) {
u := req.URL.String()
var reqBody []byte
if req.Body != nil {
reqBody, _ = io.ReadAll(req.Body)
_ = req.Body.Close()
req.Body = io.NopCloser(bytes.NewReader(reqBody))
}
logx.WithContext(req.Context()).Infof("[WMS→MES] --> %s %s body=%s", req.Method, u, truncateLogBytes(reqBody))
resp, err := t.base.RoundTrip(req)
if err != nil {
logx.WithContext(req.Context()).Errorf("[WMS→MES] <-- transport error %s err=%v", u, err)
if FailHook != nil {
FailHook(req.Context(), req.Method, u, err)
}
return resp, err
}
raw, rerr := io.ReadAll(resp.Body)
_ = resp.Body.Close()
if rerr != nil {
logx.WithContext(req.Context()).Errorf("[WMS→MES] <-- read body error %s status=%d err=%v", u, resp.StatusCode, rerr)
}
resp.Body = io.NopCloser(bytes.NewReader(raw))
logx.WithContext(req.Context()).Infof("[WMS→MES] <-- HTTP %d %s body=%s", resp.StatusCode, u, truncateLogBytes(raw))
return resp, nil
}
// truncateLogBytes 日志防刷爆:超 2000 字节截断。
func truncateLogBytes(b []byte) string {
const max = 2000
if len(b) <= max {
return string(b)
}
return string(b[:max]) + fmt.Sprintf("...(截断,共%d字节)", len(b))
}