From efaf86c86f9882c52c53c6295561f268d6ed9ed6 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Fri, 15 Apr 2022 16:32:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A2=84=E8=A3=85=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E8=81=9A=E5=90=88=E5=B7=A5=E5=BA=8F=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../om/implments/SerialOrder.service.impl.go | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/services/om/implments/SerialOrder.service.impl.go b/services/om/implments/SerialOrder.service.impl.go index 5552351..73256dc 100644 --- a/services/om/implments/SerialOrder.service.impl.go +++ b/services/om/implments/SerialOrder.service.impl.go @@ -790,10 +790,10 @@ func (impl *SerialOrderServiceImplement) ReleaseSerialOrder(user *global.User, s _ = session.Rollback() return grmi.NewBusinessError("查询BOM子项数据失败, 错误:" + err.Error()) } - poDataMap := make(map[string]*baseModel.Process) + poDataMap := make(map[string]baseModel.Process) allPoIdInterfaceLi := make([]interface{}, 0, len(usedPoLi)) for _, po := range usedPoLi { - poDataMap[po.PO] = &po + poDataMap[po.PO] = po allPoIdInterfaceLi = append(allPoIdInterfaceLi, po.PO) } sfpUsedPoMap := make(map[string]interface{}) @@ -2153,11 +2153,10 @@ func (impl *SerialOrderServiceImplement) ChangeOrderSchedKey(user *global.User, return nil } -// GetOrderPOLi 获取工序所有的后序 -func (impl *SerialOrderServiceImplement) GetOrderPOLi(poData *baseModel.Process, allPoMap map[string]*baseModel.Process) []*baseModel.Process { - prePoLi := strings.Split(",", poData.PrePO) - - prePoDataLi := make([]*baseModel.Process, 0, len(prePoLi)) +// GetOrderPOLi 获取工序所有的前序 +func (impl *SerialOrderServiceImplement) GetOrderPOLi(poData baseModel.Process, allPoMap map[string]baseModel.Process) []baseModel.Process { + prePoLi := strings.Split(poData.PrePO, ",") + prePoDataLi := make([]baseModel.Process, 0, len(prePoLi)) for _, poId := range prePoLi { prePoData, exist := allPoMap[poId] if exist { @@ -2287,11 +2286,11 @@ func (impl *SerialOrderServiceImplement) GenerateCraftDataByCustOrder(user *glob _ = session.Rollback() return grmi.NewBusinessError("查询BOM子项数据失败, 错误:" + err.Error()) } - poDataMap := make(map[string]*baseModel.Process) + poDataMap := make(map[string]baseModel.Process) allPoIdInterfaceLi := make([]interface{}, 0, len(usedPoLi)) for _, po := range usedPoLi { - poDataMap[po.PO] = &po + poDataMap[po.PO] = po allPoIdInterfaceLi = append(allPoIdInterfaceLi, po.PO) } sfpUsedPoMap := make(map[string]interface{}) @@ -2781,11 +2780,11 @@ func (impl *SerialOrderServiceImplement) GenerateCraftData(user *global.User, se if err != nil { return grmi.NewBusinessError("查询BOM子项数据失败, 错误:" + err.Error()) } - poDataMap := make(map[string]*baseModel.Process) + poDataMap := make(map[string]baseModel.Process) allPoIdInterfaceLi := make([]interface{}, 0, len(usedPoLi)) for _, po := range usedPoLi { - poDataMap[po.PO] = &po + poDataMap[po.PO] = po allPoIdInterfaceLi = append(allPoIdInterfaceLi, po.PO) } sfpUsedPoMap := make(map[string]interface{})