fix: rebuild MES as compilable go-zero+ent backend (renamed bj_power_mes), restore 3 workstation projects from pristine original, align naming; all Go projects go build clean
This commit is contained in:
SunYF
@@ -6,6 +6,7 @@ import (
|
||||
|
||||
type (
|
||||
// === 工站监控（对齐 frontend-api.md 7.2 节）===
|
||||
|
||||
StationJobBrief {
|
||||
JobId int `json:"jobId"`
|
||||
WorkOrderId int `json:"workOrderId"`
|
||||
@@ -38,7 +39,9 @@ type (
|
||||
Stations []StationMonitorItem `json:"stations"`
|
||||
ActiveOrders []ActiveOrderSummary `json:"activeOrders"`
|
||||
}
|
||||
|
||||
// === 工单管理（对齐 frontend-api.md 第 5 节）===
|
||||
|
||||
QueryWorkOrdersReq {
|
||||
PageReq
|
||||
SortReq
|
||||
@@ -46,11 +49,18 @@ type (
|
||||
Statuses []string `form:"statuses,optional"`
|
||||
ProductTypeId int `form:"productTypeId,optional"`
|
||||
}
|
||||
DockQuantity {
|
||||
DockNo int `json:"dockNo"`
|
||||
Quantity int `json:"quantity"`
|
||||
}
|
||||
|
||||
CreateWorkOrderReq {
|
||||
ProductTypeId int `json:"productTypeId"`
|
||||
Quantity int `json:"quantity,optional"`
|
||||
WorkOrderNo string `json:"workOrderNo,optional"`
|
||||
Remark string `json:"remark,optional"`
|
||||
ProductTypeId int `json:"productTypeId"`
|
||||
PartNoId int `json:"partNoId,optional"` // 零件号ID（高压清洗机按零件号选 FANUC 程序），一个工单只选一个
|
||||
DockQuantities []DockQuantity `json:"dockQuantities" validate:"required"`
|
||||
WorkOrderNo string `json:"workOrderNo,optional"`
|
||||
Remark string `json:"remark,optional"`
|
||||
AllowAppend bool `json:"allowAppend,optional"`
|
||||
}
|
||||
CreateWorkOrderReply {
|
||||
Id int `json:"id"`
|
||||
@@ -60,7 +70,8 @@ type (
|
||||
ProductTypeId int `json:"productTypeId,optional"`
|
||||
Quantity int `json:"quantity,optional"`
|
||||
WorkOrderNo string `json:"workOrderNo,optional"`
|
||||
Remark string `json:"remark,optional"`
|
||||
|
||||
Remark string `json:"remark,optional"`
|
||||
}
|
||||
RestoreWorkOrderReply {
|
||||
OrderId int `json:"orderId"`
|
||||
@@ -69,7 +80,9 @@ type (
|
||||
ManualRequired bool `json:"manualRequired"`
|
||||
Message string `json:"message,omitempty"`
|
||||
}
|
||||
|
||||
// === 恢复扫描 ===
|
||||
|
||||
RecoveryScanItem {
|
||||
OrderId int `json:"orderId"`
|
||||
Status string `json:"status"`
|
||||
@@ -82,7 +95,9 @@ type (
|
||||
RecoveryScanReply {
|
||||
Items []RecoveryScanItem `json:"items"`
|
||||
}
|
||||
|
||||
// === 工单信息 ===
|
||||
|
||||
QueryWorkOrdersReply {
|
||||
PageReply
|
||||
Data []WorkOrderReply `json:"data"`
|
||||
@@ -92,22 +107,23 @@ type (
|
||||
No string `json:"no"`
|
||||
WorkOrderNo string `json:"workOrderNo"`
|
||||
ProductTypeId int `json:"productTypeId"`
|
||||
ProductTypeName string `json:"productTypeName"`
|
||||
ProductTypeCode string `json:"productTypeCode"`
|
||||
Quantity int `json:"quantity"`
|
||||
FinishedNum int `json:"finishedNum"`
|
||||
FailNum int `json:"failNum"`
|
||||
Status string `json:"status"`
|
||||
Source string `json:"source"`
|
||||
|
||||
Remark string `json:"remark,omitempty"`
|
||||
CreatedTime string `json:"createdTime"`
|
||||
UpdatedTime string `json:"updatedTime"`
|
||||
CompletedTime string `json:"completedTime,omitempty"`
|
||||
}
|
||||
|
||||
JobStatusCount {
|
||||
Status string `json:"status"`
|
||||
Count int `json:"count"`
|
||||
}
|
||||
|
||||
WorkOrderDetailReply {
|
||||
WorkOrderReply
|
||||
ProductTypeName string `json:"productTypeName"`
|
||||
@@ -115,7 +131,9 @@ type (
|
||||
JobStats []JobStatusCount `json:"jobStats"`
|
||||
TotalJobs int `json:"totalJobs"`
|
||||
}
|
||||
|
||||
// === 任务日志（对齐 frontend-api.md 8.4 节）===
|
||||
|
||||
QueryTaskLogsReq {
|
||||
PageReq
|
||||
SortReq
|
||||
@@ -141,6 +159,36 @@ type (
|
||||
DurationMs int64 `json:"durationMs"`
|
||||
CreatedAt string `json:"createdAt"`
|
||||
}
|
||||
|
||||
// === 停止工单 ===
|
||||
|
||||
QueryStopJobsReply {
|
||||
Items []StopWorkOrderItem `json:"items"`
|
||||
}
|
||||
|
||||
StopWorkOrderItem {
|
||||
TempSlotNo int `json:"tempSlotNo"`
|
||||
DockNo int `json:"dockNo"`
|
||||
DockSlotNo int `json:"dockSlotNo"`
|
||||
WorkpieceNo string `json:"workpieceNo"`
|
||||
JobId int `json:"jobId"`
|
||||
ProductTypeName string `json:"productTypeName"`
|
||||
CurrentStepId string `json:"currentStepId"`
|
||||
}
|
||||
StopWorkOrderReply {
|
||||
OrderId int `json:"orderId"`
|
||||
Phase string `json:"phase"` // cancelled / cancelling
|
||||
}
|
||||
StopWorkOrderConfirmReply {
|
||||
Success bool `json:"success"`
|
||||
}
|
||||
CancelStopWorkOrderReply {
|
||||
Success bool `json:"success"`
|
||||
}
|
||||
StopWorkOrderConfirmReq {
|
||||
OrderId int `json:"orderId"`
|
||||
Confirmed bool `json:"confirmed"`
|
||||
}
|
||||
)
|
||||
|
||||
@server (
|
||||
@@ -148,7 +196,7 @@ type (
|
||||
group: workorder
|
||||
prefix: /api/v1
|
||||
)
|
||||
service spherical-api {
|
||||
service hougai-api {
|
||||
@doc "工站监控"
|
||||
@handler stationMonitor
|
||||
get /stations/monitor returns (StationMonitorReply)
|
||||
@@ -207,7 +255,15 @@ service spherical-api {
|
||||
|
||||
@doc "停止工单"
|
||||
@handler stopWorkOrder
|
||||
post /work-orders/:id/stop (PathId)
|
||||
post /work-orders/:id/stop (PathId) returns (StopWorkOrderReply)
|
||||
|
||||
@doc "查询停止工单的待搬运工件"
|
||||
@handler queryStopJobs
|
||||
get /work-orders/stop/jobs/:id (PathId) returns (QueryStopJobsReply)
|
||||
|
||||
@doc "确认停止工单（搬运完成后）"
|
||||
@handler stopWorkOrderConfirm
|
||||
post /work-orders/:id/stop-confirm (StopWorkOrderConfirmReq) returns (StopWorkOrderConfirmReply)
|
||||
|
||||
@doc "删除工单"
|
||||
@handler deleteWorkOrder
|
||||
@@ -216,4 +272,8 @@ service spherical-api {
|
||||
@doc "批量删除工单"
|
||||
@handler deleteWorkOrders
|
||||
delete /work-orders (BatchExecIds) returns (BatchExecReply)
|
||||
|
||||
@doc "取消停止（取消 CANCELLING）"
|
||||
@handler cancelStopWorkOrder
|
||||
post /work-orders/:id/cancel-stop (PathId) returns (CancelStopWorkOrderReply)
|
||||
}
|
||||
Reference in New Issue
Block a user