feat: 新增产品工艺管理与工序审核功能
- 新增产品工艺(product_process)及明细(product_process_item)数据模型 - 新增工序审核开关(need_audit)与审核角色(audit_role)字段 - 新增待审核签字页面与路由 - 优化 WMS/MES 接口交互,增加业务错误处理与友好提示 - 补充库存过滤逻辑,避免返回已出库 SN 数据 - 调整默认查询时间范围为近一个月,优化用户体验
This commit is contained in:
@@ -2,9 +2,12 @@ package production
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"bj_power_mes/common/httpx"
|
||||
"bj_power_mes/ent"
|
||||
material "bj_power_mes/ent/material"
|
||||
"bj_power_mes/internal/logic"
|
||||
"bj_power_mes/internal/svc"
|
||||
)
|
||||
@@ -13,16 +16,31 @@ import (
|
||||
// 两库对等的核心收益:WMS 宕机时本接口照常可用。
|
||||
// 响应 [{code,name,spec,unit,manageMode,snMode}]:manageMode=类型 1结构件/2电气件/3其他(仅分类);
|
||||
// snMode=是否逐件SN管理 0未选择/1序列号件(录SN)/2批次件(不录SN),行为唯一依据。
|
||||
// 大数据量治理:支持 keyword(图号/名称 模糊,ILIKE)过滤 + limit(默认100、封顶200),
|
||||
// 避免一次性全量返回造成数据炸弹;下拉框按需远程搜索。
|
||||
// 本地为空(冷启动)时异步自 WMS 全量拉取补齐(M7),并顺带异步重推 sync_pending 行(M3);
|
||||
// 均不阻塞响应、失败静默。
|
||||
func ListMaterialsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
logic.New(svcCtx).EnsureMaterialCacheAsync()
|
||||
q := r.URL.Query()
|
||||
keyword := strings.TrimSpace(q.Get("keyword"))
|
||||
limit := 100
|
||||
if l, err := strconv.Atoi(q.Get("limit")); err == nil && l > 0 {
|
||||
if l > 200 {
|
||||
l = 200
|
||||
}
|
||||
limit = l
|
||||
}
|
||||
query := svcCtx.EntClient.Material.Query()
|
||||
if keyword != "" {
|
||||
query = query.Where(material.Or(
|
||||
material.CodeContains(keyword),
|
||||
material.NameContains(keyword),
|
||||
))
|
||||
}
|
||||
rows, err := query.Order(ent.Desc("id")).Limit(limit).All(r.Context())
|
||||
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]any{
|
||||
@@ -164,7 +182,12 @@ func ReceiveMaterialRequestHandler(svcCtx *svc.ServiceContext) http.HandlerFunc
|
||||
RequestNo string `json:"requestNo"`
|
||||
Qty int `json:"qty"`
|
||||
}
|
||||
if err := httpx.ParseJSON(r, &req); err != nil || req.RequestNo == "" {
|
||||
// ParseJSON 失败与 requestNo 为空分开报,避免误导入参正确却看不到真实原因(AITEST 闭环实测)
|
||||
if err := httpx.ParseJSON(r, &req); err != nil {
|
||||
httpx.BadRequest(w, "请求体解析失败")
|
||||
return
|
||||
}
|
||||
if req.RequestNo == "" {
|
||||
httpx.BadRequest(w, "缺少备料单号")
|
||||
return
|
||||
}
|
||||
@@ -184,7 +207,11 @@ func StationReceiveMaterialInternalHandler(svcCtx *svc.ServiceContext) http.Hand
|
||||
RequestNo string `json:"requestNo"`
|
||||
Qty int `json:"qty"`
|
||||
}
|
||||
if err := httpx.ParseJSON(r, &req); err != nil || req.RequestNo == "" {
|
||||
if err := httpx.ParseJSON(r, &req); err != nil {
|
||||
httpx.BadRequest(w, "请求体解析失败")
|
||||
return
|
||||
}
|
||||
if req.RequestNo == "" {
|
||||
httpx.BadRequest(w, "缺少备料单号")
|
||||
return
|
||||
}
|
||||
|
||||
@@ -220,7 +220,7 @@ type orderRow struct {
|
||||
func OrderQueryInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
orderNo := r.URL.Query().Get("orderNo")
|
||||
list, err := logic.New(svcCtx).ListWorkOrders(r.Context(), orderNo, "", "", "", "", "", "", "")
|
||||
list, err := logic.New(svcCtx).ListWorkOrders(r.Context(), orderNo, "", "", "", "", "", "", "", "", 0)
|
||||
if err != nil {
|
||||
httpx.Fail(w, 2004, err.Error())
|
||||
return
|
||||
|
||||
@@ -35,11 +35,48 @@ func SignPendingHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
Page: atoiDefault(q.Get("page"), 1),
|
||||
PageSize: atoiDefault(q.Get("pageSize"), 50),
|
||||
}
|
||||
data, total, err := logic.New(svcCtx).PendingSigns(r.Context(), f)
|
||||
data, total, err := logic.New(svcCtx).PendingSigns(r.Context(), f)
|
||||
if err != nil {
|
||||
httpx.Fail(w, 3302, err.Error())
|
||||
return
|
||||
}
|
||||
httpx.Ok(w, map[string]any{"list": data, "total": total})
|
||||
}
|
||||
}
|
||||
|
||||
// AuditorSignHandler 审核人复核签字(工序级审核 gate,工艺配置 needAudit 决定)。
|
||||
func AuditorSignHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var req logic.AuditorSignReq
|
||||
if err := httpx.ParseJSON(r, &req); err != nil {
|
||||
httpx.BadRequest(w, "请求体解析失败")
|
||||
return
|
||||
}
|
||||
if err := logic.New(svcCtx).AuditorSign(r.Context(), req, operator(r, "")); err != nil {
|
||||
httpx.Fail(w, 3303, err.Error())
|
||||
return
|
||||
}
|
||||
httpx.OkMessage(w, "审核成功", nil)
|
||||
}
|
||||
}
|
||||
|
||||
// AuditPendingHandler 待审核列表(审核人「待审任务」数据源)。
|
||||
func AuditPendingHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
q := r.URL.Query()
|
||||
f := logic.PendingAuditFilter{
|
||||
Sn: q.Get("sn"),
|
||||
OrderNo: q.Get("orderNo"),
|
||||
StationNo: q.Get("stationNo"),
|
||||
Page: atoiDefault(q.Get("page"), 1),
|
||||
PageSize: atoiDefault(q.Get("pageSize"), 50),
|
||||
}
|
||||
data, total, err := logic.New(svcCtx).PendingAudits(r.Context(), f)
|
||||
if err != nil {
|
||||
httpx.Fail(w, 3302, err.Error())
|
||||
httpx.Fail(w, 3304, err.Error())
|
||||
return
|
||||
}
|
||||
httpx.Ok(w, map[string]any{"list": data, "total": total})
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -113,9 +113,17 @@ func ExportProductTypesHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
func ListWorkOrdersHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
q := r.URL.Query()
|
||||
// keyword+limit:下拉远程搜索(limit>0 才截断,封顶 200);列表页不传=全量,行为不变
|
||||
limit := 0
|
||||
if v := q.Get("limit"); v != "" {
|
||||
if n, err := strconv.Atoi(v); err == nil && n > 0 {
|
||||
limit = n
|
||||
}
|
||||
}
|
||||
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("ownershipType"), q.Get("dueFrom"), q.Get("dueTo"))
|
||||
q.Get("contractNo"), q.Get("ownershipType"), q.Get("dueFrom"), q.Get("dueTo"),
|
||||
q.Get("keyword"), limit)
|
||||
if err != nil {
|
||||
httpx.Fail(w, 3004, err.Error())
|
||||
return
|
||||
@@ -135,7 +143,8 @@ func CreateWorkOrderHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
httpx.Fail(w, 3005, err.Error())
|
||||
return
|
||||
}
|
||||
httpx.OkMessage(w, "创建成功", nil)
|
||||
// 产品工艺偏差警告(仅提示不阻断):覆盖/顺序/个数与来源产品工艺不一致时返回 warnings
|
||||
httpx.Ok(w, map[string]any{"warnings": logic.New(svcCtx).ComboDeviationWarnings(r.Context(), req.ProductProcessId, req.FlowCombination)})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -150,7 +159,8 @@ func UpdateWorkOrderHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
httpx.Fail(w, 3006, err.Error())
|
||||
return
|
||||
}
|
||||
httpx.OkMessage(w, "更新成功", nil)
|
||||
// 产品工艺偏差警告(仅提示不阻断)
|
||||
httpx.Ok(w, map[string]any{"warnings": logic.New(svcCtx).ComboDeviationWarnings(r.Context(), req.ProductProcessId, req.FlowCombination)})
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -50,7 +50,14 @@ func DoneWorkpieceHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
func ListWorkpiecesHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
q := r.URL.Query()
|
||||
data, err := logic.New(svcCtx).ListWorkpieces(r.Context(), q.Get("sn"), q.Get("orderNo"))
|
||||
// limit:下拉远程搜索场景传参(封顶 200);不传默认 500,行为向后兼容
|
||||
limit := 0
|
||||
if v := q.Get("limit"); v != "" {
|
||||
if n, err := strconv.Atoi(v); err == nil && n > 0 {
|
||||
limit = n
|
||||
}
|
||||
}
|
||||
data, err := logic.New(svcCtx).ListWorkpieces(r.Context(), q.Get("sn"), q.Get("orderNo"), limit)
|
||||
if err != nil {
|
||||
httpx.Fail(w, 3304, err.Error())
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user