241205-2代码。

routers/api/resourceProvison/MaterialReserveManagement/material.py

@@ -220,7 +220,7 @@ async def get_pattern_info(
         else:
             room_name = warehouse_room_info.room_name
         data = {
-            "id": info.id,
+            "material_id": info.material_id,
             "material_name": info.material_name,
             "warehouse_id": info.warehouse_id,
             "warehouse_name": warehouse_name,
@@ -269,19 +269,28 @@ async def get_pattern_info(
 
 @router.get("/list")
 async def get_pattern_list(
-    # name: str = Query(None, description='名称'),
+    material_id: str = Query(None, description='名称'),
+    material_name: str = Query(None, description='名称'),
+    warehouse_id: str = Query(None, description='名称'),
+    from_sys: str = Query(None, description='名称'),
     page: int = Query(1, gt=0, description='页码'),
     pageSize: int = Query(10, gt=0, description='每页条目数量'),
     db: Session = Depends(get_db)
 ):
     try:
-        query = db.query(ResourceProvisionWarehouseRoomInfo)
+        query = db.query(ResourceProvisionMaterialInfo)
         query = query.filter_by(del_flag='0')
-        # if name:
-        #     query = query.filter(ResourceProvisionWarehouseInfo.material_category_name.like(f'%{name}%'))
+        if material_id:
+            query = query.filter(ResourceProvisionMaterialInfo.material_id.like(f'%{material_id}%'))
+        if material_name:
+            query = query.filter(ResourceProvisionMaterialInfo.material_name.like(f'%{material_name}%'))
+        if warehouse_id:
+            query = query.filter(ResourceProvisionMaterialInfo.warehouse_id==warehouse_id)
+        if from_sys:
+            query = query.filter(ResourceProvisionMaterialInfo.from_sys==from_sys)
         total_items = query.count()
         # 排序
-        query = query.order_by(ResourceProvisionWarehouseRoomInfo.create_time.desc())
+        query = query.order_by(ResourceProvisionMaterialInfo.create_time.desc())
         # 执行分页查询
         lists = query.offset((page - 1) * pageSize).limit(pageSize).all()
         data = []
@@ -302,7 +311,7 @@ async def get_pattern_list(
             else:
                 room_name = warehouse_room_info.room_name
             data.append({
-            "id": info.id,
+            "material_id": info.material_id,
             "material_name": info.material_name,
             "warehouse_id": info.warehouse_id,
             "warehouse_name": warehouse_name,

routers/api/resourceProvison/MaterialReserveManagement/material_type.py

@@ -104,7 +104,7 @@ async def get_pattern_info(
 async def get_pattern_list(
     name: str = Query(None, description='名称'),
     page: int = Query(1, gt=0, description='页码'),
-    pageSize: int = Query(5, gt=0, description='每页条目数量'),
+    pageSize: int = Query(100, gt=0, description='每页条目数量'),
     db: Session = Depends(get_db)
 ):
     try:

routers/api/resourceProvison/MaterialReserveManagement/warehouse.py

@@ -131,7 +131,7 @@ async def get_pattern_info(
 async def get_pattern_list(
     # name: 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: