241214-2代码。

models/resource_provision_base.py

@@ -526,4 +526,62 @@ class ResourceProvisionProcurementReview(Base):
     create_by = Column(BigInteger, default=None, comment='创建者')
     update_by = Column(BigInteger, default=None, comment='更新者')
     del_flag = Column(String(1), default='0', comment='删除标志（0代表存在 2代表删除）')
+    remark = Column(Text, nullable=True, comment='备注')
+
+
+class ResourceProvisionDispatch(Base):
+    __tablename__ = 'resource_provision_dispatch'
+
+    id = Column(Integer, primary_key=True, comment='ID')
+    dispatch_date = Column(DateTime, default=datetime.now, nullable=False, comment='调度日期')
+    dispatch_purpose = Column(Text, nullable=False, comment='调度目的')
+    dispatch_unit = Column(String(255), nullable=False, comment='申报单位')
+    dispatch_person = Column(String(255), nullable=False, comment='申报人')
+    dispatch_details = Column(String(255), nullable=False, comment='申报情况')
+    create_time = Column(DateTime, default=datetime.now, comment='数据创建时间')
+    update_time = Column(DateTime, default=datetime.now, onupdate=datetime.now, comment='数据更新时间')
+    create_dept = Column(BigInteger, default=None, comment='创建部门')
+    create_by = Column(BigInteger, default=None, comment='创建者')
+    update_by = Column(BigInteger, default=None, comment='更新者')
+    del_flag = Column(String(1), default='0', comment='删除标志（0代表存在 2代表删除）')
+    remark = Column(Text, nullable=True, comment='备注')
+
+
+class ResourceProvisionDispatchDetail(Base):
+    __tablename__ = 'resource_provision_dispatch_detail'
+
+    id = Column(Integer, primary_key=True, comment='ID')
+    serial_number = Column(Integer, nullable=False, comment='序号')
+    dispatch_id = Column(String(255), nullable=False, comment='调度基础表id')
+    warehouse_id= Column(String(255), nullable=False, comment='仓库id')
+    material_type_id = Column(String(255), nullable=False, comment='物资类型id')
+    material_type = Column(String(255), nullable=False, comment='物资类型')
+    material_code = Column(String(255), nullable=False, comment='物资id')
+    material_name = Column(String(255), nullable=False, comment='物资名称')
+    material_quantity = Column(Integer, nullable=False, comment='物资数量（件）')
+    material_purpose = Column(Text, nullable=False, comment='物资用途')
+    create_time = Column(DateTime, default=datetime.now, comment='数据创建时间')
+    update_time = Column(DateTime, default=datetime.now, onupdate=datetime.now, comment='数据更新时间')
+    create_dept = Column(BigInteger, default=None, comment='创建部门')
+    create_by = Column(BigInteger, default=None, comment='创建者')
+    update_by = Column(BigInteger, default=None, comment='更新者')
+    del_flag = Column(String(1), default='0', comment='删除标志（0代表存在 2代表删除）')
+    remark = Column(Text, nullable=True, comment='备注')
+
+
+class ResourceProvisionDispatchReview(Base):
+    __tablename__ = 'resource_provision_dispatch_review'
+
+    id = Column(Integer, primary_key=True, comment='ID')
+    reviewer = Column(String(255), nullable=False, comment='审核人')
+    dispatch_id = Column(Integer, nullable=False, comment='调度基础表id')
+    review_result = Column(String(50), nullable=False, comment='审核结果')
+    review_comments = Column(Text, comment='审核意见')
+    review_date = Column(DateTime, default=datetime.now, comment='审核时间')
+    create_time = Column(DateTime, default=datetime.now, comment='数据创建时间')
+    update_time = Column(DateTime, default=datetime.now, onupdate=datetime.now, comment='数据更新时间')
+    create_dept = Column(BigInteger, default=None, comment='创建部门')
+    create_by = Column(BigInteger, default=None, comment='创建者')
+    update_by = Column(BigInteger, default=None, comment='更新者')
+    del_flag = Column(String(1), default='0', comment='删除标志（0代表存在 2代表删除）')
     remark = Column(Text, nullable=True, comment='备注')

