From 2c96bc009ce9b92049293949d563a80fca9cd6c8 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 21 八月 2023 19:50:24 +0800
Subject: [PATCH] 下道工序取用方式更改

---
 model/common/common.go |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/model/common/common.go b/model/common/common.go
index c953878..4bbc606 100644
--- a/model/common/common.go
+++ b/model/common/common.go
@@ -35,16 +35,18 @@
 	}
 
 	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"`
-		InputMaterials  []*ProcedureMaterial `json:"inputMaterials"`  // 杈撳叆鐗╂枡鍒楄〃
-		OutputMaterials []*ProcedureMaterial `json:"outputMaterials"` // 杈撳嚭鐗╂枡鍒楄〃
-		Workers         []*ProcedureWorker   `json:"workers"`         // 浜哄憳鍒楄〃
+		ProcedureID       string               `gorm:"uniqueIndex:idx_product_procedure;type:varchar(191);comment:宸ュ簭ID" json:"procedureId"`
+		ProcedureName     string               `gorm:"type:varchar(191);comment:宸ュ簭鍚嶇О锛屼粎鏌ヨ鐢�" json:"procedureName"`
+		NextProcedureID   string               `json:"nextProcedureId"`
+		NextProcedureName string               `json:"nextProcedureName"`
+		DeviceID          string               `gorm:"type:varchar(191);not null;comment:璁惧ID" json:"deviceId"`
+		DeviceName        string               `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"`
+		InputMaterials    []*ProcedureMaterial `json:"inputMaterials"`  // 杈撳叆鐗╂枡鍒楄〃
+		OutputMaterials   []*ProcedureMaterial `json:"outputMaterials"` // 杈撳嚭鐗╂枡鍒楄〃
+		Workers           []*ProcedureWorker   `json:"workers"`         // 浜哄憳鍒楄〃
 	}
 
 	DeliverScheduleTask struct {

--
Gitblit v1.8.0