241205-1代码。

routers/api/resourceProvison/MaterialReserveManagement/warehouse_root.py

@@ -29,6 +29,8 @@ def warehouse_room_id_get_warehouse_room_info(db,id):
 def warehouse_id_get_warehouse_info(db,id):
     query = db.query(ResourceProvisionWarehouseInfo)
     query = query.filter_by(warehouse_id = id,del_flag = '0')
+    # query = query.filter(ResourceProvisionWarehouseInfo.warehouse_id== id)
+    # query = query.filter(ResourceProvisionWarehouseInfo.del_flag != '2')
     return query.first()
 
 
@@ -103,10 +105,11 @@ async def get_pattern_info(
         if not info:
             return JSONResponse(status_code=404,content={"code":404,"msg":"warehouse room not found"})
         warehouse_info = warehouse_id_get_warehouse_info(db,info.warehouse)
-        if not warehouse_info:
-            warehouse_name=None
-        else:
+        print(info.warehouse,warehouse_info)
+        if  warehouse_info:
             warehouse_name = warehouse_info.warehouse_name
+        else:
+            warehouse_name = None
         data = {
                 "id":info.id,
                 "warehouse_id": info.warehouse,
@@ -129,16 +132,16 @@ async def get_pattern_info(
 
 @router.get("/list")
 async def get_pattern_list(
-    # name: str = Query(None, description='名称'),
+    warehouse_id: str = Query(None, description='名称'),
     page: int = Query(1, gt=0, description='页码'),
-    pageSize: int = Query(10, gt=0, description='每页条目数量'),
+    pageSize: int = Query(100, gt=0, description='每页条目数量'),
     db: Session = Depends(get_db)
 ):
     try:
         query = db.query(ResourceProvisionWarehouseRoomInfo)
         query = query.filter_by(del_flag='0')
-        # if name:
-        #     query = query.filter(ResourceProvisionWarehouseInfo.material_category_name.like(f'%{name}%'))
+        if warehouse_id:
+            query = query.filter(ResourceProvisionWarehouseInfo.warehouse_id==warehouse_id)
         total_items = query.count()
         # 排序
         query = query.order_by(ResourceProvisionWarehouseRoomInfo.create_time.desc())