feat: 完成多模块迭代更新
- 新增过程巡检按步骤上报、数量不符上报、工位退料功能 - 增加工单工程编号三级归属字段 - 新增物料安全库存与缺货预警 - 新增附件管理、退库单管理模块 - 优化生产看板展示逻辑与前端页面文案 - 清理冗余的工艺路线相关代码与备份文件
This commit is contained in:
@@ -34,10 +34,12 @@ type WorkOrder struct {
|
||||
FailNum int `json:"failNum,omitempty"`
|
||||
// 工位组合,如 1,3,5(本工单要经过的工位,按序执行)
|
||||
ProcessSeq string `json:"processSeq,omitempty"`
|
||||
// 关联工艺路线ID
|
||||
RouteId int `json:"routeId,omitempty"`
|
||||
// 工艺路线段快照,工单落地时固化路线段JSON数组
|
||||
RouteSnapshot []map[string]interface{} `json:"routeSnapshot,omitempty"`
|
||||
// 合同编号
|
||||
ContractNo string `json:"contractNo,omitempty"`
|
||||
// 工程编号(一个合同对应一个工程编号)
|
||||
ProjectNo string `json:"projectNo,omitempty"`
|
||||
// 产品序号(一个工程编号下各产品的序号)
|
||||
ProductSerial string `json:"productSerial,omitempty"`
|
||||
// Status holds the value of the "status" field.
|
||||
Status string `json:"status,omitempty"`
|
||||
// 计划开始
|
||||
@@ -60,11 +62,11 @@ func (*WorkOrder) scanValues(columns []string) ([]any, error) {
|
||||
values := make([]any, len(columns))
|
||||
for i := range columns {
|
||||
switch columns[i] {
|
||||
case workorder.FieldRouteSnapshot, workorder.FieldContext:
|
||||
case workorder.FieldContext:
|
||||
values[i] = new([]byte)
|
||||
case workorder.FieldID, workorder.FieldProductTypeId, workorder.FieldQuantity, workorder.FieldFinishedNum, workorder.FieldFailNum, workorder.FieldRouteId:
|
||||
case workorder.FieldID, workorder.FieldProductTypeId, workorder.FieldQuantity, workorder.FieldFinishedNum, workorder.FieldFailNum:
|
||||
values[i] = new(sql.NullInt64)
|
||||
case workorder.FieldWorkOrderNo, workorder.FieldProductCode, workorder.FieldProductName, workorder.FieldProcessSeq, workorder.FieldStatus:
|
||||
case workorder.FieldWorkOrderNo, workorder.FieldProductCode, workorder.FieldProductName, workorder.FieldProcessSeq, workorder.FieldContractNo, workorder.FieldProjectNo, workorder.FieldProductSerial, workorder.FieldStatus:
|
||||
values[i] = new(sql.NullString)
|
||||
case workorder.FieldPlanStart, workorder.FieldPlanEnd, workorder.FieldCompletedAt, workorder.FieldCreatedAt, workorder.FieldUpdatedAt:
|
||||
values[i] = new(sql.NullTime)
|
||||
@@ -137,19 +139,23 @@ func (_m *WorkOrder) assignValues(columns []string, values []any) error {
|
||||
} else if value.Valid {
|
||||
_m.ProcessSeq = value.String
|
||||
}
|
||||
case workorder.FieldRouteId:
|
||||
if value, ok := values[i].(*sql.NullInt64); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field routeId", values[i])
|
||||
case workorder.FieldContractNo:
|
||||
if value, ok := values[i].(*sql.NullString); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field contractNo", values[i])
|
||||
} else if value.Valid {
|
||||
_m.RouteId = int(value.Int64)
|
||||
_m.ContractNo = value.String
|
||||
}
|
||||
case workorder.FieldRouteSnapshot:
|
||||
if value, ok := values[i].(*[]byte); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field routeSnapshot", values[i])
|
||||
} else if value != nil && len(*value) > 0 {
|
||||
if err := json.Unmarshal(*value, &_m.RouteSnapshot); err != nil {
|
||||
return fmt.Errorf("unmarshal field routeSnapshot: %w", err)
|
||||
}
|
||||
case workorder.FieldProjectNo:
|
||||
if value, ok := values[i].(*sql.NullString); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field projectNo", values[i])
|
||||
} else if value.Valid {
|
||||
_m.ProjectNo = value.String
|
||||
}
|
||||
case workorder.FieldProductSerial:
|
||||
if value, ok := values[i].(*sql.NullString); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field productSerial", values[i])
|
||||
} else if value.Valid {
|
||||
_m.ProductSerial = value.String
|
||||
}
|
||||
case workorder.FieldStatus:
|
||||
if value, ok := values[i].(*sql.NullString); !ok {
|
||||
@@ -259,11 +265,14 @@ func (_m *WorkOrder) String() string {
|
||||
builder.WriteString("processSeq=")
|
||||
builder.WriteString(_m.ProcessSeq)
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("routeId=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.RouteId))
|
||||
builder.WriteString("contractNo=")
|
||||
builder.WriteString(_m.ContractNo)
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("routeSnapshot=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.RouteSnapshot))
|
||||
builder.WriteString("projectNo=")
|
||||
builder.WriteString(_m.ProjectNo)
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("productSerial=")
|
||||
builder.WriteString(_m.ProductSerial)
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("status=")
|
||||
builder.WriteString(_m.Status)
|
||||
|
||||
Reference in New Issue
Block a user