routers/api/resourceProvison/MaterialReserveManagement/__init__.py

@@ -9,7 +9,7 @@ from . import warehouse_root
 from . import material
 from . import m_count
 from . import procurement
-
+from . import dispatch
 router = APIRouter()
 
 
@@ -19,3 +19,4 @@ router.include_router(warehouse_root.router, prefix="/warehouse_root", tags=["
 router.include_router(material.router, prefix="/material", tags=["物资"])
 router.include_router(m_count.router, prefix="/count", tags=["物资统计"])
 router.include_router(procurement.router, prefix="/procurement", tags=["物资申报"])
+router.include_router(dispatch.router, prefix="/dispatch", tags=["物资调度"])

routers/api/resourceProvison/MaterialReserveManagement/dispatch.py

@@ -0,0 +1,358 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+from fastapi import APIRouter, Request, Depends, Query, HTTPException, status,WebSocket,WebSocketDisconnect
+from common.security import valid_access_token,valid_websocket_token
+from fastapi.responses import JSONResponse
+from sqlalchemy.orm import Session
+from sqlalchemy.sql import func
+from common.auth_user import *
+from sqlalchemy import  text
+from pydantic import BaseModel
+from common.BigDataCenterAPI import *
+from database import get_db
+from typing import List
+from models import *
+from utils import *
+from utils.spatial import *
+from utils.ry_system_util import *
+from utils.resource_provision_util import *
+from common.websocketManager import *
+import json
+import traceback
+
+router = APIRouter()
+
+
+@router.post("/create")
+async def create_pattern(
+    user_id=Depends(valid_access_token),
+    body = Depends(remove_xss_json),
+    db: Session = Depends(get_db)
+):
+    try:
+        dept_info = user_id_get_user_info(db,user_id)
+        new_dispatch = ResourceProvisionDispatch(
+            id = new_guid(),
+            dispatch_purpose=body['dispatch_purpose'],
+            dispatch_person=user_id,
+            dispatch_unit=dept_info.dept_id,
+            dispatch_status = '1',
+            create_by = user_id
+        )
+        db.add(new_dispatch)
+        for info in body['detail']:
+            material_type_info = type_id_get_material_type_info(db, info['material_type_id'])
+            if material_type_info:
+                material_category_name = material_type_info.material_category_name
+            else:
+                material_category_name = None
+            material_into = material_id_get_material_info(db, info['material_code'])
+            if material_into:
+                material_name = material_into.material_name
+            else:
+                material_name = None
+            new_detail = ResourceProvisionDispatchDetail(
+                id=new_guid(),
+                serial_number=info['serial_number'],
+                dispatch_id = new_dispatch.id,
+                warehouse_id = info['warehouse_id'],
+                material_type_id = info['material_type_id'],
+                material_type = material_category_name,
+                material_code = info['material_code'],
+                material_name = material_name,
+                material_quantity = info['material_quantity'],
+                material_purpose = info['material_purpose'],
+                create_by = user_id
+            )
+            db.add(new_detail)
+        db.commit()
+        return {"code": 200, "msg": "创建成功", "data": None}
+    except Exception as e:
+        traceback.print_exc()
+        raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}")
+
+
+
+@router.put("/update/{id}")
+async def update_dispatch(
+    id :str ,
+    user_id=Depends(valid_access_token),
+    body=Depends(remove_xss_json),
+    db: Session = Depends(get_db)
+):
+    try:
+        update_dispatch = dispatch_id_get_dispatch_info(db,id)
+        if not update_dispatch:
+            return JSONResponse(status_code=404,content={"code":404,"msg":"dispatch not found"})
+        if str(update_dispatch.dispatch_person) != str(user_id):
+            return JSONResponse(status_code=404, content={"code": 404, "msg": "dispatch not permission"})
+        update_dispatch.dispatch_purpose = body['dispatch_purpose']
+        update_dispatch.update_by = user_id
+
+        detail_list = []
+        for info in body['detail']:
+            material_type_info = type_id_get_material_type_info(db, info['material_type_id'])
+            if material_type_info:
+                material_category_name = material_type_info.material_category_name
+            else:
+                material_category_name = None
+            material_into = material_id_get_material_info(db, info['material_code'])
+            if material_into:
+                material_name = material_into.material_name
+            else:
+                material_name = None
+            if info['id']=='':
+                new_detail = ResourceProvisionDispatchDetail(
+                    id=new_guid(),
+                    serial_number=info['serial_number'],
+                    dispatch_id=update_dispatch.id,
+                    warehouse_id=info['warehouse_id'],
+                    material_type_id=info['material_type_id'],
+                    material_type=material_category_name,
+                    material_code=info['material_code'],
+                    material_name=material_name,
+                    material_quantity=info['material_quantity'],
+                    material_purpose=info['material_purpose'],
+                    create_by=user_id
+                )
+                db.add(new_detail)
+                detail_list.append(new_detail.id)
+            else:
+                detail = detail_id_get_declaration_detail_info(db,info['id'])
+                if detail is None:
+                    new_detail = ResourceProvisionDispatchDetail(
+                        id=new_guid(),
+                        serial_number=info['serial_number'],
+                        dispatch_id=update_dispatch.id,
+                        warehouse_id=info['warehouse_id'],
+                        material_type_id=info['material_type_id'],
+                        material_type=material_category_name,
+                        material_code=info['material_code'],
+                        material_name=material_name,
+                        material_quantity=info['material_quantity'],
+                        material_purpose=info['material_purpose'],
+                        create_by=user_id
+                    )
+                    db.add(new_detail)
+                    detail_list.append(new_detail.id)
+                else:
+                    detail.serial_number = info['serial_number']
+                    detail.warehouse_id = info['warehouse_id']
+                    detail.material_type_id = info['material_type_id']
+                    detail.material_type = material_category_name
+                    detail.material_code = info['material_code']
+                    detail.material_name = material_name
+                    detail.material_quantity = info['material_quantity']
+                    detail.material_unit_price = info['material_unit_price']
+                    detail.material_purpose = info['material_purpose']
+                    detail.update_by = user_id
+                    detail_list.append(info['id'])
+            query = db.query(ResourceProvisionDispatchDetail)
+            query = query.filter_by(declaration_id=id, del_flag='0').filter(~ResourceProvisionDispatchDetail.id.in_(detail_list))
+            for i in query.all():
+                i.del_flag='2'
+        db.commit()
+        return {"code": 200, "msg": "更新成功"}
+    except Exception as e:
+        traceback.print_exc()
+        raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}")
+
+@router.get("/info/{id}")
+async def get_pattern_info(
+    id: str,
+    db: Session = Depends(get_db)
+):
+    try:
+
+        info = dispatch_id_get_dispatch_info(db,id)
+        if not info:
+            return JSONResponse(status_code=404,content={"code":404,"msg":"dispatch not found"})
+        dept_info = dept_id_get_dept_info(db,info.declaration_unit)
+        user_info = user_id_get_user_info(db,info.declaration_person)
+        review_info = dispatch_id_get_dispatch_review_info(db,id)
+        if review_info is None:
+            dispatch_status = info.dispatch_status
+        else:
+            dispatch_status = review_info.review_result
+        data = {"id": info.id,
+                "dispatch_date": info.declaration_date,
+                "dispatch_purpose": info.declaration_amount,
+                "dispatch_unit": info.declaration_unit,
+                "dispatch_unit_name": dept_info.dept_name,
+                "dispatch_person": info.declaration_person,
+                "dispatch_person_name": user_info.nick_name,
+                "dispatch_status": dispatch_status,
+                "create_time": info.create_time}
+        detail=[]
+        for detail_info in dispatch_id_get_dispatch_detail_list(db,id):
+            # material_type_info = type_id_get_material_type_info(db,detail_info.material_type)
+            # if material_type_info:
+            #     material_category_name=material_type_info.material_category_name
+            # else:
+            #     material_category_name = None
+            # material_into = material_id_get_material_info(db,detail_info.material_code)
+            # if material_into:
+            #     material_name = material_into.material_name
+            # else:
+            #     material_name = None
+            warehouse_info = warehouse_id_get_warehouse_info(db,detail_info.warehouse_id)
+            if warehouse_info:
+                warehouse_name = warehouse_info.warehouse_name
+            else:
+                warehouse_name = None
+            detail.append({"id":detail_info.id,
+                    "serial_number":detail_info.serial_number,
+                    "warehouse_id":detail_info.warehouse_id,
+                    "warehouse_name":warehouse_name,
+                    "material_type":detail_info.material_type,
+                    "material_type_id":detail_info.material_type_id,
+                    "material_code":detail_info.material_code,
+                    "material_name":detail_info.material_name,
+                    "material_quantity":detail_info.material_quantity,
+                    "material_unit_price":detail_info.material_unit_price,
+                    "material_purpose":detail_info.material_purpose})
+        data['detail']=detail
+        return {"code": 200, "msg": "获取成功", "data": data}
+    except Exception as e:
+        traceback.print_exc()
+        raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}")
+
+@router.get("/list")
+async def get_pattern_list(
+    # declaration_details: str = Query(None, description='名称'),
+    page: int = Query(1, gt=0, description='页码'),
+    pageSize: int = Query(None, gt=0, description='每页条目数量'),
+    db: Session = Depends(get_db)
+):
+    try:
+        query = db.query(ResourceProvisionDispatch)
+        query = query.filter_by(del_flag='0')
+
+        total_items = query.count()
+        # 排序
+        if pageSize is None:
+            pageSize=total_items
+        query = query.order_by(ResourceProvisionDispatch.declaration_date.desc())
+        # 执行分页查询
+        lists = query.offset((page - 1) * pageSize).limit(pageSize).all()
+        data = []
+        for info in lists:
+            dept_info = dept_id_get_dept_info(db, info.dispatch_unit)
+            user_info = user_id_get_user_info(db, info.declaration_person)
+            review_info = declaration_id_get_declaration_review_info(db, info.id)
+            if review_info is None:
+                dispatch_status = info.dispatch_status
+            else:
+                dispatch_status = review_info.review_result
+            data .append( {"id": info.id,
+                    "dispatch_date": info.dispatch_date,
+                    "dispatch_purpose": info.dispatch_purpose,
+                    "dispatch_unit": info.dispatch_unit,
+                    "dispatch_unit_name": dept_info.dept_name,
+                    "dispatch_person": info.declaration_person,
+                    "dispatch_person_name": user_info.nick_name,
+                    "dispatch_status": dispatch_status,
+                    "create_time": info.create_time})
+
+        return {"code": 200, "msg": "查询成功", "data": data,
+                "total": total_items,
+                "page": page,
+                "pageSize": pageSize,
+                "totalPages": (total_items + pageSize - 1) // pageSize
+                }
+    except Exception as e:
+        traceback.print_exc()
+        raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}")
+
+# @router.delete("/delete/{id}")
+# async def delete_pattern(
+#     id: str,
+#     db: Session = Depends(get_db)
+# ):
+#     try:
+#         # 检查图案是否存在
+#         info = dispatch_id_get_dispatch_info(db, id)
+#         if not info:
+#             return JSONResponse(status_code=404, content={"code": 404, "msg": "type not found"})
+#         info.del_flag='2'
+#         review_info = declaration_id_get_declaration_review_info(db, id)
+#         review_info.del_flag ='2'
+#         for detail_info in declaration_id_get_declaration_detail_list(db, id):
+#             detail_info.del_flag='2'
+#         db.commit()
+#         return {"code": 200, "msg": "删除成功"}
+#     except Exception as e:
+#         traceback.print_exc()
+#         raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}")
+
+
+@router.post("/review")
+async def create_pattern(
+    user_id=Depends(valid_access_token),
+    body = Depends(remove_xss_json),
+    db: Session = Depends(get_db)
+):
+    try:
+        new_review = ResourceProvisionDispatchReview(
+            id=new_guid(),
+            reviewer=user_id,
+            declaration_id=body['dispatch_id'],
+            review_result=body['review_result'],
+            review_comments=body['review_comments'],
+            create_by = user_id
+        )
+        db.add(new_review)
+        db.commit()
+        return {"code": 200, "msg": "审核成功", "data": None}
+    except Exception as e:
+        traceback.print_exc()
+        raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}")
+
+
+@router.get("/review/list")
+async def get_pattern_list(
+    page: int = Query(1, gt=0, description='页码'),
+    pageSize: int = Query(None, gt=0, description='每页条目数量'),
+    db: Session = Depends(get_db)
+):
+    try:
+        review_list = [info.declaration_id for info in get_declaration_review_list(db)]
+        query = db.query(ResourceProvisionDispatch)
+        query = query.filter_by(del_flag='0')
+        query = query.filter(~ResourceProvisionDispatch.id.in_(review_list))
+        total_items = query.count()
+        # 排序
+        if pageSize is None:
+            pageSize=total_items
+        query = query.order_by(ResourceProvisionDispatch.declaration_date.desc())
+        # 执行分页查询
+        lists = query.offset((page - 1) * pageSize).limit(pageSize).all()
+        data = []
+        for info in lists:
+            dept_info = dept_id_get_dept_info(db, info.dispatch_unit)
+            user_info = user_id_get_user_info(db, info.dispatch_person)
+            # review_info = declaration_id_get_declaration_review_info(db, info.id)
+            # if review_info is None:
+            #     declaration_details = info.declaration_details
+            # else:
+            #     declaration_details = review_info.review_result
+            data = {"id": info.id,
+                    "dispatch_date": info.dispatch_date,
+                    "dispatch_purpose": info.dispatch_purpose,
+                    "dispatch_unit": info.dispatch_unit,
+                    "dispatch_unit_name": dept_info.dept_name,
+                    "dispatch_person": info.dispatch_person,
+                    "dispatch_person_name": user_info.nick_name,
+                    "dispatch_status": info.dispatch_status,
+                    "create_time": info.create_time}
+
+        return {"code": 200, "msg": "查询成功", "data": data,
+                "total": total_items,
+                "page": page,
+                "pageSize": pageSize,
+                "totalPages": (total_items + pageSize - 1) // pageSize
+                }
+    except Exception as e:
+        traceback.print_exc()
+        raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}")

