1.去掉了派生库存查询和座椅查询中的已拆包包装

2.修正了拆包记录查询中包装时间显示错误的问题

services/report/implments/CustomizedQuery.service.impl.go

@@ -189,6 +189,7 @@ func (impl *CustomizedQueryServiceImplement) querySerialOrdersWithMapping(user *
 		query = query.Join("INNER", jitMeta.PackOrderStatus.TableName, fmt.Sprintf("%s = %s and %s = %s", jitMeta.PackOrder_PlantNr.ColumnName, jitMeta.PackOrderStatus_PlantNr.ColumnName, jitMeta.PackOrder_PackOrderId.ColumnName, jitMeta.PackOrderStatus_PackOrderId.ColumnName))
 		query = query.Join("LEFT OUTER", jitMeta.ShipOrderDataLst.TableName, fmt.Sprintf("%s = %s and %s = %s", jitMeta.PackOrder_PlantNr.ColumnName, jitMeta.ShipOrderDataLst_PlantNr.ColumnName, jitMeta.PackOrder_PackOrderId.ColumnName, jitMeta.ShipOrderDataLst_PackOrderId.ColumnName))
 		query = query.Where(fmt.Sprintf("%s = ?", jitMeta.PackOrder_PlantNr.ColumnName), user.PlantNr)
+		query = query.Where(fmt.Sprintf("%s = ?", jitMeta.PackOrderStatus_Status.ColumnName), 80) // 不显示拆包数据
 		if projectId != "" {
 			query = query.Where(fmt.Sprintf("%s = ?", jitMeta.PackOrder_ProjectId.ColumnName), projectId)
 		}
@@ -719,8 +720,7 @@ func (impl *CustomizedQueryServiceImplement) PackingRecordQuery(user *global.Use
 	packOrders := make([]wrapper_PackOrder_Lite, 0, 1000)
 	{
 		query := session.Table(omMeta.SerialOrder.TableName)
-		query = query.Select(fmt.Sprintf("%s.*", jitMeta.PackOrder.TableName))
-		query = query.Select(fmt.Sprintf("%s.*", jitMeta.PackOrderStatus.TableName))
+		query = query.Select(fmt.Sprintf("%s.*, %s.*", jitMeta.PackOrder.TableName, jitMeta.PackOrderStatus.TableName))
 		query = query.Join("INNER", omMeta.SerialOrderStatus.TableName, fmt.Sprintf("%s = %s and %s = %s", omMeta.SerialOrder_PlantNr.ColumnName, omMeta.SerialOrderStatus_PlantNr.ColumnName, omMeta.SerialOrder_SerialOrderId.ColumnName, omMeta.SerialOrderStatus_SerialOrderId.ColumnName))
 		query = query.Join("LEFT OUTER", jitMeta.PackOrderItemLst.TableName, fmt.Sprintf("%s = %s and %s = %s", omMeta.SerialOrder_PlantNr.ColumnName, jitMeta.PackOrderItemLst_PlantNr.ColumnName, omMeta.SerialOrder_SerialOrderId.ColumnName, jitMeta.PackOrderItemLst_SerialOrderId.ColumnName))
 		query = query.Join("LEFT OUTER", jitMeta.PackOrder.TableName, fmt.Sprintf("%s = %s and %s = %s", jitMeta.PackOrderItemLst_PlantNr.ColumnName, jitMeta.PackOrder_PlantNr.ColumnName, jitMeta.PackOrderItemLst_PackOrderId.ColumnName, jitMeta.PackOrder_PackOrderId.ColumnName))