增加workorder,完善

zhangqian

2023-08-18 478720790a6c7adfad82cf6829ef9471a00daab2

 nsq/msg_handler.go

@@ -3,6 +3,7 @@
import (
   "apsClient/conf"
   "apsClient/model"
   "apsClient/model/request"
   "apsClient/pkg/logx"
   "apsClient/pkg/structx"
   "encoding/json"
@@ -20,7 +21,7 @@
func (slf *ScheduleTask) HandleMessage(data []byte) (err error) {
   fmt.Println(string(data))

   var tasks = make([]*DeliverScheduleTask, 0)
   var tasks = make([]*request.DeliverScheduleTask, 0)

   err = json.Unmarshal(data, &tasks)
   if err != nil {
@@ -31,10 +32,10 @@
      for _, procedure := range task.Procedures {
         if procedure.DeviceID == conf.Conf.System.DeviceId { //只存储本设备的工序
            err = model.WithTransaction(func(db *gorm.DB) error {
               _, err := model.NewOrderSearch(db).SetOrderId(task.Order.OrderID).First()
               _, err := model.NewOrderSearch(db).SetWorkOrderId(task.WorkOrder.WorkOrderID).First()
               if err == gorm.ErrRecordNotFound {
                  var orderRecord model.Order
                  err = structx.AssignTo(task.Order, &orderRecord)
                  err = structx.AssignTo(task.WorkOrder, &orderRecord)
                  orderRecord.Status = model.OrderStatusUnFinished
                  if err != nil {
                     logx.Errorf(" structx.Assign task.Order to orderRecord err: %v", err.Error())
@@ -45,8 +46,9 @@
                  }
               }
               procedureRecord := model.Procedures{
                  OrderID: task.Order.OrderID,
                  Status:  model.ProcedureStatusUnFinished,
                  WorkOrderID: task.WorkOrder.WorkOrderID,
                  OrderID:     task.WorkOrder.OrderID,
                  Status:      model.ProcedureStatusUnFinished,
               }
               procedureData, err := json.Marshal(procedure)
               procedureRecord.ProcedureData = string(procedureData)