From 302c591ca77dd4fb2b6e373d9912b91ee88f89f5 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 23 八月 2023 12:58:56 +0800
Subject: [PATCH] 下发工艺参数时使用nsq获取工艺参数
---
model/common/common.go | 53 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 43 insertions(+), 10 deletions(-)
diff --git a/model/common/common.go b/model/common/common.go
index c953878..c329eec 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 {
@@ -52,3 +54,34 @@
Procedures []*ProductProcedure `json:"procedures"` // 宸ュ簭鍒楄〃
}
)
+
+// PLC鍐欏叆鍦板潃
+type (
+ RequestPlcAddress struct {
+ DeviceId string
+ }
+ ResponsePlcAddress struct {
+ KeyData []byte
+ AddressData []byte
+ }
+)
+
+// 宸ヨ壓鍙傛暟
+type (
+ RequestProcessParams struct {
+ WorkOrder string `json:"workOrder,omitempty" form:"workOrder"` //宸ュ簭缂栧彿
+ OrderId string `json:"orderId"` // 璁㈠崟鍙�
+ Product string `json:"password"` // 浜у搧
+ Procedure string `json:"procedure"` // 宸ュ簭
+ Device string `json:"device"` // 璁惧
+ }
+ ResponseProcessParams struct {
+ Number string `json:"number"` //宸ヨ壓妯″瀷缂栧彿
+ OrderId string `json:"orderId"` //璁㈠崟id
+ Product string `json:"product"` //浜у搧鍚嶇О
+ Procedure string `json:"procedure"` //宸ュ簭
+ WorkOrder string `json:"workOrder"` //宸ュ崟
+ Device string `json:"device"` //璁惧
+ ParamsMap map[string]interface{} `json:"paramsMap"`
+ }
+)
--
Gitblit v1.8.0