From dcf393c077af5638ea12c05dd6e1754fa535be20 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 27 十一月 2023 16:30:04 +0800
Subject: [PATCH] 排程任务下发增加productProcedureID,报工表和工序表增加productProcedureID

---
 model/report_work.go |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/model/report_work.go b/model/report_work.go
index 379c664..658ff65 100644
--- a/model/report_work.go
+++ b/model/report_work.go
@@ -9,20 +9,21 @@
 type (
 	ReportWork struct {
 		gorm.Model
-		ProceduresID uint   `gorm:"index;type:varchar(191)" json:"proceduresId"` //procedures琛ㄧ殑id
-		WorkOrderID  string `gorm:"index;type:varchar(191);not null" json:"workOrderId"`
-		DeviceID     string `gorm:"index;type:varchar(191)" json:"deviceId"`
-		DeviceName   string `gorm:"index;type:varchar(191)" json:"deviceName"`
-		ProcedureID  string `gorm:"index;type:varchar(191)" json:"procedureId"`
-		Channel      int32  `gorm:"index;" json:"channel"` //閫氶亾
-		StartTime    int64  `json:"startTime"`
-		EndTime      int64  `json:"endTime"`
-		ReportAmount int    `json:"reportAmount"` //鎶ュ伐鏁伴噺
-		FinishAmount int    `json:"finishAmount"` //鏈鎶ュ伐 - 涓婃鎶ュ伐
-		WorkerID     string `json:"workerID"`     //鎶ュ伐浜篿d
-		WorkerName   string `json:"workerName"`   //鎶ュ伐浜哄鍚�
-		WorkerTime   int64  `json:"workerTime"`   //宸ユ椂锛屽崟浣嶇
-		BarCode      string `json:"barCode"`      //鏉″舰鐮�
+		ProceduresID       uint   `gorm:"index;type:varchar(191)" json:"proceduresId"`                //procedures琛ㄧ殑id
+		ProductProcedureID string `gorm:"index;type:varchar(191);not null" json:"productProcedureID"` //浜у搧宸ュ簭id
+		WorkOrderID        string `gorm:"index;type:varchar(191);not null" json:"workOrderId"`
+		DeviceID           string `gorm:"index;type:varchar(191)" json:"deviceId"`
+		DeviceName         string `gorm:"index;type:varchar(191)" json:"deviceName"`
+		ProcedureID        string `gorm:"index;type:varchar(191)" json:"procedureId"`
+		Channel            int32  `gorm:"index;" json:"channel"` //閫氶亾
+		StartTime          int64  `json:"startTime"`
+		EndTime            int64  `json:"endTime"`
+		ReportAmount       int    `json:"reportAmount"` //鎶ュ伐鏁伴噺
+		FinishAmount       int    `json:"finishAmount"` //鏈鎶ュ伐 - 涓婃鎶ュ伐
+		WorkerID           string `json:"workerID"`     //鎶ュ伐浜篿d
+		WorkerName         string `json:"workerName"`   //鎶ュ伐浜哄鍚�
+		WorkerTime         int64  `json:"workerTime"`   //宸ユ椂锛屽崟浣嶇
+		BarCode            string `json:"barCode"`      //鏉″舰鐮�
 	}
 
 	ReportWorkSearch struct {

--
Gitblit v1.8.0