Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

controllers/stock_in_api_controller.go

@@ -8036,16 +8036,24 @@ func (this *StockManagerApiController) GetInvetoryWarehouseInfoList() {
 				info = append(info, item)
 			}
 		}
+		manufacturerList, _ := service.GetAllManufacturerList(orgId)
+		dealerList, _ := service.GetAllDealerList(orgId)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":             info,
+			"manufacturerList": manufacturerList,
+			"dealerList":       dealerList,
+		})
+	} else {
+		manufacturerList, _ := service.GetAllManufacturerList(orgId)
+		dealerList, _ := service.GetAllDealerList(orgId)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":             list,
+			"manufacturerList": manufacturerList,
+			"dealerList":       dealerList,
+			"info":             info,
+		})
 	}
 
-	manufacturerList, _ := service.GetAllManufacturerList(orgId)
-	dealerList, _ := service.GetAllDealerList(orgId)
-	this.ServeSuccessJSON(map[string]interface{}{
-		"list":             list,
-		"manufacturerList": manufacturerList,
-		"dealerList":       dealerList,
-		"info":             info,
-	})
 }
 
 func (this *StockManagerApiController) GetNewGoodWarehouseInfo() {