From 06cff5f59c72d36b745515d98b9e645e92bb91a3 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 23 八月 2023 20:14:23 +0800
Subject: [PATCH] 修改获取工艺参数等待超时,修改生产进度返回值参数

---
 model/work_order.go |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/model/work_order.go b/model/work_order.go
index 6848342..ed4ca40 100644
--- a/model/work_order.go
+++ b/model/work_order.go
@@ -22,7 +22,7 @@
 		Unit        string          `gorm:"type:varchar(100);comment:鍗曚綅" json:"unit"`
 		StartTime   int64           `gorm:"comment:璁″垝寮�濮嬫椂闂�" json:"startTime"`
 		EndTime     int64           `gorm:"comment:璁″垝缁撴潫鏃堕棿" json:"endTime"`
-		Status      OrderStatus     `json:"-"`
+		Status      OrderStatus
 	}
 
 	OrderSearch struct {
@@ -97,7 +97,7 @@
 	}
 
 	if slf.WorkOrderID != "" {
-		db = db.Where("work_order_id = ?", slf.OrderID)
+		db = db.Where("work_order_id = ?", slf.WorkOrderID)
 	}
 
 	if slf.Status != 0 {

--
Gitblit v1.8.0