feat&refactor: 2026-09-22 半成品业务模型重构与功能完善
- 重构半成品流转逻辑:进度权威源改为 workpiece.currentStationNo,新增 completedText 快照字段,废除 doneProcessCodes - 清理物料品类中半成品类型,存量数据幂等清理,调整物料管理方式文案为批次/序列号 - 新增日排产状态专用更新接口,修复工单工艺校验逻辑 - 新增物料档案代理接口、深路径文件下载接口 - 优化前端界面文案与工位选择逻辑,补充追溯页半成品流转展示 - 调整WMS端物料品类校验与入库接口契约 - 新增/更新数据库表结构与实体类代码
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
package handler
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"errors"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strconv"
|
||||
"time"
|
||||
@@ -118,7 +118,7 @@ func StationTaskInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
}
|
||||
|
||||
// StationReportInternalHandler 工位终端工序报工(写工序实绩 + 步骤考核)
|
||||
// StationReportInternalHandler 工位终端工艺报工(写工位实绩 + 步骤考核)
|
||||
func StationReportInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var req logic.ReportProcessReq
|
||||
@@ -159,15 +159,14 @@ func FileDownloadInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
|
||||
// StationCheckinInternalHandler 工位终端暂存退库(半成品入库,块4/5)
|
||||
// 记录已完成工序后按半成品 INBOUND 流转,并通知 WMS 入库。
|
||||
// 进度由 MES 服务端自取(workpiece.currentStationNo),按半成品 INBOUND 流转并通知 WMS 入库。
|
||||
func StationCheckinInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var req struct {
|
||||
Sn string `json:"sn"`
|
||||
OrderNo string `json:"orderNo"`
|
||||
StationNo int `json:"stationNo"`
|
||||
ProcessCode int `json:"processCode"`
|
||||
Operator string `json:"operator"`
|
||||
Sn string `json:"sn"`
|
||||
OrderNo string `json:"orderNo"`
|
||||
StationNo int `json:"stationNo"`
|
||||
Operator string `json:"operator"`
|
||||
}
|
||||
if err := httpx.ParseJSON(r, &req); err != nil {
|
||||
httpx.BadRequest(w, "请求体解析失败")
|
||||
@@ -177,19 +176,14 @@ func StationCheckinInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc
|
||||
httpx.BadRequest(w, "缺少 sn")
|
||||
return
|
||||
}
|
||||
doneCodes := []int{}
|
||||
if req.ProcessCode > 0 {
|
||||
doneCodes = append(doneCodes, req.ProcessCode)
|
||||
}
|
||||
op := req.Operator
|
||||
if op == "" {
|
||||
op = operator(r, "")
|
||||
}
|
||||
if err := logic.New(svcCtx).SemiFlow(r.Context(), logic.SemiReq{
|
||||
Sn: req.Sn,
|
||||
OrderNo: req.OrderNo,
|
||||
DoneProcessCodes: doneCodes,
|
||||
Action: "INBOUND",
|
||||
Sn: req.Sn,
|
||||
OrderNo: req.OrderNo,
|
||||
Action: "INBOUND",
|
||||
}, op); err != nil {
|
||||
httpx.Fail(w, 2106, err.Error())
|
||||
return
|
||||
@@ -198,7 +192,6 @@ func StationCheckinInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// PerformanceExportHandler GET /performance/export 绩效报表导出(一个 xlsx 三个 sheet:按人/按工位/明细)
|
||||
// 执行全项目统一导出时间硬规则:起止必填(默认近3个月)、间隔≤1年
|
||||
func PerformanceExportHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
@@ -260,7 +253,6 @@ func PerformanceExportHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// normalizeExportRange MES 侧导出时间硬规则(与 WMS 同一套):
|
||||
// ① 起止都空 → 默认近 3 个月;② 只传一个 → 报错;③ 间隔 > 1 年 → 报错;④ 结束早于起始 → 报错。
|
||||
func normalizeExportRange(startDate, endDate string) (string, string, error) {
|
||||
|
||||
Reference in New Issue
Block a user