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

---
 nsq/msg_handler.go |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index 82d2118..a45aed8 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -52,15 +52,16 @@
 		procedureRecords := make([]*model.Procedures, 0, len(task.Procedures))
 		for _, procedure := range task.Procedures {
 			procedureRecord := model.Procedures{
-				WorkOrderID:    task.WorkOrder.WorkOrderID,
-				OrderID:        task.WorkOrder.OrderID,
-				DeviceID:       procedure.DeviceID,
-				ProcedureID:    procedure.ProcedureID,
-				StartTime:      procedure.StartTime,
-				EndTime:        procedure.EndTime,
-				Status:         model.ProcedureStatusWaitProcess,
-				Channel:        procedure.Channel,
-				ProceduresInfo: common.ProductProcedure{},
+				ProductProcedureID: procedure.ProductProcedureID,
+				WorkOrderID:        task.WorkOrder.WorkOrderID,
+				OrderID:            task.WorkOrder.OrderID,
+				DeviceID:           procedure.DeviceID,
+				ProcedureID:        procedure.ProcedureID,
+				StartTime:          procedure.StartTime,
+				EndTime:            procedure.EndTime,
+				Status:             model.ProcedureStatusWaitProcess,
+				Channel:            procedure.Channel,
+				ProceduresInfo:     common.ProductProcedure{},
 			}
 			procedureData, err := json.Marshal(procedure)
 			if err != nil {

--
Gitblit v1.8.0