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:
@@ -29,8 +29,8 @@ type MaterialRequest struct {
|
||||
MaterialName string `json:"materialName,omitempty"`
|
||||
// Unit holds the value of the "unit" field.
|
||||
Unit string `json:"unit,omitempty"`
|
||||
// ManageMode holds the value of the "manageMode" field.
|
||||
ManageMode string `json:"manageMode,omitempty"`
|
||||
// SnMode holds the value of the "snMode" field.
|
||||
SnMode int `json:"snMode,omitempty"`
|
||||
// 需备数量
|
||||
ReqQty float64 `json:"reqQty,omitempty"`
|
||||
// Status holds the value of the "status" field.
|
||||
@@ -79,9 +79,9 @@ func (*MaterialRequest) scanValues(columns []string) ([]any, error) {
|
||||
values[i] = new(sql.NullBool)
|
||||
case materialrequest.FieldReqQty, materialrequest.FieldSentQty, materialrequest.FieldReceivedQty, materialrequest.FieldOverQty:
|
||||
values[i] = new(sql.NullFloat64)
|
||||
case materialrequest.FieldID, materialrequest.FieldStationNo, materialrequest.FieldFlowId, materialrequest.FieldReceivedAt:
|
||||
case materialrequest.FieldID, materialrequest.FieldSnMode, materialrequest.FieldStationNo, materialrequest.FieldFlowId, materialrequest.FieldReceivedAt:
|
||||
values[i] = new(sql.NullInt64)
|
||||
case materialrequest.FieldRequestNo, materialrequest.FieldOrderNo, materialrequest.FieldPlanDate, materialrequest.FieldMaterialCode, materialrequest.FieldMaterialName, materialrequest.FieldUnit, materialrequest.FieldManageMode, materialrequest.FieldStatus, materialrequest.FieldTargetDock, materialrequest.FieldReceiveBy, materialrequest.FieldSource, materialrequest.FieldOverReason, materialrequest.FieldRefReportNo, materialrequest.FieldBatchNo, materialrequest.FieldOperator:
|
||||
case materialrequest.FieldRequestNo, materialrequest.FieldOrderNo, materialrequest.FieldPlanDate, materialrequest.FieldMaterialCode, materialrequest.FieldMaterialName, materialrequest.FieldUnit, materialrequest.FieldStatus, materialrequest.FieldTargetDock, materialrequest.FieldReceiveBy, materialrequest.FieldSource, materialrequest.FieldOverReason, materialrequest.FieldRefReportNo, materialrequest.FieldBatchNo, materialrequest.FieldOperator:
|
||||
values[i] = new(sql.NullString)
|
||||
case materialrequest.FieldCreatedAt, materialrequest.FieldUpdatedAt:
|
||||
values[i] = new(sql.NullTime)
|
||||
@@ -142,11 +142,11 @@ func (_m *MaterialRequest) assignValues(columns []string, values []any) error {
|
||||
} else if value.Valid {
|
||||
_m.Unit = value.String
|
||||
}
|
||||
case materialrequest.FieldManageMode:
|
||||
if value, ok := values[i].(*sql.NullString); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field manageMode", values[i])
|
||||
case materialrequest.FieldSnMode:
|
||||
if value, ok := values[i].(*sql.NullInt64); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field snMode", values[i])
|
||||
} else if value.Valid {
|
||||
_m.ManageMode = value.String
|
||||
_m.SnMode = int(value.Int64)
|
||||
}
|
||||
case materialrequest.FieldReqQty:
|
||||
if value, ok := values[i].(*sql.NullFloat64); !ok {
|
||||
@@ -311,8 +311,8 @@ func (_m *MaterialRequest) String() string {
|
||||
builder.WriteString("unit=")
|
||||
builder.WriteString(_m.Unit)
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("manageMode=")
|
||||
builder.WriteString(_m.ManageMode)
|
||||
builder.WriteString("snMode=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.SnMode))
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("reqQty=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.ReqQty))
|
||||
|
||||
Reference in New Issue
Block a user