From c4eee48822aa3047e0390289ef8f145f72a157b8 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Tue, 7 Sep 2021 09:30:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BE=E5=B7=A5=E7=9A=84PO?= =?UTF-8?q?=E5=8F=AA=E6=A0=B9=E6=8D=AE=E6=98=AF=E5=90=A6=E6=9C=89depend=20?= =?UTF-8?q?on?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/schedule/SchedTask.Ctrl.go | 35 ++++++++++++++++++----------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/services/schedule/SchedTask.Ctrl.go b/services/schedule/SchedTask.Ctrl.go index b7ee410..b2db681 100644 --- a/services/schedule/SchedTask.Ctrl.go +++ b/services/schedule/SchedTask.Ctrl.go @@ -487,21 +487,30 @@ func (tasksrv *TaskSrv) ReleaseSerialOrder(relQty int, releaseId string) (err er _ = session.Rollback() return err } - firstPOMap := make(map[int]interface{}) - releasePOLi := make([]int, 0) + //firstPOMap := make(map[int]interface{}) + //releasePOLi := make([]int, 0) + //for _, po := range poDataLi { + // if po.IsFirstPO { + // firstPOMap[po.PO] = nil + // releasePOLi = append(releasePOLi, po.PO) + // } + //} + //for firstPO, _ := range firstPOMap { + // li := tasksrv.RecursionComposePO(firstPO, &poDataLi) + // if workLine.WorkLineid == "CN7C" { + // fmt.Println("RecursionComposePO li:", li) + // } + // releasePOLi = append(releasePOLi, li...) + //} + releasePOMap := make(map[int]interface{}, len(poDataLi)) + //for _, po := range releasePOLi { + // releasePOMap[po] = nil + //} for _, po := range poDataLi { - if po.IsFirstPO { - firstPOMap[po.PO] = nil - releasePOLi = append(releasePOLi, po.PO) + if po.HasDependOn { + continue } - } - for firstPO, _ := range firstPOMap { - li := tasksrv.RecursionComposePO(firstPO, &poDataLi) - releasePOLi = append(releasePOLi, li...) - } - releasePOMap := make(map[int]interface{}, len(releasePOLi)) - for _, po := range releasePOLi { - releasePOMap[po] = nil + releasePOMap[po.PO] = nil } poRecLi := make([]model.SerialOrderPOStatusRecLst, 0, len(poLi))