From 478720790a6c7adfad82cf6829ef9471a00daab2 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 18 八月 2023 15:50:41 +0800
Subject: [PATCH] 增加workorder,完善
---
model/request/schedule_task.go | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/model/request/schedule_task.go b/model/request/schedule_task.go
index 43ca48c..dfe7a8e 100644
--- a/model/request/schedule_task.go
+++ b/model/request/schedule_task.go
@@ -4,7 +4,8 @@
// 鎺掔▼浠诲姟涓嬪彂
type (
- Order struct {
+ WorkOrder struct {
+ WorkOrderID string `json:"workOrderId"`
OrderID string `gorm:"index;type:varchar(191);not null;comment:璁㈠崟ID" json:"orderId"`
ProductID string `gorm:"type:varchar(191);comment:浜у搧ID" json:"productId"`
ProductName string `gorm:"type:varchar(191);comment:浜у搧鍚嶇О" json:"productName"`
@@ -29,12 +30,15 @@
WorkerID string `gorm:"type:varchar(2048);comment:浜哄憳ID" json:"workerId"`
WorkerName string `gorm:"unique;type:varchar(191);not null;comment:浜哄憳濮撳悕" json:"workerName"`
PhoneNum string `gorm:"type:varchar(191);comment:鎵嬫満鍙�" json:"phoneNum"`
+ StartTime int64 `gorm:"comment:寮�濮嬫椂闂�" json:"startTime"`
+ EndTime int64 `gorm:"comment:缁撴潫鏃堕棿" json:"endTime"`
}
ProductProcedure struct {
ProcedureID string `gorm:"uniqueIndex:idx_product_procedure;type:varchar(191);comment:宸ュ簭ID" json:"procedureId"`
ProcedureName string `gorm:"type:varchar(191);comment:宸ュ簭鍚嶇О锛屼粎鏌ヨ鐢�" json:"procedureName"`
DeviceID string `gorm:"type:varchar(191);not null;comment:璁惧ID" json:"deviceId"`
+ DeviceName string `gorm:"type:varchar(191);not null;comment:璁惧鍚嶇О" json:"deviceName"`
StartTime int64 `gorm:"comment:璁″垝寮�濮嬫椂闂�" json:"startTime"`
EndTime int64 `gorm:"comment:璁″垝缁撴潫鏃堕棿" json:"endTime"`
WorkHours decimal.Decimal `gorm:"type:decimal(35,18);comment:宸ユ椂" json:"workHours"`
@@ -44,7 +48,7 @@
}
DeliverScheduleTask struct {
- Order Order `json:"order"`
+ WorkOrder WorkOrder `json:"workOrder"`
Procedures []*ProductProcedure `json:"procedures"` // 宸ュ簭鍒楄〃
}
)
--
Gitblit v1.8.0