250207-1代码。

routers/api/resourceProvison/MaterialReserveManagement/warehouse_inbound.py

@@ -33,9 +33,14 @@ async def create_pattern(
     db: Session = Depends(get_db)
 ):
     try:
+        room_id = body['room_id']
+        warehouse_info = warehouse_room_id_get_warehouse_room_info(db,room_id)
+        warehouse_id = ''
+        if warehouse_info:
+            warehouse_id = warehouse_info.warehouse_id
         new_inbound = ResourceProvisionInboundBasic(
             # id = new_guid(),
-            warehouse_id=body['warehouse_id'],
+            warehouse_id=warehouse_id, #body['warehouse_id'],
             purchase_order_number=body['purchase_order_number'],
             is_donation=body['is_donation'],
             transport_order_number=body['transport_order_number'],

routers/api/resourceProvison/MaterialReserveManagement/warehouse_root.py

@@ -186,3 +186,41 @@ async def delete_pattern(
     except Exception as e:
         traceback.print_exc()
         raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}")
+
+
+@router.get('/treeselect')
+async def gettreeselect(request: Request,room_name: str = Query(None, description='名称'),material_type_name: str = Query(None, description='名称'),db: Session = Depends(get_db), user_id: int = Depends(valid_access_token)):
+
+
+    query = db.query(ResourceProvisionWarehouseInfo)
+    query = query.filter_by(del_flag='0')
+    query = query.filter_by(status='1')
+    query = query.order_by(ResourceProvisionWarehouseInfo.create_time.desc())
+    lists = query.all()
+    data = []
+    for info in lists:
+        data_info = {"id": info.warehouse_id,
+                     "label": info.warehouse_name,
+                     "isWarehouse": True}
+        # material_list = warehouse_id_get_material_list(db,info.warehouse_id)
+        query1 = db.query(ResourceProvisionWarehouseRoomInfo)
+        query1 = query1.filter_by(warehouse=info.warehouse_id, del_flag='0')
+        if room_name:
+            query1 = query1.filter(ResourceProvisionWarehouseRoomInfo.room_name.like(f'%{room_name}%'))
+
+        room_list=  query1.all()
+        if room_list:
+            data_info['children'] = []
+            for room in room_list:
+
+                data_info['children'].append({"id": room.id,
+                         "label": room.room_name,
+                         "warehouse_id": info.warehouse_id,
+                         "warehouse_name":info.warehouse_name,
+                         "isWarehouse": False})
+        data.append(data_info)
+    return {
+        "code": 200,
+        "msg": "操作成功",
+        "data": data
+    }