feat: 解耦管理类型与SN管理方式,新增sn_mode字段实现全链路SN管理标准化
本次重构将原manage_mode字段拆分为独立的分类维度(manage_mode)和SN管理维度(sn_mode),实现全链路(MES/WMS/工位终端)的SN管理行为统一依据: 1. 新增sn_mode字段,定义1=序列号件、2=批次件、0=未选择,替代原manage_mode的SN判断逻辑 2. 移除冗余的manage_mode字段在多个实体中的使用,统一使用sn_mode决定业务行为 3. 新增工位接驳台配置,服务端固定接驳台,前端不可修改,确保AGV送达准确性 4. 优化检验记录导出,新增装配物料绑定明细,满足客户追溯需求 5. 修正前端提示文本,统一使用序列号件/批次件表述,与后端逻辑对齐
This commit is contained in:
@@ -111,6 +111,19 @@ func InspectionDisposalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
}
|
||||
|
||||
// InspectionBindsHandler GET /inspections/binds?sn= 检验记录详情附带的装配物料绑定明细
|
||||
// (按 SN 跨工艺查 workpiece_bind,标注工艺/工位;客户需求:检验记录附装配明细)
|
||||
func InspectionBindsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
sn := r.URL.Query().Get("sn")
|
||||
if sn == "" {
|
||||
httpx.BadRequest(w, "缺少 sn")
|
||||
return
|
||||
}
|
||||
httpx.Ok(w, logic.New(svcCtx).InspectionBinds(r.Context(), sn))
|
||||
}
|
||||
}
|
||||
|
||||
// UnqualifiedReportHandler GET /quality/unqualified-report?id= 一键生成《不合格单》xlsx 模板(预填检验数据)
|
||||
func UnqualifiedReportHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
@@ -140,6 +153,28 @@ func UnqualifiedReportHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
cell, _ := excelize.CoordinatesToCellName(c+1, 2)
|
||||
_ = f.SetCellValue(sheet, cell, v)
|
||||
}
|
||||
// 装配物料绑定明细区(明细下方加区块,照主表风格):该 SN 跨工艺全部装机绑定
|
||||
if rec.Sn != "" {
|
||||
if binds := logic.New(svcCtx).InspectionBinds(r.Context(), rec.Sn); len(binds) > 0 {
|
||||
titleCell, _ := excelize.CoordinatesToCellName(1, 4)
|
||||
_ = f.SetCellValue(sheet, titleCell, "装配物料绑定明细")
|
||||
bindHeaders := []string{"工件SN", "工艺", "工位", "物料编码", "物料名称", "规格", "绑定值(SN/批次)", "绑定方式", "绑定人", "绑定时间"}
|
||||
for c, h := range bindHeaders {
|
||||
cell, _ := excelize.CoordinatesToCellName(c+1, 5)
|
||||
_ = f.SetCellValue(sheet, cell, h)
|
||||
}
|
||||
for i, b := range binds {
|
||||
bindRow := []any{
|
||||
b.Sn, b.FlowName, b.StationNo, b.MaterialCode, b.MaterialName, b.Spec,
|
||||
b.BindValue, b.BindMode, b.Operator, b.CreatedAt.Format("2006-01-02 15:04:05"),
|
||||
}
|
||||
for c, v := range bindRow {
|
||||
cell, _ := excelize.CoordinatesToCellName(c+1, 6+i)
|
||||
_ = f.SetCellValue(sheet, cell, v)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
w.Header().Set("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
|
||||
w.Header().Set("Content-Disposition", "attachment; filename*=UTF-8''"+url.PathEscape("不合格单.xlsx"))
|
||||
_, _ = f.WriteTo(w)
|
||||
|
||||
@@ -114,7 +114,7 @@ type modelBomItem struct {
|
||||
MaterialName string
|
||||
Spec string
|
||||
Unit string
|
||||
ManageMode string
|
||||
SnMode int // 是否逐件SN管理 1序列号件/2批次件
|
||||
FlowNames string // 使用该物料的工艺清单(经 flow_material 映射)
|
||||
UnitQty string
|
||||
LossRate string
|
||||
@@ -292,7 +292,7 @@ func buildModelCard(ctx context.Context, svcCtx *svc.ServiceContext, productType
|
||||
MaterialName: fm.MaterialName,
|
||||
Spec: fm.Spec,
|
||||
Unit: fm.Unit,
|
||||
ManageMode: manageModeCN(fm.ManageMode),
|
||||
SnMode: fm.SnMode,
|
||||
FlowNames: name,
|
||||
UnitQty: f2s(fm.UnitQty),
|
||||
LossRate: f2s(fm.LossRate),
|
||||
@@ -391,14 +391,14 @@ func flowStatusCN(v string) string {
|
||||
return v
|
||||
}
|
||||
|
||||
func manageModeCN(v string) string {
|
||||
func snModeCN(v int) string {
|
||||
switch v {
|
||||
case "1":
|
||||
return "批次(结构件)"
|
||||
case "2":
|
||||
return "序列号(电气件)"
|
||||
case 1:
|
||||
return "序列号件"
|
||||
case 2:
|
||||
return "批次件"
|
||||
}
|
||||
return v
|
||||
return "-"
|
||||
}
|
||||
|
||||
func criteriaText(cs []*ent.StepCriterion) string {
|
||||
@@ -544,7 +544,7 @@ func renderModelCard(c *modelCard) (string, error) {
|
||||
{{range .Items}}
|
||||
<tr>
|
||||
<td>{{.MaterialCode}}</td><td class="left">{{.MaterialName}}</td><td class="left">{{.Spec}}</td>
|
||||
<td>{{.Unit}}</td><td>{{.ManageMode}}</td><td>{{.FlowNames}}</td>
|
||||
<td>{{.Unit}}</td><td>{{snModeCN .SnMode}}</td><td>{{.FlowNames}}</td>
|
||||
<td>{{.UnitQty}}</td><td>{{.LossRate}}</td><td>{{.RequiredQty}}</td>
|
||||
</tr>
|
||||
{{end}}
|
||||
|
||||
@@ -22,7 +22,7 @@ func ListFlowMaterialsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
|
||||
// SaveFlowMaterialsHandler POST /api/v1/process-flows/:id/materials —— 整表覆盖保存工艺物料清单
|
||||
// body: {items: [{materialCode, materialName, spec, unit, manageMode, unitQty, lossRate}]}
|
||||
// body: {items: [{materialCode, materialName, spec, unit, snMode, unitQty, lossRate}]}
|
||||
func SaveFlowMaterialsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
flowId := pathID(r)
|
||||
|
||||
@@ -2,7 +2,6 @@ package production
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"strconv"
|
||||
|
||||
"bj_power_mes/common/httpx"
|
||||
"bj_power_mes/ent"
|
||||
@@ -12,25 +11,27 @@ import (
|
||||
|
||||
// ListMaterialsHandler GET /api/v1/materials 物料下拉(读 MES 本地 materials 副本,需求一 M3/M6)。
|
||||
// 两库对等的核心收益:WMS 宕机时本接口照常可用。
|
||||
// 响应 [{code,name,spec,unit,manageMode}],manageMode "1"=批次(结构件)/"2"=序列号(电气件),
|
||||
// 与 WMS manage_mode 口径一致。本地为空(冷启动)时异步自 WMS 全量拉取补齐(M7),
|
||||
// 并顺带异步重推 sync_pending 行(M3);均不阻塞响应、失败静默。
|
||||
// 响应 [{code,name,spec,unit,manageMode,snMode}]:manageMode=类型 1结构件/2电气件/3其他(仅分类);
|
||||
// snMode=是否逐件SN管理 0未选择/1序列号件(录SN)/2批次件(不录SN),行为唯一依据。
|
||||
// 本地为空(冷启动)时异步自 WMS 全量拉取补齐(M7),并顺带异步重推 sync_pending 行(M3);
|
||||
// 均不阻塞响应、失败静默。
|
||||
func ListMaterialsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
logic.New(svcCtx).EnsureMaterialCacheAsync()
|
||||
list := []map[string]string{}
|
||||
list := []map[string]any{}
|
||||
rows, err := svcCtx.EntClient.Material.Query().
|
||||
Order(ent.Desc("id")).
|
||||
Limit(1000).
|
||||
All(r.Context())
|
||||
if err == nil {
|
||||
for _, m := range rows {
|
||||
list = append(list, map[string]string{
|
||||
list = append(list, map[string]any{
|
||||
"code": m.Code,
|
||||
"name": m.Name,
|
||||
"spec": m.Spec,
|
||||
"unit": m.Unit,
|
||||
"manageMode": strconv.Itoa(m.ManageMode),
|
||||
"manageMode": m.ManageMode,
|
||||
"snMode": m.SnMode,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,8 @@ import (
|
||||
"strconv"
|
||||
|
||||
"bj_power_mes/common/httpx"
|
||||
"bj_power_mes/ent"
|
||||
"bj_power_mes/ent/material"
|
||||
"bj_power_mes/internal/logic"
|
||||
"bj_power_mes/internal/svc"
|
||||
)
|
||||
@@ -91,6 +93,14 @@ func WorkpieceTraceInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc
|
||||
}
|
||||
}
|
||||
|
||||
// orderRow 工单行 + 产品序列号件口径(工位终端上线建档面板分流用)
|
||||
type orderRow struct {
|
||||
*ent.WorkOrder
|
||||
ProductSnMode int `json:"productSnMode"` // 产品型号/物料档案 sn_mode:0未选择/1序列号件/2批次件
|
||||
}
|
||||
|
||||
// OrderQueryInternalHandler GET /api/internal/order/query?orderNo=
|
||||
// 返回工单列表并附 productSnMode(按工单产品编码查 MES 本地物料档案;档案缺失/未选择=0)。
|
||||
func OrderQueryInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
orderNo := r.URL.Query().Get("orderNo")
|
||||
@@ -99,7 +109,27 @@ func OrderQueryInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
httpx.Fail(w, 2004, err.Error())
|
||||
return
|
||||
}
|
||||
httpx.Ok(w, list)
|
||||
// 批量取产品编码 → sn_mode,供工位终端上线建档 SN 分流(序列号件扫来料SN/批次件自动发号)
|
||||
codes := make([]string, 0, len(list))
|
||||
for _, wo := range list {
|
||||
if wo.ProductCode != "" {
|
||||
codes = append(codes, wo.ProductCode)
|
||||
}
|
||||
}
|
||||
snByCode := map[string]int{}
|
||||
if len(codes) > 0 {
|
||||
ms, err := svcCtx.EntClient.Material.Query().Where(material.CodeIn(codes...)).All(r.Context())
|
||||
if err == nil {
|
||||
for _, m := range ms {
|
||||
snByCode[m.Code] = m.SnMode
|
||||
}
|
||||
}
|
||||
}
|
||||
rows := make([]orderRow, 0, len(list))
|
||||
for _, wo := range list {
|
||||
rows = append(rows, orderRow{WorkOrder: wo, ProductSnMode: snByCode[wo.ProductCode]})
|
||||
}
|
||||
httpx.Ok(w, rows)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -115,7 +115,7 @@ func ListWorkOrdersHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
q := r.URL.Query()
|
||||
data, err := logic.New(svcCtx).ListWorkOrders(r.Context(),
|
||||
q.Get("orderNo"), q.Get("status"), q.Get("productCode"), q.Get("productName"),
|
||||
q.Get("contractNo"), q.Get("projectNo"), q.Get("dueFrom"), q.Get("dueTo"))
|
||||
q.Get("contractNo"), q.Get("ownershipType"), q.Get("dueFrom"), q.Get("dueTo"))
|
||||
if err != nil {
|
||||
httpx.Fail(w, 3004, err.Error())
|
||||
return
|
||||
@@ -166,7 +166,9 @@ func GetWorkOrderHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
|
||||
// WorkOrderInternalHandler GET /api/internal/work-orders/:no
|
||||
// 供 WMS 解析工单归属(A2 半成品入库归属继承产线工单):返回工单号、合同编号(contractNo)、工程编号(projectNo)。
|
||||
// 供 WMS 解析工单归属(A2 半成品入库归属继承产线工单):返回工单号、归属编号(contractNo)、
|
||||
// 归属类型(ownershipType: workorder=合同号/project=科技项目号/other=其他)。
|
||||
// 工程编号 projectNo 已废弃(被合同号顶替),字段保留防历史迁移,不再对外提供。
|
||||
// X-API-TOKEN 保护;工单不存在返回 code!=0(调用方按"找不到"静默处理,不阻断入库)。
|
||||
func WorkOrderInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
@@ -181,9 +183,9 @@ func WorkOrderInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return
|
||||
}
|
||||
httpx.Ok(w, map[string]any{
|
||||
"workOrderNo": wo.WorkOrderNo,
|
||||
"contractNo": wo.ContractNo,
|
||||
"projectNo": wo.ProjectNo,
|
||||
"workOrderNo": wo.WorkOrderNo,
|
||||
"contractNo": wo.ContractNo,
|
||||
"ownershipType": wo.OwnershipType,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -272,8 +272,9 @@ func RegisterProductionRoutes(server *rest.Server, serverCtx *svc.ServiceContext
|
||||
// ---------- PAD 巡检终端(块8) ----------
|
||||
{Method: http.MethodPost, Path: "/inspections", Handler: CreateInspectionHandler(serverCtx)},
|
||||
{Method: http.MethodGet, Path: "/inspections", Handler: ListInspectionsHandler(serverCtx)},
|
||||
{Method: http.MethodGet, Path: "/inspections/binds", Handler: InspectionBindsHandler(serverCtx)},
|
||||
{Method: http.MethodPost, Path: "/inspections/upload", Handler: UploadPhotoHandler(serverCtx)},
|
||||
// P0-4:一键生成《工序间检验记录》(汇总该工单 PROCESS 类巡检,按步骤维度)
|
||||
// P0-4:一键生成《工序间检验记录》(汇总该工单 PROCESS 类巡检,按步骤维度,附装配物料绑定明细)
|
||||
// ---------- MES 质量检验(过程检/完工检,来料检在 WMS 已做仍落本表) ----------
|
||||
|
||||
{Method: http.MethodPost, Path: "/quality/disposal", Handler: InspectionDisposalHandler(serverCtx)},
|
||||
|
||||
Reference in New Issue
Block a user