Browse Source

历史排班

28169 9 months ago
parent
commit
5490312a30
1 changed files with 16 additions and 8 deletions
  1. 16 8
      controllers/stock_in_api_controller.go

+ 16 - 8
controllers/stock_in_api_controller.go View File

@@ -8036,16 +8036,24 @@ func (this *StockManagerApiController) GetInvetoryWarehouseInfoList() {
8036 8036
 				info = append(info, item)
8037 8037
 			}
8038 8038
 		}
8039
+		manufacturerList, _ := service.GetAllManufacturerList(orgId)
8040
+		dealerList, _ := service.GetAllDealerList(orgId)
8041
+		this.ServeSuccessJSON(map[string]interface{}{
8042
+			"list":             info,
8043
+			"manufacturerList": manufacturerList,
8044
+			"dealerList":       dealerList,
8045
+		})
8046
+	} else {
8047
+		manufacturerList, _ := service.GetAllManufacturerList(orgId)
8048
+		dealerList, _ := service.GetAllDealerList(orgId)
8049
+		this.ServeSuccessJSON(map[string]interface{}{
8050
+			"list":             list,
8051
+			"manufacturerList": manufacturerList,
8052
+			"dealerList":       dealerList,
8053
+			"info":             info,
8054
+		})
8039 8055
 	}
8040 8056
 
8041
-	manufacturerList, _ := service.GetAllManufacturerList(orgId)
8042
-	dealerList, _ := service.GetAllDealerList(orgId)
8043
-	this.ServeSuccessJSON(map[string]interface{}{
8044
-		"list":             list,
8045
-		"manufacturerList": manufacturerList,
8046
-		"dealerList":       dealerList,
8047
-		"info":             info,
8048
-	})
8049 8057
 }
8050 8058
 
8051 8059
 func (this *StockManagerApiController) GetNewGoodWarehouseInfo() {