From 9fe522dadc7b3475a1e831571775e5192f7e9a18 Mon Sep 17 00:00:00 2001 From: allanwei Date: Wed, 23 Mar 2022 14:39:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E5=BA=A7=E6=A4=85?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../implments/CustomizedQuery.service.impl.go | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/services/report/implments/CustomizedQuery.service.impl.go b/services/report/implments/CustomizedQuery.service.impl.go index 6502be1..3cb9e37 100644 --- a/services/report/implments/CustomizedQuery.service.impl.go +++ b/services/report/implments/CustomizedQuery.service.impl.go @@ -263,13 +263,13 @@ func (impl *CustomizedQueryServiceImplement) querySerialOrdersWithMapping(user * // 合并正式发运单和预发运单 shipOrderMapping := make(map[string]wrapper_ShipOrder) - for _, shipOrder := range shipOrders { + for _, shipOrder := range allShipOrders { if shipOrder.ShipType == "ADVANCE" { shipOrderMapping[shipOrder.ShipOrder.ShipOrderId] = shipOrder } } - for _, shipOrder := range shipOrders { + for _, shipOrder := range allShipOrders { if shipOrder.ShipType == "FORMAL" { if _, ok := shipOrderMapping[shipOrder.ShipOrder.SourceId]; ok { delete(shipOrderMapping, shipOrder.ShipOrder.SourceId) @@ -278,7 +278,6 @@ func (impl *CustomizedQueryServiceImplement) querySerialOrdersWithMapping(user * } } - shipOrders = make([]wrapper_ShipOrder, 0, 100) for _, shipOrder := range shipOrderMapping { shipOrders = append(shipOrders, shipOrder) } @@ -650,7 +649,6 @@ func (impl *CustomizedQueryServiceImplement) SeatQuery(user *global.User, serial engine := db.Eloquent.Master() session := engine.NewSession() defer session.Close() - switch status { case "": break @@ -682,11 +680,17 @@ func (impl *CustomizedQueryServiceImplement) SeatQuery(user *global.User, serial } for _, shipOrder := range shipOrders { + if shipOrder.ShipOrder.ShipOrderId == "C20220306238108J01" { + fmt.Printf("-0") + } packOrderGroup, ok := packOrderGroups[shipOrder.ShipOrder.ShipOrderId] if !ok { continue } delete(packOrderGroups, shipOrder.ShipOrder.ShipOrderId) + if shipOrder.ShipOrder.ShipOrderId == "C20220306238108J01" { + fmt.Printf("-1") + } for _, packOrder := range packOrderGroup { if status == "packed" && packOrder.PackOrderStatus.Status != 80 { continue @@ -697,6 +701,9 @@ func (impl *CustomizedQueryServiceImplement) SeatQuery(user *global.User, serial continue } delete(serialOrderGroups, packOrder.PackOrder.PackOrderId) + if shipOrder.ShipOrder.ShipOrderId == "C20220306238108J01" { + fmt.Printf("-2") + } var packTemplateIds string packTemplateIdLst, ok := productFamilyKeyMapping[packOrder.ProductFamilyKey] if ok {