From 4b2ee753c9a89d55b723d7ae1dcea92f0280af87 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Sat, 25 Jun 2022 12:33:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=B9=E9=87=8F=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E7=9A=84=E9=A2=84=E8=A3=85=E5=B7=A5=E5=8D=95schedKey?= =?UTF-8?q?=E7=9B=B8=E5=90=8C=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/om/implments/SerialOrder.Craft.impl.go | 2 ++ services/om/implments/SerialOrder.Logic.impl.go | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/services/om/implments/SerialOrder.Craft.impl.go b/services/om/implments/SerialOrder.Craft.impl.go index 865e6d5..010eba0 100644 --- a/services/om/implments/SerialOrder.Craft.impl.go +++ b/services/om/implments/SerialOrder.Craft.impl.go @@ -296,6 +296,7 @@ func (impl *SerialOrderServiceImplement) GenerateProductCraft(user *global.User, twMap := make(map[int][]baseModel.TightenWrenchInfo) planDate := serialOrder.PlanStartDate.Restore().Format(grmi.DateOutFormat) schedKey := serialOrder.SchedKey + priority := serialOrder.Priority var usedArticle *baseModel.Article var usedSerialOrder *model.SerialOrder for _, orderOPData := range orderPoMap { @@ -334,6 +335,7 @@ func (impl *SerialOrderServiceImplement) GenerateProductCraft(user *global.User, LastPieceInBatch: serialOrder.LastPieceInBatch, PreSchedKey: schedKey, SchedKey: schedKey, + Priority: priority, OrderType: baseModel.ORDER_TYPE_PRE, OrderType1: serialOrder.OrderType1, OrderType2: serialOrder.OrderType2, diff --git a/services/om/implments/SerialOrder.Logic.impl.go b/services/om/implments/SerialOrder.Logic.impl.go index 07b74d7..2d62864 100644 --- a/services/om/implments/SerialOrder.Logic.impl.go +++ b/services/om/implments/SerialOrder.Logic.impl.go @@ -182,6 +182,8 @@ func (impl *SerialOrderServiceImplement) CreateBatchSerialOrder(user *global.Use copy(preSerialOrder.LabelDetailLi, serialOrder.LabelDetailLi) for _, preOrder := range serialOrder.PreOrderLi { newPreOrder := preOrder + newPreOrder.SchedKey = serialOrder.SchedKey + newPreOrder.Priority = serialOrder.Priority newPreOrder.SerialOrderPOLstLi = make([]model.SerialOrderPOLst, len(preOrder.SerialOrderPOLstLi), len(preOrder.SerialOrderPOLstLi)) newPreOrder.SerialOrderStepLstLi = make([]model.SerialOrderStepLst, len(preOrder.SerialOrderStepLstLi), len(preOrder.SerialOrderStepLstLi)) newPreOrder.SerialOrderOPDetailLi = make([]model.SerialOrderOPDetail, len(preOrder.SerialOrderOPDetailLi), len(preOrder.SerialOrderOPDetailLi)) @@ -208,6 +210,8 @@ func (impl *SerialOrderServiceImplement) CreateBatchSerialOrder(user *global.Use copy(serialOrder.LabelDetailLi, preSerialOrder.LabelDetailLi) for _, preOrder := range preSerialOrder.PreOrderLi { newPreOrder := preOrder + newPreOrder.SchedKey = serialOrder.SchedKey + newPreOrder.Priority = serialOrder.Priority newPreOrder.SerialOrderPOLstLi = make([]model.SerialOrderPOLst, len(preOrder.SerialOrderPOLstLi), len(preOrder.SerialOrderPOLstLi)) newPreOrder.SerialOrderStepLstLi = make([]model.SerialOrderStepLst, len(preOrder.SerialOrderStepLstLi), len(preOrder.SerialOrderStepLstLi)) newPreOrder.SerialOrderOPDetailLi = make([]model.SerialOrderOPDetail, len(preOrder.SerialOrderOPDetailLi), len(preOrder.SerialOrderOPDetailLi)) @@ -235,6 +239,8 @@ func (impl *SerialOrderServiceImplement) CreateBatchSerialOrder(user *global.Use impl.ReplaceData(&serialOrder, serialNumber, false) for index, preOrder := range serialOrder.PreOrderLi { preOrder.MainOrderId = serialOrder.SerialOrderId + preOrder.SchedKey = serialOrder.SchedKey + preOrder.Priority = serialOrder.Priority serialNumber, err = snrDao.GetNextSnrWithTime(project.PreOrderSnr, serialOrder.PlanStartTime.Restore()) if err != nil { _ = session.Rollback()