From 1c31947fd6902b570e3b9ac9eaab8ad9de58ee19 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 02 九月 2023 15:23:41 +0800
Subject: [PATCH] 获取任务逻辑调整，只获取本设备的工序，由工序反推订单
---
nsq/msg_handler.go | 108 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 72 insertions(+), 36 deletions(-)
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index be6dea7..af96211 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -43,41 +43,48 @@
return err
}
for _, task := range tasks {
+ oldWorkOrder, err := model.NewOrderSearch(nil).SetWorkOrderId(task.WorkOrder.WorkOrderID).First()
+ if oldWorkOrder != nil && oldWorkOrder.WorkOrderID != "" && oldWorkOrder.Status != model.OrderStatusWaitProcess { //宸插紑濮嬬殑宸ュ簭涓嶅彲浠ヤ慨鏀�
+ continue
+ }
+
+ procedureRecords := make([]*model.Procedures, 0, len(task.Procedures))
for _, procedure := range task.Procedures {
- if procedure.DeviceID == conf.Conf.System.DeviceId { //鍙瓨鍌ㄦ湰璁惧鐨勫伐搴�
- err = model.WithTransaction(func(db *gorm.DB) error {
- _, err := model.NewOrderSearch(db).SetWorkOrderId(task.WorkOrder.WorkOrderID).First()
- if err == gorm.ErrRecordNotFound {
- var orderRecord model.Order
- err = structx.AssignTo(task.WorkOrder, &orderRecord)
- orderRecord.Status = model.OrderStatusWaitProcess
- if err != nil {
- logx.Errorf(" structx.Assign task.Order to orderRecord err: %v", err.Error())
- return err
- }
- if err = model.NewOrderSearch(db).Create(&orderRecord); err != nil {
- return err
- }
- }
- procedureRecord := model.Procedures{
- StartTime: procedure.StartTime,
- EndTime: procedure.EndTime,
- WorkOrderID: task.WorkOrder.WorkOrderID,
- OrderID: task.WorkOrder.OrderID,
- Status: model.ProcedureStatusWaitProcess,
- }
- procedureData, err := json.Marshal(procedure)
- procedureRecord.ProcedureData = string(procedureData)
- if err != nil {
- logx.Errorf(" json.Marshal(procedure) err: %v", err.Error())
- return err
- }
- return model.NewProceduresSearch(db).Create(&procedureRecord)
- })
- if err != nil {
- logx.Errorf(" save procedure err: %v", err.Error())
- }
+ procedureRecord := model.Procedures{
+ WorkOrderID: task.WorkOrder.WorkOrderID,
+ OrderID: task.WorkOrder.OrderID,
+ DeviceID: procedure.DeviceID,
+ StartTime: procedure.StartTime,
+ EndTime: procedure.EndTime,
+ Status: model.ProcedureStatusWaitProcess,
+ ProcedureData: "",
+ ProceduresInfo: common.ProductProcedure{},
}
+ procedureData, err := json.Marshal(procedure)
+ if err != nil {
+ return err
+ }
+ procedureRecord.ProcedureData = string(procedureData)
+ procedureRecords = append(procedureRecords, &procedureRecord)
+ }
+
+ var orderRecord model.Order
+ err = structx.AssignTo(task.WorkOrder, &orderRecord)
+ orderRecord.Status = model.OrderStatusWaitProcess
+ if err != nil {
+ logx.Errorf(" structx.Assign task.Order to orderRecord err: %v", err.Error())
+ return err
+ }
+
+ err = model.WithTransaction(func(db *gorm.DB) error {
+ if err = model.NewOrderSearch(db).Save(&orderRecord); err != nil {
+ return err
+ }
+ return model.NewProceduresSearch(db).CreateBatch(procedureRecords)
+ })
+ if err != nil {
+ logx.Errorf(" save task message error err: %v", err.Error())
+ return err
}
}
return nil
@@ -134,11 +141,20 @@
func (slf *ProcessParams) HandleMessage(data []byte) (err error) {
logx.Infof("get an process params message :%s", data)
- var resp = new(common.ResponseProcessParams)
- err = json.Unmarshal(data, &resp)
+ var processModel model.ProcessModel
+ err = json.Unmarshal(data, &processModel)
if err != nil {
- logx.Errorf("ScheduleTask HandleMessage Unmarshal json err: %v", err.Error())
+ logx.Infof("unmarshal process params sync err :%s", err)
return err
+ }
+ if processModel.DeviceId != conf.Conf.System.DeviceId { //涓嶆槸鍙戠粰鏈澶囩殑娑堟伅
+ return nil
+ }
+ if processModel.Params != "" {
+ err = model.NewProcessModelSearch().Create(&processModel)
+ if err != nil {
+ logx.Infof("save process params err :%s", err)
+ }
}
//閫氱煡鍥炲鏀跺埌
ReceivedMessageChan <- &ReceivedMessage{
@@ -147,3 +163,23 @@
}
return nil
}
+
+type ProcessParamsSync struct {
+ Topic string
+}
+
+func (slf *ProcessParamsSync) HandleMessage(data []byte) (err error) {
+ logx.Infof("get an process params sync message :%s", data)
+ var processModel model.ProcessModel
+ err = json.Unmarshal(data, &processModel)
+ if err != nil {
+ logx.Infof("unmarshal process params sync err :%s", err)
+ return err
+ }
+ err = model.NewProcessModelSearch().Create(&processModel)
+ if err != nil {
+ logx.Infof("save process params sync err :%s", err)
+ return err
+ }
+ return nil
+}
--
Gitblit v1.8.0