Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_om

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 {