Merge pull request 'feature_CustomizedQuery' (#156) from feature_CustomizedQuery into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/156

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

@@ -374,7 +374,7 @@ func (impl *CustomizedQueryServiceImplement) ProductFamilyInventoryQuery(user *g
 			}
 			var inventoryQuantity float64 = 0
 			if packOrder.IsInventory() {
-				inventoryQuantity = float64(len(seats))
+				inventoryQuantity = 1
 			}
 			packTemplateIdLst, ok := productFamilyKeyMapping[packOrder.ProductFamilyKey]
 			// 没找到派生
@@ -425,7 +425,7 @@ func (impl *CustomizedQueryServiceImplement) ProductFamilyInventoryQuery(user *g
 			}
 			var inventoryQuantity float64 = 0
 			if packOrder.IsInventory() {
-				inventoryQuantity = float64(len(seats))
+				inventoryQuantity = 1
 			}
 			packTemplateIdLst, ok := productFamilyKeyMapping[packOrder.ProductFamilyKey]
 			// 没找到派生
@@ -494,7 +494,7 @@ func WriteExcelFile(result []ProductFamilyInventoryQuery_ProductFamilyStatistics
 	}
 
 	for _, productFamily := range result {
-		if err = WriteExcelRow(streamWriter, &rowIndex, productFamily.ProductFamilyId, productFamily.ProductFamilyId); err != nil {
+		if err = WriteExcelRow(streamWriter, &rowIndex, productFamily.ProductFamilyId, productFamily.InventoryQuantity); err != nil {
 			return
 		}
 
@@ -576,7 +576,7 @@ func (impl *CustomizedQueryServiceImplement) SeatQuery(user *global.User, serial
 	case "ok":
 		break
 	default:
-		errors.New("状态查询条件错误")
+		err = errors.New("状态查询条件错误")
 		return
 	}
 

web/controllers/report/CustomizedQuery.rest.go

@@ -146,7 +146,7 @@ func RegisterRouteMappingOfSeatQueryInCustomizedQuery(party router.Party, servic
 		}
 		urlParameters := ctx.URLParams()
 		var status string
-		if status, ok = urlParameters["serialorderid"]; !ok {
+		if status, ok = urlParameters["status"]; !ok {
 			status = ""
 		}
 		var serialOrderId string