From 8add418bbe07c9edb604c615b07394fed36646a4 Mon Sep 17 00:00:00 2001 From: allanwei Date: Thu, 23 Jun 2022 13:22:42 +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=E5=8F=91=E8=BF=90=E6=97=B6=E9=97=B4=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/implments/CustomizedQuery.service.impl.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/services/report/implments/CustomizedQuery.service.impl.go b/services/report/implments/CustomizedQuery.service.impl.go index 3cb9e37..c58d41d 100644 --- a/services/report/implments/CustomizedQuery.service.impl.go +++ b/services/report/implments/CustomizedQuery.service.impl.go @@ -210,7 +210,7 @@ func NewCustomizedQueryServiceImplement() *CustomizedQueryServiceImplement { * @Date : 2022-03-16 11:15 * ******************************************************************************/ -func (impl *CustomizedQueryServiceImplement) querySerialOrdersWithMapping(user *global.User, session *xorm.Session, projectId string) (shipOrders []wrapper_ShipOrder, packOrderGroups map[string][]*wrapper_PackOrder, serialOrderGroups map[string][]*wrapper_SerialOrder, productFamilyKeyMapping map[string][]string, err error) { +func (impl *CustomizedQueryServiceImplement) querySerialOrdersWithMapping(user *global.User, session *xorm.Session, projectId string) (shipOrders []*wrapper_ShipOrder, packOrderGroups map[string][]*wrapper_PackOrder, serialOrderGroups map[string][]*wrapper_SerialOrder, productFamilyKeyMapping map[string][]string, err error) { // 查询座椅-座椅状态-包装单项 serialOrders := make([]wrapper_SerialOrder, 0, 1000) @@ -261,20 +261,20 @@ func (impl *CustomizedQueryServiceImplement) querySerialOrdersWithMapping(user * } // 合并正式发运单和预发运单 - shipOrderMapping := make(map[string]wrapper_ShipOrder) + shipOrderMapping := make(map[string]*wrapper_ShipOrder) - for _, shipOrder := range allShipOrders { + for i, shipOrder := range allShipOrders { if shipOrder.ShipType == "ADVANCE" { - shipOrderMapping[shipOrder.ShipOrder.ShipOrderId] = shipOrder + shipOrderMapping[shipOrder.ShipOrder.ShipOrderId] = &allShipOrders[i] } } - for _, shipOrder := range allShipOrders { + for i, shipOrder := range allShipOrders { if shipOrder.ShipType == "FORMAL" { if _, ok := shipOrderMapping[shipOrder.ShipOrder.SourceId]; ok { delete(shipOrderMapping, shipOrder.ShipOrder.SourceId) } - shipOrderMapping[shipOrder.ShipOrder.ShipOrderId] = shipOrder + shipOrderMapping[shipOrder.ShipOrder.ShipOrderId] = &allShipOrders[i] } }