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
+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())
}