routers/api/resourceProvison/MaterialReserveManagement/procurement.py

@@ -319,7 +319,7 @@ async def get_pattern_list(
                     "declaration_unit": info.declaration_unit,
                     "declaration_unit_name": dept_info.dept_name,
                     "declaration_person": info.declaration_person,
-                    "declaration_person_name": user_info.user_name,
+                    "declaration_person_name": user_info.nick_name,
                     "declaration_details": info.declaration_details,
                     "create_time": info.create_time}
 

utils/resource_provision_util.py

@@ -172,6 +172,7 @@ def get_resource_provision_file_query_fun(db,from_scenario,foreign_key):
         "url":  file.file_name  #"/api/file/download/%s" %
     } for file in files]
     return result
+# 申报采购部分
 def declaration_id_get_declaration_info(db,id):
     query = db.query(ResourceProvisionProcurementDeclaration)
     query = query.filter_by(id = id,del_flag = '0')
@@ -194,4 +195,26 @@ def get_declaration_review_list(db):
     query = db.query(ResourceProvisionProcurementReview)
     query = query.filter_by(del_flag = '0')
     return query.all()
+# 申请调度部分
+def dispatch_id_get_dispatch_info(db,id):
+    query = db.query(ResourceProvisionDispatch)
+    query = query.filter_by(id = id,del_flag = '0')
+    return query.first()
+def dispatch_id_get_dispatch_detail_list(db,id):
+    query = db.query(ResourceProvisionDispatchDetail)
+    query = query.filter_by(declaration_id = id,del_flag = '0')
+    query = query.order_by(ResourceProvisionDispatchDetail.serial_number)
+    return query.all()
+def detail_id_get_dispatch_detail_info(db,id):
+    query = db.query(ResourceProvisionDispatchDetail)
+    query = query.filter_by(id = id,del_flag = '0')
+    return query.first()
 
+def dispatch_id_get_dispatch_review_info(db,id):
+    query = db.query(ResourceProvisionDispatchReview)
+    query = query.filter_by(declaration_id = id,del_flag = '0')
+    return query.first()
+def get_dispatch_review_list(db):
+    query = db.query(ResourceProvisionDispatchReview)
+    query = query.filter_by(del_flag = '0')
+    return query.all()