|
|
@ -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] |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|