feat: 大屏多订单改为同屏并列展示,物料申请新增跨工位借料来源并移除工单完成日期

This commit is contained in:
SunYF
2026-11-02 19:17:05 +08:00
parent 0c03d32682
commit fd2f0e2767
77 changed files with 1773 additions and 664 deletions
+1 -15
View File
@@ -42,8 +42,6 @@ type WorkOrder struct {
ProductSerial string `json:"productSerial,omitempty"`
// 创建人
CreatedBy string `json:"createdBy,omitempty"`
// 完成日期(必填)
DueDate *time.Time `json:"dueDate,omitempty"`
// 工艺组合 [{flowId,stationNo}] 按工位号升序
FlowCombination []map[string]int `json:"flowCombination,omitempty"`
// 来源产品工艺ID(0=无来源)
@@ -78,7 +76,7 @@ func (*WorkOrder) scanValues(columns []string) ([]any, error) {
values[i] = new(sql.NullInt64)
case workorder.FieldWorkOrderNo, workorder.FieldProductCode, workorder.FieldProductName, workorder.FieldContractNo, workorder.FieldOwnershipType, workorder.FieldProjectNo, workorder.FieldProductSerial, workorder.FieldCreatedBy, workorder.FieldStatus:
values[i] = new(sql.NullString)
case workorder.FieldDueDate, workorder.FieldPlanStart, workorder.FieldPlanEnd, workorder.FieldCompletedAt, workorder.FieldActualStart, workorder.FieldCreatedAt, workorder.FieldUpdatedAt:
case workorder.FieldPlanStart, workorder.FieldPlanEnd, workorder.FieldCompletedAt, workorder.FieldActualStart, workorder.FieldCreatedAt, workorder.FieldUpdatedAt:
values[i] = new(sql.NullTime)
default:
values[i] = new(sql.UnknownType)
@@ -173,13 +171,6 @@ func (_m *WorkOrder) assignValues(columns []string, values []any) error {
} else if value.Valid {
_m.CreatedBy = value.String
}
case workorder.FieldDueDate:
if value, ok := values[i].(*sql.NullTime); !ok {
return fmt.Errorf("unexpected type %T for field dueDate", values[i])
} else if value.Valid {
_m.DueDate = new(time.Time)
*_m.DueDate = value.Time
}
case workorder.FieldFlowCombination:
if value, ok := values[i].(*[]byte); !ok {
return fmt.Errorf("unexpected type %T for field flowCombination", values[i])
@@ -321,11 +312,6 @@ func (_m *WorkOrder) String() string {
builder.WriteString("createdBy=")
builder.WriteString(_m.CreatedBy)
builder.WriteString(", ")
if v := _m.DueDate; v != nil {
builder.WriteString("dueDate=")
builder.WriteString(v.Format(time.ANSIC))
}
builder.WriteString(", ")
builder.WriteString("flowCombination=")
builder.WriteString(fmt.Sprintf("%v", _m.FlowCombination))
builder.WriteString(", ")