From 2c96bc009ce9b92049293949d563a80fca9cd6c8 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 21 八月 2023 19:50:24 +0800
Subject: [PATCH] 下道工序取用方式更改
---
service/task.go | 9 ---------
model/common/common.go | 22 ++++++++++++----------
model/response/common.go | 5 ++---
docs/swagger.yaml | 6 ++++--
docs/docs.go | 9 ++++++---
docs/swagger.json | 9 ++++++---
6 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index b074161..b32229d 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -490,6 +490,12 @@
"$ref": "#/definitions/common.ProcedureMaterial"
}
},
+ "nextProcedureId": {
+ "type": "string"
+ },
+ "nextProcedureName": {
+ "type": "string"
+ },
"outputMaterials": {
"description": "杈撳嚭鐗╂枡鍒楄〃",
"type": "array",
@@ -857,9 +863,6 @@
},
"deviceStatus": {
"type": "string"
- },
- "nextProcedure": {
- "$ref": "#/definitions/model.Procedures"
},
"order": {
"$ref": "#/definitions/model.Order"
diff --git a/docs/swagger.json b/docs/swagger.json
index 6214d47..ae5d0c7 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -478,6 +478,12 @@
"$ref": "#/definitions/common.ProcedureMaterial"
}
},
+ "nextProcedureId": {
+ "type": "string"
+ },
+ "nextProcedureName": {
+ "type": "string"
+ },
"outputMaterials": {
"description": "杈撳嚭鐗╂枡鍒楄〃",
"type": "array",
@@ -845,9 +851,6 @@
},
"deviceStatus": {
"type": "string"
- },
- "nextProcedure": {
- "$ref": "#/definitions/model.Procedures"
},
"order": {
"$ref": "#/definitions/model.Order"
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index ea34318..67965d9 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -36,6 +36,10 @@
items:
$ref: '#/definitions/common.ProcedureMaterial'
type: array
+ nextProcedureId:
+ type: string
+ nextProcedureName:
+ type: string
outputMaterials:
description: 杈撳嚭鐗╂枡鍒楄〃
items:
@@ -282,8 +286,6 @@
type: string
deviceStatus:
type: string
- nextProcedure:
- $ref: '#/definitions/model.Procedures'
order:
$ref: '#/definitions/model.Order'
procedure:
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 {
diff --git a/model/response/common.go b/model/response/common.go
index 1a42102..8a25c70 100644
--- a/model/response/common.go
+++ b/model/response/common.go
@@ -19,9 +19,8 @@
}
type TaskData struct {
- Order *model.Order
- Procedure *model.Procedures
- NextProcedure *model.Procedures
+ Order *model.Order
+ Procedure *model.Procedures
Config
}
diff --git a/service/task.go b/service/task.go
index e173964..3cb816f 100644
--- a/service/task.go
+++ b/service/task.go
@@ -52,18 +52,9 @@
if err != nil {
return nil, ecode.DBErr
}
- nextProcedure := new(model.Procedures)
- nextProcedure, err = model.NewProceduresSearch(nil).
- SetWorkOrderId(order.WorkOrderID).
- SetStatus(model.ProcedureStatusUnFinished).
- SetId(procedure.ID + 1).First()
- if err == nil {
- nextProcedure.ProceduresInfo.ProcedureName = "--"
- }
taskData = new(response.TaskData)
taskData.Order = order
taskData.Procedure = procedure
- taskData.NextProcedure = nextProcedure
return taskData, ecode.OK
}
--
Gitblit v1.8.0