241212-1代码。

models/resource_provision_base.py

@@ -477,7 +477,7 @@ class ResourceProvisionProcurementDeclaration(Base):
 
     id = Column(Integer, primary_key=True, comment='ID')
     declaration_date = Column(DateTime, default=datetime.now, nullable=False, comment='申报日期')
-    declaration_amount = Column(Numeric(15, 2), nullable=False, comment='申报金额（元）')
+    declaration_amount = Column(Float, nullable=False, comment='申报金额（元）')
     declaration_unit = Column(String(255), nullable=False, comment='申报单位')
     declaration_person = Column(String(255), nullable=False, comment='申报人')
     declaration_details = Column(String(255), nullable=False, comment='申报情况')
@@ -500,7 +500,7 @@ class ResourceProvisionProcurementDeclarationDetail(Base):
     material_type = Column(String(255), nullable=False, comment='物资类型')
     material_code = Column(String(255), nullable=False, comment='物资名称')
     material_quantity = Column(Integer, nullable=False, comment='物资数量（件）')
-    material_unit_price = Column(Numeric(15, 2), nullable=False, comment='物资单价')
+    material_unit_price = Column(Float, 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='数据更新时间')

routers/api/resourceProvison/MaterialReserveManagement/material.py

@@ -367,7 +367,8 @@ async def delete_pattern(
             return JSONResponse(status_code=404, content={"code": 404, "msg": "warehouse room not found"})
         bar_info = material_id_get_material_barcode_info(db,id)
         info.del_flag='2'
-        bar_info.del_flag = '2'
+        if  bar_info is not None:
+            bar_info.del_flag = '2'
         delete_resource_provision_file(db, 'ResourceProvisionMaterialInfo', id)
         db.commit()
         return {"code": 200, "msg": "删除成功"}

routers/api/resourceProvison/MaterialReserveManagement/procurement.py

@@ -32,11 +32,12 @@ async def create_pattern(
 ):
     try:
         dept_info = user_id_get_user_info(db,user_id)
-        new_declaration = ResourceProvisionMaterialType(
+        new_declaration = ResourceProvisionProcurementDeclaration(
             id = new_guid(),
             declaration_amount=body['declaration_amount'],
             declaration_person=user_id,
             declaration_unit=dept_info.dept_id,
+            declaration_details = '1',
             create_by = user_id
         )
         db.add(new_declaration)
@@ -155,7 +156,7 @@ async def get_pattern_info(
                 "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": declaration_details,
                 "create_time": info.create_time}
         detail=[]
@@ -174,6 +175,7 @@ async def get_pattern_info(
                     "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()
@@ -207,15 +209,15 @@ async def get_pattern_list(
                 declaration_details = info.declaration_details
             else:
                 declaration_details = review_info.review_result
-            data = {"id": info.id,
+            data .append( {"id": info.id,
                     "declaration_date": info.declaration_date,
                     "declaration_amount": info.declaration_amount,
                     "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": declaration_details,
-                    "create_time": info.create_time}
+                    "create_time": info.create_time})
 
         return {"code": 200, "msg": "查询成功", "data": data,
                 "total": total_items,