feat: 退料闭环定稿(损耗台账/备料清单/退料AGV自动派车/剩余量参考)+ 工位托盘守卫

- MES 新增损耗台账 loss_ledger,差异确认损耗接口 ConfirmReceiveLoss(按工单归集)
- 备料清单 preparation:MES 按 日计划×工单×工位×物料 实时计算,WMS 只读展示 PreparationList
- 退料闭环:N5 工位托盘守卫(未完成禁止退料)、退料 AGV 自动派车(JBT21 空位判定 + 托盘回收链路)、退料参考剩余量接口(应剩余=实备-已耗-已退-已损)
- 新增 AGV 车辆状态表 agv_vehicle_state 及查询
- 整合接驳台/叫料池/库存锁既有闭环,清理 sql 目录注释生成脚本与 catalog,更新文档
This commit is contained in:
SunYF
2026-11-04 19:06:03 +08:00
parent 42bcf395d2
commit 46fcb59079
123 changed files with 10666 additions and 3227 deletions
+41 -2
View File
@@ -68,6 +68,12 @@ type MaterialRequest struct {
LossQty *float64 `json:"lossQty,omitempty"`
// 损耗原因(有损耗时必填,主管在损耗台账批注)
LossReason string `json:"lossReason,omitempty"`
// 库管实收量(WMS 确认收货回写)
ReceiveQty *float64 `json:"receiveQty,omitempty"`
// 收货差异=应退-实收(>0 为少收,记待核,不自动进损耗台账)
ReceiveDiff *float64 `json:"receiveDiff,omitempty"`
// 收货差异备注(库管填写,说明差异原因)
ReceiveNote string `json:"receiveNote,omitempty"`
// CreatedAt holds the value of the "createdAt" field.
CreatedAt time.Time `json:"createdAt,omitempty"`
// UpdatedAt holds the value of the "updatedAt" field.
@@ -84,11 +90,11 @@ func (*MaterialRequest) scanValues(columns []string) ([]any, error) {
values[i] = new([]byte)
case materialrequest.FieldNeedAgv, materialrequest.FieldCrossDay:
values[i] = new(sql.NullBool)
case materialrequest.FieldReqQty, materialrequest.FieldSentQty, materialrequest.FieldReturnedQty, materialrequest.FieldTheoryQty, materialrequest.FieldLossQty:
case materialrequest.FieldReqQty, materialrequest.FieldSentQty, materialrequest.FieldReturnedQty, materialrequest.FieldTheoryQty, materialrequest.FieldLossQty, materialrequest.FieldReceiveQty, materialrequest.FieldReceiveDiff:
values[i] = new(sql.NullFloat64)
case materialrequest.FieldID, materialrequest.FieldSnMode, materialrequest.FieldStationNo:
values[i] = new(sql.NullInt64)
case materialrequest.FieldRequestNo, materialrequest.FieldMaterialCode, materialrequest.FieldMaterialName, materialrequest.FieldUnit, materialrequest.FieldStatus, materialrequest.FieldTargetDock, materialrequest.FieldSource, materialrequest.FieldRefReportNo, materialrequest.FieldAgvTaskNo, materialrequest.FieldOutboundNo, materialrequest.FieldRejectReason, materialrequest.FieldOperator, materialrequest.FieldWorkOrderNo, materialrequest.FieldReturnDock, materialrequest.FieldLossReason:
case materialrequest.FieldRequestNo, materialrequest.FieldMaterialCode, materialrequest.FieldMaterialName, materialrequest.FieldUnit, materialrequest.FieldStatus, materialrequest.FieldTargetDock, materialrequest.FieldSource, materialrequest.FieldRefReportNo, materialrequest.FieldAgvTaskNo, materialrequest.FieldOutboundNo, materialrequest.FieldRejectReason, materialrequest.FieldOperator, materialrequest.FieldWorkOrderNo, materialrequest.FieldReturnDock, materialrequest.FieldLossReason, materialrequest.FieldReceiveNote:
values[i] = new(sql.NullString)
case materialrequest.FieldCreatedAt, materialrequest.FieldUpdatedAt:
values[i] = new(sql.NullTime)
@@ -267,6 +273,26 @@ func (_m *MaterialRequest) assignValues(columns []string, values []any) error {
} else if value.Valid {
_m.LossReason = value.String
}
case materialrequest.FieldReceiveQty:
if value, ok := values[i].(*sql.NullFloat64); !ok {
return fmt.Errorf("unexpected type %T for field receiveQty", values[i])
} else if value.Valid {
_m.ReceiveQty = new(float64)
*_m.ReceiveQty = value.Float64
}
case materialrequest.FieldReceiveDiff:
if value, ok := values[i].(*sql.NullFloat64); !ok {
return fmt.Errorf("unexpected type %T for field receiveDiff", values[i])
} else if value.Valid {
_m.ReceiveDiff = new(float64)
*_m.ReceiveDiff = value.Float64
}
case materialrequest.FieldReceiveNote:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field receiveNote", values[i])
} else if value.Valid {
_m.ReceiveNote = value.String
}
case materialrequest.FieldCreatedAt:
if value, ok := values[i].(*sql.NullTime); !ok {
return fmt.Errorf("unexpected type %T for field createdAt", values[i])
@@ -395,6 +421,19 @@ func (_m *MaterialRequest) String() string {
builder.WriteString("lossReason=")
builder.WriteString(_m.LossReason)
builder.WriteString(", ")
if v := _m.ReceiveQty; v != nil {
builder.WriteString("receiveQty=")
builder.WriteString(fmt.Sprintf("%v", *v))
}
builder.WriteString(", ")
if v := _m.ReceiveDiff; v != nil {
builder.WriteString("receiveDiff=")
builder.WriteString(fmt.Sprintf("%v", *v))
}
builder.WriteString(", ")
builder.WriteString("receiveNote=")
builder.WriteString(_m.ReceiveNote)
builder.WriteString(", ")
builder.WriteString("createdAt=")
builder.WriteString(_m.CreatedAt.Format(time.ANSIC))
builder.WriteString(", ")