Compare commits

..
Author SHA1 Message Date
wuzilongandCursor 233c2c7faa fix(pl): 加油汇总卡片排除报废车辆。
验收反馈:顶部车牌卡片不再展示 vehicle_status=scrapped 的自有车。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-19 18:02:11 +08:00
wuzilong a4d747aece Merge branch 'codex/issue-48-fuel-avg-rate-42852718d883' into V3.0
加油汇总顶部近10/20/30次平均油耗(#48),待用户测试。
2026-11-19 18:00:10 +08:00
wuzilongandCursor c658f78329 feat(pl): 加油汇总顶部改为近10/20/30次平均油耗。
按相邻登记的升数与期初公里差计算 L/100km,并恢复汇总页车牌卡片展示。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-19 18:00:00 +08:00
wuzilongandCursor 90fc25f3fe fix(crm): 被引用合同明细的空品牌与不限品牌视为同一身份。
编辑页会把历史空品牌提交为 any,原先被当成更换产品身份,导致无法同时新增明细。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-18 20:33:48 +08:00
wuzilongandCursor d333e97bec fix(web): 派车日历在日期旁显示红色星期。
手工日历和普通日历都能直接看出当天是星期几。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-18 13:50:41 +08:00
wuzilongandCursor f9d031bacb fix(pl): 未打标计划按生效时间判断是否走客户品类额度规则。
安排前版本为空时不再一律当成旧规则,归档和实际调整与安排判定保持一致。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-18 13:50:41 +08:00
wuzilongandCursor 3f62af430f fix(pl): 同市与异地混跑时结转只要求本组来源有实运量。
运输证分组只有部分来源时,忽略实际量里多出来的来源,不再整单报缺实际量。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-18 13:50:41 +08:00
wuzilongandCursor 643221c61f feat(crm): 客户增加同市标记,装卸段选客户时默认带入。
同市客户在运输计划装货、卸货段自动带出同市,同市运输只要求购买证。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-18 13:50:41 +08:00
wuzilongandCursor a7b9386e79 fix(pl): 报废车和三方车不再生成证件到期提醒。
扫描时跳过这两类车辆,并关闭已经存在的待提醒。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-18 13:45:29 +08:00
wuzilongandCursor 9f8dd0590a fix(pl): 购买证和运输证有效期改为按计划日期比对。
安排与归档不再取今天和计划日期的较晚值,历史计划按自身计划日期判断证件是否有效。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-18 13:45:28 +08:00
wuzilongandCursor ff2f05c522 fix(pl): 运输归档角标不再统计 2026-09-01 及更早的计划。
菜单数字只计计划日期晚于 2026-09-01、已安排且未归档的计划。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-18 13:45:28 +08:00
wuzilongandCursor 7cef2d0f9d fix(crm): 合同详情基本信息展示合同备注。
表单已可录入备注,详情页此前未展示,补齐查看态。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-17 17:19:16 +08:00
wuzilongandCursor 9143eb776c fix(crm): 合同 PC 新增/编辑表单补全合同备注字段。
列表与移动端已有合同级备注,PC 弹窗此前仅有产品行备注,导致无法录入。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-17 17:12:27 +08:00
wuzilong 366c69b8a3 merge: issue #45 再安排排除本单一次有效占用。 2026-11-17 12:39:55 +08:00
wuzilongandCursor 4f24fd9658 fix(pl): 再安排时排除本单一次有效占用并归还预占余量。
避免已安排计划再次保存时,把本单预占的一次有效购买证误判为已使用。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-17 12:39:50 +08:00
wuzilong 97d6ec4b8a merge: issue #45 内部站点清合同并隐藏已释放关联证件。 2026-11-17 12:10:48 +08:00
wuzilongandCursor 2045e7de89 fix(pl): 内部站点清空合同,并隐藏已释放关联证件。
避免山峡/云栋装送段残留外部合同选证,以及 released 用量行仍出现在计划详情关联证件中。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-17 12:09:06 +08:00
wuzilongandCursor eab882f92c fix(deploy): nginx 隐藏 MinIO 上游 CORS 头避免双 Origin。
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-16 15:42:03 +08:00
wuzilongandCursor 04450fff88 fix(web-admin): 运输归档合计行与可见表头列对齐。
planNo 可隐藏后不再硬编码插入,避免统计行按索引错位。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-16 15:42:03 +08:00
wuzilongandCursor 82c21262ed fix(web-admin): 顶栏菜单折叠按钮改为内联 SVG 并始终可见。
避免 Iconify/el-icon 在部分浏览器不绘制,并去掉可关闭开关以免按钮被关掉。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-16 15:42:03 +08:00
wuzilongandCursor 8ac835fa96 fix(pl): 未安排计划按生效时间走新规则选证。
安排预检不再把空版本当成 legacy 去查合同绑证,与证书齐备待完善判定一致。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-16 15:26:12 +08:00
wuzilong e9f3602459 Merge branch 'codex/issue-43-cert-ready-pending-a8f3c1d9e2b4' into V3.0 2026-11-16 15:03:00 +08:00
wuzilong d2b8a573a1 Merge remote-tracking branch 'origin/V3.0' into V3.0 2026-11-16 15:02:57 +08:00
wuzilongandCursor 79d1242d25 fix(pl): 安排前证书齐备按生效时间写入待完善。
避免版本未打标时被当成 legacy,导致待完善列表漏单;安排打成新规则时回补 pending。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-16 15:02:45 +08:00
wuzilongandCursor 7e515d9ccd fix(pl): 客户品类安排运输时采用已保存单位换算。
安排自动选证不再忽略计划段次用证中的 manualAllocations,避免瓶升等异单位已填换算仍无法安排。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-16 10:56:29 +08:00
wuzilong 12652b826d merge: issue #40 证件额度切点改为按首次安排时间并冻结版本。 2026-11-15 19:47:58 +08:00
wuzilongandCursor be0ba622a0 fix(pl): 证件额度切点改为按首次安排时间并冻结版本。
切点前已安排的计划归档跳过购买证/运输证校验;创建较早但安排在生效后的计划走客户+品类新规则。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-15 19:11:02 +08:00
wuzilongandCursor f865d8ed99 fix(pl): 证用品类差量复用软删关联,并修正归档用证结转与证面品类展示。
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-15 18:52:33 +08:00
wuzilong 6f20c0ff8a merge: issue #39 安排运输购买证失败提示补全客户与产品。 2026-11-15 16:57:52 +08:00
wuzilongandCursor 14516dd2d0 fix(pl): 安排运输购买证失败提示补全客户名与产品名。
无匹配购买证时点名异地客户与产品,便于对照建档;来源 snapshot 补充展示用产品名且不参与 fingerprint。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-15 16:57:24 +08:00
wuzilongandCursor 5a8a9048d4 fix(pl): 新规则归档超额按客户选证,并修正用证提示与启用口径。
安排/归档失败改为可执行原因;证件保存后自动启用、只读不再假启用;
customer_category 归档超额改为客户+品类证件池,避免误查合同绑证。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-15 16:46:09 +08:00
wuzilongandCursor ba62ec7b36 fix(pl): 证书齐备待完善列表将多选列置于首列。
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-15 15:13:14 +08:00
wuzilong 579285a7bf merge: issue #34 归档运费运输量回填修复。
将任务分支合入本地 V3.0,供本机验收测试;未推送远端集成分支。
2026-11-15 15:03:44 +08:00
wuzilongandCursor f41e47601d fix(pl): 归档再次打开时按实际数量回填运费运输量。
resetFreightCalc 在产品已加载后会清空运输量且不再触发 watch,导致再次归档误报运输量须大于0。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-15 15:03:44 +08:00
wuzilongandCursor e0598ed07b fix(pl): 证件建档后自动启用,取消期初确认门槛。
保存即写入期初已用0并置为active;Web/H5仅保留复核入口,存量未确认证在读取或选证时自动补期初。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-15 14:53:43 +08:00
wuzilongandCursor 02d576abfe fix(pl): 证书齐备待完善归档不再误出齐备按钮。
归档结转无用量行时保留待完善错误文案,前端按计划齐备状态只提醒完善证件。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-15 14:51:45 +08:00
wuzilongandCursor 95ecb7236e fix(pl): 计划详情用关联证件附件替换危化品证书区。
Web 与 H5 详情将关联购买证/运输证移到装送货后并以附件卡片展示;用证接口回填证件附件 URL。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-15 14:46:46 +08:00
wuzilongandCursor ea46761f40 feat(pl): 合同用证改为客户用证并修复列表筛选。
证件额度按客户展示;Web 客户列表改用 toQueryParams,修复 buildQuery is not a function。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-15 14:46:46 +08:00
117 changed files with 6033 additions and 943 deletions

No files matched your search

+4 -7
View File
@@ -2206,8 +2206,7 @@ def create_plan(
create_by=user.id,
create_dept_id=user.dept_id,
)
from app.services.pl_cert_quota_rule_config_service import stamp_plan_rule_version
stamp_plan_rule_version(db, user, plan)
# 证件额度规则版本在首次安排时按生效时间打标,创建不打标。
db.add(plan)
# 添加产品明细
@@ -2379,8 +2378,7 @@ def create_plan_full(
create_by=user.id,
create_dept_id=user.dept_id,
)
from app.services.pl_cert_quota_rule_config_service import stamp_plan_rule_version
stamp_plan_rule_version(db, user, plan)
# 证件额度规则版本在首次安排时按生效时间打标,创建不打标。
db.add(plan)
db.flush()
@@ -2531,8 +2529,7 @@ def create_from_contract(
create_by=user.id,
create_dept_id=user.dept_id,
)
from app.services.pl_cert_quota_rule_config_service import stamp_plan_rule_version
stamp_plan_rule_version(db, user, plan)
# 证件额度规则版本在首次安排时按生效时间打标,创建不打标。
db.add(plan)
# 查询合同产品明细
@@ -3807,7 +3804,7 @@ def archive_plan(
db.flush()
result = get_plan(id, db, user)
if not quota_settled:
result.quota_settlement_error = read_quota_settlement_error(db, tenant_no, plan.id)
result.quota_settlement_error = read_quota_settlement_error(db, tenant_no, plan.id, plan=plan)
return result
+25 -1
View File
@@ -320,6 +320,23 @@ def contract_statistics_list(keyword: str = Query('', max_length=200),
cert_count=cert_count, cert_count_min=cert_count_min, cert_count_max=cert_count_max))
@router.get('/statistics/customers')
def customer_statistics_list(keyword: str = Query('', max_length=200),
customer_no: str = Query('', alias='customerNo', max_length=200),
customer_name: str = Query('', alias='customerName', max_length=200),
cert_count_op: str = Query('', alias='certCountOp', max_length=20),
cert_count: str = Query('', alias='certCount', max_length=40),
cert_count_min: str = Query('', alias='certCountMin', max_length=40),
cert_count_max: str = Query('', alias='certCountMax', max_length=40),
page: int = Query(1, ge=1),
page_size: int = Query(20, alias='pageSize', ge=1, le=100),
db: Session = Depends(get_db), user: DbUserContext = Depends(current_user)):
return _wire(statistics.list_customers(
db, user, keyword=keyword, page=page, page_size=page_size, customer_no=customer_no,
customer_name=customer_name, cert_count_op=cert_count_op, cert_count=cert_count,
cert_count_min=cert_count_min, cert_count_max=cert_count_max))
@router.get('/statistics/certificates')
def certificate_statistics_list(keyword: str = Query('', max_length=200),
cert_no: str = Query('', alias='certNo', max_length=200),
@@ -378,6 +395,12 @@ def contract_statistics(contract_id: str, db: Session = Depends(get_db),
return _wire(statistics.contract_statistics(db, user, contract_id))
@router.get('/customers/{customer_id}/statistics')
def customer_statistics(customer_id: str, db: Session = Depends(get_db),
user: DbUserContext = Depends(current_user)):
return _wire(statistics.customer_statistics(db, user, customer_id))
@router.get('/{cert_type}/{cert_id}/statistics')
def certificate_statistics(cert_type: CertType, cert_id: str, db: Session = Depends(get_db),
user: DbUserContext = Depends(current_user)):
@@ -386,8 +409,9 @@ def certificate_statistics(cert_type: CertType, cert_id: str, db: Session = Depe
@router.get('/{cert_type}')
def list_certs(cert_type: CertType, keyword: Optional[str] = None, status: Optional[str] = None,
customer_id: Optional[str] = Query(None, alias='customerId', max_length=64),
db: Session = Depends(get_db), user: DbUserContext = Depends(current_user)):
return _wire(certs.list_certs(db, user, cert_type, keyword, status))
return _wire(certs.list_certs(db, user, cert_type, keyword, status, customer_id=customer_id))
@router.post('/{cert_type}/recognize', dependencies=[Depends(require_menu_code('pl:quota-cert:edit'))])
+5
View File
@@ -888,7 +888,10 @@ def arrange_transport(
)
apply_resource_snapshot_json(plan=plan, transport=transport, snapshot=snapshot)
from app.services.pl_quota_planning import pin_measurement_version
from app.services.pl_cert_quota_rule_config_service import stamp_plan_rule_on_arrange
pin_measurement_version(db, user, plan)
# 首次安排按生效时间打标并冻结;改派不重打。
stamp_plan_rule_on_arrange(db, user, plan)
plan.transport_status = "arranged"
plan.follow_status = "arranged"
plan.freight_amount = freight_amount or 0
@@ -1304,11 +1307,13 @@ def process_approval(
transport.carrier_name = vehicle_info['carrier_name']
snapshot = build_transport_resource_snapshot(db, tenant_no, transport.vehicle_id,
selected_driver_id=transport.driver_id, selected_escort_id=transport.escort_id)
from app.services.pl_cert_quota_rule_config_service import stamp_plan_rule_on_arrange
for plan in plans:
assert_pl_row_in_scope(db, plan, PlPlan, user, tenant_no)
plan.vehicle_id = transport.vehicle_id
plan.license_plate = transport.license_plate
apply_resource_snapshot_json(plan=plan, transport=transport, snapshot=snapshot)
stamp_plan_rule_on_arrange(db, user, plan)
apply_plan_quota(db, user, plan, "reserve", payload)
plan.transport_status = "arranged"
plan.follow_status = "arranged"
+8 -2
View File
@@ -447,8 +447,14 @@ def _assert_contract_line_unreferenced(db, tenant_no, line_id):
def _referenced_line_identity(data: dict):
"""产品、品牌、型号、单位决定被引用明细的身份;包装规格单独校验。"""
return _product_identity(data)[:-1]
"""产品、品牌、型号、单位决定被引用明细的身份;包装规格单独校验。
未指定具体品牌时,历史空值和编辑页提交的 any(不限品牌)是同一身份。
"""
product_id, brand_mode, brand_id, model, unit = _product_identity(data)[:-1]
if not brand_id and brand_mode in ("", "any"):
brand_mode = ""
return (product_id, brand_mode, brand_id, model, unit)
def _package_specs_used_by_active_plans(db, tenant_no, line_id):
+8
View File
@@ -129,6 +129,7 @@ def _row_to_dict(row: CrmCustomer) -> Dict[str, Any]:
"city": row.city or "",
"district": row.district or "",
"address": row.address or "",
"sameCity": 1 if int(getattr(row, "same_city", 0) or 0) == 1 else 0,
"status": row.status or "",
"dealStatus": row.deal_status or "",
"ownerUserId": row.owner_user_id or "",
@@ -206,6 +207,7 @@ def list_customer_options(
"id": r.id,
"customerName": r.customer_name,
"customerNo": r.customer_no,
"sameCity": 1 if int(getattr(r, "same_city", 0) or 0) == 1 else 0,
"label": r.customer_name,
"value": r.id,
}
@@ -569,6 +571,7 @@ def create_customer(
city=kwargs.get("city"),
district=kwargs.get("district"),
address=kwargs.get("address"),
same_city=1 if int(kwargs.get("same_city") or 0) == 1 else 0,
status="normal",
deal_status="not_deal",
owner_user_id=owner_id,
@@ -626,18 +629,23 @@ def update_customer(
"customer_name", "short_name", "customer_type", "mobile", "telephone",
"email", "website", "level", "source", "industry", "park_area",
"payment_terms", "scale", "province", "city", "district", "address",
"same_city",
"business_license_img",
"business_permit_images", "other_cert_images",
"clue_id", "order_num", "remark",
"next_time",
)
_datetime_fields = {"next_time"}
_flag_fields = {"same_city"}
for field in _updatable:
if field not in kwargs:
continue
val = kwargs[field]
if field in _datetime_fields:
setattr(obj, field, _parse_optional_datetime(val))
elif field in _flag_fields:
if val is not None:
setattr(obj, field, 1 if int(val or 0) == 1 else 0)
elif val is not None:
setattr(obj, field, val)
+6
View File
@@ -177,6 +177,12 @@ class CrmCustomer(Base):
city = Column(String(50), nullable=True, comment="市")
district = Column(String(50), nullable=True, comment="区")
address = Column(String(255), nullable=True, comment="详细地址")
same_city = Column(
SmallInteger,
nullable=False,
default=0,
comment="是否同市 0-否 1-是;相对本公司业务所在市,运输计划段次默认带入",
)
# 状态与归属
status = Column(
+2 -1
View File
@@ -370,7 +370,8 @@ class PlPlan(Base):
quota_cert_waived_by = Column(String(64), nullable=True, comment="证书齐备确认人ID")
quota_cert_waived_by_name = Column(String(100), nullable=True, comment="证书齐备确认人姓名")
quota_cert_waived_time = Column(DateTime, nullable=True, comment="证书齐备确认时间")
cert_quota_rule_version = Column(String(32), nullable=True, comment="证件额度规则版本 legacy|customer_category;创建时打标")
cert_quota_rule_version = Column(String(32), nullable=True, comment="证件额度规则版本 legacy|customer_category;首次安排时打标并冻结")
cert_quota_arranged_at = Column(DateTime, nullable=True, comment="首次安排时间(证件额度切点用);再次安排不改")
quota_cert_pending_fulfill = Column(SmallInteger, nullable=False, default=0, comment="新规则证书齐备待完善 0-否 1-是")
erp_entered = Column(SmallInteger, nullable=False, default=0, comment="是否已录入ERP 0-否 1-是")
cancel_reason = Column(String(500), nullable=True, comment="作废原因")
+10
View File
@@ -263,6 +263,11 @@ class CustomerCreateBody(BaseModel):
city: Optional[str] = Field(default=None, description="市")
district: Optional[str] = Field(default=None, description="区")
address: Optional[str] = Field(default=None, description="详细地址")
same_city: int = Field(
default=0,
alias="sameCity",
description="是否同市 0-否 1-是;相对本公司业务所在市,运输计划段次默认带入",
)
next_time: Optional[str] = Field(default=None, alias="nextTime", description="下次联系时间")
remark: Optional[str] = Field(default=None, description="备注")
owner_user_id: Optional[str] = Field(default=None, alias="ownerUserId", description="负责人ID")
@@ -330,6 +335,11 @@ class CustomerUpdateBody(BaseModel):
city: Optional[str] = Field(default=None, description="市")
district: Optional[str] = Field(default=None, description="区")
address: Optional[str] = Field(default=None, description="详细地址")
same_city: Optional[int] = Field(
default=None,
alias="sameCity",
description="是否同市 0-否 1-是;相对本公司业务所在市,运输计划段次默认带入",
)
next_time: Optional[str] = Field(default=None, alias="nextTime", description="下次联系时间")
remark: Optional[str] = Field(default=None, description="备注")
owner_user_id: Optional[str] = Field(default=None, alias="ownerUserId", description="负责人ID")
+2 -1
View File
@@ -417,7 +417,8 @@ class PlanRead(PlanBase, PlanResourceSnapshotMixin):
quota_cert_waived_by: Optional[str] = Field(default=None, alias="quotaCertWaivedBy", description="证书齐备确认人ID")
quota_cert_waived_by_name: Optional[str] = Field(default=None, alias="quotaCertWaivedByName", description="证书齐备确认人姓名")
quota_cert_waived_time: Optional[datetime] = Field(default=None, alias="quotaCertWaivedTime", description="证书齐备确认时间")
cert_quota_rule_version: Optional[str] = Field(default=None, alias="certQuotaRuleVersion", description="legacy|customer_category")
cert_quota_rule_version: Optional[str] = Field(default=None, alias="certQuotaRuleVersion", description="legacy|customer_category;首次安排打标")
cert_quota_arranged_at: Optional[datetime] = Field(default=None, alias="certQuotaArrangedAt", description="首次安排时间(证件额度切点)")
quota_cert_pending_fulfill: int = Field(default=0, alias="quotaCertPendingFulfill", description="新规则齐备待完善 0否 1是")
erp_entered: int = Field(default=0, alias="erpEntered", description="是否已录入ERP 0-否 1-是")
cancel_reason: Optional[str] = Field(default=None, alias="cancelReason", description="作废原因")
+15
View File
@@ -130,6 +130,21 @@ class VehicleFuelPlateMonthItem(BaseModel):
alias="last3MonthsRateL100",
description="近三个月百公里油耗 L/100km,不足则为 null",
)
avg_rate_last10_l100: Optional[Decimal] = Field(
default=None,
alias="avgRateLast10L100",
description="近10次有效加油段平均百公里油耗 L/100km,不足则为 null",
)
avg_rate_last20_l100: Optional[Decimal] = Field(
default=None,
alias="avgRateLast20L100",
description="近20次有效加油段平均百公里油耗 L/100km,不足则为 null",
)
avg_rate_last30_l100: Optional[Decimal] = Field(
default=None,
alias="avgRateLast30L100",
description="近30次有效加油段平均百公里油耗 L/100km,不足则为 null",
)
model_config = {"populate_by_name": True}
@@ -127,12 +127,16 @@ def save_category(db: Session, user, data: dict, category_id=None):
submitted = data['products']
if submitted is None:
raise HTTPException(400, '产品关联集合不可为 null;清空请提交 []')
existing = {
r.id: r
for r in db.query(PlCertCategoryProduct).filter_by(
tenant_no=user.tenant_no, category_id=row.id, del_flag=0,
).with_for_update().populate_existing().all()
}
# uk_cert_category_product 不含 del_flag,软删行仍占唯一键;无 id 再加须复用。
all_links = (
db.query(PlCertCategoryProduct)
.filter_by(tenant_no=user.tenant_no, category_id=row.id)
.with_for_update()
.populate_existing()
.all()
)
existing = {r.id: r for r in all_links if r.del_flag == 0}
by_product = {r.product_id: r for r in all_links}
seen = set()
product_ids = set()
for item in submitted:
@@ -150,20 +154,46 @@ def save_category(db: Session, user, data: dict, category_id=None):
raise HTTPException(400, '产品关联明细不属于当前品类')
if rid in seen:
raise HTTPException(400, '产品关联明细 ID 重复')
if pid != link.product_id:
conflict = by_product.get(pid)
if conflict is not None and conflict.id != link.id:
if conflict.del_flag == 0:
raise HTTPException(400, '同一品类不能重复关联同一产品')
# 目标 product_id 被软删行占用:恢复该行并软删当前行
conflict.del_flag = 0
conflict.scope_status = scope
conflict.update_by = user.id
link.del_flag = 1
link.update_by = user.id
seen.add(conflict.id)
continue
if by_product.get(link.product_id) is link:
del by_product[link.product_id]
link.product_id = pid
by_product[pid] = link
seen.add(rid)
link.product_id = pid
link.scope_status = scope
link.update_by = user.id
else:
link = PlCertCategoryProduct(
**_audit(user),
category_id=row.id,
product_id=pid,
scope_status=scope,
)
db.add(link)
# 关联表业务键 (category_id, product_id):复用有效或软删行,避免 uk 冲突
link = by_product.get(pid)
if link is not None:
if link.del_flag == 0:
seen.add(link.id)
link.del_flag = 0
link.scope_status = scope
link.update_by = user.id
else:
link = PlCertCategoryProduct(
**_audit(user),
category_id=row.id,
product_id=pid,
scope_status=scope,
)
db.add(link)
by_product[pid] = link
for rid, link in existing.items():
if rid not in seen:
if rid not in seen and link.del_flag == 0:
link.del_flag = 1
link.update_by = user.id
db.flush()
@@ -1,4 +1,4 @@
"""客户品类额度规则切点:系统信息配置;未配置则拦住安排。"""
"""客户品类额度规则切点:按首次安排时间打标;切点前已安排归档跳过校证。"""
from datetime import datetime
from typing import Optional
from uuid import uuid4
@@ -58,20 +58,103 @@ def assert_cert_quota_rule_configured(db: Session, tenant_no: str) -> datetime:
return effective_at
def resolve_rule_version_for_create(db: Session, tenant_no: str, create_time: Optional[datetime] = None) -> str:
"""计划创建时打标;未配置生效时间时仍标 legacy(安排会被拦住)。"""
def resolve_rule_version_for_arrange(
db: Session, tenant_no: str, arrange_time: Optional[datetime] = None
) -> str:
"""首次安排时打标:安排时刻 >= 生效时间 → 新规则,否则祖父 legacy。"""
effective_at = get_effective_at(db, tenant_no)
when = create_time or datetime.now()
when = arrange_time or datetime.now()
if effective_at is not None and when >= effective_at:
return VERSION_CUSTOMER_CATEGORY
return VERSION_LEGACY
def stamp_plan_rule_version(db: Session, user, plan) -> str:
version = resolve_rule_version_for_create(db, user.tenant_no, getattr(plan, 'create_time', None) or datetime.now())
# 兼容旧测试/调用名;语义已改为安排时刻。
resolve_rule_version_for_create = resolve_rule_version_for_arrange
def stamp_plan_rule_on_arrange(
db: Session, user, plan, *, arrange_time: Optional[datetime] = None
) -> str:
"""首次安排写入版本与安排时刻;再次安排冻结,不改版本。"""
if getattr(plan, 'cert_quota_arranged_at', None) is not None:
return getattr(plan, 'cert_quota_rule_version', None) or VERSION_LEGACY
when = arrange_time or datetime.now()
version = resolve_rule_version_for_arrange(db, user.tenant_no, when)
plan.cert_quota_arranged_at = when
plan.cert_quota_rule_version = version
# 安排前已按旧判定齐备时,打成新规则后回补待完善,避免待完善列表漏单。
if (
version == VERSION_CUSTOMER_CATEGORY
and int(getattr(plan, 'quota_cert_waived', 0) or 0) == 1
and int(getattr(plan, 'quota_cert_pending_fulfill', 0) or 0) != 1
):
plan.quota_cert_pending_fulfill = 1
return version
def stamp_plan_rule_version(db: Session, user, plan) -> str:
"""兼容旧名:等价于首次安排打标(创建路径不应再调用)。"""
return stamp_plan_rule_on_arrange(db, user, plan)
def plan_uses_customer_category(plan) -> bool:
"""仅看已落库版本;空版本视为 legacy。安排前请用 plan_applies_customer_category_rule。"""
return (getattr(plan, 'cert_quota_rule_version', None) or VERSION_LEGACY) == VERSION_CUSTOMER_CATEGORY
def plan_applies_customer_category_rule(db: Session, tenant_no: str, plan) -> bool:
"""业务是否按新规则:已打 customer_category,或尚未安排且按当前时刻将落入新规则。
安排前 `cert_quota_rule_version` 常为空;不能把空当成 legacy,否则会误走合同绑证、
漏写齐备待完善。已首次安排并打成 legacy 的计划保持旧规则。
"""
if plan_uses_customer_category(plan):
return True
if getattr(plan, 'cert_quota_arranged_at', None) is not None:
return False
return resolve_rule_version_for_arrange(db, tenant_no) == VERSION_CUSTOMER_CATEGORY
def plan_requires_cert_fulfill(db: Session, tenant_no: str, plan) -> bool:
"""齐备后是否须进待完善;与安排是否走新规则同一判定。"""
return plan_applies_customer_category_rule(db, tenant_no, plan)
def infer_arranged_at(db: Session, plan) -> Optional[datetime]:
"""历史缺字段时用关联运输单创建时间推断首次安排。"""
stamped = getattr(plan, 'cert_quota_arranged_at', None)
if stamped is not None:
return stamped
transport_id = getattr(plan, 'transport_id', None)
tenant_no = getattr(plan, 'tenant_no', None)
if not transport_id or not tenant_no or db is None:
return None
from app.models.pl_models import PlTransport
transport = (
db.query(PlTransport)
.filter_by(id=transport_id, tenant_no=tenant_no, del_flag=0)
.first()
)
return getattr(transport, 'create_time', None) if transport else None
def plan_skips_archive_cert_quota(plan, db: Session = None, tenant_no: str = None) -> bool:
"""首次安排早于生效时间则归档跳过校证。
优先比较安排时刻与生效时间;若无生效配置或无法得到安排时刻,则不因空版本自动跳过
(避免误伤仍走合同绑证结转的历史路径;迁移/安排打标会补齐 arranged_at)。
"""
tn = tenant_no or getattr(plan, 'tenant_no', None)
arranged_at = getattr(plan, 'cert_quota_arranged_at', None)
if arranged_at is None and db is not None:
arranged_at = infer_arranged_at(db, plan)
if arranged_at is None:
return False
if db is not None and tn:
effective_at = get_effective_at(db, tn)
if effective_at is not None:
return arranged_at < effective_at
# 已记录首次安排且版本为 legacy(安排时未达生效点)→ 跳过
return not plan_uses_customer_category(plan)
+42 -1
View File
@@ -252,8 +252,35 @@ def _resolve_pending_reminder(
reminder.document_no = document_no
def _vehicle_reminder_skip_reason(
db: Session, cert: PlCert
) -> Optional[str]:
"""报废车、三方(承运商)车不做人车证件到期提醒;返回关闭 remark。"""
if cert.owner_type != "vehicle" or not cert.owner_id:
return None
vehicle = (
db.query(PlVehicle)
.filter(
PlVehicle.id == cert.owner_id,
PlVehicle.tenant_no == cert.tenant_no,
PlVehicle.del_flag == 0,
)
.first()
)
if not vehicle:
return None
if vehicle.vehicle_status == "scrapped":
return "系统自动关闭:车辆已报废,不再提醒"
if vehicle.vehicle_type == "carrier":
return "系统自动关闭:三方/承运商车辆不提醒"
return None
def scan_cert_expiry(db: Session, tenant_no: Optional[str] = None, *, today: Optional[date] = None) -> int:
"""扫描 pl_cert 生成到期提醒;退出提醒窗口或证件失效时关闭旧 pending。"""
"""扫描 pl_cert 生成到期提醒;退出提醒窗口或证件失效时关闭旧 pending。
报废车辆、三方(承运商)车辆的证件不提醒,并关闭已有 pending。
"""
today = today or date.today()
query = db.query(PlCert).filter(
PlCert.del_flag == 0,
@@ -266,6 +293,20 @@ def scan_cert_expiry(db: Session, tenant_no: Optional[str] = None, *, today: Opt
active_cert_ids: set[str] = set()
created_count = 0
for cert in query.all():
skip_reason = _vehicle_reminder_skip_reason(db, cert)
if skip_reason:
existing = _pending_reminder_for_cert(db, cert.id)
if existing:
_resolve_pending_reminder(
existing,
remark=skip_reason,
expire_date=cert.expire_date,
days_remaining=(cert.expire_date - today).days,
document_type=cert.cert_name,
document_no=cert.cert_no,
)
continue
active_cert_ids.add(cert.id)
days_remaining = (cert.expire_date - today).days
existing = _pending_reminder_for_cert(db, cert.id)
@@ -1,6 +1,7 @@
"""运输管理 - 侧栏菜单角标统计"""
from __future__ import annotations
from datetime import date
from typing import Dict, List, Optional
from sqlalchemy.orm import Session
@@ -115,14 +116,19 @@ def count_legal_use_document_pending(db: Session, tenant_no: str, user) -> int:
return apply_pl_scope(query, PlPlan, user, db, tenant_no).count()
# 运输归档角标从该日之后起算,当天及更早的计划不计入。
ARCHIVE_BADGE_PLAN_DATE_AFTER = date(2026, 9, 1)
def count_plan_archive_pending(db: Session, tenant_no: str, user) -> int:
"""待归档角标:与归档列表一致,仅统计已安排运输且未归档的计划。"""
"""待归档角标:已安排运输、未归档,且计划日期晚于 2026-09-01。"""
query = db.query(PlPlan).filter(
PlPlan.tenant_no == tenant_no,
PlPlan.del_flag == 0,
PlPlan.archive_status == "unarchived",
PlPlan.follow_status != "cancelled",
PlPlan.transport_status == "arranged",
PlPlan.plan_date > ARCHIVE_BADGE_PLAN_DATE_AFTER,
)
query = apply_pl_scope(query, PlPlan, user, db, tenant_no)
return query.count()
+2
View File
@@ -1166,7 +1166,9 @@ def create_transport_for_plan(
escort_id=escort_id,
)
from app.services.pl_quota_planning import pin_measurement_version
from app.services.pl_cert_quota_rule_config_service import stamp_plan_rule_on_arrange
pin_measurement_version(db, user, plan)
stamp_plan_rule_on_arrange(db, user, plan)
plan.transport_status = "arranged"
plan.follow_status = "arranged"
plan.freight_amount = freight_amount or 0
@@ -831,6 +831,15 @@ def assert_stop_contract_required(
raise HTTPException(status_code=422, detail=f"请为{side_label}选择合同")
def _clear_internal_stop_product_contracts(stop) -> None:
"""山峡/云栋段不占用外部合同;客户端若仍回传产品行合同字段,保存前强制清空。"""
if stop is None or not is_internal_customer_name(getattr(stop, 'customer_name', None)):
return
for prod in getattr(stop, 'products', None) or []:
prod.contract_id = None
prod.contract_product_id = None
def _resolve_stop_contracts(
db: Session,
tenant_no: str,
@@ -975,6 +984,7 @@ def validate_plan_stops_write(
"装货合同",
expected_supplier_name=entity_name,
)
_clear_internal_stop_product_contracts(load)
resolved_deliveries: list[PlanDeliveryBody] = []
for idx, delivery in enumerate(deliveries, start=1):
@@ -990,6 +1000,7 @@ def validate_plan_stops_write(
f"送货段#{idx}合同",
expected_supplier_name=entity_name,
)
_clear_internal_stop_product_contracts(delivery)
resolved_deliveries.append(delivery)
enrich_stop_addresses_from_library(db, tenant_no, load, resolved_deliveries)
@@ -1443,6 +1454,7 @@ def replace_plan_stops(
stop.customer_name, kind, body.generate_dibang, body.dibang_direction)
stop.same_city = 1 if int(getattr(body, "same_city", 0) or 0) == 1 else 0
stop.del_flag, stop.update_by, stop.update_time = 0, user_id, now
internal_stop = is_internal_customer_name(body.customer_name)
model = PlPlanLoadProduct if kind == 'load' else PlPlanDeliveryProduct
for idx, (row, product, linked) in enumerate(product_jobs or []):
if row is None:
@@ -1453,6 +1465,10 @@ def replace_plan_stops(
for field in product_fields:
if field in product.model_fields_set or row.id is None:
setattr(row, field, getattr(product, field))
if internal_stop:
# 内部客户段即使客户端漏清/省略合同字段,落库也不得保留外部合同绑定。
row.contract_id = None
row.contract_product_id = None
row.plan_product_id = linked
row.order_num, row.update_by, row.update_time = idx, user_id, now
for row in removed:
+7 -1
View File
@@ -337,7 +337,13 @@ def settle_allocations(reserved: Sequence[Allocation], actual_by_source: Mapping
异单位来源须逐行重新确认全部实际量(含零量行),不按预占比例推算。
超来源量或超任一证件预占量均要求先补充分配。
同市等仅购买证场景下,调用方仍可能对本函数传入空的运输证分组与全量实运量;
无预占行时直接空结转,不把「缺实际量」套到另一类证件上。
同市装货 + 异地卸货混跑时,运输证分组往往只有卸货来源,而 actual 含全部来源;
只要求本组预占来源都有实运量,多出来源忽略。
"""
if not reserved:
return ()
keys, seqs, grouped = set(), set(), {}
kinds = {r.permit_kind for r in reserved}
if len(kinds) > 1 or kinds - {'purchase', 'transport'}:
@@ -353,7 +359,7 @@ def settle_allocations(reserved: Sequence[Allocation], actual_by_source: Mapping
keys.add(key)
seqs.add(seq)
grouped.setdefault(row.source_id, []).append(row)
if set(actual_by_source) != set(grouped):
if not set(grouped) <= set(actual_by_source):
raise AllocationInputError('必须明确提交每个来源的实际量')
manual = {}
for row in manual_actuals:
+31 -6
View File
@@ -120,18 +120,29 @@ def apply_plan_quota(db, user, plan, action, payload=None):
evidenceUrls=getattr(payload, 'quota_evidence_urls', None),
sourceNote=getattr(payload, 'quota_source_note', None))
from app.services.pl_quota_waiver import assert_waived_sources, quota_cert_waived
from app.services.pl_cert_quota_rule_config_service import plan_uses_customer_category
from app.services.pl_cert_quota_rule_config_service import (
plan_applies_customer_category_rule,
plan_skips_archive_cert_quota,
)
tenant_no = getattr(user, 'tenant_no', None) or ''
customer_rule = plan_applies_customer_category_rule(db, tenant_no, plan)
# 新规则:齐备仅放行安排/改派预占;归档与实际调整必须真证结转。
# 旧规则(legacy):齐备仍跳过安排与归档(祖父兼容)。
# 切点前首次安排:归档/实调不校证件(无需齐备);齐备仍可跳过安排预占。
skip_actions = ('reserve', 'resize')
if not plan_uses_customer_category(plan):
if not customer_rule:
skip_actions = ('reserve', 'resize', 'settle', 'actual_adjust')
grandfather_archive_skip = (
action in ('settle', 'actual_adjust')
and plan_skips_archive_cert_quota(plan, db, tenant_no)
)
if grandfather_archive_skip:
return {'operationId': ledger_id, 'usageIds': [], 'waived': True, 'skippedCertQuota': True}
if quota_cert_waived(plan) and action in skip_actions:
if action in ('reserve', 'resize'):
assert_waived_sources(db, user, plan, lock=True)
return {'operationId': ledger_id, 'usageIds': [], 'waived': True}
if (
plan_uses_customer_category(plan)
customer_rule
and action in ('settle', 'actual_adjust')
and int(getattr(plan, 'quota_cert_pending_fulfill', 0) or 0) == 1
):
@@ -171,26 +182,40 @@ def settle_plan_quota(db, user, plan, payload, *, adjustment=False):
except ArchiveQuotaBlocked as exc:
raise HTTPException(409, str(exc)) from exc
except (HTTPException, ValueError, AllocationIncomplete) as exc:
message = str(getattr(exc, 'detail', exc))
# 无用量行(如证书齐备仅放行安排)时仍保留原因,供同请求读回。
setattr(plan, '_quota_settlement_error', message)
rows = db.query(PlPlanCertUsage).filter_by(tenant_no=user.tenant_no, plan_id=plan.id, del_flag=0).all()
for row in rows:
if not adjustment:
row.usage_status = 'exception'
row.confirmation_snapshot = {**(row.confirmation_snapshot or {}), 'executed': True,
'settlementError': str(getattr(exc, 'detail', exc))}
'settlementError': message}
row.update_by = user.id
if not adjustment:
plan.archive_status = 'exception'
return False
def read_quota_settlement_error(db, tenant_no, plan_id):
def read_quota_settlement_error(db, tenant_no, plan_id, plan=None):
"""结转失败时返回已经写在用量快照上的原因。"""
from app.models.pl_models import PlPlan
from app.models.pl_quota_models import PlPlanCertUsage
if plan is not None:
cached = getattr(plan, '_quota_settlement_error', None)
if isinstance(cached, str) and cached.strip():
return cached.strip()
rows = db.query(PlPlanCertUsage).filter_by(tenant_no=tenant_no, plan_id=plan_id, del_flag=0).all()
for row in rows:
message = (row.confirmation_snapshot or {}).get('settlementError')
if isinstance(message, str) and message.strip():
return message.strip()
target = plan
if target is None:
target = db.query(PlPlan).filter_by(id=plan_id, tenant_no=tenant_no, del_flag=0).first()
if target is not None and int(getattr(target, 'quota_cert_pending_fulfill', 0) or 0) == 1:
return '该计划仍处于证书齐备待完善,请先在证书齐备中完善并关闭后再归档'
return '实际数量已保存,证件没有扣减。请把实际数量改小,或先补充购买证和运输证,再重新归档。'
@@ -155,4 +155,6 @@ def save_cert(db, user, cert_type, data, cert_id=None):
for scope in prepared:
scopes.apply_contract_bindings(db, user, scope)
db.flush()
# 与无合同集合的 save_cert 一致:建档/保存后自动期初并启用;current=True 的读回不会再跑启用。
row = certs.ensure_zero_opening(db, user, cert_type, row.id, row=row)
return get_cert(db, user, cert_type, row.id, current=True)
+223 -8
View File
@@ -9,6 +9,7 @@ from fastapi import HTTPException
from pydantic import BaseModel
from sqlalchemy import or_
from sqlalchemy.exc import IntegrityError
from app.models.crm_models import CrmCustomer
from app.models.pl_quota_models import (
PlPurchaseCert, PlTransportCert, PlTransportCertPurchaseRef,
PlCertQtyLog, PlPlanCertUsage, PlContractCertLink, PlCertOperation,
@@ -47,6 +48,39 @@ def usage_policy(valid_use_text):
return {'一次有效': 'once', '多次有效': 'multiple'}.get((valid_use_text or '').strip(), 'needs_confirmation')
_ONCE_USAGE_STATUSES = ('reserved', 'in_transit', 'settled', 'exception')
def is_single_use_consumed(db, user, cert_type, cert, *, exclude_plan_id=None):
"""一次有效证是否已不可再用:期初已使用,或其它计划已占用/已执行。
exclude_plan_id:当前计划自身的用量不计入占用(安排/结转同一计划可续用)。
多次有效或待确认原文返回 False,由调用方另行校验 policy。
"""
if usage_policy(getattr(cert, 'valid_use_text', None)) != 'once':
return False
if getattr(cert, 'opening_single_use_consumed', 0):
return True
previous = (
db.query(PlPlanCertUsage)
.filter_by(
tenant_no=user.tenant_no,
cert_type=cert_type,
cert_id=cert.id,
del_flag=0,
)
.all()
)
for usage in previous:
if exclude_plan_id is not None and usage.plan_id == exclude_plan_id:
continue
if usage.usage_status in _ONCE_USAGE_STATUSES:
return True
if (usage.confirmation_snapshot or {}).get('executed'):
return True
return False
def _assert_known_usage_policy(row):
if usage_policy(row.valid_use_text) == 'needs_confirmation':
raise HTTPException(400, '有效次数原文待确认,明确一次或多次有效后才能启用')
@@ -85,8 +119,47 @@ def _transport_derived_categories(db, user, transport_cert_id):
return list(dict.fromkeys(r.category_id for r in rows if r.category_id))
def _customer_display_name(db, user, customer_id):
"""按证件绑定的系统客户 ID 取 CRM 名称;与证面收货/购买单位无关。"""
cid = str(customer_id or '').strip()
if not cid:
return None
row = (
db.query(CrmCustomer.customer_name)
.filter(
CrmCustomer.id == cid,
CrmCustomer.tenant_no == user.tenant_no,
CrmCustomer.del_flag == 0,
)
.first()
)
return (row[0] if row else None) or None
def _category_display_names(db, user, category_ids):
"""按证用品类 ID 顺序返回启用中的品类名称;未知 ID 跳过。"""
from app.models.pl_quota_models import PlCertCategory
ids = [str(item or '').strip() for item in (category_ids or []) if str(item or '').strip()]
if not ids:
return []
rows = (
db.query(PlCertCategory.id, PlCertCategory.category_name)
.filter(
PlCertCategory.tenant_no == user.tenant_no,
PlCertCategory.del_flag == 0,
PlCertCategory.id.in_(ids),
)
.all()
)
names = {row.id: (row.category_name or '').strip() for row in rows}
return [names[item] for item in ids if names.get(item)]
def get_cert(db, user, cert_type, cert_id, current=False):
row = _get_row(db, user, cert_type, cert_id, lock=current)
# 只读列表/详情不得在未提交事务里改状态,否则会出现「页面已启用、库仍 draft」。
# 自动期初与启用仅在 save_cert / confirm 等写入路径执行。
result = _row_to_dict(row)
result['usagePolicy'] = usage_policy(row.valid_use_text)
opening_query = db.query(PlCertQtyLog.id).filter_by(
@@ -96,17 +169,28 @@ def get_cert(db, user, cert_type, cert_id, current=False):
opening_query = opening_query.with_for_update()
result['openingConfirmed'] = opening_query.first() is not None
result['availableQty'] = row.total_qty - row.used_qty - row.reserved_qty
result['singleUseConsumed'] = is_single_use_consumed(db, user, cert_type, row)
result['customerName'] = _customer_display_name(db, user, getattr(row, 'customer_id', None))
if cert_type == 'purchase':
names = _category_display_names(db, user, [getattr(row, 'category_id', None)])
result['categoryName'] = names[0] if names else None
if cert_type == 'transport':
result['purchaseRefs'] = [_row_to_dict(r) for r in _refs(db, user, cert_id, lock=current)]
result['referencesEditable'] = not _has_history(db, user, cert_type, cert_id, lock=current)
result['derivedCategoryIds'] = _transport_derived_categories(db, user, cert_id)
result['referencesEditable'] = not _has_usage_beyond_zero_opening(
db, user, cert_type, cert_id, lock=current
)
derived_ids = _transport_derived_categories(db, user, cert_id)
result['derivedCategoryIds'] = derived_ids
result['derivedCategoryNames'] = _category_display_names(db, user, derived_ids)
return result
def list_certs(db, user, cert_type, keyword=None, status=None):
def list_certs(db, user, cert_type, keyword=None, status=None, customer_id=None):
model = _model(cert_type)
query = db.query(model).filter(model.tenant_no == user.tenant_no, model.del_flag == 0)
query = apply_pl_scope(query, model, user, db, user.tenant_no)
if customer_id:
query = query.filter(model.customer_id == customer_id)
if keyword:
sale_name = model.seller_name if cert_type == 'purchase' else model.shipper_name
buy_name = model.buyer_name if cert_type == 'purchase' else model.consignee_name
@@ -123,7 +207,9 @@ def list_certs(db, user, cert_type, keyword=None, status=None):
result = [get_cert(db, user, cert_type, r.id) for r in query.order_by(model.create_time.desc()).all()]
if cert_type == 'transport':
for item in result:
item['derivedCategoryIds'] = _transport_derived_categories(db, user, item['id'])
derived_ids = _transport_derived_categories(db, user, item['id'])
item['derivedCategoryIds'] = derived_ids
item['derivedCategoryNames'] = _category_display_names(db, user, derived_ids)
return result
@@ -169,8 +255,11 @@ def _refs_keep_verified(pending, removed):
def _has_history(db, user, cert_type, cert_id, lock=True):
"""任意额度流水或计划占用均视为已有历史(含自动期初),用于锁证号/核定量等身份。"""
for model in (PlCertQtyLog, PlPlanCertUsage):
query = db.query(model.id).filter_by(tenant_no=user.tenant_no, cert_type=cert_type, cert_id=cert_id)
query = db.query(model.id).filter_by(
tenant_no=user.tenant_no, cert_type=cert_type, cert_id=cert_id, del_flag=0,
)
if lock:
query = query.with_for_update()
if query.first() is not None:
@@ -178,6 +267,35 @@ def _has_history(db, user, cert_type, cert_id, lock=True):
return False
def _has_usage_beyond_zero_opening(db, user, cert_type, cert_id, lock=True):
"""真实用量/占用才锁运输证引用;期初已用=0 的 opening 仍可补全关联购买证。"""
usage_q = db.query(PlPlanCertUsage.id).filter_by(
tenant_no=user.tenant_no, cert_type=cert_type, cert_id=cert_id, del_flag=0,
)
if lock:
usage_q = usage_q.with_for_update()
if usage_q.first() is not None:
return True
log_q = db.query(PlCertQtyLog).filter_by(
tenant_no=user.tenant_no, cert_type=cert_type, cert_id=cert_id, del_flag=0,
)
if lock:
log_q = log_q.with_for_update()
for log in log_q.all():
snap = log.event_snapshot or {}
# 仅建档自动期初(已用0)不锁引用;手工期初或其它流水仍锁。
if (
log.event_type == 'opening'
and snap.get('auto')
and (log.used_delta or 0) == 0
and (log.reserved_delta or 0) == 0
and (log.total_delta or 0) == 0
):
continue
return True
return False
def _validate_refs(db, user, cert_id, submitted, historical, purchases, current=False):
if submitted is None:
raise HTTPException(400, '引用集合不可为null;清空请提交[]')
@@ -282,7 +400,8 @@ def prepare_cert(db, user, cert_type, data, cert_id=None, *, locked=None, effect
if duplicate and duplicate.id != cert_id:
raise HTTPException(400, '证号已存在,删除后也不得重建额度池')
effective_id = cert_id or effective_id or str(uuid4())
pending, removed = _validate_refs(db,user,effective_id,refs,historical,purchases,current=bool(cert_id)) if refs_present else ([],[])
refs_locked = bool(row and _has_usage_beyond_zero_opening(db, user, cert_type, cert_id))
pending, removed = _validate_refs(db,user,effective_id,refs,refs_locked,purchases,current=bool(cert_id)) if refs_present else ([],[])
changed = {key for key, value in values.items() if row is None or getattr(row, key) != value}
refs_changed = bool(removed) or any(previous is None or previous.del_flag == 1 or any(getattr(previous, key) != value for key, value in item.items() if key != 'id') for previous, item in pending)
return dict(model=model, row=row, values=values, cert_id=cert_id, effective_id=effective_id,
@@ -329,19 +448,98 @@ def apply_cert(db, user, prepared):
return row
def ensure_zero_opening(db, user, cert_type, cert_id, *, row=None):
"""建档后无需手工期初确认:缺 opening 流水时写入期初已用=0;draft 直接启用。"""
if row is None:
row = _get_row(db, user, cert_type, cert_id)
if row.status in ('void', 'closed'):
return row
existing = db.query(PlCertQtyLog.id).filter_by(
tenant_no=user.tenant_no, cert_type=cert_type, cert_id=cert_id, event_type='opening', del_flag=0,
).first()
if existing:
return row
row = _get_row(db, user, cert_type, cert_id, lock=True)
if row.status in ('void', 'closed'):
return row
if db.query(PlCertQtyLog.id).filter_by(
tenant_no=user.tenant_no, cert_type=cert_type, cert_id=cert_id, event_type='opening', del_flag=0,
).with_for_update().first():
return row
# 有效次数原文未识别时保留 draft,不自动启用;明确一次/多次后保存或读取再启用。
if usage_policy(row.valid_use_text) == 'needs_confirmation':
return row
used = Decimal(row.used_qty or 0)
op_id = f'auto-opening:{cert_type}:{cert_id}'
digest = hashlib.sha256(op_id.encode()).hexdigest()
operation, replay = _claim_operation(db, user, 'opening', op_id, digest)
if replay:
return row
db.add(PlCertQtyLog(
**_audit(user),
operation_id=op_id,
request_hash=digest,
cert_type=cert_type,
cert_id=cert_id,
event_type='opening',
quantity_unit=row.quantity_unit,
total_delta=Decimal(0),
reserved_delta=Decimal(0),
used_delta=used,
before_total_qty=row.total_qty,
after_total_qty=row.total_qty,
before_reserved_qty=row.reserved_qty,
after_reserved_qty=row.reserved_qty,
before_used_qty=used,
after_used_qty=used,
reason='建档自动启用',
evidence_urls=None,
event_snapshot={'singleUseConsumed': False, 'sourceNote': 'auto', 'auto': True},
))
if row.status == 'draft':
row.status = 'active'
row.verified_by = user.id
row.verified_time = datetime.now()
row.update_by = user.id
operation.result_json = {'certType': cert_type, 'certId': cert_id, 'auto': True}
db.flush()
return row
def save_cert(db, user, cert_type, data, cert_id=None):
row = apply_cert(db, user, prepare_cert(db, user, cert_type, data, cert_id))
ensure_zero_opening(db, user, cert_type, row.id, row=row)
return get_cert(db, user, cert_type, row.id)
def delete_cert(db, user, cert_type, cert_id):
row = _get_row(db,user,cert_type,cert_id,lock=True)
if _has_history(db,user,cert_type,cert_id) or row.reserved_qty or row.used_qty:
if row.reserved_qty or row.used_qty:
raise HTTPException(400, '已有用量或流水的证件只能停用、核销或作废')
if db.query(PlPlanCertUsage.id).filter_by(
tenant_no=user.tenant_no, cert_type=cert_type, cert_id=cert_id, del_flag=0,
).with_for_update().first():
raise HTTPException(400, '已有用量或流水的证件只能停用、核销或作废')
logs = (
db.query(PlCertQtyLog)
.filter_by(tenant_no=user.tenant_no, cert_type=cert_type, cert_id=cert_id, del_flag=0)
.with_for_update()
.all()
)
# 仅建档自动期初(或无流水)仍允许删除;手工期初或其它额度流水则禁止。
def _auto_opening(log):
snap = log.event_snapshot or {}
return log.event_type == 'opening' and bool(snap.get('auto')) and (log.used_delta or 0) == 0
if any(not _auto_opening(log) for log in logs):
raise HTTPException(400, '已有用量或流水的证件只能停用、核销或作废')
if db.query(PlContractCertLink.id).filter_by(tenant_no=user.tenant_no,cert_type=cert_type,cert_id=cert_id,del_flag=0).with_for_update().first():
raise HTTPException(400, '证件已绑定合同')
if cert_type == 'purchase' and db.query(PlTransportCertPurchaseRef.id).filter_by(tenant_no=user.tenant_no,purchase_cert_id=cert_id,del_flag=0).with_for_update().first():
raise HTTPException(400, '证件被运输证引用')
for log in logs:
log.del_flag = 1
log.update_by = user.id
row.del_flag = 1
row.update_by = user.id
if cert_type == 'transport':
@@ -388,7 +586,24 @@ def _confirm_cert(db, user, cert_type, cert_id, data):
_assert_known_usage_policy(row)
if row.status == 'void': raise HTTPException(400, '作废证件不能启用')
if row.status == 'closed': raise HTTPException(400, '已核销证件不能启用')
if row.verified_time or _has_history(db,user,cert_type,cert_id):
# 建档自动期初(used=0)可被手工/接口期初覆盖;已有真实用量或非自动期初则拒绝。
openings = (
db.query(PlCertQtyLog)
.filter_by(
tenant_no=user.tenant_no, cert_type=cert_type, cert_id=cert_id,
event_type='opening', del_flag=0,
)
.with_for_update()
.all()
)
for log in openings:
snap = log.event_snapshot or {}
if snap.get('auto') and (log.used_delta or 0) == 0:
log.del_flag = 1
log.update_by = user.id
else:
raise HTTPException(400, '期初已确认,不能重复初始化额度')
if _has_history(db, user, cert_type, cert_id):
raise HTTPException(400, '期初已确认,不能重复初始化额度')
if body.used_qty > row.total_qty:
raise HTTPException(400, '期初已用量不能超过核定量')
+490 -57
View File
@@ -9,14 +9,37 @@ from app.models.pl_quota_models import (
PlTransportCert,
PlTransportCertPurchaseRef,
PlCertQtyLog,
PlPlanCertUsage,
)
from app.schemas.pl.quota_planning import ManualQuantity
from app.services.pl_cert_category_service import category_ids_for_product
from app.services.pl_quota_cert_service import is_single_use_consumed
from app.services.pl_quota_units import same_quantity_unit, standard_conversion_ratio
def _available(cert):
return Decimal(cert.total_qty) - Decimal(cert.used_qty) - Decimal(cert.reserved_qty)
def _plan_own_reserved(db, user, plan_id, cert_type, cert_id) -> Decimal:
"""本计划对该证的预占量;再安排时加回余量,避免把本单占用当成他人占用。"""
if not plan_id:
return Decimal('0')
row = (
db.query(PlPlanCertUsage)
.filter_by(
tenant_no=user.tenant_no,
plan_id=plan_id,
cert_type=cert_type,
cert_id=cert_id,
del_flag=0,
)
.first()
)
if row is None:
return Decimal('0')
return Decimal(row.reserved_qty or 0)
def _available(cert, *, own_reserved=None):
own = Decimal(own_reserved if own_reserved is not None else 0)
return Decimal(cert.total_qty) - Decimal(cert.used_qty) - Decimal(cert.reserved_qty) + own
def _in_force(cert, on_date: date) -> bool:
@@ -42,6 +65,16 @@ def _has_opening(db, user, cert_type, cert_id) -> bool:
)
def _ensure_opening_quiet(db, user, cert_type, cert_id, row):
"""选证前尽量自动补期初;单元测试 mock 库失败时静默跳过。"""
try:
from app.services.pl_quota_cert_service import ensure_zero_opening
ensure_zero_opening(db, user, cert_type, cert_id, row=row)
except Exception:
return
def _vehicle_ok(cert, vehicle_no: str) -> bool:
plates = cert.vehicle_numbers_json or []
if not isinstance(plates, list):
@@ -52,6 +85,14 @@ def _vehicle_ok(cert, vehicle_no: str) -> bool:
return plate in {str(p).strip() for p in plates if p}
def _cert_no(cert) -> str:
return str(getattr(cert, 'cert_no', None) or getattr(cert, 'id', '') or '').strip()
def _join_cert_nos(certs) -> str:
return '、'.join(dict.fromkeys(_cert_no(c) for c in certs if _cert_no(c)))
def _permit_qty_for(source_qty: Decimal, source_unit: str, cert_unit: str) -> Decimal:
if same_quantity_unit(source_unit, cert_unit):
return source_qty
@@ -61,6 +102,49 @@ def _permit_qty_for(source_qty: Decimal, source_unit: str, cert_unit: str) -> De
return (source_qty * Decimal(str(ratio))).quantize(Decimal('0.000001'))
def _manual_field(row, *names):
if isinstance(row, dict):
for name in names:
if name in row and row[name] is not None:
return row[name]
return None
for name in names:
value = getattr(row, name, None)
if value is not None:
return value
return None
def _saved_permit_qty(manuals, kind, source_id, permit_id, source_qty: Decimal):
"""计划段次用证已保存的人工换算;来源量变化时按原比例缩放。"""
for row in manuals or ():
if (
str(_manual_field(row, 'permit_kind', 'permitKind') or '') != kind
or str(_manual_field(row, 'source_id', 'sourceId') or '') != str(source_id)
or str(_manual_field(row, 'permit_id', 'permitId') or '') != str(permit_id)
):
continue
saved_src = Decimal(str(_manual_field(row, 'source_quantity', 'sourceQuantity') or '0'))
saved_permit = Decimal(str(_manual_field(row, 'permit_quantity', 'permitQuantity') or '0'))
if saved_src <= 0 or saved_permit <= 0:
return None
current = Decimal(source_qty)
if saved_src == current:
return saved_permit
return (saved_permit * current / saved_src).quantize(Decimal('0.000001'))
return None
def _need_permit_qty(source_qty, source_unit, cert_unit, manuals, kind, source_id, permit_id):
try:
return _permit_qty_for(Decimal(source_qty), source_unit, cert_unit)
except HTTPException:
manual_qty = _saved_permit_qty(manuals, kind, source_id, permit_id, Decimal(source_qty))
if manual_qty is None:
raise
return manual_qty
def _customer_id_from_source(source) -> str:
snap = source.snapshot or {}
cid = snap.get('customerId') or snap.get('customer_id')
@@ -69,10 +153,313 @@ def _customer_id_from_source(source) -> str:
raise HTTPException(409, '用证段次缺少客户,无法按客户选证')
def select_whole_cover_certs(db, user, sources, *, vehicle_no: str, on_date: date):
def _snap_text(source, *keys) -> str:
snap = source.snapshot or {}
for key in keys:
value = snap.get(key)
if value is not None and str(value).strip():
return str(value).strip()
return ''
def _source_customer_label(source) -> str:
return _snap_text(
source, 'customerName', 'customer_name', 'customerNo', 'customer_no'
) or _customer_id_from_source(source)
def _source_product_label(db, user, source) -> str:
name = _snap_text(source, 'productName', 'product_name')
if name:
return name
product_id = getattr(source, 'product_id', None)
if not product_id:
return ''
try:
from app.models.crm_models import CrmProduct
row = (
db.query(CrmProduct)
.filter(
CrmProduct.id == product_id,
CrmProduct.tenant_no == user.tenant_no,
CrmProduct.del_flag == 0,
)
.first()
)
except Exception:
return ''
product_name = getattr(row, 'product_name', None) if row is not None else None
if isinstance(product_name, str) and product_name.strip():
return product_name.strip()
return str(product_id)
def _purchase_candidates(db, user, customer_id, categories):
# MySQL ASC 会把 NULL 排最前;无到期证应排在末尾,优先消耗更早到期的证(D5)
return (
db.query(PlPurchaseCert)
.filter(
PlPurchaseCert.tenant_no == user.tenant_no,
PlPurchaseCert.del_flag == 0,
PlPurchaseCert.status == 'active',
PlPurchaseCert.customer_id == customer_id,
PlPurchaseCert.category_id.in_(categories),
)
.order_by(
PlPurchaseCert.valid_to.is_(None).asc(),
PlPurchaseCert.valid_to.asc(),
PlPurchaseCert.id.asc(),
)
.all()
)
def _linked_transports(db, user, customer_id, purchase_id):
refs = (
db.query(PlTransportCertPurchaseRef)
.filter_by(
tenant_no=user.tenant_no,
purchase_cert_id=purchase_id,
del_flag=0,
)
.all()
)
transport_cert_ids = [r.transport_cert_id for r in refs if r.transport_cert_id]
if not transport_cert_ids:
return []
return (
db.query(PlTransportCert)
.filter(
PlTransportCert.tenant_no == user.tenant_no,
PlTransportCert.del_flag == 0,
PlTransportCert.status == 'active',
PlTransportCert.customer_id == customer_id,
PlTransportCert.id.in_(transport_cert_ids),
)
.order_by(
PlTransportCert.valid_to.is_(None).asc(),
PlTransportCert.valid_to.asc(),
PlTransportCert.id.asc(),
)
.all()
)
def _diagnose_select_failure(
db, user, source, *, vehicle_no: str, on_date: date, candidates, manual_allocations=(),
plan_id=None,
):
"""选证失败时按证据优先给出单一可执行原因,避免笼统兜底句。"""
place = '同市' if not source.requires_transport else '异地'
plate = (vehicle_no or '').strip()
need_qty = Decimal(source.quantity)
customer_label = _source_customer_label(source)
product_label = _source_product_label(db, user, source)
manuals = manual_allocations or ()
if not candidates:
product_part = f'产品「{product_label}」' if product_label else '该产品'
return (
f'{place}段客户「{customer_label}」下没有{product_part}匹配品类的有效购买证,'
'请先建档购买证或核对客户/证用品类后再安排'
)
unverified_buy = []
no_opening_buy = []
expired_buy = []
consumed_buy = []
unit_buy = []
short_buy = []
ready_buy = []
no_transport_link = []
unverified_move = []
no_opening_move = []
expired_move = []
consumed_move = []
vehicle_miss = []
unit_move = []
short_move = []
for purchase in candidates:
if not purchase.verified_by or not purchase.verified_time:
unverified_buy.append(purchase)
continue
_ensure_opening_quiet(db, user, 'purchase', purchase.id, purchase)
if not _has_opening(db, user, 'purchase', purchase.id):
no_opening_buy.append(purchase)
continue
if not _in_force(purchase, on_date):
expired_buy.append(purchase)
continue
if is_single_use_consumed(db, user, 'purchase', purchase, exclude_plan_id=plan_id):
consumed_buy.append(purchase)
continue
try:
need = _need_permit_qty(
need_qty, source.unit, purchase.quantity_unit,
manuals, 'purchase', source.source_id, purchase.id,
)
except HTTPException:
unit_buy.append(purchase)
continue
buy_own = _plan_own_reserved(db, user, plan_id, 'purchase', purchase.id)
if _available(purchase, own_reserved=buy_own) < need:
short_buy.append((purchase, need))
continue
if not source.requires_transport:
ready_buy.append(purchase)
continue
transports = _linked_transports(db, user, purchase.customer_id, purchase.id)
if not transports:
no_transport_link.append(purchase)
continue
purchase_had_ready_transport = False
for transport in transports:
if not transport.verified_by or not transport.verified_time:
unverified_move.append(transport)
continue
_ensure_opening_quiet(db, user, 'transport', transport.id, transport)
if not _has_opening(db, user, 'transport', transport.id):
no_opening_move.append(transport)
continue
if not _in_force(transport, on_date):
expired_move.append(transport)
continue
if is_single_use_consumed(db, user, 'transport', transport, exclude_plan_id=plan_id):
consumed_move.append(transport)
continue
if not _vehicle_ok(transport, vehicle_no):
vehicle_miss.append(transport)
continue
try:
t_need = _need_permit_qty(
need_qty, source.unit, transport.quantity_unit,
manuals, 'transport', source.source_id, transport.id,
)
except HTTPException:
unit_move.append(transport)
continue
move_own = _plan_own_reserved(db, user, plan_id, 'transport', transport.id)
if _available(transport, own_reserved=move_own) < t_need:
short_move.append((transport, t_need))
continue
purchase_had_ready_transport = True
break
if purchase_had_ready_transport:
ready_buy.append(purchase)
if source.requires_transport and not plate:
return (
f'{place}段安排运输须填写车牌号;当前计划未填写车牌,'
'无法匹配运输证车号,请先填写车牌后再安排'
)
if vehicle_miss and not short_move and not unit_move:
nos = _join_cert_nos(vehicle_miss)
listed = '、'.join(
dict.fromkeys(
str(p).strip()
for t in vehicle_miss
for p in (t.vehicle_numbers_json or [])
if str(p).strip()
)
)
suffix = f'(证上现有车号:{listed})' if listed else ''
return (
f'{place}段运输证 {nos} 未包含车牌号「{plate}」{suffix}。'
'请到运输证中补充该车号,或更换已登记该车号的车辆后再安排'
)
if short_move:
parts = []
for cert, need in short_move[:3]:
left = _available(cert)
parts.append(
f'{_cert_no(cert)}剩余{left}{cert.quantity_unit},本次需要{need}{cert.quantity_unit}'
)
return (
f'{place}段运输证{";".join(parts)}。'
'运输证余量不足,请先补充额度或调整计划量后再安排'
)
if short_buy and not ready_buy:
parts = []
for cert, need in short_buy[:3]:
left = _available(cert)
parts.append(
f'{_cert_no(cert)}剩余{left}{cert.quantity_unit},本次需要{need}{cert.quantity_unit}'
)
return (
f'{place}段购买证{";".join(parts)}。'
'购买证余量不足,请先补充额度或调整计划量后再安排'
)
if no_transport_link and not vehicle_miss and not short_move:
nos = _join_cert_nos(no_transport_link)
return (
f'{place}段购买证 {nos} 尚未关联运输证。'
'请打开运输证,在「关联购买证」中选择该购买证后再安排'
)
if expired_move and not vehicle_miss:
nos = _join_cert_nos(expired_move)
return (
f'{place}段运输证 {nos} 不在计划日期 {on_date.isoformat()} 的有效期内,'
'请更换有效运输证后再安排'
)
if expired_buy and not ready_buy:
nos = _join_cert_nos(expired_buy)
return (
f'{place}段购买证 {nos} 不在计划日期 {on_date.isoformat()} 的有效期内,'
'请更换有效购买证后再安排'
)
if unverified_move and not vehicle_miss:
nos = _join_cert_nos(unverified_move)
return f'{place}段运输证 {nos} 尚未复核启用,请先复核后再安排'
if unverified_buy and not ready_buy:
nos = _join_cert_nos(unverified_buy)
return f'{place}段购买证 {nos} 尚未复核启用,请先复核后再安排'
if consumed_move:
nos = _join_cert_nos(consumed_move)
return f'{place}段运输证 {nos} 为一次有效且已使用,请更换证件后再安排'
if consumed_buy and not ready_buy:
nos = _join_cert_nos(consumed_buy)
return f'{place}段购买证 {nos} 为一次有效且已使用,请更换证件后再安排'
if unit_buy or unit_move:
return (
f'{place}段证件单位与计划单位无法自动换算,'
'请调整单位或到「计划段次用证」填写换算后再安排'
)
if no_opening_buy or no_opening_move:
return f'{place}段证件尚未确认期初用量,请先确认期初后再安排'
return (
f'{place}段找不到可用的购买证'
f'{"和运输证" if source.requires_transport else ""},'
'请补充证件或标记证书齐备后再安排'
)
def select_whole_cover_certs(
db, user, sources, *, vehicle_no: str, on_date: date, manual_allocations=(),
plan_id=None,
):
"""返回 purchase_cert_ids, transport_cert_ids, manual_allocations。
每个来源必须由一张购买证整笔覆盖;异地再配一张关联且车号/余量够的运输证。
单位无法自动换算时,使用计划段次用证已保存的人工换算量。
plan_id:再安排时排除本计划已占用的一次有效证,并把本单预占加回可选余量。
"""
if not sources:
return [], [], []
@@ -80,33 +467,19 @@ def select_whole_cover_certs(db, user, sources, *, vehicle_no: str, on_date: dat
purchase_ids = []
transport_ids = []
manuals = []
saved_manuals = manual_allocations or ()
for source in sources:
customer_id = _customer_id_from_source(source)
categories = category_ids_for_product(db, user.tenant_no, source.product_id)
if not categories:
product_label = _source_product_label(db, user, source) or '该产品'
raise HTTPException(
409,
'产品未配置证用品类,请先在证用品类中关联系统产品后再安排运输',
f'产品「{product_label}」未配置证用品类,请先在证用品类中关联系统产品后再安排运输',
)
# MySQL ASC 会把 NULL 排最前;无到期证应排在末尾,优先消耗更早到期的证(D5)
candidates = (
db.query(PlPurchaseCert)
.filter(
PlPurchaseCert.tenant_no == user.tenant_no,
PlPurchaseCert.del_flag == 0,
PlPurchaseCert.status == 'active',
PlPurchaseCert.customer_id == customer_id,
PlPurchaseCert.category_id.in_(categories),
)
.order_by(
PlPurchaseCert.valid_to.is_(None).asc(),
PlPurchaseCert.valid_to.asc(),
PlPurchaseCert.id.asc(),
)
.all()
)
candidates = _purchase_candidates(db, user, customer_id, categories)
chosen_purchase = None
chosen_transport = None
@@ -116,17 +489,22 @@ def select_whole_cover_certs(db, user, sources, *, vehicle_no: str, on_date: dat
for purchase in candidates:
if not purchase.verified_by or not purchase.verified_time:
continue
_ensure_opening_quiet(db, user, 'purchase', purchase.id, purchase)
if not _has_opening(db, user, 'purchase', purchase.id):
continue
if not _in_force(purchase, on_date):
continue
if purchase.opening_single_use_consumed:
if is_single_use_consumed(db, user, 'purchase', purchase, exclude_plan_id=plan_id):
continue
try:
need = _permit_qty_for(Decimal(source.quantity), source.unit, purchase.quantity_unit)
need = _need_permit_qty(
source.quantity, source.unit, purchase.quantity_unit,
saved_manuals, 'purchase', source.source_id, purchase.id,
)
except HTTPException:
continue
if _available(purchase) < need:
buy_own = _plan_own_reserved(db, user, plan_id, 'purchase', purchase.id)
if _available(purchase, own_reserved=buy_own) < need:
continue
if not source.requires_transport:
@@ -134,50 +512,30 @@ def select_whole_cover_certs(db, user, sources, *, vehicle_no: str, on_date: dat
purchase_permit_qty = need
break
refs = (
db.query(PlTransportCertPurchaseRef)
.filter_by(
tenant_no=user.tenant_no,
purchase_cert_id=purchase.id,
del_flag=0,
)
.all()
)
transport_cert_ids = [r.transport_cert_id for r in refs if r.transport_cert_id]
if not transport_cert_ids:
transports = _linked_transports(db, user, customer_id, purchase.id)
if not transports:
continue
transports = (
db.query(PlTransportCert)
.filter(
PlTransportCert.tenant_no == user.tenant_no,
PlTransportCert.del_flag == 0,
PlTransportCert.status == 'active',
PlTransportCert.customer_id == customer_id,
PlTransportCert.id.in_(transport_cert_ids),
)
.order_by(
PlTransportCert.valid_to.is_(None).asc(),
PlTransportCert.valid_to.asc(),
PlTransportCert.id.asc(),
)
.all()
)
for transport in transports:
if not transport.verified_by or not transport.verified_time:
continue
_ensure_opening_quiet(db, user, 'transport', transport.id, transport)
if not _has_opening(db, user, 'transport', transport.id):
continue
if not _in_force(transport, on_date):
continue
if transport.opening_single_use_consumed:
if is_single_use_consumed(db, user, 'transport', transport, exclude_plan_id=plan_id):
continue
if not _vehicle_ok(transport, vehicle_no):
continue
try:
t_need = _permit_qty_for(Decimal(source.quantity), source.unit, transport.quantity_unit)
t_need = _need_permit_qty(
source.quantity, source.unit, transport.quantity_unit,
saved_manuals, 'transport', source.source_id, transport.id,
)
except HTTPException:
continue
if _available(transport) < t_need:
move_own = _plan_own_reserved(db, user, plan_id, 'transport', transport.id)
if _available(transport, own_reserved=move_own) < t_need:
continue
chosen_purchase = purchase
chosen_transport = transport
@@ -188,11 +546,13 @@ def select_whole_cover_certs(db, user, sources, *, vehicle_no: str, on_date: dat
break
if chosen_purchase is None:
place = '同市' if not source.requires_transport else '异地'
raise HTTPException(
409,
f'{place}段找不到余量足够、有效期内且匹配品类/车号的购买证'
f'{"和运输证" if source.requires_transport else ""},请补充证件或标记证书齐备后再安排',
_diagnose_select_failure(
db, user, source, vehicle_no=vehicle_no, on_date=on_date,
candidates=candidates, manual_allocations=saved_manuals,
plan_id=plan_id,
),
)
purchase_ids.append(chosen_purchase.id)
@@ -221,3 +581,76 @@ def select_whole_cover_certs(db, user, sources, *, vehicle_no: str, on_date: dat
return list(dict.fromkeys(values))
return unique(purchase_ids), unique(transport_ids), manuals
def resolve_customer_category_cover_certs(db, user, sources):
"""归档超额补扣:按客户+品类收集证件池,不查合同绑证。
与 select_whole_cover_certs 不同,这里不按数量筛证,把客户下匹配品类的
有效购买证及其关联运输证全部纳入候选,由结转阶段结合本计划返还额度分配。
"""
if not sources:
return [], []
purchase_ids = []
transport_ids = []
missing_both = []
missing_purchase = []
missing_transport = []
for source in sources:
customer_id = _customer_id_from_source(source)
snap = source.snapshot or {}
customer_label = (
snap.get('customerName')
or snap.get('customer_name')
or snap.get('customerNo')
or snap.get('customer_no')
or customer_id
)
categories = category_ids_for_product(db, user.tenant_no, source.product_id)
if not categories:
product_label = _source_product_label(db, user, source) or '该产品'
raise HTTPException(
409,
f'产品「{product_label}」未配置证用品类,请先在证用品类中关联系统产品后再归档',
)
purchases = _purchase_candidates(db, user, customer_id, categories)
needs_transport = getattr(source, 'requires_transport', True)
if not purchases:
(missing_both if needs_transport else missing_purchase).append(str(customer_label))
continue
purchase_ids.extend(p.id for p in purchases)
if not needs_transport:
continue
linked = []
for purchase in purchases:
linked.extend(_linked_transports(db, user, customer_id, purchase.id))
if not linked:
missing_transport.append(str(customer_label))
continue
transport_ids.extend(t.id for t in linked)
messages = []
if missing_both:
names = '、'.join(dict.fromkeys(missing_both))
messages.append(
f'客户{names}下尚未建档匹配品类的购买证和运输证,请先建档证件后再归档'
)
if missing_purchase:
names = '、'.join(dict.fromkeys(missing_purchase))
messages.append(
f'客户{names}下尚未建档匹配品类的购买证,请先建档证件后再归档'
)
if missing_transport:
names = '、'.join(dict.fromkeys(missing_transport))
messages.append(
f'客户{names}下购买证尚未关联可用运输证,请先关联运输证后再归档'
)
if messages:
raise HTTPException(409, ';'.join(messages))
def unique(values):
return list(dict.fromkeys(values))
return unique(purchase_ids), unique(transport_ids)
+45 -12
View File
@@ -34,6 +34,13 @@ def plan_fingerprint(sources):
return hashlib.sha256(json.dumps(sorted((s.source_id, s.fingerprint) for s in sources)).encode()).hexdigest()
def plan_cert_on_date(plan) -> date:
"""购买证、运输证有效期只按计划日期比对。"""
if getattr(plan, "plan_date", None) is None:
raise HTTPException(409, "请先填写计划日期")
return plan.plan_date
def classify_contract_cert_bindings(sources, bindings_by_contract, contract_labels):
"""按合同产品的可用绑定选出购买证、运输证。同市段只要求购买证。"""
purchase_ids, transport_ids = [], []
@@ -131,16 +138,20 @@ def build_usage_request(db, user, plan_id, operation, action, *, lock=False, che
sources, actuals = [], {}
else:
sources, actuals = extract_sources(db, user, plan_id, mapping, actual=action in ('settle', 'actual_adjust'), lock=lock, preview_vehicle=preview_vehicle, measurement_version=config.measurement_version)
from app.services.pl_cert_quota_rule_config_service import plan_uses_customer_category
customer_rule = plan_uses_customer_category(plan)
from app.services.pl_cert_quota_rule_config_service import plan_applies_customer_category_rule
customer_rule = plan_applies_customer_category_rule(db, user.tenant_no, plan)
if action in ('reserve', 'resize') and not explicit and sources:
if customer_rule:
# 新规则:禁止手工选证;按客户+品类整笔自动选证
from app.services.pl_quota_customer_select import select_whole_cover_certs
vehicle = (preview_vehicle or {}).get('licensePlate', plan.license_plate) or ''
on_date = max(date.today(), plan.plan_date or date.today())
vehicle = str(
(preview_vehicle or {}).get('licensePlate', plan.license_plate) or ''
).strip()
on_date = plan_cert_on_date(plan)
purchase_ids, transport_ids, manuals = select_whole_cover_certs(
db, user, sources, vehicle_no=vehicle, on_date=on_date,
manual_allocations=config.manual_allocations,
plan_id=plan.id,
)
config = config.model_copy(update={
'purchase_cert_ids': purchase_ids,
@@ -171,7 +182,7 @@ def build_usage_request(db, user, plan_id, operation, action, *, lock=False, che
certs = {key: _get_row(db, user, *key, lock=False) for key in sorted(keys)}
if sources and not keys:
msg = (
'找不到适用的购买证和运输证,请补充证件或标记证书齐备后再安排运输'
'未选到可用的购买证和运输证。请核对证件余量、有效期、品类与车牌号后补充证件,或标记证书齐备后再安排运输'
if customer_rule else
'请先在合同中绑定购买证和运输证后再安排运输'
)
@@ -183,7 +194,7 @@ def build_usage_request(db, user, plan_id, operation, action, *, lock=False, che
operation_id=op.operation_id, action=action, plan_id=plan_id, sources=sources,
allow_supplement=op.allow_supplement,
purchase_cert_ids=config.purchase_cert_ids, transport_cert_ids=config.transport_cert_ids,
vehicle_no=(preview_vehicle or {}).get('licensePlate', plan.license_plate) or '', on_date=max(date.today(), plan.plan_date or date.today()),
vehicle_no=str((preview_vehicle or {}).get('licensePlate', plan.license_plate) or '').strip(), on_date=plan_cert_on_date(plan),
executed=executed, manual_allocations=[UsageManual(**r.model_dump()) for r in config.manual_allocations],
actual_by_source=actuals, manual_actuals=[UsageManual(**r.model_dump()) for r in op.manual_actuals],
reason=op.reason, evidence_urls=op.evidence_urls or '', source_note=op.source_note or '',
@@ -225,10 +236,10 @@ def preview_plan(db, user, plan_id, config, preview_vehicle=None):
def save_configuration(db, user, plan_id, config):
from app.services.pl_plan_service import record_plan_change
from app.services.pl_cert_quota_rule_config_service import plan_uses_customer_category
from app.services.pl_cert_quota_rule_config_service import plan_applies_customer_category_rule
config = config if isinstance(config, PlanQuotaConfiguration) else PlanQuotaConfiguration.model_validate(config)
plan = _plan(db, user, plan_id, lock=True)
if plan_uses_customer_category(plan):
if plan_applies_customer_category_rule(db, user.tenant_no, plan):
raise HTTPException(409, '新规则下安排仅自动选证,不支持手工保存用证配置')
if plan.transport_status == 'arranged' or plan.archive_status == 'archived':
raise HTTPException(409, '已安排计划请通过调整运输在同一事务重算用证')
@@ -333,13 +344,35 @@ def get_plan_quota(db, user, plan_id):
if row.contract_product_id in cert['productIds']]})
if product.is_toxic == 1:
options.append(item)
usages = db.query(PlPlanCertUsage).filter_by(tenant_no=user.tenant_no, plan_id=plan_id, del_flag=0).order_by(PlPlanCertUsage.create_time.desc()).all()
# 关联证件展示只含仍占用/结转中的用量;released 已从配置摘除,不再算作当前关联。
usages = (
db.query(PlPlanCertUsage)
.filter(
PlPlanCertUsage.tenant_no == user.tenant_no,
PlPlanCertUsage.plan_id == plan_id,
PlPlanCertUsage.del_flag == 0,
PlPlanCertUsage.usage_status != 'released',
)
.order_by(PlPlanCertUsage.create_time.desc())
.all()
)
version = resolve_measurement_version(db, user, plan)
from app.services.pl_cert_quota_rule_config_service import plan_uses_customer_category
customer_rule = plan_uses_customer_category(plan)
from app.services.pl_cert_quota_rule_config_service import (
VERSION_LEGACY,
plan_applies_customer_category_rule,
resolve_rule_version_for_arrange,
)
customer_rule = plan_applies_customer_category_rule(db, user.tenant_no, plan)
stamped = getattr(plan, 'cert_quota_rule_version', None)
if stamped:
rule_version = stamped
elif getattr(plan, 'cert_quota_arranged_at', None) is None:
rule_version = resolve_rule_version_for_arrange(db, user.tenant_no)
else:
rule_version = VERSION_LEGACY
result = {'planId': plan.id, 'planNo': plan.plan_no, 'licensePlate': plan.license_plate,
'quotaCertWaived': int(getattr(plan, 'quota_cert_waived', 0) or 0) == 1,
'certQuotaRuleVersion': getattr(plan, 'cert_quota_rule_version', None) or 'legacy',
'certQuotaRuleVersion': rule_version or VERSION_LEGACY,
'measurementVersion': version,
'configuration': {**(plan.cert_configuration or {}), 'measurementVersion': version}, 'sourceOptions': options,
'stopProducts': stop_products,
+4
View File
@@ -168,6 +168,10 @@ def extract_sources(db, user, plan_id, mapping=None, *, actual=False, lock=False
snapshot['vehicle'] = preview_vehicle.get('licensePlate', plan.license_plate)
snapshot['trailer'] = preview_vehicle.get('trailerNo', plan.trailer_no)
fingerprint = hashlib.sha256(json.dumps(snapshot, sort_keys=True, ensure_ascii=False).encode()).hexdigest()
# 展示字段不参与 fingerprint,避免仅补产品名就触发来源指纹变化
product_name = getattr(row, 'product_name', None)
if product_name is not None and str(product_name).strip():
snapshot = {**snapshot, 'productName': str(product_name).strip()}
source = UsageSource(source_stop_type=side, source_stop_id=stop.id, source_stop_product_id=row.id,
plan_product_id=row.plan_product_id, contract_id=row.contract_id,
contract_product_id=row.contract_product_id, product_id=row.product_id,
+107 -2
View File
@@ -4,12 +4,12 @@ from decimal import Decimal
from sqlalchemy import and_, or_, literal, func
from fastapi import HTTPException
from app.crud.crm.data_scope_helpers import apply_crm_owner_scope
from app.models.crm_models import CrmContract, CrmContractProduct
from app.models.crm_models import CrmContract, CrmContractProduct, CrmCustomer
from app.models.pl_models import PlPlan
from app.models.pl_quota_models import (PlContractCertLink as Link, PlContractCertProduct as Scope,
PlPlanCertUsage as Usage, PlPlanCertUsageItem as Item, PlCertQtyLog as Log)
from app.services.pl_data_scope import apply_pl_scope
from app.services.pl_quota_cert_service import MODELS, _get_row
from app.services.pl_quota_cert_service import MODELS, _get_row, get_cert, usage_policy
ZERO = Decimal('0')
CONTRACT_TYPES = {'sale', 'purchase', 'framework_sale', 'framework_purchase', 'framework'}
@@ -109,6 +109,39 @@ def _contracts(db, user):
user.to_user_info(), db, user.tenant_no)
def _customers(db, user):
return apply_crm_owner_scope(_active(db, user, CrmCustomer), CrmCustomer,
user.to_user_info(), db, user.tenant_no)
def _customer_cert_counts(db, user):
"""按客户汇总购买证+运输证数量;默认排除已核销/作废,与证件列表一致。"""
parts = []
for model in MODELS.values():
query = apply_pl_scope(_active(db, user, model), model, user, db, user.tenant_no)
query = query.filter(
model.customer_id.isnot(None),
model.customer_id != '',
model.status.notin_(('closed', 'void')),
)
parts.append(query.with_entities(model.customer_id.label('customer_id'), literal(1).label('one')))
combined = parts[0].union_all(*parts[1:]).subquery()
return (
db.query(combined.c.customer_id.label('customer_id'), func.count().label('cert_count'))
.group_by(combined.c.customer_id)
.subquery()
)
def _customer_summary(row):
return {
'id': row.id,
'customerId': row.id,
'customerNo': row.customer_no or '',
'customerName': row.customer_name or '',
}
def _certificates(db, user, keyword=None, cert_type=None, cert_no=None, cert_types=None):
queries = []
for kind, model in MODELS.items():
@@ -351,6 +384,78 @@ def contract_statistics(db, user, contract_id):
return {**_contract_summary(contract), 'certificates': result}
def list_customers(db, user, keyword=None, page=1, page_size=20, customer_no=None, customer_name=None,
cert_count_op=None, cert_count=None, cert_count_min=None, cert_count_max=None):
counts = _customer_cert_counts(db, user)
query = _customers(db, user).join(counts, counts.c.customer_id == CrmCustomer.id)
if keyword:
query = query.filter(or_(
CrmCustomer.customer_no.contains(keyword, autoescape=True),
CrmCustomer.customer_name.contains(keyword, autoescape=True),
CrmCustomer.short_name.contains(keyword, autoescape=True),
))
if _text(customer_no):
query = query.filter(CrmCustomer.customer_no.contains(_text(customer_no), autoescape=True))
if _text(customer_name):
query = query.filter(CrmCustomer.customer_name.contains(_text(customer_name), autoescape=True))
for clause in _number_clauses(counts.c.cert_count, cert_count_op, cert_count, cert_count_min, cert_count_max):
query = query.filter(clause)
total = query.count()
rows = query.with_entities(CrmCustomer, counts.c.cert_count).order_by(
CrmCustomer.create_time.desc(), CrmCustomer.id
).offset((page - 1) * page_size).limit(page_size).all()
return {
'list': [{**_customer_summary(customer), 'certCount': int(count or 0)} for customer, count in rows],
'total': total,
'page': page,
'pageSize': page_size,
}
def customer_statistics(db, user, customer_id):
customer = _customers(db, user).filter(CrmCustomer.id == customer_id).first()
if customer is None:
raise HTTPException(404, '客户不存在或无权访问')
certificates = []
for kind, model in MODELS.items():
query = apply_pl_scope(_active(db, user, model), model, user, db, user.tenant_no)
query = query.filter(
model.customer_id == customer_id,
model.status.notin_(('closed', 'void')),
)
for row in query.order_by(model.create_time.desc(), model.id).all():
item = get_cert(db, user, kind, row.id)
sale = item.get('sellerName') if kind == 'purchase' else item.get('shipperName')
buy = item.get('buyerName') if kind == 'purchase' else item.get('consigneeName')
certificates.append({
'id': row.id,
'certId': row.id,
'certType': kind,
'certNo': item.get('certNo') or '',
'productNameOnCert': item.get('productNameOnCert') or '',
'quantityUnit': item.get('quantityUnit') or '',
'totalQty': item.get('totalQty'),
'reservedQty': item.get('reservedQty'),
'usedQty': item.get('usedQty'),
'availableQty': item.get('availableQty'),
'status': item.get('status') or '',
'validFrom': item.get('validFrom'),
'validTo': item.get('validTo'),
'salePartyName': sale or '',
'buyPartyName': buy or '',
'validUseText': item.get('validUseText') or '',
'usagePolicy': item.get('usagePolicy') or usage_policy(row.valid_use_text),
'singleUseConsumed': bool(item.get('singleUseConsumed')),
'openingConfirmed': bool(item.get('openingConfirmed')),
'createTime': item.get('createTime'),
})
certificates.sort(
key=lambda row: (str(row.get('createTime') or ''), row.get('certNo') or ''),
reverse=True,
)
return {**_customer_summary(customer), 'certificates': certificates}
def certificate_statistics(db, user, cert_type, cert_id):
_get_row(db, user, cert_type, cert_id)
certs = _certificates(db, user, cert_type=cert_type)
+155 -45
View File
@@ -16,7 +16,7 @@ from app.models.pl_models import PlPlan
from app.models.crm_models import CrmContractProduct
from app.schemas.pl.quota_usage import UsageManual, UsageRequest
from app.services.pl_data_scope import assert_pl_row_in_scope
from app.services.pl_quota_cert_service import _audit, _get_row, usage_policy
from app.services.pl_quota_cert_service import _audit, _get_row, is_single_use_consumed, usage_policy
from app.services.pl_quota_contract_service import _contract
from app.services.pl_quota_allocation import (SourceDemand, PermitCandidate, ManualAllocation, Allocation,
allocate_plan, settle_allocations, validate_allocation_pairing, InsufficientQuota)
@@ -26,6 +26,26 @@ from app.services.pl_quota_units import same_quantity_unit, standard_conversion_
ZERO = Decimal('0')
def _normalize_vehicle_no(vehicle_no) -> str:
return str(vehicle_no or '').strip()
def _vehicle_on_cert(cert, vehicle_no) -> bool:
"""计划车牌与证上车号比对时两侧都去空白,避免尾部空格误判。"""
plate = _normalize_vehicle_no(vehicle_no)
if not plate:
return False
plates = getattr(cert, 'vehicle_numbers_json', None) or []
if isinstance(plates, str):
try:
plates = json.loads(plates)
except Exception:
plates = [plates]
if not isinstance(plates, list):
return False
return plate in {str(p).strip() for p in plates if p is not None and str(p).strip()}
def _reserve_input_mode(source_unit, cert_unit):
if same_quantity_unit(source_unit, cert_unit):
return 'same_unit'
@@ -131,9 +151,8 @@ def _execute(db,user,r,digest,plan):
selected={('purchase',x) for x in r.purchase_cert_ids}|{('transport',x) for x in r.transport_cert_ids}
keys=selected|{(u.cert_type,u.cert_id) for u in old_rows}
if r.action in ('settle', 'actual_adjust') and not r.allow_supplement and r.sources:
from app.services.pl_quota_planning import resolve_contract_bound_certs
try:
purchase_ids, transport_ids = resolve_contract_bound_certs(db, user, r.sources)
purchase_ids, transport_ids = _settle_cover_cert_ids(db, user, plan, r.sources)
except HTTPException:
purchase_ids, transport_ids = [], []
keys |= {('purchase', cert_id) for cert_id in purchase_ids} | {('transport', cert_id) for cert_id in transport_ids}
@@ -166,9 +185,9 @@ def _execute(db,user,r,digest,plan):
raise ValueError('已执行用证不得释放预占,请先结转实际量')
for k,u in usages.items():
certs[k].reserved_qty-=u.reserved_qty; u.reserved_qty=ZERO
u.usage_status='released'
u.usage_status='released'; u.del_flag=1
for item in items[k]:
item.reserved_qty=ZERO; item.item_status='released'
item.reserved_qty=ZERO; item.item_status='released'; item.del_flag=1
else:
supplement=_settle(db,user,r,certs,usages,items,plan)
for k,u in usages.items():
@@ -198,10 +217,13 @@ def _candidate_context(db,user,r,plan,certs,usages,items,selected,preview=False,
if product is None or product.product_id!=s.product_id: raise ValueError('合同产品归属不符')
scopes={}; candidates={'purchase':[],'transport':[]}
skipped_for_vehicle=False
from app.services.pl_cert_quota_rule_config_service import plan_uses_customer_category
customer_rule = plan_uses_customer_category(plan)
from app.services.pl_cert_quota_rule_config_service import plan_applies_customer_category_rule
# 安排前 version 常为空;须按 effective_at 前瞻,不能把空当 legacy(否则人工行会报「不适用」)。
customer_rule = plan_applies_customer_category_rule(db, getattr(user, 'tenant_no', None) or '', plan)
from app.services.pl_quota_cert_service import ensure_zero_opening
for k in sorted(selected):
kind,pid=k; c=certs[k]
c = certs[k] = ensure_zero_opening(db, user, kind, pid, row=c)
if not query(m.PlCertQtyLog,cert_type=kind,cert_id=pid,event_type='opening',del_flag=0).first(): raise ValueError('证件尚未确认期初')
if c.status=='closed': raise ValueError('已核销证件不能再安排用证')
if c.status!='active' or not c.verified_time or not c.verified_by: raise ValueError('证件尚未启用复核')
@@ -210,13 +232,11 @@ def _candidate_context(db,user,r,plan,certs,usages,items,selected,preview=False,
policy=usage_policy(c.valid_use_text)
if policy=='needs_confirmation': raise ValueError('有效次数待确认')
# 合同上常有多张运输证。车号对不上的证不参与本次分配,只要还有一张覆盖该主车号即可安排。
if kind=='transport' and (not r.vehicle_no or r.vehicle_no not in (c.vehicle_numbers_json or [])):
if kind=='transport' and not _vehicle_on_cert(c, r.vehicle_no):
skipped_for_vehicle=True
continue
if policy=='once':
previous=query(m.PlPlanCertUsage,cert_type=kind,cert_id=pid,del_flag=0).all()
if c.opening_single_use_consumed or any(u.plan_id!=plan.id and (u.usage_status in ('reserved','in_transit','settled','exception') or (u.confirmation_snapshot or {}).get('executed')) for u in previous):
raise ValueError('一次有效证件已使用或已占用')
if policy=='once' and is_single_use_consumed(db, user, kind, c, exclude_plan_id=plan.id):
raise ValueError('一次有效证件已使用或已占用')
eligible=set()
if customer_rule:
# 新规则已由客户+品类整笔选证;账本不再依赖合同绑证 scope。
@@ -233,7 +253,21 @@ def _candidate_context(db,user,r,plan,certs,usages,items,selected,preview=False,
own=usages[k].reserved_qty if k in usages else ZERO
candidates[kind].append(PermitCandidate(pid,c.total_qty-c.used_qty-c.reserved_qty+own,c.quantity_unit,c.valid_to,frozenset(eligible),refs))
if skipped_for_vehicle and not candidates['transport']:
raise ValueError('车号不在运输证范围')
plate = _normalize_vehicle_no(r.vehicle_no)
if not plate:
raise ValueError('安排运输须填写车牌号;当前未填写车牌,无法匹配运输证车号')
nos = '、'.join(
dict.fromkeys(
str(certs[k].cert_no or k[1])
for k in sorted(selected)
if k[0] == 'transport' and k in certs
)
)
suffix = f'(已选运输证 {nos})' if nos else ''
raise ValueError(
f'车牌号「{plate}」不在运输证车号范围内{suffix},'
'请到运输证中补充该车号或更换车辆后再安排'
)
return sources,scopes,candidates
def _reserve(db,user,r,plan,certs,usages,items,selected,preview=False,lock_preview=False):
@@ -310,7 +344,12 @@ def _reserve(db,user,r,plan,certs,usages,items,selected,preview=False,lock_previ
if item.actual_cert_qty is not None or item.item_status in ('in_transit','settled'): raise ValueError('已执行明细不能移除')
item.del_flag=1; item.reserved_qty=ZERO; item.item_status='released'
new_qty=sum((a.permit_quantity for a in allocations),ZERO)
c.reserved_qty+=new_qty-u.reserved_qty; u.reserved_qty=new_qty; u.usage_status='reserved' if allocations else 'released'
c.reserved_qty+=new_qty-u.reserved_qty; u.reserved_qty=new_qty
# 无分配时标记释放并软删,详情「关联证件」不再展示;再预占同证时复用本行并恢复 del_flag。
if allocations:
u.usage_status='reserved'; u.del_flag=0
else:
u.usage_status='released'; u.del_flag=1
u.cert_revision=c.revision; u.confirmed_by=user.id; u.confirmed_time=datetime.now()
u.confirmation_snapshot={'executed':False,'vehicleNo':r.vehicle_no,
'measurementVersion': next((s.snapshot.get('measurementVersion', 'legacy_single_side') for s in r.sources), 'legacy_single_side')}
@@ -362,35 +401,88 @@ def _validate_current_sources(r,active):
raise ValueError('当前权威来源身份、计划量、单位或指纹已变化,请重新核对用证')
class ArchiveQuotaBlocked(ValueError):
"""合同上的购买证、运输证仍不够本次实际量,归档必须整单回滚。"""
"""可用购买证、运输证仍不够本次实际量,归档必须整单回滚。"""
ARCHIVE_QUOTA_BLOCK = '合同绑定的购买证和运输证剩余额度不够覆盖本次实际数量,不能归档。请先补充证件额度或调整实际数量后再归档。'
CUSTOMER_ARCHIVE_QUOTA_BLOCK = (
'客户名下购买证和运输证剩余额度不够覆盖本次实际数量,不能归档。'
'请先补充证件额度或调整实际数量后再归档。'
)
ARCHIVE_CONVERSION_EXCESS_BLOCK = (
'实际数量超出安排时的预占,且原证件剩余额度不够按原换算系数继续扣减,不能归档。'
'请把实际数量改小,或先补充证件额度后再归档。'
)
def _settle_cover_cert_ids(db, user, plan, sources):
"""归档超额补扣证件池:新规则按客户+品类,旧规则按合同绑证。"""
from app.services.pl_cert_quota_rule_config_service import plan_applies_customer_category_rule
if plan_applies_customer_category_rule(db, getattr(user, 'tenant_no', None) or '', plan):
from app.services.pl_quota_customer_select import resolve_customer_category_cover_certs
return resolve_customer_category_cover_certs(db, user, sources)
from app.services.pl_quota_planning import resolve_contract_bound_certs
return resolve_contract_bound_certs(db, user, sources)
def _settlement_cover_cert(db, user, r, plan, kind, cert):
"""合同上另有证件时,不合格的证跳过,不因此挡住其余还能扣的证。"""
return _settlement_cover_reject_reason(db, user, r, plan, kind, cert) is None
def _settlement_cover_reject_reason(db, user, r, plan, kind, cert):
"""返回不可用于归档补扣的具体原因;可用时返回 None。"""
from app.services.pl_quota_cert_service import ensure_zero_opening
cert = ensure_zero_opening(db, user, kind, cert.id, row=cert)
label = '购买证' if kind == 'purchase' else '运输证'
no = str(cert.cert_no or cert.id)
if not _query(db, user, m.PlCertQtyLog, cert_type=kind, cert_id=cert.id, event_type='opening', del_flag=0).first():
return False
return f'{label} {no} 尚未确认期初用量'
if cert.status != 'active' or not cert.verified_time or not cert.verified_by:
return False
return f'{label} {no} 未启用或未复核'
if cert.valid_from is None or cert.valid_to is None or not cert.valid_from <= r.on_date <= cert.valid_to:
return False
return f'{label} {no} 不在计划日期 {r.on_date.isoformat()} 的有效期内'
policy = usage_policy(cert.valid_use_text)
if policy == 'needs_confirmation':
return False
if kind == 'transport' and (not r.vehicle_no or r.vehicle_no not in (cert.vehicle_numbers_json or [])):
return False
if policy == 'once':
previous = _query(db, user, m.PlPlanCertUsage, cert_type=kind, cert_id=cert.id, del_flag=0).all()
if cert.opening_single_use_consumed or any(
u.plan_id != plan.id and (
u.usage_status in ('reserved', 'in_transit', 'settled', 'exception')
or (u.confirmation_snapshot or {}).get('executed')
) for u in previous
):
return False
return True
return f'{label} {no} 有效次数待确认'
if kind == 'transport':
plate = _normalize_vehicle_no(r.vehicle_no)
if not plate:
return f'运输证 {no} 需要车牌号,当前计划未填写车牌'
if not _vehicle_on_cert(cert, plate):
raw = cert.vehicle_numbers_json or []
if isinstance(raw, str):
listed = raw
else:
listed = '、'.join(str(p).strip() for p in raw if str(p).strip())
suffix = f'(证上现有车号:{listed})' if listed else ''
return f'运输证 {no} 未包含车牌号「{plate}」{suffix}'
if policy == 'once' and is_single_use_consumed(db, user, kind, cert, exclude_plan_id=plan.id):
return f'{label} {no} 为一次有效且已使用'
return None
def _archive_cover_block_message(db, user, r, plan, certs, candidate_keys):
"""补证候选全被跳过时,汇总具体原因,避免笼统额度不足。"""
from app.services.pl_cert_quota_rule_config_service import plan_applies_customer_category_rule
customer_rule = plan_applies_customer_category_rule(db, getattr(user, 'tenant_no', None) or '', plan)
reasons = []
for kind, cid in candidate_keys:
key = (kind, cid)
cert = certs.get(key)
if cert is None:
label = '购买证' if kind == 'purchase' else '运输证'
reasons.append(f'{label} {cid} 不存在或不可用')
continue
reason = _settlement_cover_reject_reason(db, user, r, plan, kind, cert)
if reason:
reasons.append(reason)
if not reasons:
return CUSTOMER_ARCHIVE_QUOTA_BLOCK if customer_rule else ARCHIVE_QUOTA_BLOCK
unique = list(dict.fromkeys(reasons))
detail = ';'.join(unique[:4])
scope = '客户名下' if customer_rule else '合同上'
return f'{detail}。{scope}没有其他可用证件覆盖本次实际数量,不能归档。请先处理上述问题后再归档。'
_QTY = Decimal('0.000001')
@@ -447,7 +539,7 @@ def _prepare_saved_conversion(groups, actual_by_source, certs):
proposals[kind] = [row for row in rows if row.source_id != sid] + updated
mine = updated
if need > 0:
return groups, [], ARCHIVE_QUOTA_BLOCK
return groups, [], ARCHIVE_CONVERSION_EXCESS_BLOCK
remaining = actual
for row in sorted(mine, key=lambda item: item.allocation_seq):
take = min(remaining, row.source_quantity)
@@ -488,8 +580,8 @@ def _settle(db,user,r,certs,usages,items,plan):
raise ArchiveQuotaBlocked(conversion_error)
if generated:
r = r.model_copy(update={'manual_actuals': generated})
# 同单位超出预占时,自动改用合同上已绑定的购买证和运输证,含原证剩余额度。
contract_cover = False
# 同单位超出预占时,自动改用补扣证件池(新规则客户+品类,旧规则合同绑证),含原证剩余额度。
auto_cover = False
if not r.allow_supplement:
for sid, value in r.actual_by_source.items():
mine = [a for rows in groups.values() for a in rows if a.source_id == sid]
@@ -497,7 +589,7 @@ def _settle(db,user,r,certs,usages,items,plan):
continue
capacity = sum((a.source_quantity for a in groups['purchase'] if a.source_id == sid), ZERO)
if value > capacity:
contract_cover = True
auto_cover = True
break
# 原始容量不随补量扩大;新增证件原始容量为零,后续纠错始终先用原分配。
base_actual=dict(r.actual_by_source)
@@ -506,7 +598,7 @@ def _settle(db,user,r,certs,usages,items,plan):
capacity=sum((a.source_quantity for a in groups['purchase'] if a.source_id==sid),ZERO)
if value>capacity:
excess[sid]=value-capacity
if r.allow_supplement or contract_cover: base_actual[sid]=capacity
if r.allow_supplement or auto_cover: base_actual[sid]=capacity
# 人工显式补量可从当前实运来源拆出一段(如原证24、新证5),两段合计仍是29。
# 两证有一侧同单位时由联合分配器配对;异单位补量仍须完整人工输入。
if r.allow_supplement and r.manual_allocations:
@@ -558,35 +650,52 @@ def _settle(db,user,r,certs,usages,items,plan):
settled={kind:settle_allocations(rows,base_actual,manual_actuals=[a for a in _manual(r.manual_actuals) if a.permit_kind==kind]) for kind,rows in groups.items()}
supplemental=[]
if excess:
if contract_cover:
from app.services.pl_quota_planning import resolve_contract_bound_certs
if auto_cover:
from app.services.pl_cert_quota_rule_config_service import plan_applies_customer_category_rule
customer_rule = plan_applies_customer_category_rule(db, getattr(user, 'tenant_no', None) or '', plan)
try:
purchase_ids, transport_ids = resolve_contract_bound_certs(db, user, r.sources)
purchase_ids, transport_ids = _settle_cover_cert_ids(db, user, plan, r.sources)
except HTTPException as exc:
raise ArchiveQuotaBlocked(str(getattr(exc, 'detail', exc))) from exc
candidate_keys=[('purchase', x) for x in purchase_ids] + [('transport', x) for x in transport_ids]
selected=set()
for kind, cid in [('purchase', x) for x in purchase_ids] + [('transport', x) for x in transport_ids]:
for kind, cid in candidate_keys:
key=(kind, cid)
if key not in certs:
raise ArchiveQuotaBlocked(ARCHIVE_QUOTA_BLOCK)
raise ArchiveQuotaBlocked(
_archive_cover_block_message(db, user, r, plan, certs, candidate_keys)
)
if _settlement_cover_cert(db, user, r, plan, kind, certs[key]):
selected.add(key)
if not selected:
raise ArchiveQuotaBlocked(ARCHIVE_QUOTA_BLOCK)
raise ArchiveQuotaBlocked(
_archive_cover_block_message(db, user, r, plan, certs, candidate_keys)
)
else:
if not r.reason.strip() or not (r.evidence_urls.strip() or r.source_note.strip()):
raise ValueError('补分配必须有理由及依据')
selected={('purchase',x) for x in r.purchase_cert_ids}|{('transport',x) for x in r.transport_cert_ids}
customer_rule = False
# 校验器看到的是扣除原量、返还本计划旧账后的净可用量。
base_totals={k:ZERO for k in usages}
for kind,rows in settled.items():
for row in rows: base_totals[(kind,row.allocation.permit_id)]+=row.actual_permit_quantity
credits={k:SimpleNamespace(reserved_qty=u.reserved_qty+u.used_qty-base_totals[k]) for k,u in usages.items()}
extra_request=r.model_copy(update={'sources':[source.model_copy(update={'quantity':excess[source.source_id]}) for source in r.sources if source.source_id in excess]})
# 超额补扣需求仅为超出预占的部分。安排/完善并关闭写入的 manual_allocations
# 是整笔计划量,若原样带入会与超额需求冲突(证件明明够却报额度不足)。
extra_update = {
'sources': [
source.model_copy(update={'quantity': excess[source.source_id]})
for source in r.sources if source.source_id in excess
],
}
if auto_cover:
extra_update['manual_allocations'] = []
extra_request = r.model_copy(update=extra_update)
try:
result=_reserve(db,user,extra_request,plan,certs,credits,{},selected,preview=True,lock_preview=True)
except InsufficientQuota as exc:
if not contract_cover:
if not auto_cover:
raise
from app.services.pl_quota_diagnostics import archive_quantity_shortfall_message
cert_rows=[]
@@ -600,7 +709,8 @@ def _settle(db,user,r,certs,usages,items,plan):
message=archive_quantity_shortfall_message(
getattr(exc, 'diagnostics', None), cert_rows, r.actual_by_source, excess,
{source.source_id: source.unit for source in r.sources})
raise ArchiveQuotaBlocked(message or ARCHIVE_QUOTA_BLOCK) from exc
fallback = CUSTOMER_ARCHIVE_QUOTA_BLOCK if customer_rule else ARCHIVE_QUOTA_BLOCK
raise ArchiveQuotaBlocked(message or fallback) from exc
for kind in ('purchase','transport'):
for row in result[kind+'Allocations']:
supplemental.append((kind,row))
+16 -7
View File
@@ -269,7 +269,17 @@ def mark_ready(db, user, plan_id):
plan = _plan(db, user, plan_id, lock=True)
if plan.follow_status == "cancelled" or plan.archive_status == "cancelled":
raise HTTPException(409, "已作废的计划不能标记证书齐备")
from app.services.pl_cert_quota_rule_config_service import plan_requires_cert_fulfill
if quota_cert_waived(plan):
# 历史:安排前齐备按空版本当成 legacy,漏写 pending;再次调用时回补。
if (
plan_requires_cert_fulfill(db, user.tenant_no, plan)
and int(getattr(plan, "quota_cert_pending_fulfill", 0) or 0) != 1
):
plan.quota_cert_pending_fulfill = 1
plan.update_by = user.id
db.flush()
labels = _product_names(db, user, [plan.id])
return _row(plan, labels.get(plan.id, ""))
if not db.query(PlPlan.id).filter(PlPlan.id == plan.id, _toxic_exists(db, user.tenant_no)).first():
@@ -290,8 +300,7 @@ def mark_ready(db, user, plan_id):
plan.quota_cert_waived_by = user.id
plan.quota_cert_waived_by_name = name[:100] if name else None
plan.quota_cert_waived_time = datetime.now()
from app.services.pl_cert_quota_rule_config_service import plan_uses_customer_category
if plan_uses_customer_category(plan):
if plan_requires_cert_fulfill(db, user.tenant_no, plan):
plan.quota_cert_pending_fulfill = 1
change_content = "标记证书齐备:可安排运输;归档前须在证书齐备中完善并关闭"
else:
@@ -313,15 +322,15 @@ def mark_ready(db, user, plan_id):
def list_pending_fulfill_plans(db, user, page=1, page_size=20, keyword=""):
"""新规则下已齐备、待完善挂证的计划。"""
from app.services.pl_cert_quota_rule_config_service import VERSION_CUSTOMER_CATEGORY
"""新规则下已齐备、待完善挂证的计划。
以 pending 为准;安排前版本可能仍为空,不能再要求 cert_quota_rule_version。
"""
query = db.query(PlPlan).filter(
PlPlan.tenant_no == user.tenant_no,
PlPlan.del_flag == 0,
PlPlan.follow_status != "cancelled",
PlPlan.archive_status != "cancelled",
PlPlan.cert_quota_rule_version == VERSION_CUSTOMER_CATEGORY,
PlPlan.quota_cert_pending_fulfill == 1,
PlPlan.quota_cert_waived == 1,
)
@@ -345,14 +354,14 @@ def list_pending_fulfill_plans(db, user, page=1, page_size=20, keyword=""):
def fulfill_plan_certs(db, user, plan_id, *, operation_id=None):
"""完善并关闭:按安排同款自动选证并 reserve,成功后出队。"""
from app.services.pl_cert_quota_rule_config_service import plan_uses_customer_category
from app.services.pl_cert_quota_rule_config_service import plan_requires_cert_fulfill
from app.services.pl_plan_service import record_plan_change
from app.services.pl_quota_business import apply_plan_quota
from app.services.pl_quota_planning import _plan
from types import SimpleNamespace
plan = _plan(db, user, plan_id, lock=True)
if not plan_uses_customer_category(plan):
if not plan_requires_cert_fulfill(db, user.tenant_no, plan):
raise HTTPException(409, '仅新规则计划支持完善并关闭')
if int(getattr(plan, 'quota_cert_pending_fulfill', 0) or 0) != 1:
raise HTTPException(409, '该计划不在证书齐备待完善列表中')
@@ -479,6 +479,41 @@ def rate_l100(liters: Decimal, run_km: Optional[Decimal]) -> Optional[Decimal]:
)
def trip_rate_l100(
prev_liters: Optional[Decimal],
prev_odometer: Optional[Decimal],
curr_odometer: Optional[Decimal],
) -> Optional[Decimal]:
"""相邻两次登记的单次油耗:上次升数 × 100 / (本次期初 − 上次期初)。"""
if prev_liters is None or prev_odometer is None or curr_odometer is None:
return None
liters = Decimal(prev_liters)
if liters <= 0:
return None
return rate_l100(liters, Decimal(curr_odometer) - Decimal(prev_odometer))
def avg_recent_trip_rates_l100(
rows: Sequence[Tuple[Optional[Decimal], Optional[Decimal]]],
n: int,
) -> Optional[Decimal]:
"""rows 为按时间升序的 (期初公里, 加油升数);取最近 n 个有效单次油耗算术平均。"""
if n <= 0:
return None
rates: list[Decimal] = []
for i in range(1, len(rows)):
prev_odo, prev_liters = rows[i - 1]
curr_odo, _ = rows[i]
rate = trip_rate_l100(prev_liters, prev_odo, curr_odo)
if rate is not None:
rates.append(rate)
if not rates:
return None
selected = rates[-n:]
total = sum(selected, Decimal("0"))
return (total / Decimal(len(selected))).quantize(Decimal("0.01"), rounding=ROUND_HALF_UP)
def _odo_pairs(
rows: Sequence[PlVehicleFuelRegister],
) -> list[Tuple[date, Optional[Decimal]]]:
@@ -526,8 +561,6 @@ def list_plate_month_summary(
q_start, q_end = quarter_bounds(anchor)
prev_q_start, _ = _ym_bounds(ym_shift(f"{q_start:%Y-%m}", -3))
_, next_q_end = quarter_bounds(q_end)
range_start = min(prev_q_start, last3_start, prev_start)
range_end = max(next_end, next_q_end)
vehicle_query = (
db.query(PlVehicle)
@@ -535,6 +568,7 @@ def list_plate_month_summary(
PlVehicle.tenant_no == tenant_no,
PlVehicle.vehicle_type == "self",
PlVehicle.del_flag == 0,
PlVehicle.vehicle_status != "scrapped",
# 历史档案将叉车、油桶也归为 self;车辆统计卡片不展示这两类用油对象。
func.trim(PlVehicle.license_plate).notin_(("叉车", "油桶")),
)
@@ -547,12 +581,11 @@ def list_plate_month_summary(
vehicles = apply_pl_scope(vehicle_query, PlVehicle, user, db, tenant_no).all()
personnel_summaries = load_vehicle_personnel_summaries(db, tenant_no, [v.id for v in vehicles])
# 近 N 次平均需要完整历史;月/季指标仍从同批记录按区间切片。
query = db.query(PlVehicleFuelRegister).filter(
PlVehicleFuelRegister.tenant_no == tenant_no,
PlVehicleFuelRegister.del_flag == 0,
PlVehicleFuelRegister.status == "normal",
PlVehicleFuelRegister.register_date >= range_start,
PlVehicleFuelRegister.register_date < range_end,
)
query = apply_pl_scope(query, PlVehicleFuelRegister, user, db, tenant_no)
registers = query.order_by(
@@ -575,6 +608,7 @@ def list_plate_month_summary(
next_q_rows = [r for r in rows if q_end <= r.register_date < next_q_end]
prev_q_rows = [r for r in rows if prev_q_start <= r.register_date < q_start]
last3_rows = [r for r in rows if last3_start <= r.register_date < cur_end]
odo_liter_rows = [(r.odometer_km, r.fuel_liters) for r in rows]
month_km, month_status = period_run_km(_odo_pairs(cur_rows), _odo_pairs(next_rows))
prev_month_km, prev_month_status = period_run_km(_odo_pairs(prev_rows), _odo_pairs(cur_rows))
@@ -606,6 +640,9 @@ def list_plate_month_summary(
prevQuarterRateL100=prev_quarter_rate,
prevMonthRateL100=prev_month_rate,
last3MonthsRateL100=last3_rate,
avgRateLast10L100=avg_recent_trip_rates_l100(odo_liter_rows, 10),
avgRateLast20L100=avg_recent_trip_rates_l100(odo_liter_rows, 20),
avgRateLast30L100=avg_recent_trip_rates_l100(odo_liter_rows, 30),
)
)
@@ -309,6 +309,34 @@ def test_referenced_line_still_cannot_change_product_identity_or_be_removed(db):
assert old.del_flag == 0
def test_referenced_blank_brand_can_save_as_unrestricted_and_add_line(db):
"""编辑页把历史空品牌提交为不限品牌时,不算更换身份,可以同时新增明细。"""
old = _referenced_contract(db)
old.brand_mode = None
old.brand_id = None
old.brand_name = None
db.flush()
sync(db, 'contract', [
{'id': 'old', 'brandMode': 'any', 'brandId': None, 'brandName': None},
{'productId': 'lye30', 'productName': '30%液碱', 'model': '30%', 'unit': '吨', 'quantity': 0, 'packageSpec': '槽罐车'},
])
assert old.del_flag == 0 and old.id == 'old' and old.product_id == 'sku'
assert old.brand_mode == 'any' and old.brand_id is None
added = db.query(CrmContractProduct).filter_by(product_id='lye30', del_flag=0).one()
assert added.model == '30%' and added.unit == '吨'
def test_referenced_blank_brand_still_cannot_become_specific_brand(db):
old = _referenced_contract(db)
old.brand_mode = None
old.brand_id = None
old.brand_name = None
db.flush()
with pytest.raises(ValueError, match='不能删除或更换产品身份'):
sync(db, 'contract', [{'id': 'old', 'brandMode': 'required', 'brandId': 'hong', 'brandName': '红四方'}])
assert old.brand_mode is None and old.brand_id is None and old.del_flag == 0
@pytest.mark.parametrize('follow_status,delivery_flag', [('cancelled', 0), ('arranged', 1)])
def test_inactive_plan_reference_does_not_lock_package_spec(db, follow_status, delivery_flag):
old = _referenced_contract(db, follow_status=follow_status, delivery_flag=delivery_flag)
@@ -0,0 +1,117 @@
"""证用品类产品关联差量保存:软删后再加回须复用唯一键行。"""
from datetime import datetime
from types import SimpleNamespace
import pytest
from fastapi import HTTPException
from sqlalchemy import create_engine
from sqlalchemy.orm import Session
from app.models.pl_quota_models import PlCertCategory, PlCertCategoryProduct
from app.services import pl_cert_category_service as svc
@pytest.fixture
def db(monkeypatch):
engine = create_engine('sqlite://')
PlCertCategory.__table__.create(engine)
PlCertCategoryProduct.__table__.create(engine)
monkeypatch.setattr(svc, '_product_labels', lambda *a, **k: {})
with Session(engine) as session:
yield session
engine.dispose()
def user(tenant='t', uid='editor'):
return SimpleNamespace(id=uid, tenant_no=tenant, dept_id='dept')
def seed_category(db, id='cat', **extra):
values = dict(
id=id, category_name='硫酸', category_code='H2SO4', status='1',
tenant_no='t', create_by='creator', create_dept_id='dept',
create_time=datetime(2020, 1, 1), del_flag=0,
)
values.update(extra)
row = PlCertCategory(**values)
db.add(row)
db.flush()
return row
def seed_link(db, id='link', product_id='339E64E02E7C41F3', del_flag=0, **extra):
values = dict(
id=id, category_id='cat', product_id=product_id, scope_status='active',
tenant_no='t', create_by='creator', create_dept_id='dept',
create_time=datetime(2020, 1, 1), del_flag=del_flag,
)
values.update(extra)
row = PlCertCategoryProduct(**values)
db.add(row)
db.flush()
return row
def test_readd_soft_deleted_product_reuses_unique_key_row(db):
seed_category(db)
link = seed_link(db, del_flag=1)
result = svc.save_category(
db, user(),
{'categoryName': '硫酸', 'products': [{'productId': link.product_id}]},
category_id='cat',
)
db.flush()
assert db.query(PlCertCategoryProduct).count() == 1
assert link.del_flag == 0
assert link.create_by == 'creator'
assert link.create_time == datetime(2020, 1, 1)
assert link.update_by == 'editor'
assert result['products'][0]['id'] == link.id
assert result['products'][0]['productId'] == link.product_id
def test_remove_then_readd_without_id_keeps_one_row(db):
seed_category(db)
link = seed_link(db)
svc.save_category(
db, user(),
{'categoryName': '硫酸', 'products': []},
category_id='cat',
)
assert link.del_flag == 1
svc.save_category(
db, user(),
{'categoryName': '硫酸', 'products': [{'productId': link.product_id, 'scopeStatus': 'active'}]},
category_id='cat',
)
db.flush()
assert db.query(PlCertCategoryProduct).count() == 1
assert link.del_flag == 0
assert link.scope_status == 'active'
def test_no_id_reuses_active_row_by_product_id(db):
seed_category(db)
link = seed_link(db)
svc.save_category(
db, user(),
{'categoryName': '硫酸', 'products': [{'productId': link.product_id}]},
category_id='cat',
)
db.flush()
assert db.query(PlCertCategoryProduct).filter_by(del_flag=0).count() == 1
assert link.del_flag == 0
assert link.id == 'link'
def test_deleted_explicit_id_is_rejected(db):
seed_category(db)
link = seed_link(db, del_flag=1)
with pytest.raises(HTTPException) as exc:
svc.save_category(
db, user(),
{'categoryName': '硫酸', 'products': [{'id': link.id, 'productId': link.product_id}]},
category_id='cat',
)
assert exc.value.status_code == 400
assert link.del_flag == 1
File diff suppressed because it is too large. Load diff
@@ -0,0 +1,52 @@
"""运输归档角标:计划日期在 2026-09-01 及以前的不计数。"""
from datetime import date
from types import SimpleNamespace
from unittest.mock import patch
from sqlalchemy import create_engine
from sqlalchemy.orm import Session
from app.models.pl_models import PlPlan
from app.services.pl_menu_badge_service import count_plan_archive_pending
def test_archive_badge_skips_plans_on_or_before_2026_09_01():
engine = create_engine("sqlite://")
PlPlan.__table__.create(engine)
db = Session(engine)
def add(plan_id, plan_date, **extra):
fields = dict(
id=plan_id,
plan_no=plan_id,
create_date=date(2026, 9, 2),
plan_date=plan_date,
belongs_company="shanxia",
plan_type="direct",
tenant_no="t",
transport_status="arranged",
archive_status="unarchived",
follow_status="arranged",
)
fields.update(extra)
db.add(PlPlan(**fields))
add("before", date(2026, 8, 31))
add("on-cutoff", date(2026, 9, 1))
add("after", date(2026, 9, 2))
add("blank", None)
add("archived", date(2026, 9, 2), archive_status="archived")
add("pending", date(2026, 9, 2), transport_status="pending")
add("cancelled", date(2026, 9, 2), follow_status="cancelled")
db.commit()
user = SimpleNamespace()
with patch(
"app.services.pl_menu_badge_service.apply_pl_scope",
side_effect=lambda query, *args, **kwargs: query,
):
total = count_plan_archive_pending(db, "t", user)
assert total == 1
db.close()
engine.dispose()
@@ -42,6 +42,28 @@ def test_internal_stop_skips_belongs_company_contract_check():
assert links == []
def test_internal_stop_clears_product_contract_fields():
from types import SimpleNamespace
from app.services.pl_plan_stop_service import _clear_internal_stop_product_contracts
stop = SimpleNamespace(
customer_name="安庆市山峡化工有限公司",
products=[
SimpleNamespace(contract_id="c-dongheng", contract_product_id="line-1"),
SimpleNamespace(contract_id="c-2", contract_product_id="line-2"),
],
)
_clear_internal_stop_product_contracts(stop)
assert all(p.contract_id is None and p.contract_product_id is None for p in stop.products)
external = SimpleNamespace(
customer_name="安庆市鑫富化工有限责任公司",
products=[SimpleNamespace(contract_id="keep", contract_product_id="line")],
)
_clear_internal_stop_product_contracts(external)
assert external.products[0].contract_id == "keep"
def test_belongs_company_contract_error_is_not_swallowed():
mismatch = HTTPException(status_code=422, detail="装货合同的交易主体与归属公司不一致")
empty = HTTPException(status_code=422, detail="请先选择归属公司")
+21
View File
@@ -249,6 +249,27 @@ def test_same_city_settlement_does_not_require_transport_pairing():
assert validate_allocation_pairing([demand], [purchase], [], []) is None
def test_empty_transport_kind_settle_ignores_source_actuals():
"""同市只结转购买证时,空的运输证分组对实运量应直接空结果,不报缺实际量。"""
assert settle_allocations([], {'city': D(10)}) == ()
def test_partial_transport_settle_ignores_sources_without_reservation():
"""同市装货无运输预占、异地卸货有运输预占时,运输结转不得因多出来源实运量报缺实际量。"""
from app.services.pl_quota_allocation import Allocation
transport_rows = [
Allocation('transport', 'delivery:sp', 't1', D(33), D(33), 'dun', 'dun', 1),
]
actuals = {'load:sp': D(33), 'delivery:sp': D(33)}
settled = settle_allocations(transport_rows, actuals)
assert len(settled) == 1
assert settled[0].actual_source_quantity == D(33)
with pytest.raises(AllocationInputError, match='实际量'):
settle_allocations(transport_rows, {'load:sp': D(33)})
@pytest.mark.parametrize('manual_values', [(8,10,0),(18,0,0)])
def test_zero_capacity_foreign_row_cannot_unlock_manual_reordering(manual_values):
from app.services.pl_quota_allocation import Allocation
+3 -2
View File
@@ -57,7 +57,7 @@ def test_permission_guards_validation_and_atomic_creation(api):
saved = client.post(path, json=payload())
assert saved.status_code == 200
row = saved.json()
assert row['tenantNo'] == 't' and row['status'] == 'draft' and row['openingConfirmed'] is False
assert row['tenantNo'] == 't' and row['status'] == 'active' and row['openingConfirmed'] is True
assert client.put(path + '/' + row['id'], json={'totalQty': '-1'}).status_code == 422
assert client.get(path + '/' + row['id']).json()['totalQty'] == '30.000000'
app.dependency_overrides[auth] = lambda: {'role': 'admin', 'user_id': 'u', 'tenant_no': 'other'}
@@ -130,7 +130,8 @@ def test_total_adjust_requires_provenance_and_replays_without_duplicate_log(api)
assert response.status_code == 200
assert client.post(path, json=body).status_code == 200
logs = client.get(base + '/' + row['id'] + '/logs').json()
assert len(logs) == 1 and logs[0]['totalDelta'] == '5.000000'
adjust_logs = [item for item in logs if item.get('eventType') == 'total_adjust']
assert len(adjust_logs) == 1 and adjust_logs[0]['totalDelta'] == '5.000000'
assert client.post(path, json={**body,'totalQty':'40'}).status_code == 409
assert client.post(path, json={**body,'operationId':'adjust-2','sourceNote':''}).status_code == 409
assert client.get(base + '/' + row['id']).json()['totalQty'] == '35.000000'
+39 -17
View File
@@ -41,14 +41,31 @@ def transport(**kw):
return data
def test_save_auto_enables_with_zero_opening(ctx):
"""建档即启用:期初已用默认 0,无需手工期初确认。"""
db, u, s, m = ctx
row = s.save_cert(db, u, 'purchase', purchase())
assert row['status'] == 'active'
assert row['openingConfirmed'] is True
assert row['usedQty'] == Decimal('0')
assert row['verifiedBy'] == 'u'
assert row['verifiedTime'] is not None
log = db.query(m.PlCertQtyLog).filter_by(del_flag=0, event_type='opening').one()
assert (log.event_snapshot or {}).get('auto') is True
transport_row = s.save_cert(db, u, 'transport', transport())
assert transport_row['status'] == 'active' and transport_row['openingConfirmed'] is True
def test_manual_optional_image_complete_fields(ctx):
db,u,s,m = ctx
data = purchase(buyerAddress='地址', buyerPhone='电话', buyerLegalRepresentative='甲', sellerAddress='乙址', sellerPhone='乙电话', sellerLegalRepresentative='乙', purchasePurpose='用途', issueDate='2026-01-01', validFrom='2026-01-01', validTo='2027-01-01')
row = s.save_cert(db,u,'purchase',data)
assert row['buyerAddress'] == '地址' and row['attachmentUrls'] is None
assert row['totalQty'] == Decimal('100.123456')
assert row['status'] == 'draft'
assert db.query(m.PlCertQtyLog).count() == 0
assert row['status'] == 'active'
assert row['openingConfirmed'] is True
assert row['usedQty'] == Decimal('0')
assert db.query(m.PlCertQtyLog).filter_by(del_flag=0, event_type='opening').count() == 1
db.rollback()
assert db.query(m.PlPurchaseCert).count() == 0
@@ -56,9 +73,8 @@ def test_manual_optional_image_complete_fields(ctx):
def test_opening_confirmation_remains_visible_after_reverification_required(ctx):
db, user, svc, models = ctx
row = svc.save_cert(db, user, 'purchase', purchase())
assert row['openingConfirmed'] is False
row = svc.confirm_cert(db, user, 'purchase', row['id'], {
'operationId': 'op-ui', 'usedQty': '0', 'singleUseConsumed': False, 'reason': '全新证'})
assert row['openingConfirmed'] is True
assert row['status'] == 'active'
changed = svc.save_cert(db, user, 'purchase', {'buyerAddress': '更正地址'}, row['id'])
assert changed['verifiedTime'] is None
assert changed['openingConfirmed'] is True
@@ -89,10 +105,12 @@ def test_reference_delta_omitted_empty_and_invalid_prewrite(ctx):
def test_confirmation_and_history_protection(ctx):
db,u,s,m=ctx
row=s.save_cert(db,u,'purchase',purchase())
assert row['status']=='active' and row['openingConfirmed'] is True
with pytest.raises((HTTPException,ValidationError)): s.confirm_cert(db,u,'purchase',row['id'],{'usedQty':'0','singleUseConsumed':True,'reason':'核对','operationId':'op'})
row=s.confirm_cert(db,u,'purchase',row['id'],{'usedQty':'0','singleUseConsumed':True,'reason':'核对','evidenceUrls':'https://minio/evidence','operationId':'op'})
assert row['openingSingleUseConsumed']==1 and row['status']=='active'
assert db.query(m.PlCertQtyLog).one().event_type=='opening'
assert db.query(m.PlCertQtyLog).filter_by(del_flag=0).one().event_type=='opening'
# 建档自动期初后身份已锁定;手工覆盖期初后同样不可改核定量/证号。
for data in ({'quantityUnit':'千克'},{'certNo':'new'},{'totalQty':'90'}):
with pytest.raises(HTTPException): s.save_cert(db,u,'purchase',data,row['id'])
with pytest.raises(HTTPException): s.delete_cert(db,u,'purchase',row['id'])
@@ -151,8 +169,9 @@ def test_opening_retry_preserves_balance_and_operation_identity(ctx):
db.query(m.PlPurchaseCert).one().used_qty=Decimal('5')
retry=s.confirm_cert(db,u,'purchase',row['id'],opening())
assert retry['usedQty']==Decimal('5')
assert db.query(m.PlCertQtyLog).count()==1
assert db.query(m.PlCertOperation).count()==1
assert db.query(m.PlCertQtyLog).filter_by(del_flag=0).count()==1
# 自动期初操作号 + 手工期初操作号;重放不新增手工操作
assert db.query(m.PlCertOperation).filter_by(operation_id='opening').count()==1
with pytest.raises(HTTPException): s.confirm_cert(db,u,'purchase',row['id'],opening(usedQty='7'))
with pytest.raises(HTTPException): s.confirm_cert(db,u,'purchase',row['id'],opening(operationId='second'))
@@ -209,10 +228,11 @@ def test_reverify_after_correction_keeps_opening_and_balances(ctx):
assert corrected['status']=='suspended' and corrected['verifiedBy'] is None
result=s.verify_cert(db,u,'purchase',row['id'],{'operationId':'verify-1','reason':'地址更正核对','evidenceUrls':'https://minio/evidence'})
assert result['status']=='active' and result['usedQty']==Decimal('5')
assert db.query(m.PlCertQtyLog).count()==1
assert db.query(m.PlCertOperation).count()==2
assert db.query(m.PlCertQtyLog).filter_by(del_flag=0).count()==1
# 自动期初 + 手工期初 + 复核
assert db.query(m.PlCertOperation).count()==3
result=s.verify_cert(db,u,'purchase',row['id'],{'operationId':'verify-1','reason':'地址更正核对','evidenceUrls':'https://minio/evidence'})
assert db.query(m.PlCertOperation).count()==2
assert db.query(m.PlCertOperation).count()==3
def test_actual_scope_denies_user_without_roles(ctx):
@@ -261,7 +281,7 @@ def test_historical_opening_accepts_written_source_without_image(ctx):
row=s.save_cert(db,u,'purchase',purchase())
result=s.confirm_cert(db,u,'purchase',row['id'],{'operationId':'written-source','usedQty':'5','singleUseConsumed':True,'reason':'历史核对','sourceNote':'2026年10月纸质台账第3页,经张三核实'})
assert result['usedQty']==Decimal('5') and result['status']=='active'
assert db.query(m.PlCertQtyLog).one().event_snapshot['sourceNote'].startswith('2026')
assert db.query(m.PlCertQtyLog).filter_by(del_flag=0).one().event_snapshot['sourceNote'].startswith('2026')
def test_unknown_use_text_is_preserved_and_requires_confirmation(ctx):
@@ -423,7 +443,7 @@ def test_opening_verify_stale_operation_snapshot_uses_unique_insert_arbitration(
result=fn(db,u,'purchase',p['id'],body)
assert missed and result['id']==p['id']
assert db.query(m.PlCertOperation).count()==count
assert db.query(m.PlCertQtyLog).count()==1
assert db.query(m.PlCertQtyLog).filter_by(del_flag=0).count()==1
def test_opening_and_verify_allow_blank_reason(ctx):
@@ -431,7 +451,7 @@ def test_opening_and_verify_allow_blank_reason(ctx):
p=s.save_cert(db,u,'purchase',purchase())
row=s.confirm_cert(db,u,'purchase',p['id'],{**opening(),'reason':' '})
assert row['status']=='active'
assert db.query(m.PlCertQtyLog).one().reason==''
assert db.query(m.PlCertQtyLog).filter_by(del_flag=0).one().reason==''
s.save_cert(db,u,'purchase',{'buyerAddress':'更正地址'},p['id'])
verified=s.verify_cert(db,u,'purchase',p['id'],{'operationId':'verify-blank','reason':''})
assert verified['status']=='active' and verified['verifiedTime']
@@ -440,10 +460,12 @@ def test_opening_and_verify_allow_blank_reason(ctx):
def test_rejected_opening_rolls_back_claimed_operation(ctx):
db,u,s,m=ctx
p=s.save_cert(db,u,'purchase',purchase())
auto_ops = db.query(m.PlCertOperation).count()
auto_logs = db.query(m.PlCertQtyLog).filter_by(del_flag=0).count()
with pytest.raises(HTTPException):
s.confirm_cert(db,u,'purchase',p['id'],{**opening(),'usedQty':'999'})
assert db.query(m.PlCertOperation).count()==0
assert db.query(m.PlCertQtyLog).count()==0
assert db.query(m.PlCertOperation).count()==auto_ops
assert db.query(m.PlCertQtyLog).filter_by(del_flag=0).count()==auto_logs
def test_replay_reads_current_certificate_and_opening_not_old_snapshot(ctx,monkeypatch):
@@ -472,7 +494,7 @@ def test_closed_certificate_keeps_history_and_cannot_be_reopened(ctx):
used = confirmed['usedQty']
closed = s.save_cert(db, u, 'purchase', {'status': 'closed'}, row['id'])
assert closed['status'] == 'closed' and closed['usedQty'] == used
assert db.query(m.PlCertQtyLog).count() == 1
assert db.query(m.PlCertQtyLog).filter_by(del_flag=0).count() == 1
for action, payload in (
('confirm', {**opening(), 'operationId': 'reopen-opening'}),
('verify', {'operationId': 'reopen-verify', 'reason': '重新启用'}),
@@ -64,6 +64,44 @@ def test_create_with_bindings_and_bad_create_has_no_pending_row(case):
assert result['id'] not in ('g1', 'g2')
def test_create_with_empty_contract_bindings_auto_enables(case):
"""前端保存常带 contractBindings:[];必须与无合同集合路径一样自动启用并落库。"""
c = case
body = dict(
certNo='G-AUTO',
productNameOnCert='硫酸',
totalQty='300',
quantityUnit='吨',
validUseText='多次有效',
buyerName='买方',
sellerName='卖方',
contractBindings=[],
)
result = save(c, body, None)
assert result['status'] == 'active'
assert result['openingConfirmed'] is True
assert result['verifiedBy'] == 'u'
row = c.db.query(c.m.PlPurchaseCert).filter_by(id=result['id']).one()
assert row.status == 'active'
assert row.verified_by == 'u'
assert c.db.query(c.m.PlCertQtyLog).filter_by(
cert_id=result['id'], event_type='opening', del_flag=0,
).count() == 1
def test_get_cert_read_does_not_fake_enable_draft(case):
"""只读详情/列表不得在未提交事务里把 draft 伪装成 active。"""
from app.services import pl_quota_cert_service as certs
c = case
row = c.db.query(c.m.PlPurchaseCert).filter_by(id='g1').one()
assert row.status == 'draft'
detail = certs.get_cert(c.db, c.user, 'purchase', 'g1')
assert detail['status'] == 'draft'
assert c.db.query(c.m.PlPurchaseCert).filter_by(id='g1').one().status == 'draft'
assert c.db.query(c.m.PlCertQtyLog).filter_by(cert_id='g1', del_flag=0).count() == 0
def test_hidden_contract_cannot_be_cleared_but_face_can_change(case, monkeypatch):
from app.services import pl_quota_cert_bindings as svc
from app.models.crm_models import CrmContract
+46
View File
@@ -353,3 +353,49 @@ def test_plan_quota_usages_include_cert_attachment_urls(case):
assert usages['p1']['attachmentUrls'] == 'https://example.com/buy.jpg'
assert usages['p1']['certNo'] == 'G-BUY'
assert usages['t1']['attachmentUrls'] in ('', None)
def test_plan_quota_usages_hide_released_rows(case, monkeypatch):
"""详情关联证件不展示已释放用量,避免改客户后仍显示旧购买证。"""
from app.models.crm_models import CrmContract
from app.models.pl_quota_models import (
PlCertQuotaRuleConfig, PlPlanCertUsage, PlPlanCertUsageItem, PlPurchaseCert,
)
from app.services.pl_quota_planning import get_plan_quota
c = case
for model in (CrmContract, PlCertQuotaRuleConfig, PlPlanCertUsage, PlPlanCertUsageItem, PlPurchaseCert):
model.__table__.create(c.db.bind, checkfirst=True)
monkeypatch.setattr(
'app.services.pl_cert_quota_rule_config_service.plan_applies_customer_category_rule',
lambda *a, **k: False,
)
monkeypatch.setattr(
'app.services.pl_cert_quota_rule_config_service.resolve_rule_version_for_arrange',
lambda *a, **k: 'legacy',
)
# 本用例只断言 usages 过滤;清空站点合同避免 get_plan_quota 拉合同表
c.db.get(c.m.PlPlanLoadProduct, 'lp').contract_id = None
c.db.get(c.m.PlPlanDeliveryProduct, 'dp').contract_id = None
c.db.add(PlPurchaseCert(
id='p-keep', cert_no='G-KEEP', product_name_on_cert='硫酸', valid_use_text='多次有效',
buyer_name='买方', seller_name='卖方', total_qty=33, quantity_unit='吨',
tenant_no='t', status='active',
))
c.db.add(PlPurchaseCert(
id='p-old', cert_no='G-OLD', product_name_on_cert='硫酸', valid_use_text='多次有效',
buyer_name='买方', seller_name='卖方', total_qty=33, quantity_unit='吨',
tenant_no='t', status='active',
))
c.db.add(PlPlanCertUsage(
id='u-keep', tenant_no='t', plan_id='plan', plan_no_snapshot='PLAN',
cert_type='purchase', cert_id='p-keep', cert_no_snapshot='G-KEEP', cert_revision=1,
quantity_unit='吨', reserved_qty=5, used_qty=0, usage_status='reserved', del_flag=0,
))
c.db.add(PlPlanCertUsage(
id='u-released', tenant_no='t', plan_id='plan', plan_no_snapshot='PLAN',
cert_type='purchase', cert_id='p-old', cert_no_snapshot='G-OLD', cert_revision=1,
quantity_unit='吨', reserved_qty=0, used_qty=0, usage_status='released', del_flag=0,
))
c.db.flush()
cert_nos = [u['certNo'] for u in get_plan_quota(c.db, c.user, 'plan')['usages']]
assert cert_nos == ['G-KEEP']
+115 -3
View File
@@ -17,7 +17,7 @@ def case(request):
db = Session(engine, autoflush=request.param)
user = SimpleNamespace(id='u',dept_id='d',tenant_no='t',to_user_info=lambda: {'role':'super_admin','user_id':'u'})
for pid in ['plan','other']:
db.add(PlPlan(id=pid,plan_no=pid,create_date=date.today(),belongs_company='shanxia',plan_type='direct',tenant_no='t'))
db.add(PlPlan(id=pid,plan_no=pid,create_date=date.today(),plan_date=date.today(),belongs_company='shanxia',plan_type='direct',tenant_no='t'))
db.add(CrmContract(id='c',contract_no='c',contract_name='c',customer_id='customer',contract_type='sale',status='approved',tenant_no='t'))
db.add(CrmContractProduct(id='cp',contract_id='c',product_id='product',product_name='酸',quantity=100,tenant_no='t'))
for kind,model,pid in [('purchase',m.PlPurchaseCert,'p'),('transport',m.PlTransportCert,'t')]:
@@ -98,6 +98,31 @@ def test_zero_reservation_consumes_once_slot(case):
assert c.db.query(c.m.PlPlanCertUsage).count()==2
with pytest.raises(ValueError): run(c,operation_id='other',plan_id='other',sources=sources)
def test_same_city_purchase_only_settle_without_transport(case):
"""同市段只预占购买证时,归档结转不得因空运输证分组误报缺实际量。"""
c = case
sources = [dict(
source_stop_type='delivery', source_stop_id='stop', source_stop_product_id='sp',
plan_product_id='pp', contract_id='c', contract_product_id='cp', product_id='product',
quantity='1', unit='吨', fingerprint='fp', requires_transport=False,
)]
run(c, purchase_cert_ids=['p'], transport_cert_ids=[], sources=sources)
assert c.db.query(c.m.PlPlanCertUsage).count() == 1
assert c.db.get(c.m.PlPurchaseCert, 'p').reserved_qty == 1
run(
c,
operation_id='settle-same-city',
action='settle',
purchase_cert_ids=['p'],
transport_cert_ids=[],
sources=sources,
actual_by_source={'delivery:sp': '1'},
)
assert c.db.get(c.m.PlPurchaseCert, 'p').used_qty == 1
assert c.db.get(c.m.PlPurchaseCert, 'p').reserved_qty == 0
assert c.db.query(c.m.PlTransportCert).filter_by(id='t').one().used_qty == 0
def test_same_cert_balance_covers_actual_above_reservation(case):
c = case
run(c)
@@ -108,6 +133,27 @@ def test_same_cert_balance_covers_actual_above_reservation(case):
assert c.db.query(c.m.PlPlanCertUsage).count() == 2
def test_auto_cover_ignores_arrangement_manuals_when_actual_exceeds_reservation(case):
"""安排/完善并关闭写入的整笔 manual_allocations 不得挡住归档超额补扣。"""
c = case
manuals = [
dict(permit_kind='purchase', source_id='load:sp', permit_id='p', source_quantity='29', permit_quantity='29'),
dict(permit_kind='transport', source_id='load:sp', permit_id='t', source_quantity='29', permit_quantity='29'),
]
run(c, manual_allocations=manuals)
# 归档请求仍带着计划量人工行(与完善并关闭后 cert_configuration 回灌一致)
run(
c,
operation_id='settle-with-stale-manuals',
action='settle',
actual_by_source={'load:sp': '35'},
manual_allocations=manuals,
)
assert c.db.get(c.m.PlPurchaseCert, 'p').used_qty == 35
assert c.db.get(c.m.PlPurchaseCert, 'p').reserved_qty == 0
assert c.db.get(c.m.PlTransportCert, 't').used_qty == 35
def test_same_cert_without_enough_balance_asks_for_another_certificate(case):
c = case
c.db.get(c.m.PlPurchaseCert, 'p').total_qty = 30
@@ -245,7 +291,7 @@ def test_opening_consumed_and_expiry_vehicle_block(case):
p.opening_single_use_consumed=0; p.valid_to=date(2000,1,1); c.db.flush()
with pytest.raises(ValueError): run(c)
p.valid_to=date(2099,12,31); c.db.flush()
with pytest.raises(ValueError, match='车号不在运输证范围'): run(c,vehicle_no='unknown')
with pytest.raises(ValueError, match='车牌号「unknown」不在运输证车号范围内'): run(c,vehicle_no='unknown')
def test_reserve_uses_transport_cert_that_lists_the_vehicle(case):
@@ -262,9 +308,19 @@ def test_reserve_uses_transport_cert_that_lists_the_vehicle(case):
assert c.db.get(c.m.PlPurchaseCert, 'p2').reserved_qty == 0
transport_usages = c.db.query(c.m.PlPlanCertUsage).filter_by(cert_type='transport', del_flag=0).all()
assert [u.cert_id for u in transport_usages if u.usage_status == 'reserved'] == ['t']
with pytest.raises(ValueError, match='车号不在运输证范围'):
with pytest.raises(ValueError, match='车牌号「NONE」不在运输证车号范围内'):
run(c, operation_id='none', vehicle_no='NONE', purchase_cert_ids=['p', 'p2'], transport_cert_ids=['t', 't2'])
def test_reserve_accepts_vehicle_no_with_trailing_spaces(case):
"""计划车牌尾部空格不得误判为不在运输证车号范围。"""
c = case
# 证上车号无空格;计划侧常带尾部空格(与 PO20261115096 现场一致)
assert c.db.get(c.m.PlTransportCert, 't').vehicle_numbers_json == ['CAR']
run(c, vehicle_no='CAR ')
assert c.db.get(c.m.PlTransportCert, 't').reserved_qty == 29
def test_no_cert_operation_is_still_idempotent(case):
c=case
first=run(c,sources=[],purchase_cert_ids=[],transport_cert_ids=[])
@@ -274,11 +330,16 @@ def test_no_cert_operation_is_still_idempotent(case):
def test_removal_and_restore_preserve_item_id(case):
c=case; run(c)
ids={i.id for i in c.db.query(c.m.PlPlanCertUsageItem).all()}
usage_ids={u.id for u in c.db.query(c.m.PlPlanCertUsage).all()}
run(c,action='resize',operation_id='clear',sources=[],purchase_cert_ids=[],transport_cert_ids=[])
assert all(i.del_flag==1 for i in c.db.query(c.m.PlPlanCertUsageItem).all())
# 清空分配后用量行标记 released 并软删,详情关联证件不再展示
assert all(u.usage_status=='released' and u.del_flag==1 for u in c.db.query(c.m.PlPlanCertUsage).all())
run(c,action='resize',operation_id='restore')
assert {i.id for i in c.db.query(c.m.PlPlanCertUsageItem).all()}==ids
assert {u.id for u in c.db.query(c.m.PlPlanCertUsage).all()}==usage_ids
assert all(i.del_flag==0 for i in c.db.query(c.m.PlPlanCertUsageItem).all())
assert all(u.usage_status=='reserved' and u.del_flag==0 for u in c.db.query(c.m.PlPlanCertUsage).all())
def _second_pair(c, cross=False):
for kind,model,old_id,new_id,total in [('purchase',c.m.PlPurchaseCert,'p','p2',100),('transport',c.m.PlTransportCert,'t','t2',100)]:
@@ -498,3 +559,54 @@ def test_new_current_usage_rejects_without_out_of_order_cert_lock(case,monkeypat
assert c.db.get(c.m.PlPurchaseCert,'p').reserved_qty==29
assert all(u.reserved_qty==29 for u in c.db.query(c.m.PlPlanCertUsage).all())
assert c.db.query(c.m.PlCertOperation).count()==1
def test_archive_cover_block_message_names_vehicle(monkeypatch):
"""归档补证被车号挡住时,应点名车牌与运输证,而不是笼统额度不足。"""
from types import SimpleNamespace
from datetime import date
from app.services import pl_quota_usage_service as svc
transport = SimpleNamespace(
id='t1',
cert_no='Y-ARCH-1',
status='active',
verified_by='u',
verified_time=date(2026, 1, 1),
valid_from=date(2026, 1, 1),
valid_to=date(2027, 12, 31),
valid_use_text='多次有效',
vehicle_numbers_json=['皖A00000'],
)
r = SimpleNamespace(vehicle_no='皖A9BE91', on_date=date(2026, 11, 15))
plan = SimpleNamespace(id='plan1')
user = SimpleNamespace(tenant_no='t')
class OpeningQuery:
def first(self):
return SimpleNamespace(id='opening')
db = SimpleNamespace()
monkeypatch.setattr(
'app.services.pl_cert_quota_rule_config_service.plan_applies_customer_category_rule',
lambda db, tenant_no, plan: False,
)
monkeypatch.setattr(
svc,
'_query',
lambda db, user, model, lock=True, **filters: OpeningQuery(),
)
monkeypatch.setattr(
'app.services.pl_quota_cert_service.ensure_zero_opening',
lambda db, user, kind, cert_id, row=None: row or transport,
)
monkeypatch.setattr(svc, 'usage_policy', lambda text: 'multi')
monkeypatch.setattr(svc, 'is_single_use_consumed', lambda *a, **k: False)
message = svc._archive_cover_block_message(
db, user, r, plan, {('transport', 't1'): transport}, [('transport', 't1')],
)
assert '皖A9BE91' in message
assert 'Y-ARCH-1' in message
assert '未包含车牌号' in message
assert '剩余额度不够覆盖本次实际数量' not in message
+170
View File
@@ -113,6 +113,9 @@ def test_mark_ready_allows_weighed_plan_until_quota_is_posted(monkeypatch):
quota_cert_waived_by=None,
quota_cert_waived_by_name=None,
quota_cert_waived_time=None,
quota_cert_pending_fulfill=0,
cert_quota_rule_version="legacy",
cert_quota_arranged_at=__import__("datetime").datetime(2026, 11, 1, 10, 0, 0),
update_by=None,
plan_no="PO1",
plan_date=None,
@@ -173,6 +176,173 @@ def test_mark_ready_allows_weighed_plan_until_quota_is_posted(monkeypatch):
raise AssertionError("已入账仍允许证书齐备")
def test_mark_ready_before_arrange_uses_effective_at_for_pending(monkeypatch):
"""安排前版本未打标时,仍按生效时间走新规则并进入待完善。"""
from datetime import datetime, timedelta
from app.models.pl_quota_models import PlPlanCertUsage
from app.services.pl_quota_waiver import mark_ready
plan = SimpleNamespace(
id="p1",
follow_status="draft",
archive_status="unarchived",
quota_cert_waived=0,
quota_cert_waived_by=None,
quota_cert_waived_by_name=None,
quota_cert_waived_time=None,
quota_cert_pending_fulfill=0,
cert_quota_rule_version=None,
cert_quota_arranged_at=None,
update_by=None,
plan_no="PO1",
plan_date=None,
license_plate=None,
supplier_name=None,
customer_name=None,
)
user = SimpleNamespace(id="u1", tenant_no="shanxia2.0", name="齐备员", dept_id="")
changes = []
class Query:
def __init__(self, rows):
self.rows = rows
def filter(self, *args, **kwargs):
return self
def filter_by(self, **kwargs):
return self
def all(self):
return list(self.rows)
def first(self):
return self.rows[0] if self.rows else None
class DB:
def query(self, model):
if model is PlPlanCertUsage:
return Query([])
return Query([plan])
def flush(self):
return None
monkeypatch.setattr("app.services.pl_quota_planning._plan", lambda *args, **kwargs: plan)
monkeypatch.setattr("app.services.pl_quota_waiver._toxic_exists", lambda *args, **kwargs: True)
monkeypatch.setattr("app.services.pl_quota_waiver._product_names", lambda *args, **kwargs: {})
monkeypatch.setattr(
"app.services.pl_plan_service.record_plan_change",
lambda *args, **kwargs: changes.append(kwargs),
)
monkeypatch.setattr(
"app.services.pl_cert_quota_rule_config_service.get_effective_at",
lambda *args, **kwargs: datetime.now() - timedelta(hours=1),
)
mark_ready(DB(), user, "p1")
assert plan.quota_cert_waived == 1
assert plan.quota_cert_pending_fulfill == 1
assert changes and "完善并关闭" in (changes[-1].get("change_content") or "")
def test_mark_ready_stamped_legacy_skips_pending(monkeypatch):
"""已按首次安排打成 legacy 的计划,齐备不进待完善。"""
from datetime import datetime
from app.models.pl_quota_models import PlPlanCertUsage
from app.services.pl_quota_waiver import mark_ready
plan = SimpleNamespace(
id="p1",
follow_status="arranged",
archive_status="unarchived",
quota_cert_waived=0,
quota_cert_waived_by=None,
quota_cert_waived_by_name=None,
quota_cert_waived_time=None,
quota_cert_pending_fulfill=0,
cert_quota_rule_version="legacy",
cert_quota_arranged_at=datetime(2026, 11, 1, 10, 0, 0),
update_by=None,
plan_no="PO1",
plan_date=None,
license_plate=None,
supplier_name=None,
customer_name=None,
)
user = SimpleNamespace(id="u1", tenant_no="shanxia2.0", name="齐备员", dept_id="")
changes = []
class Query:
def __init__(self, rows):
self.rows = rows
def filter(self, *args, **kwargs):
return self
def filter_by(self, **kwargs):
return self
def all(self):
return list(self.rows)
def first(self):
return self.rows[0] if self.rows else None
class DB:
def query(self, model):
if model is PlPlanCertUsage:
return Query([])
return Query([plan])
def flush(self):
return None
monkeypatch.setattr("app.services.pl_quota_planning._plan", lambda *args, **kwargs: plan)
monkeypatch.setattr("app.services.pl_quota_waiver._toxic_exists", lambda *args, **kwargs: True)
monkeypatch.setattr("app.services.pl_quota_waiver._product_names", lambda *args, **kwargs: {})
monkeypatch.setattr(
"app.services.pl_plan_service.record_plan_change",
lambda *args, **kwargs: changes.append(kwargs),
)
monkeypatch.setattr(
"app.services.pl_cert_quota_rule_config_service.get_effective_at",
lambda *args, **kwargs: datetime(2026, 11, 15, 20, 0, 0),
)
mark_ready(DB(), user, "p1")
assert plan.quota_cert_waived == 1
assert plan.quota_cert_pending_fulfill == 0
assert changes and "不再校验" in (changes[-1].get("change_content") or "")
def test_stamp_arrange_backfills_pending_when_already_waived(monkeypatch):
"""安排打成新规则时,若已齐备则回补待完善。"""
from datetime import datetime
from app.services.pl_cert_quota_rule_config_service import (
VERSION_CUSTOMER_CATEGORY,
stamp_plan_rule_on_arrange,
)
plan = SimpleNamespace(
cert_quota_arranged_at=None,
cert_quota_rule_version=None,
quota_cert_waived=1,
quota_cert_pending_fulfill=0,
)
user = SimpleNamespace(tenant_no="shanxia2.0")
monkeypatch.setattr(
"app.services.pl_cert_quota_rule_config_service.resolve_rule_version_for_arrange",
lambda *args, **kwargs: VERSION_CUSTOMER_CATEGORY,
)
version = stamp_plan_rule_on_arrange(None, user, plan, arrange_time=datetime(2026, 11, 16, 14, 0, 0))
assert version == VERSION_CUSTOMER_CATEGORY
assert plan.quota_cert_pending_fulfill == 1
def test_waived_arrange_check_keeps_source_errors_and_skips_cert_balance(monkeypatch):
from app.services.pl_quota_planning import contract_cert_arrange_block
+105 -9
View File
@@ -10,31 +10,43 @@ from app.models.pl_models import PlCert, PlDocumentReminder, PlVehicle
from app.services.pl_cert_service import scan_cert_expiry
def _session():
def _session(*, vehicles=None):
engine = create_engine("sqlite://")
PlCert.__table__.create(engine)
PlDocumentReminder.__table__.create(engine)
PlVehicle.__table__.create(engine)
db = sessionmaker(bind=engine)()
db.add(
PlVehicle(
rows = vehicles or [
dict(
id="veh-1",
vehicle_type="self",
vehicle_status="available",
license_plate="皖LB1283",
tenant_no="t1",
create_dept_id="d1",
)
)
]
for row in rows:
db.add(PlVehicle(**row))
db.commit()
return db
def _add_cert(db, *, cert_id: str, expire_date: date, remind_days: int = 30, del_flag: int = 0, status: str = "valid"):
def _add_cert(
db,
*,
cert_id: str,
expire_date: date,
remind_days: int = 30,
del_flag: int = 0,
status: str = "valid",
owner_id: str = "veh-1",
):
db.add(
PlCert(
id=cert_id,
owner_type="vehicle",
owner_id="veh-1",
owner_id=owner_id,
cert_name="罐检报告",
cert_no="皖R8440挂",
expire_date=expire_date,
@@ -47,14 +59,23 @@ def _add_cert(db, *, cert_id: str, expire_date: date, remind_days: int = 30, del
)
def _add_pending_reminder(db, *, rem_id: str, cert_id: str, expire_date: date, days_remaining: int):
def _add_pending_reminder(
db,
*,
rem_id: str,
cert_id: str,
expire_date: date,
days_remaining: int,
owner_id: str = "veh-1",
owner_label: str = "皖LB1283",
):
db.add(
PlDocumentReminder(
id=rem_id,
cert_id=cert_id,
owner_type="vehicle",
owner_id="veh-1",
owner_label="皖LB1283",
owner_id=owner_id,
owner_label=owner_label,
document_type="罐检报告",
document_no="皖R8440挂",
expire_date=expire_date,
@@ -161,3 +182,78 @@ def test_scan_resolves_pending_when_cert_soft_deleted():
rem = db.query(PlDocumentReminder).filter_by(id="rem-gone").one()
assert rem.status == "resolved"
assert rem.remark and "失效" in rem.remark
def test_scan_skips_scrapped_vehicle_and_resolves_pending():
db = _session(
vehicles=[
dict(
id="veh-scrap",
vehicle_type="self",
vehicle_status="scrapped",
license_plate="皖H57837",
trailer_no="皖HE155挂",
tenant_no="t1",
create_dept_id="d1",
)
]
)
today = date.today()
expire = today + timedelta(days=5)
_add_cert(db, cert_id="cert-scrap", expire_date=expire, owner_id="veh-scrap")
_add_pending_reminder(
db,
rem_id="rem-scrap",
cert_id="cert-scrap",
expire_date=expire,
days_remaining=5,
owner_id="veh-scrap",
owner_label="皖H57837",
)
db.commit()
created = scan_cert_expiry(db, tenant_no="t1")
db.commit()
assert created == 0
assert db.query(PlDocumentReminder).filter_by(cert_id="cert-scrap", status="pending").count() == 0
rem = db.query(PlDocumentReminder).filter_by(id="rem-scrap").one()
assert rem.status == "resolved"
assert rem.remark and "报废" in rem.remark
def test_scan_skips_carrier_vehicle_and_resolves_pending():
db = _session(
vehicles=[
dict(
id="veh-carrier",
vehicle_type="carrier",
vehicle_status="available",
license_plate="皖HA1082",
tenant_no="t1",
create_dept_id="d1",
)
]
)
today = date.today()
expire = today + timedelta(days=5)
_add_cert(db, cert_id="cert-carrier", expire_date=expire, owner_id="veh-carrier")
_add_pending_reminder(
db,
rem_id="rem-carrier",
cert_id="cert-carrier",
expire_date=expire,
days_remaining=5,
owner_id="veh-carrier",
owner_label="皖HA1082",
)
db.commit()
created = scan_cert_expiry(db, tenant_no="t1")
db.commit()
assert created == 0
assert db.query(PlDocumentReminder).filter_by(cert_id="cert-carrier", status="pending").count() == 0
rem = db.query(PlDocumentReminder).filter_by(id="rem-carrier").one()
assert rem.status == "resolved"
assert rem.remark and ("三方" in rem.remark or "承运" in rem.remark)
@@ -0,0 +1,39 @@
"""近 N 次加油段平均百公里油耗(L/100km)算法。"""
from decimal import Decimal
from app.services.pl_vehicle_fuel_service import avg_recent_trip_rates_l100, trip_rate_l100
def test_trip_rate_uses_previous_liters_over_odometer_delta():
# (本次期初 - 上次期初) = 200km,上次加油 50L → 25 L/100km
assert trip_rate_l100(
prev_liters=Decimal("50"),
prev_odometer=Decimal("1000"),
curr_odometer=Decimal("1200"),
) == Decimal("25.00")
def test_trip_rate_rejects_non_positive_delta_or_liters():
assert trip_rate_l100(Decimal("50"), Decimal("1200"), Decimal("1000")) is None
assert trip_rate_l100(Decimal("0"), Decimal("1000"), Decimal("1200")) is None
assert trip_rate_l100(Decimal("-1"), Decimal("1000"), Decimal("1200")) is None
assert trip_rate_l100(Decimal("50"), None, Decimal("1200")) is None
assert trip_rate_l100(Decimal("50"), Decimal("1000"), None) is None
def test_avg_recent_takes_last_n_valid_segments_only():
# 段1: 1000→1100 / 40L = 40
# 段2: 1100→1300 / 50L = 25
# 段3: 无效(里程倒退)
# 段4: 1200→1500 / 60L = 20
rows = [
(Decimal("1000"), Decimal("40")),
(Decimal("1100"), Decimal("50")),
(Decimal("1300"), Decimal("30")),
(Decimal("1200"), Decimal("60")), # 倒退后的上一笔,下一段用其升数
(Decimal("1500"), Decimal("10")),
]
assert avg_recent_trip_rates_l100(rows, 2) == Decimal("22.50") # (25+20)/2
assert avg_recent_trip_rates_l100(rows, 10) == Decimal("28.33") # (40+25+20)/3
assert avg_recent_trip_rates_l100(rows[:1], 10) is None
assert avg_recent_trip_rates_l100([], 10) is None
@@ -73,6 +73,10 @@ def test_summary_includes_html_metrics_and_previous_quarter_across_year(summary_
assert item["quarterRateL100"] == Decimal("50")
assert item["prevMonthRateL100"] == Decimal("50")
assert item["prevQuarterRateL100"] == Decimal("21.05")
# 五段有效:2、20、10、50、20 → 平均 20.40
assert item["avgRateLast10L100"] == Decimal("20.40")
assert item["avgRateLast20L100"] == Decimal("20.40")
assert item["avgRateLast30L100"] == Decimal("20.40")
def test_summary_follows_requested_month_instead_of_today(summary_db):
@@ -105,6 +109,7 @@ def test_all_self_vehicles_visible_even_without_calculable_rate(summary_db):
db = summary_db
vehicle(db)
vehicle(db, "无记录车辆", vehicle_status="maintaining")
vehicle(db, "报废车辆", vehicle_status="scrapped")
vehicle(db, "承运商车辆", vehicle_type="carrier")
vehicle(db, "其他租户", tenant_no="t2")
vehicle(db, "删除车辆", del_flag=1)
@@ -113,6 +118,7 @@ def test_all_self_vehicles_visible_even_without_calculable_rate(summary_db):
fuel(db, "2026-01-10", 120, 3400)
items = {item.license_plate: item.model_dump(by_alias=True) for item in summary(db).items}
assert set(items) == {"皖H57837", "无记录车辆"}
assert "报废车辆" not in items
assert items["皖H57837"]["liters"] == 120
assert items["皖H57837"]["monthRateL100"] is None
assert items["无记录车辆"]["liters"] == 0
@@ -0,0 +1,28 @@
-- 证件额度切点改为首次安排时间:补 arranged_at 列,并按运输单创建时间回填已安排计划。
-- MySQL 5.7。可重复执行。
SET NAMES utf8mb4;
SET @schema_name = DATABASE();
SET @col = (SELECT COUNT(*) FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA=@schema_name AND TABLE_NAME='pl_plan' AND COLUMN_NAME='cert_quota_arranged_at');
SET @sql = IF(@col=0,
'ALTER TABLE pl_plan ADD COLUMN cert_quota_arranged_at datetime DEFAULT NULL COMMENT ''首次安排时间(证件额度切点用);再次安排不改'' AFTER cert_quota_rule_version',
'SELECT 1');
PREPARE s FROM @sql; EXECUTE s; DEALLOCATE PREPARE s;
-- 已安排:回填首次安排时刻,并按「安排时刻 vs 生效时间」校正规则版本(修正历史按创建打标)。
UPDATE pl_plan p
INNER JOIN pl_transport t
ON t.id = p.transport_id AND t.tenant_no = p.tenant_no AND t.del_flag = 0
LEFT JOIN pl_cert_quota_rule_config cfg
ON cfg.tenant_no = p.tenant_no AND cfg.del_flag = 0
SET
p.cert_quota_arranged_at = COALESCE(p.cert_quota_arranged_at, t.create_time),
p.cert_quota_rule_version = CASE
WHEN cfg.effective_at IS NOT NULL
AND COALESCE(p.cert_quota_arranged_at, t.create_time) >= cfg.effective_at
THEN 'customer_category'
ELSE 'legacy'
END
WHERE p.del_flag = 0
AND p.transport_status = 'arranged';
@@ -0,0 +1,18 @@
-- 客户主数据增加「是否同市」,运输计划装/送段选客户时默认带入段次勾选。
-- MySQL 5.7。可重复执行。存量客户默认 0。
SET NAMES utf8mb4;
SET @schema_name = DATABASE();
SET @col_exists = (
SELECT COUNT(*) FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = @schema_name AND TABLE_NAME = 'crm_customer' AND COLUMN_NAME = 'same_city'
);
SET @alter_sql = IF(
@col_exists = 0,
'ALTER TABLE crm_customer ADD COLUMN same_city tinyint NOT NULL DEFAULT 0 COMMENT ''是否同市 0-否 1-是;相对本公司业务所在市,运输计划段次默认带入'' AFTER address',
'SELECT 1'
);
PREPARE alter_stmt FROM @alter_sql;
EXECUTE alter_stmt;
DEALLOCATE PREPARE alter_stmt;
@@ -0,0 +1,28 @@
-- 证件额度切点改为首次安排时间:补 arranged_at 列,并按运输单创建时间回填已安排计划。
-- MySQL 5.7。可重复执行。
SET NAMES utf8mb4;
SET @schema_name = DATABASE();
SET @col = (SELECT COUNT(*) FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA=@schema_name AND TABLE_NAME='pl_plan' AND COLUMN_NAME='cert_quota_arranged_at');
SET @sql = IF(@col=0,
'ALTER TABLE pl_plan ADD COLUMN cert_quota_arranged_at datetime DEFAULT NULL COMMENT ''首次安排时间(证件额度切点用);再次安排不改'' AFTER cert_quota_rule_version',
'SELECT 1');
PREPARE s FROM @sql; EXECUTE s; DEALLOCATE PREPARE s;
-- 已安排:回填首次安排时刻,并按「安排时刻 vs 生效时间」校正规则版本(修正历史按创建打标)。
UPDATE pl_plan p
INNER JOIN pl_transport t
ON t.id = p.transport_id AND t.tenant_no = p.tenant_no AND t.del_flag = 0
LEFT JOIN pl_cert_quota_rule_config cfg
ON cfg.tenant_no = p.tenant_no AND cfg.del_flag = 0
SET
p.cert_quota_arranged_at = COALESCE(p.cert_quota_arranged_at, t.create_time),
p.cert_quota_rule_version = CASE
WHEN cfg.effective_at IS NOT NULL
AND COALESCE(p.cert_quota_arranged_at, t.create_time) >= cfg.effective_at
THEN 'customer_category'
ELSE 'legacy'
END
WHERE p.del_flag = 0
AND p.transport_status = 'arranged';
@@ -0,0 +1,16 @@
-- 合同用证 → 客户用证(菜单展示名);保留菜单 ID 与权限码。
SET NAMES utf8mb4;
START TRANSACTION;
UPDATE sys_menu
SET menu_name = '客户用证', update_time = NOW()
WHERE del_flag = 0
AND (
id = 'PL_CONTRACT_QUOTA'
OR (path = 'contract-quota' AND perms = 'pl:quota-cert:list')
OR id = 'MINI_PL_CERT_CONTRACT'
OR perms = 'mini:pl:contract-quota:list'
)
AND menu_name = '合同用证';
COMMIT;
@@ -0,0 +1,18 @@
-- 客户主数据增加「是否同市」,运输计划装/送段选客户时默认带入段次勾选。
-- MySQL 5.7。可重复执行。存量客户默认 0。
SET NAMES utf8mb4;
SET @schema_name = DATABASE();
SET @col_exists = (
SELECT COUNT(*) FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = @schema_name AND TABLE_NAME = 'crm_customer' AND COLUMN_NAME = 'same_city'
);
SET @alter_sql = IF(
@col_exists = 0,
'ALTER TABLE crm_customer ADD COLUMN same_city tinyint NOT NULL DEFAULT 0 COMMENT ''是否同市 0-否 1-是;相对本公司业务所在市,运输计划段次默认带入'' AFTER address',
'SELECT 1'
);
PREPARE alter_stmt FROM @alter_sql;
EXECUTE alter_stmt;
DEALLOCATE PREPARE alter_stmt;
+1
View File
@@ -9792,6 +9792,7 @@ CREATE TABLE `crm_customer` (
`city` varchar(50) DEFAULT NULL COMMENT '市',
`district` varchar(50) DEFAULT NULL COMMENT '区',
`address` varchar(255) DEFAULT NULL COMMENT '详细地址',
`same_city` tinyint NOT NULL DEFAULT 0 COMMENT '是否同市 0-否 1-是;相对本公司业务所在市,运输计划段次默认带入',
`status` varchar(20) DEFAULT 'normal' COMMENT '客户状态(字典 crm_customer_status: normal/pool/invalid)',
`deal_status` varchar(20) DEFAULT 'not_deal' COMMENT '成交状态(字典 crm_deal_status: not_deal/dealed/lost)',
`owner_user_id` varchar(64) DEFAULT NULL COMMENT '负责人ID',
@@ -0,0 +1,30 @@
# 证件额度切点:按首次安排时间(设计)
工单:[#40](https://gitea.aichengyan.com/cykj/shanxia2.0/issues/40)
## 背景
原设计按计划 `create_time` 与 `effective_at` 比较打 `cert_quota_rule_version`。业务要求改为按**首次安排运输**时刻切点;切点前已安排的计划归档不再校购买证/运输证。
## 定稿规则
1. **未配置 `effective_at`**:安排仍 409 拦住(不变)。
2. **首次安排**时写入:
- `cert_quota_arranged_at = 安排时刻`
- `cert_quota_rule_version = customer_category` 若 `安排时刻 >= effective_at`,否则 `legacy`
3. **再次调整运输**:不重打 `cert_quota_arranged_at` / `cert_quota_rule_version`(冻结首次安排)。
4. **创建计划**:不再按创建时间打标(可空,待安排时写入)。
5. **归档**:
- `legacy`(切点前首次安排):不校验、不扣购买证/运输证,额度结转按跳过处理,允许直接归档。
- `customer_category`:保持现有最新业务逻辑(选证、齐备仅放行安排、归档须真证等)。
6. **历史已安排且缺 `cert_quota_arranged_at`**:归档/读规则时用关联 `pl_transport.create_time` 推断;若推断时刻 `< effective_at` 视为 `legacy` 祖父。
## 范围
- backend:切点服务、安排打标、归档跳过、迁移列
- web-admin:系统信息「运输证件规则」说明文案
## 非目标
- 不批量改历史 `quota_cert_waived`
- 不改选证算法本身
@@ -0,0 +1,3 @@
schema: spec-driven
created: 2026-11-19
issue: 48
@@ -0,0 +1,14 @@
## Context
汇总页与本人登记页共用 `FuelRegisterListPage`;仅 `mode=summary` 显示顶部卡片。原月度指标 API 仍保留字段,前端改为展示近 N 次平均。
## Decision
1. **计算放后端**:租户隔离、数据范围与作废过滤与列表一致;前端只展示。
2. **复用 `plate-month-summary`**:增加 `avgRateLast10/20/30L100`,拉取该车全部正常未删登记再切片,避免新路由。
3. **单位 L/100km**:与既有 `rate_l100` 一致;升数≤0 或里程差≤0 的段不计入平均。
4. **UI**:去掉月份条;三项指标;点击车牌仍写列头车牌过滤。
## Risks
- 全量历史登记加载:自有车加油量通常可控;若日后变大再按车牌限窗。
@@ -0,0 +1,26 @@
## Why
加油登记汇总页顶部曾改为「待开发」。业务需要按车牌展示近 10/20/30 次平均油耗(L/100km),替代原按月加油量/里程/月季油耗卡片内容。
## What Changes
- 恢复汇总页顶部车牌卡片(复用既有卡片布局,去掉月份选择)
- `plate-month-summary` 增加近 10/20/30 次平均百公里油耗字段
- 单次油耗:`(上次加油升数 × 100) / (本次期初公里 − 上次期初公里)`
- 近 N 次:同一车牌时间升序中,最近 N 个有效单次的算术平均;无效段跳过
## Capabilities
### New Capabilities
- (无)
### Modified Capabilities
- `pl-vehicle-fuel-summary`: 汇总顶部统计口径改为近 N 次平均 L/100km
## Impact
- 后端 `pl_vehicle_fuel_service` / `vehicle_fuel` schema
- Web `FuelPlateMonthCards`、`FuelRegisterListPage`、API 类型
- 工单:https://gitea.aichengyan.com/cykj/shanxia2.0/issues/48
@@ -0,0 +1,25 @@
## ADDED Requirements
### Requirement: 近 N 次平均百公里油耗
系统 SHALL 在加油登记汇总顶部按自有车牌展示近 10、20、30 次平均油耗,单位为 L/100km。
#### Scenario: 单次油耗计算
- **WHEN** 同一车牌存在相邻两次正常未删除登记,且上次加油升数 > 0、本次期初公里 > 上次期初公里
- **THEN** 该段油耗为 `上次加油升数 × 100 / (本次期初公里 − 上次期初公里)`,保留两位小数
#### Scenario: 近 N 次平均
- **WHEN** 某车牌存在至少一段有效单次油耗
- **THEN** 近 N 次平均为时间升序下最近 min(N, 有效段数) 个单次油耗的算术平均;无效段(缺期初、升数≤0、里程未增加)不计入
#### Scenario: 数据不足
- **WHEN** 某车牌没有有效单次油耗段
- **THEN** 对应近 N 次平均字段为 null,界面显示 —
#### Scenario: 点击筛选
- **WHEN** 用户点击某车牌卡片
- **THEN** 下方列表按该车牌过滤;再次点击同一车牌取消过滤
@@ -0,0 +1,15 @@
## 1. 后端
- [x] 单次/近 N 次平均算法与单测
- [x] schema 增加 avgRateLast10/20/30L100
- [x] `list_plate_month_summary` 填充新字段;汇总回归断言
## 2. Web
- [x] 恢复汇总顶部卡片,展示近 10/20/30 次平均
- [x] API 类型字段对齐
## 3. 验证
- [x] `pytest` 加油汇总相关:21 passed
- [ ] 本机打开汇总页目视验收(需在任务 worktree 启前后端)
+1 -1
View File
@@ -9,5 +9,5 @@ allowBuilds:
core-js: false
es5-ext: false
esbuild: true
protobufjs: false
protobufjs: true
vue-demi: true
@@ -0,0 +1,54 @@
import assert from 'node:assert/strict'
import test from 'node:test'
import { resolveArchiveQuotaBlockMode } from '../src/utils/pl-archive-quota-block'
test('pending fulfill plan only alerts, no certificate-ready confirm', () => {
assert.equal(
resolveArchiveQuotaBlockMode(
'实际数量已保存,证件没有扣减。请把实际数量改小,或先补充购买证和运输证,再重新归档。',
'用证没有完成',
{ quotaCertPendingFulfill: 1, quotaCertWaived: 1 }
),
'alert-pending'
)
})
test('already waived plan does not offer archive-time certificate ready', () => {
assert.equal(
resolveArchiveQuotaBlockMode('余额不足', '用证没有完成', { quotaCertWaived: 1 }),
'alert-pending'
)
})
test('pending keywords still force alert mode without plan flags', () => {
assert.equal(
resolveArchiveQuotaBlockMode(
'该计划仍处于证书齐备待完善,请先在证书齐备中完善并关闭后再归档',
'用证没有完成',
{}
),
'alert-pending'
)
})
test('unmarked quota block only alerts, never offers certificate ready', () => {
assert.equal(
resolveArchiveQuotaBlockMode(
'实际数量已保存,证件没有扣减。请把实际数量改小,或先补充购买证和运输证,再重新归档。',
'用证没有完成',
{ quotaCertPendingFulfill: 0, quotaCertWaived: 0 }
),
'alert-plain'
)
})
test('non quota-title blocks stay plain alert', () => {
assert.equal(resolveArchiveQuotaBlockMode('不能归档:缺证', '不能归档', {}), 'alert-plain')
})
test('missing actual-quantity settle error does not offer certificate ready', () => {
assert.equal(
resolveArchiveQuotaBlockMode('必须明确提交每个来源的实际量', '用证没有完成', {}),
'alert-plain'
)
})
@@ -25,6 +25,20 @@ test('incomplete certificate filter is sent as quotaCertWaivedIn=0', () => {
assert.deepEqual(params, { quotaCertWaivedIn: '0' })
})
test('fulfill tab selection column is first among table columns', () => {
const web = readFileSync(new URL('../src/views/pl/cert-ready/index.vue', import.meta.url), 'utf8')
const selectionIdx = web.indexOf('type="selection"')
const columnsIdx = web.indexOf('v-for="column in columns"')
const actionsIdx = web.indexOf('label="操作"')
assert.ok(selectionIdx > 0, 'selection column missing')
assert.ok(columnsIdx > selectionIdx, 'selection must precede business columns')
assert.ok(actionsIdx > columnsIdx, 'actions must follow business columns')
assert.match(
web,
/v-if="listMode === 'fulfill'"[\s\S]*?type="selection"[\s\S]*?v-for="column in columns"/
)
})
test('web funnel and miniprogram status dropdown default to incomplete', () => {
const web = readFileSync(new URL('../src/views/pl/cert-ready/index.vue', import.meta.url), 'utf8')
const mobile = readFileSync(
+17 -4
View File
@@ -203,13 +203,14 @@ test('real template keeps plans quota proof order and separate lazy contract sco
canViewQuotaCert: true,
canViewProof: true,
detailActiveTab: 'proof',
detailContract: { id: 42 }
detailContract: { id: 42, customerId: 'cust-42' }
}
const rows = panes(ctx)
assert.deepEqual(
rows.map((v: any) => v.props.name),
['plans', 'quota', 'proof']
)
assert.equal(rows[1].props.label, '客户证件与额度')
assert.equal(rows[2].props.label, '运输计划合法使用证明')
assert.equal(rows[2].props.lazy, '')
assert.equal(panel(rows[1]), undefined)
@@ -219,14 +220,19 @@ test('real template keeps plans quota proof order and separate lazy contract sco
assert.equal(proof.props.active, true)
assert.equal(proof.props.embedded, '')
ctx.detailContract.id = 43
ctx.detailContract.customerId = 'cust-43'
ctx.currentDetailId = 43
assert.equal(panel(panes(ctx)[2]).key, 43)
ctx.detailActiveTab = 'quota'
const quota = panel(panes(ctx)[1])
assert.equal(quota.type?.name || quota.type, 'CustomerCertQuotaPanel')
assert.equal(quota.props['customer-id'] ?? quota.props.customerId, 'cust-43')
assert.equal(quota.props.active, true)
ctx.canViewQuotaCert = false
assert.deepEqual(
panes(ctx).map((v: any) => v.props.name),
['plans', 'proof']
)
ctx.detailActiveTab = 'quota'
assert.equal(panel(panes(ctx)[1]), undefined)
})
@@ -265,7 +271,14 @@ test('mounted template unmounts old contract and never mounts quota for proof-on
}
}),
StopDocuments: Child('proof'),
ContractQuotaPanel: Child('quota'),
CustomerCertQuotaPanel: vue.defineComponent({
props: ['customerId', 'active'],
setup(props) {
lifecycle.push(`mount:quota:${props.customerId}`)
vue.onBeforeUnmount(() => lifecycle.push(`unmount:quota:${props.customerId}`))
return () => vue.h('span')
}
}),
PlContractLinkedPlansPanel: vue.defineComponent({
setup() {
return () => vue.h('span')
@@ -282,7 +295,7 @@ test('mounted template unmounts old contract and never mounts quota for proof-on
canViewQuotaCert: false,
canViewProof: true,
detailActiveTab: 'proof',
detailContract: { id: 'A' }
detailContract: { id: 'A', customerId: 'cust-A' }
})
const renderer = vue.createRenderer<any, any>({
createElement: () => ({ children: [] }),
@@ -0,0 +1,126 @@
import test from 'node:test'
import assert from 'node:assert/strict'
import { readFileSync } from 'node:fs'
test('web contract detail embeds customer cert panel and renamed tab', () => {
const source = readFileSync(
new URL('../src/views/crm/contract/components/ContractDetailDialog.vue', import.meta.url),
'utf8'
)
assert.match(source, /label="客户证件与额度"/)
assert.match(source, /CustomerCertQuotaPanel/)
assert.doesNotMatch(source, /ContractQuotaPanel/)
assert.match(source, /:customer-id="detailContract\.customerId"/)
})
test('h5 contract detail includes customer cert tab', () => {
const source = readFileSync(
new URL('../src/views/m/crm/contract/detail.vue', import.meta.url),
'utf8'
)
assert.match(source, /CustomerCertQuotaTab/)
assert.match(source, /客户证件与额度/)
assert.match(source, /canViewQuotaCert/)
assert.match(source, /:customer-id="contract\.customerId"/)
})
test('customer cert panel lists by customerId without contract bindings', () => {
const source = readFileSync(
new URL('../src/views/pl/contract-quota/CustomerCertQuotaPanel.vue', import.meta.url),
'utf8'
)
assert.match(source, /quotaCertApi\.list\('purchase', \{ customerId \}\)/)
assert.match(source, /quotaCertApi\.list\('transport', \{ customerId \}\)/)
assert.match(source, /有效次数/)
assert.match(source, /singleUseConsumed/)
assert.doesNotMatch(source, /saveBindings|openCreate|bindings\(/)
})
test('standalone contract-quota page is customer quota list', () => {
const panel = readFileSync(
new URL('../src/views/pl/contract-quota/CustomerQuotaPanel.vue', import.meta.url),
'utf8'
)
const wrapper = readFileSync(
new URL('../src/views/pl/contract-quota/ContractQuotaPanel.vue', import.meta.url),
'utf8'
)
const router = readFileSync(new URL('../src/router/modules/pl.ts', import.meta.url), 'utf8')
assert.match(panel, /客户用证/)
assert.match(panel, /quotaStatisticsApi\.customers/)
assert.match(wrapper, /CustomerQuotaPanel/)
assert.match(router, /title: '客户用证'/)
})
test('web customer quota panel uses toQueryParams from useServerColumnFilters', () => {
const panel = readFileSync(
new URL('../src/views/pl/contract-quota/CustomerQuotaPanel.vue', import.meta.url),
'utf8'
)
assert.match(panel, /toQueryParams/)
assert.match(panel, /\.\.\.toQueryParams\(\)/)
assert.doesNotMatch(panel, /\bbuildQuery\b/)
assert.doesNotMatch(panel, /\bresetFilters\b/)
assert.match(panel, /clearAllFilters/)
assert.match(panel, /watchVisibleColumns/)
})
test('web customer quota panel computes visibleDefs locally (not from composable)', () => {
const panel = readFileSync(
new URL('../src/views/pl/contract-quota/CustomerQuotaPanel.vue', import.meta.url),
'utf8'
)
assert.doesNotMatch(
panel,
/const \{[^}]*\bvisibleDefs\b[^}]*\} = usePersistedListColumns/
)
assert.match(
panel,
/const \{ visibleColumns, checkAll, isIndeterminate, resetToDefault \} = usePersistedListColumns/
)
assert.match(
panel,
/const visibleDefs = computed\(\(\) =>\s*columns\.filter\(\(column\) => visibleColumns\.value\.includes\(column\.prop\)\)/
)
assert.match(panel, /v-for="column in visibleDefs"/)
})
test('h5 customer tab renders customer fields without persisted column defs', () => {
const tab = readFileSync(
new URL('../src/views/m/pl/plan-cert/CustomerTab.vue', import.meta.url),
'utf8'
)
assert.doesNotMatch(tab, /usePersistedListColumns/)
assert.doesNotMatch(tab, /visibleDefs/)
assert.match(tab, /row\.customerName/)
assert.match(tab, /row\.customerNo/)
assert.match(tab, /row\.certCount/)
})
test('h5 customer quota tab does not call buildQuery', () => {
const tab = readFileSync(
new URL('../src/views/m/pl/plan-cert/CustomerTab.vue', import.meta.url),
'utf8'
)
assert.doesNotMatch(tab, /\bbuildQuery\b/)
assert.match(tab, /quotaStatisticsApi\.customers/)
})
test('web customer quota panel wires viewport height like StatisticsPanel', () => {
const panel = readFileSync(
new URL('../src/views/pl/contract-quota/CustomerQuotaPanel.vue', import.meta.url),
'utf8'
)
assert.match(panel, /useElementSize\(tableWrapRef\)/)
assert.match(
panel,
/const expansionStyle = computed\(\(\) => \(\{[\s\S]*width: tableViewportWidth/
)
assert.match(panel, /tableEl: tableWrapRef/)
assert.match(panel, /pagerEl: pagerRef/)
assert.doesNotMatch(panel, /\bwrapRef\s*:/)
assert.doesNotMatch(
panel,
/const \{[^}]*\bexpansionStyle\b[^}]*\} = useListTableViewportHeight/
)
})
@@ -0,0 +1,46 @@
/**
* 顶栏侧栏收起按钮必须始终可见:
* - persist afterRestore 强制 ensureMenuButtonVisible(禁止 toggle)
* - AppLayout 挂载时再次兜底
* - 设置面板不再提供可关闭开关
*/
import test from 'node:test'
import assert from 'node:assert/strict'
import { readFileSync } from 'node:fs'
import { dirname, join } from 'node:path'
import { fileURLToPath } from 'node:url'
const root = join(dirname(fileURLToPath(import.meta.url)), '..')
test('setting store forces menu button visible on restore', () => {
const src = readFileSync(join(root, 'src/store/modules/setting.ts'), 'utf8')
assert.match(src, /ensureMenuButtonVisible\s*=\s*\(\)\s*=>\s*\{[\s\S]*?showMenuButton\.value\s*=\s*true/)
assert.match(src, /afterRestore:\s*\(ctx\)\s*=>\s*\{[\s\S]*?ensureMenuButtonVisible\(\)/)
assert.doesNotMatch(
src,
/afterRestore:[\s\S]*?if\s*\(\s*!ctx\.store\.showMenuButton\s*\)[\s\S]*?setButton\(\)/,
'afterRestore must not rely on setButton toggle'
)
assert.match(
src,
/const setButton = \(\) => \{\s*showMenuButton\.value = true/,
'setButton must assign true, not toggle'
)
})
test('AppLayout mount ensures menu button visible', () => {
const src = readFileSync(join(root, 'src/views/index/index.vue'), 'utf8')
assert.match(src, /ensureMenuButtonVisible\(\)/)
})
test('settings panel does not expose showMenuButton switch', () => {
const src = readFileSync(
join(root, 'src/components/core/layouts/art-settings-panel/composables/useSettingsConfig.ts'),
'utf8'
)
assert.doesNotMatch(
src,
/key:\s*'showMenuButton'/,
'settings UI must not allow turning off the fold control'
)
})
@@ -12,18 +12,36 @@ import { parse } from '@vue/compiler-sfc'
const root = join(dirname(fileURLToPath(import.meta.url)), '..')
test('ArtSvgIcon: el-icon branch must not use Tailwind inline class', () => {
test('ArtSvgIcon: icon roots must not use Tailwind inline class', () => {
const src = readFileSync(join(root, 'src/components/core/base/art-svg-icon/index.vue'), 'utf8')
const { descriptor } = parse(src)
const template = descriptor.template?.content || ''
assert.match(template, /<el-icon\b[^>]*class="[^"]*art-svg-icon/)
assert.doesNotMatch(
template,
/<el-icon\b[^>]*class="[^"]*\binline\b/,
'el-icon must not include Tailwind inline (breaks display:inline-flex in prod CSS order)'
/<(?:el-icon|Icon)\b[^>]*class="[^"]*\binline\b/,
'icon roots must not include Tailwind inline (breaks display in prod CSS order)'
)
})
test('header fold button uses inline SVG button (Chrome-safe)', () => {
const src = readFileSync(
join(root, 'src/components/core/layouts/art-header-bar/index.vue'),
'utf8'
)
const { descriptor } = parse(src)
const template = descriptor.template?.content || ''
assert.match(template, /class="menu-fold-btn/)
assert.match(template, /menu-fold-btn__icon/)
assert.match(template, /<svg[\s\S]*viewBox="0 0 24 24"/)
assert.doesNotMatch(
template,
/<ArtIconButton[\s\S]*menu-fold/,
'fold control must not rely on ArtIconButton/iconify in Chrome'
)
assert.match(template, /<button[\s\S]*class="menu-fold-btn/)
})
test('plan-archive: planNo is in column defs and table visibility gate', () => {
const src = readFileSync(join(root, 'src/views/pl/plan-archive/index.vue'), 'utf8')
assert.match(src, /prop:\s*'planNo',\s*label:\s*'计划编号'/)
@@ -0,0 +1,66 @@
/**
* #41 回归:运输归档绿色合计行须与表头列一一对应。
* planNo 可隐藏后,不得再无条件硬编码插入 planNo,否则按索引错位。
*/
import test from 'node:test'
import assert from 'node:assert/strict'
import { readFileSync } from 'node:fs'
import { dirname, join } from 'node:path'
import { fileURLToPath } from 'node:url'
import { buildStatsRowColumns } from '../src/utils/list-column-stats.ts'
const root = join(dirname(fileURLToPath(import.meta.url)), '..')
const ARCHIVE_DEFS = [
{ prop: 'planNo' },
{ prop: 'planDate' },
{ prop: 'planQty' },
{ prop: 'actualQty' },
{ prop: 'amount' }
]
test('buildStatsRowColumns: hidden planNo must not leave a phantom stats cell', () => {
const visible = new Set(['planDate', 'planQty', 'actualQty', 'amount'])
const cols = buildStatsRowColumns({
leadingSpacers: 2,
optionalDefs: ARCHIVE_DEFS,
isColumnVisible: (prop) => visible.has(prop),
moneyProps: ['amount']
})
const props = cols.map((c) => c.prop || c.key)
assert.deepEqual(props, [
'__spacer_0',
'__spacer_1',
'planDate',
'planQty',
'actualQty',
'amount'
])
assert.equal(cols.filter((c) => c.prop === 'planNo').length, 0)
})
test('buildStatsRowColumns: visible planNo appears once after spacers', () => {
const visible = new Set(['planNo', 'planDate', 'planQty'])
const cols = buildStatsRowColumns({
leadingSpacers: 2,
optionalDefs: ARCHIVE_DEFS,
isColumnVisible: (prop) => visible.has(prop)
})
const props = cols.map((c) => c.prop || c.key)
assert.deepEqual(props, ['__spacer_0', '__spacer_1', 'planNo', 'planDate', 'planQty'])
assert.equal(cols.filter((c) => c.prop === 'planNo').length, 1)
})
test('plan-archive: stats row builds from visible columns without always-on planNo', () => {
const src = readFileSync(join(root, 'src/views/pl/plan-archive/index.vue'), 'utf8')
assert.match(
src,
/archiveStatsRowColumns[\s\S]*?buildStatsRowColumns\s*\(/,
'archive stats columns should use buildStatsRowColumns so visibility stays in sync'
)
assert.doesNotMatch(
src,
/archiveStatsRowColumns[\s\S]*?key:\s*'__index'[\s\S]*?key:\s*'planNo'[\s\S]*?for\s*\(\s*const\s+def\s+of\s+listColumnDefs/,
'must not hardcode planNo before looping listColumnDefs (causes off-by-one when hidden)'
)
})
+38 -4
View File
@@ -7,7 +7,11 @@ const readyTab = readFileSync(
'utf8'
)
const contractTab = readFileSync(
new URL('../src/views/m/pl/plan-cert/ContractTab.vue', import.meta.url),
new URL('../src/views/m/pl/plan-cert/CustomerTab.vue', import.meta.url),
'utf8'
)
const planCertIndex = readFileSync(
new URL('../src/views/m/pl/plan-cert/index.vue', import.meta.url),
'utf8'
)
const archiveForm = readFileSync(
@@ -30,9 +34,39 @@ test('H5 证书齐备对齐 2.0:待完善列表与完善并关闭,且文案
assert.doesNotMatch(readyTab, /也不扣减额度/)
})
test('H5 合同用证页对新规则给出只读提示', () => {
assert.match(contractTab, /客户\+证用品类/)
assert.match(contractTab, /仅供历史查看/)
test('H5 客户用证按客户列表展示证件', () => {
assert.match(contractTab, /quotaStatisticsApi\.customers/)
assert.match(contractTab, /\/m\/pl\/plan-cert\/customer\//)
assert.match(contractTab, /暂无客户用证数据/)
assert.match(planCertIndex, /title: '客户用证'/)
assert.match(planCertIndex, /客户名称 \/ 编号/)
assert.doesNotMatch(planCertIndex, /合同编号 \/ 名称 \/ 销售或购买单位/)
})
test('H5 客户用证详情显式导入 WebView 壳,避免空白页', () => {
const customerDetail = readFileSync(
new URL('../src/views/m/pl/plan-cert/customer-detail.vue', import.meta.url),
'utf8'
)
assert.match(customerDetail, /import MpWebviewShell from '@\/layouts\/MpWebviewShell\.vue'/)
assert.match(customerDetail, /import MpBusinessHeader from '@\/components\/mp\/MpBusinessHeader\.vue'/)
assert.match(customerDetail, /@ready="onShellReady"/)
})
test('H5 证件详情与建档列表展示系统客户和证用品类', () => {
const faceModel = readFileSync(
new URL('../src/views/m/pl/plan-cert/face-model.ts', import.meta.url),
'utf8'
)
const archiveTab = readFileSync(
new URL('../src/views/m/pl/plan-cert/ArchiveTab.vue', import.meta.url),
'utf8'
)
assert.match(faceModel, /label: '证用品类'/)
assert.match(faceModel, /certCategoryLabel/)
assert.match(archiveTab, /系统客户/)
assert.match(archiveTab, /证用品类/)
assert.match(archiveTab, /certCategoryLabel/)
})
test('H5 建档页使用关联购买证且无证面引用残留', () => {
@@ -0,0 +1,91 @@
import assert from 'node:assert/strict'
import { existsSync, readFileSync } from 'node:fs'
import test from 'node:test'
import ts from 'typescript'
import * as vue from 'vue'
function loadFreightCalc() {
const path = new URL('../src/composables/usePlFreightCalc.ts', import.meta.url)
assert.ok(existsSync(path), 'usePlFreightCalc must exist')
const source = readFileSync(path, 'utf8')
const ast = ts.createSourceFile('usePlFreightCalc.ts', source, ts.ScriptTarget.Latest, true)
const code = ast.statements
.filter((node) => !ts.isImportDeclaration(node))
.map((node) => node.getText(ast))
.join('\n')
const compiled = ts.transpileModule(code, {
compilerOptions: { target: ts.ScriptTarget.ES2022, module: ts.ModuleKind.CommonJS }
}).outputText
const module = { exports: {} as Record<string, unknown> }
const requireStub = () => {
throw new Error('unexpected require in freight calc test harness')
}
// eslint-disable-next-line no-new-func
const factory = new Function(
'exports',
'require',
'module',
'__filename',
'__dirname',
'computed',
'ref',
'watch',
compiled + '\nmodule.exports = { usePlFreightCalc, sumProductActualQuantities };'
)
factory(
module.exports,
requireStub,
module,
'usePlFreightCalc.ts',
'.',
vue.computed,
vue.ref,
vue.watch
)
return module.exports as {
usePlFreightCalc: typeof import('../src/composables/usePlFreightCalc').usePlFreightCalc
}
}
test('resetFreightCalc re-sums transport qty from existing product actuals', async () => {
const { usePlFreightCalc } = loadFreightCalc()
const products = vue.ref([{ actualQty: 0.04, unit: '吨' }, { actualQty: 0.04, unit: '吨' }])
const hasFreight = vue.ref(1)
const freightType = vue.ref('by_weight')
const scope = vue.effectScope()
const calc = scope.run(() => usePlFreightCalc({ products, hasFreight, freightType }))
assert.ok(calc)
await vue.nextTick()
assert.equal(calc!.transportQty.value, 0.08)
calc!.resetFreightCalc()
await vue.nextTick()
assert.equal(calc!.transportQtyTouched.value, false)
assert.equal(
calc!.transportQty.value,
0.08,
'reset after products already loaded must not leave transport qty empty'
)
scope.stop()
})
test('resetFreightCalc restores product sum after manual transport qty edit', async () => {
const { usePlFreightCalc } = loadFreightCalc()
const products = vue.ref([{ actualQty: 0.04, unit: '吨' }])
const hasFreight = vue.ref(1)
const freightType = vue.ref('by_weight')
const scope = vue.effectScope()
const calc = scope.run(() => usePlFreightCalc({ products, hasFreight, freightType }))
assert.ok(calc)
await vue.nextTick()
calc!.transportQty.value = 9.9
calc!.markTransportQtyTouched()
calc!.resetFreightCalc()
await vue.nextTick()
assert.equal(calc!.transportQtyTouched.value, false)
assert.equal(calc!.transportQty.value, 0.04)
scope.stop()
})
+61 -66
View File
@@ -105,6 +105,9 @@ function harness(fixed?: string) {
useServerColumnFilters,
createStatisticsLoader,
quotaStatisticsApi: api,
certQuotaRuleApi: {
get: async () => ({ configured: false })
},
onBeforeUnmount: (fn: Function) => unmount.push(fn)
}
const src = ts.createSourceFile(
@@ -154,16 +157,21 @@ test('cert tabs keep their identities and legal proof is a sibling menu', () =>
assert.equal(legal.meta!.title, '合法使用证明')
assert.deepEqual(
group.children!.filter((r) => !r.meta?.isHide).map((r) => r.path),
['quota-cert', 'contract-quota', 'certificate-usage', 'plan-cert', 'cert-ready']
['quota-cert', 'cert-category', 'contract-quota', 'certificate-usage', 'plan-cert', 'cert-ready']
)
assert.equal(group.children![0].id, 'PL_QUOTA_CERT')
assert.equal(group.children![3].id, 'PL00000000000000000000000000015')
assert.equal(group.children!.find((r) => r.path === 'contract-quota')?.meta?.title, '客户用证')
assert.equal(
group.children!.find((r) => r.path === 'plan-cert')?.id,
'PL00000000000000000000000000015'
)
assert.deepEqual(
group.children!.filter((r) => !r.meta?.isHide).map((r) => r.meta!.menuCode),
[
'pl:quota-cert:list',
'pl:quota-cert:list',
'pl:quota-cert:list',
'pl:quota-cert:list',
'pl:plan-cert:list',
'pl:cert-ready:list'
]
@@ -648,71 +656,58 @@ function compiledSfc(path: string, dependencies: Record<string, any>, inlineTemp
)
return new Function(...Object.keys(env), `${code}; return component`)(...Object.values(env))
}
for (const wrapper of [
'contract-quota/ContractQuotaPanel.vue',
'certificate-usage/CertificateUsagePanel.vue'
]) {
for (const active of [undefined, false])
test(`compiled ${wrapper} ${active === false ? 'inactive skips requests' : 'defaults to active and loads'}`, async () => {
const calls: string[] = []
const dependencies = {
useUserStore: () => vue.reactive({ accessToken: 'token', getUserInfo: { tenantNo: 'a' } }),
useRouter: () => ({ push() {}, replace() {} }),
fetchGetMenuCodes: async () => {
calls.push('permissions')
return { all: true }
},
quotaStatisticsApi: {
contracts: async () => {
calls.push('contracts')
return { list: [], total: 0 }
},
certificates: async () => {
calls.push('certificates')
return { list: [], total: 0 }
}
},
usePersistedListColumns,
useServerColumnFilters,
createStatisticsLoader,
useElementSize: () => ({ width: vue.ref(1120) }),
useListTableViewportHeight: () => ({ tableHeight: vue.ref(400) }),
statusLabel: statisticsLabels.statusLabel,
contractTypeLabel: statisticsLabels.contractTypeLabel
}
// Compile the real inner setup too; only its visual child tree is omitted here.
const StatisticsPanel = compiledSfc(
'../src/views/pl/quota-statistics/StatisticsPanel.vue',
dependencies,
false
)
StatisticsPanel.render = () => null
const Wrapper = compiledSfc(`../src/views/pl/${wrapper}`, { StatisticsPanel })
const renderer = vue.createRenderer<any, any>({
createElement: () => ({}),
createText: () => ({}),
createComment: () => ({}),
setText: () => {},
setElementText: () => {},
parentNode: () => null,
nextSibling: () => null,
insert: () => {},
remove: () => {},
patchProp: () => {}
})
const app = renderer.createApp(Wrapper, active === undefined ? {} : { active })
app.mount({})
await flush()
await vue.nextTick()
assert.deepEqual(
calls,
active === false
? []
: ['permissions', wrapper.startsWith('contract') ? 'contracts' : 'certificates']
)
app.unmount()
for (const active of [undefined, false])
test(`compiled certificate-usage/CertificateUsagePanel.vue ${active === false ? 'inactive skips requests' : 'defaults to active and loads'}`, async () => {
const calls: string[] = []
const dependencies = {
useUserStore: () => vue.reactive({ accessToken: 'token', getUserInfo: { tenantNo: 'a' } }),
useRouter: () => ({ push() {}, replace() {} }),
fetchGetMenuCodes: async () => {
calls.push('permissions')
return { all: true }
},
quotaStatisticsApi: {
certificates: async () => {
calls.push('certificates')
return { list: [], total: 0 }
}
},
usePersistedListColumns,
useServerColumnFilters,
createStatisticsLoader,
useElementSize: () => ({ width: vue.ref(1120) }),
useListTableViewportHeight: () => ({ tableHeight: vue.ref(400) }),
statusLabel: statisticsLabels.statusLabel,
contractTypeLabel: statisticsLabels.contractTypeLabel
}
const StatisticsPanel = compiledSfc(
'../src/views/pl/quota-statistics/StatisticsPanel.vue',
dependencies,
false
)
StatisticsPanel.render = () => null
const Wrapper = compiledSfc('../src/views/pl/certificate-usage/CertificateUsagePanel.vue', {
StatisticsPanel
})
}
const renderer = vue.createRenderer<any, any>({
createElement: () => ({}),
createText: () => ({}),
createComment: () => ({}),
setText: () => {},
setElementText: () => {},
parentNode: () => null,
nextSibling: () => null,
insert: () => {},
remove: () => {},
patchProp: () => {}
})
const app = renderer.createApp(Wrapper, active === undefined ? {} : { active })
app.mount({})
await flush()
await vue.nextTick()
assert.deepEqual(calls, active === false ? [] : ['permissions', 'certificates'])
app.unmount()
})
test('expanded content follows the table viewport width and keeps alignment local', () => {
const h = harness()
+1 -1
View File
@@ -111,7 +111,7 @@
const panelTitleClassList = [...panelTitleIconByText.map(([, cls]) => cls), 'auto-title-list']
const panelTitleBarClass = 'title-bar-heading'
const panelTitleBarTextRules = [/^(购买证与运输证|合法使用证明|计划用证|证件建档|证用品类|合同用证|证件用量|计划段次用证|证书齐备|合同证件与额度|运输证件规则)$/]
const panelTitleBarTextRules = [/^(购买证与运输证|合法使用证明|计划用证|证件建档|证用品类|合同用证|客户用证|证件用量|计划段次用证|证书齐备|合同证件与额度|客户证件与额度|运输证件规则)$/]
const panelTitleHeadingSelector =
'.page-container .panel-top h2, .page-container .panel-top h3, .page-container .storage-content-header h3, .page-container .storage-aside__head h2, .page-container .user-dept-aside__head h2, .console-container .panel-top h2'
+4
View File
@@ -95,6 +95,8 @@ export interface CustomerForm {
district?: string;
/** 详细地址 */
address?: string;
/** 是否同市 0-否 1-是 */
sameCity?: number;
/** 负责人ID */
ownerUserId?: number;
/** 下次联系时间 */
@@ -133,6 +135,8 @@ export interface CustomerVO {
city?: string;
district?: string;
address?: string;
/** 是否同市 0-否 1-是 */
sameCity?: number;
status: string;
dealStatus: string;
ownerUserId?: number;
+11
View File
@@ -624,6 +624,13 @@ export interface Plan {
hazardCertReady?: number
hazardCertReadyBy?: string
hazardCertReadyTime?: string
/** 证书齐备:新规则仅放行安排 */
quotaCertWaived?: number
quotaCertWaivedBy?: string
quotaCertWaivedByName?: string
quotaCertWaivedTime?: string
/** 新规则证书齐备待完善 */
quotaCertPendingFulfill?: number
erpEntered?: number
remark?: string
createBy?: string
@@ -2255,6 +2262,10 @@ export interface VehicleFuelPlateMonthItem {
prevMonthRateL100?: number | string | null
/** 近三个月百公里油耗 L/100km;里程不足时为 null */
last3MonthsRateL100?: number | string | null
/** 近 10/20/30 次有效加油段平均百公里油耗 L/100km */
avgRateLast10L100?: number | string | null
avgRateLast20L100?: number | string | null
avgRateLast30L100?: number | string | null
}
export interface VehicleFuelPlateMonthSummaryResponse {
+30 -2
View File
@@ -61,10 +61,13 @@ export interface QuotaCert extends Omit<CertBody, 'status'> {
verifiedTime?: string | null
openingConfirmed: boolean
usagePolicy: 'once' | 'multiple' | 'needs_confirmation'
singleUseConsumed?: boolean
createTime?: string
certType?: CertType
derivedCategoryIds?: string[]
derivedCategoryNames?: string[]
customerName?: string | null
categoryName?: string | null
}
export interface ScopeProduct {
id?: string
@@ -132,8 +135,10 @@ export interface LegalDocument {
}
const base = '/transport/quota-certs'
export const quotaCertApi = {
list: (kind: CertType, params: { keyword?: string; status?: string } = {}) =>
request.get(`${base}/${kind}`, { params }).then(pickBxData<QuotaCert[]>),
list: (
kind: CertType,
params: { keyword?: string; status?: string; customerId?: string } = {}
) => request.get(`${base}/${kind}`, { params }).then(pickBxData<QuotaCert[]>),
get: (kind: CertType, id: string) =>
request.get(`${base}/${kind}/${id}`).then(pickBxData<QuotaCert>),
save: (kind: CertType, body: CertBody, id?: string) =>
@@ -504,6 +509,13 @@ export interface StatisticsPage<T> {
export interface ContractStatisticsSummary extends ContractOption {
certCount: number
}
export interface CustomerStatisticsSummary {
id: string
customerId: string
customerNo: string
customerName: string
certCount: number
}
export interface CertificateStatisticsSummary {
id: string
certId: string
@@ -522,6 +534,14 @@ export interface CertificateStatisticsSummary {
buyPartyName?: string | null
validUseText?: string | null
}
export interface CustomerStatistics extends CustomerStatisticsSummary {
certificates: (CertificateStatisticsSummary & {
usagePolicy?: QuotaCert['usagePolicy']
singleUseConsumed?: boolean
openingConfirmed?: boolean
createTime?: string
})[]
}
export interface StatisticsProduct {
id: string
contractProductId: string
@@ -579,6 +599,8 @@ export interface StatisticsQuery {
contractNo?: string
contractName?: string
contractTypeIn?: string
customerNo?: string
customerName?: string
certCountOp?: string
certCount?: string
certCountMin?: string
@@ -622,12 +644,18 @@ export const quotaStatisticsApi = {
request
.get(`${base}/statistics/contracts`, { params })
.then(pickBxData<StatisticsPage<ContractStatisticsSummary>>),
customers: (params: StatisticsQuery) =>
request
.get(`${base}/statistics/customers`, { params })
.then(pickBxData<StatisticsPage<CustomerStatisticsSummary>>),
certificates: (params: StatisticsQuery) =>
request
.get(`${base}/statistics/certificates`, { params })
.then(pickBxData<StatisticsPage<CertificateStatisticsSummary>>),
contract: (id: string) =>
request.get(`${base}/contracts/${id}/statistics`).then(pickBxData<ContractStatistics>),
customer: (id: string) =>
request.get(`${base}/customers/${id}/statistics`).then(pickBxData<CustomerStatistics>),
certificate: (kind: CertType, id: string) =>
request.get(`${base}/${kind}/${id}/statistics`).then(pickBxData<CertificateStatistics>)
}
@@ -299,6 +299,7 @@
extractArchiveLineOverageDetail,
showArchiveLineOverageConfirm
} from '@/utils/pl-contract-qty-reminder'
import { resolveArchiveQuotaBlockMode } from '@/utils/pl-archive-quota-block'
const props = defineProps<{
visible: boolean
@@ -1602,37 +1603,18 @@
async function showArchiveQuotaBlockDialog(message: string, title = '不能归档') {
const html = `<p class="pl-arrange-block-text">${escapeArchiveBlockText(message)}</p>`
const pendingFulfill =
message.includes('待完善') || message.includes('完善并关闭') || message.includes('证书齐备待完善')
if (title !== '用证没有完成' || pendingFulfill) {
const guide = pendingFulfill
? `${html}<p class="pl-arrange-block-text">新规则下证书齐备只放行安排,不能绕过归档挂证。请到「证书齐备 → 已标记待完善证书」上传证件并执行完善并关闭后再归档。</p>`
const mode = resolveArchiveQuotaBlockMode(message, title, plan.value)
const guide =
mode === 'alert-pending'
? `${html}<p class="pl-arrange-block-text">该运输计划已走证书齐备,归档前须完善证件。请到「证书齐备 → 已标记待完善证书」上传购买证/运输证并执行完善并关闭后再归档。</p>`
: html
await ElMessageBox.alert(guide, title, {
type: 'warning',
confirmButtonText: '知道了',
dangerouslyUseHTMLString: true,
customClass: 'pl-arrange-block-msgbox',
closeOnClickModal: false
}).catch(() => undefined)
return undefined
}
// 仅旧规则(legacy)允许在归档时标记证书齐备以跳过额度
const readyHtml = `${html}<p class="pl-arrange-block-text">如果购买证、运输证还没上传,可以标记证书齐备。仅旧规则计划标记后这次归档不再校验、不扣这两证额度;新规则计划请走「证书齐备 → 已标记待完善证书」。</p>`
try {
await ElMessageBox.confirm(readyHtml, title, {
type: 'warning',
confirmButtonText: '证书齐备',
cancelButtonText: '知道了',
dangerouslyUseHTMLString: true,
customClass: 'pl-arrange-block-msgbox',
closeOnClickModal: false,
distinguishCancelAndClose: true
})
return 'ready' as const
} catch {
return undefined
}
await ElMessageBox.alert(guide, title, {
type: 'warning',
confirmButtonText: '知道了',
dangerouslyUseHTMLString: true,
customClass: 'pl-arrange-block-msgbox',
closeOnClickModal: false
}).catch(() => undefined)
}
function applyArchiveOverageHighlight(items: Array<Record<string, unknown>>) {
@@ -1667,13 +1649,7 @@
// 业务异常已作为一次请求提交;补齐条件后允许新尝试,不回放旧异常。
quotaArchiveAttempt = { signature: '', id: '' }
const message = saved.quotaSettlementError
const choice = await showArchiveQuotaBlockDialog(message, '用证没有完成')
if (choice === 'ready' && current()) {
await planApi.markQuotaCertReady(targetId)
if (!current()) return
await submitArchiveWithOverageConfirm(targetId, frozenBody, current, confirmOverage)
return
}
await showArchiveQuotaBlockDialog(message, '用证没有完成')
const error = new Error(message) as Error & { cancelled?: boolean }
error.cancelled = true
throw error
@@ -245,7 +245,7 @@
import { mobileStopIdentity } from '@/views/m/pl/plan/mobileStopIdentity'
import MobilePlanDeliverySection from '@/views/m/pl/plan/MobilePlanDeliverySection.vue'
import { Bottom, Delete, Plus, Search, Top } from '@element-plus/icons-vue'
import { fetchCustomerOptions } from '@/api/crm/customer'
import { fetchCustomerDetail, fetchCustomerOptions } from '@/api/crm/customer'
import { customerStopPrefApi, type CustomerStopPref } from '@/api/pl/index'
import PlAddressWithLibrary, {
type PlAddressApplyPayload
@@ -256,6 +256,7 @@
import {
canManualToggleStopDibang,
createEmptyDeliveryForm,
resolveCustomerSameCityFlag,
resolveStopDibangDefaults,
sumStopProductsPlanQty,
type PlanDeliveryForm,
@@ -331,6 +332,7 @@
id: string
customerName: string
customerNo?: string
sameCity?: number
}
const activeIndex = ref(0)
@@ -579,6 +581,7 @@
products: [],
generateDibang: 0,
dibangDirection: 'none',
sameCity: 0,
address: '',
lng: null,
lat: null,
@@ -604,15 +607,34 @@
products: [],
generateDibang: defaults.generateDibang,
dibangDirection: defaults.dibangDirection,
sameCity: resolveCustomerSameCityFlag(customer?.sameCity),
address: '',
lng: null,
lat: null,
contact: '',
notes: ''
})
void applySameCityFromCustomer(index, String(customerId))
void applyDeliveryStopPref(index, String(customerId))
}
async function applySameCityFromCustomer(index: number, customerId: string) {
const identity = props.mobileSheet ? mobileStopIdentity(props.modelValue[index]) : undefined
try {
const res = await fetchCustomerDetail({ id: customerId })
const data = pickBxData<{ sameCity?: number }>(res)
if (!data) return
if (props.mobileSheet) {
index = props.modelValue.findIndex((row) => mobileStopIdentity(row) === identity)
}
const current = props.modelValue[index]
if (!current || String(current.customerId) !== String(customerId)) return
patchDelivery(index, { sameCity: resolveCustomerSameCityFlag(data.sameCity) })
} catch {
// 静默:不阻断选客户
}
}
async function applyDeliveryStopPref(index: number, customerId: string) {
const identity = props.mobileSheet ? mobileStopIdentity(props.modelValue[index]) : undefined
try {
@@ -175,7 +175,7 @@
<script setup lang="ts">
import MobilePlanLoadSection from '@/views/m/pl/plan/MobilePlanLoadSection.vue'
import { Plus, Search } from '@element-plus/icons-vue'
import { fetchCustomerOptions } from '@/api/crm/customer'
import { fetchCustomerDetail, fetchCustomerOptions } from '@/api/crm/customer'
import { customerStopPrefApi, type CustomerStopPref } from '@/api/pl/index'
import PlAddressWithLibrary, {
type PlAddressApplyPayload
@@ -189,6 +189,7 @@
} from '@/utils/pl-plan-contract-product'
import {
canManualToggleStopDibang,
resolveCustomerSameCityFlag,
resolveStopDibangDefaults,
type PlanLoadForm
} from '@/utils/pl-plan-stop-form'
@@ -232,6 +233,7 @@
id: string
customerName: string
customerNo?: string
sameCity?: number
}
const customerOptions = ref<CustomerOptionRow[]>([])
@@ -402,6 +404,7 @@
products: [],
generateDibang: 0,
dibangDirection: 'none',
sameCity: 0,
address: '',
lng: null,
lat: null,
@@ -427,15 +430,29 @@
products: [],
generateDibang: defaults.generateDibang,
dibangDirection: defaults.dibangDirection,
sameCity: resolveCustomerSameCityFlag(customer?.sameCity),
address: '',
lng: null,
lat: null,
contact: '',
notes: ''
})
void applySameCityFromCustomer(String(customerId))
void applyStopPrefFromCustomer(String(customerId))
}
async function applySameCityFromCustomer(customerId: string) {
try {
const res = await fetchCustomerDetail({ id: customerId })
const data = pickBxData<{ sameCity?: number }>(res)
if (!data) return
if (String(props.modelValue.customerId) !== String(customerId)) return
patch({ sameCity: resolveCustomerSameCityFlag(data.sameCity) })
} catch {
// 静默:不阻断选客户
}
}
async function applyStopPrefFromCustomer(customerId: string) {
try {
const res = await customerStopPrefApi.get({ customerId, stopType: 'load' })
@@ -1,11 +1,11 @@
<!-- 图标组件:支持 Element Plus 图标(无 : 前缀)与 Iconify 图标(含 : 前缀) -->
<template>
<!-- el-icon 勿加 Tailwind `inline`:生产 CSS 中 `.inline{display:inline}` 会覆盖
`.el-icon{display:inline-flex}`,导致 Fold 等图标在打包后不可见 -->
<!-- 勿给图标根节点加 Tailwind `inline`:生产 CSS 中 `.inline{display:inline}`
会覆盖 flex/尺寸,部分 Chrome 下 Fold 等图标不可见 -->
<el-icon v-if="epIcon" v-bind="iconAttrs" class="art-svg-icon">
<component :is="epIcon" />
</el-icon>
<Icon v-else-if="icon" :icon="icon" v-bind="iconAttrs" class="art-svg-icon inline" />
<Icon v-else-if="icon" :icon="icon" v-bind="iconAttrs" class="art-svg-icon" />
</template>
<script setup lang="ts">
@@ -21,17 +21,31 @@
@click="toHome"
/>
<!-- 菜单按钮 -->
<ArtIconButton
<!-- 菜单按钮:内联 SVG,避开 Chrome 下 el-icon / Iconify 偶发不绘制 -->
<button
v-if="isLeftMenu && shouldShowMenuButton"
icon="fold"
class="ml-3 max-sm:ml-[7px] menu-fold-btn"
type="button"
class="menu-fold-btn"
:class="{ 'is-menu-collapsed': !menuOpen }"
:title="menuOpen ? '收起菜单' : '展开菜单'"
:aria-label="menuOpen ? '收起菜单' : '展开菜单'"
:aria-expanded="menuOpen"
@click="visibleMenu"
/>
>
<svg
class="menu-fold-btn__icon"
viewBox="0 0 24 24"
width="20"
height="20"
aria-hidden="true"
focusable="false"
>
<path
fill="currentColor"
d="M21 18v2H3v-2zm0-5v2h-9v-2zm0-5v2h-9V8zM3 3.5v10l5-5z"
/>
</svg>
</button>
<!-- 刷新按钮 - 已隐藏 -->
<ArtIconButton
@@ -388,14 +402,49 @@
}
}
.menu-fold-btn :deep(.art-svg-icon) {
transition: transform 0.3s ease;
/* 顶栏折叠按钮:原生 button + 内联 SVG,保证 Chrome/Safari 一致可见 */
.menu-fold-btn {
box-sizing: border-box;
display: inline-flex;
flex-shrink: 0;
align-items: center;
justify-content: center;
width: 34px;
height: 34px;
margin-left: 12px;
padding: 0;
color: #64748b;
cursor: pointer;
background: transparent;
border: 0;
border-radius: 8px;
appearance: none;
}
.menu-fold-btn.is-menu-collapsed :deep(.art-svg-icon) {
@media (max-width: 640px) {
.menu-fold-btn {
margin-left: 7px;
}
}
.menu-fold-btn:hover {
color: #1e293b;
background: var(--mint-row-alt, #f1f5f9);
}
.menu-fold-btn__icon {
display: block;
width: 20px;
height: 20px;
transition: transform 0.3s ease;
/* 展开态默认旋转,与收起态对调 */
transform: rotate(180deg);
}
.menu-fold-btn.is-menu-collapsed .menu-fold-btn__icon {
transform: rotate(0deg);
}
/* Hover animation classes */
.refresh-btn:hover :deep(.art-svg-icon) {
animation: rotate180 0.5s;
@@ -119,13 +119,7 @@ export function useSettingsConfig() {
handler: 'uniqueOpened',
headerBarKey: null // 不依赖headerBar配置
},
{
key: 'showMenuButton',
label: t('setting.basics.list.collapseSidebar'),
type: 'switch' as const,
handler: 'menuButton',
headerBarKey: 'menuButton' as const
},
// showMenuButton 不提供开关:顶栏收起侧栏按钮为产品必显能力
{
key: 'showFastEnter',
label: t('setting.basics.list.fastEnter'),
@@ -67,7 +67,7 @@ export function useSettingsHandlers() {
uniqueOpened: createToggleHandler(() => settingStore.setUniqueOpened()),
// 显示菜单按钮
menuButton: createToggleHandler(() => settingStore.setButton()),
menuButton: createToggleHandler(() => settingStore.ensureMenuButtonVisible()),
// 显示快速入口
fastEnter: createToggleHandler(() => settingStore.setFastEnter()),
@@ -185,9 +185,8 @@
settingStore.setElementTheme(config.systemThemeColor)
// 界面显示(切换类方法)
toggleIfDifferent(settingStore.showMenuButton, config.showMenuButton, () =>
settingStore.setButton()
)
// 顶栏收起按钮为必显,导入配置时也强制打开
settingStore.ensureMenuButtonVisible()
toggleIfDifferent(settingStore.showFastEnter, config.showFastEnter, () =>
settingStore.setFastEnter()
)
@@ -86,11 +86,13 @@ export function usePlFreightCalc(options: {
)
function resetFreightCalc() {
transportQty.value = null
transportQtyTouched.value = false
freightAmount.value = null
freightAmountTouched.value = false
freightPrice.value = null
// 产品已加载时 watch 不会因 reset 重跑;须立即按当前实际数量回填,
// 否则归档弹窗再次打开会误报「运输量须大于0」。
transportQty.value = defaultTransportQty.value || null
}
function markTransportQtyTouched() {
+1 -1
View File
@@ -133,7 +133,7 @@
mode: 'list',
title: '运输证件管理',
search: '证件编号 / 品名',
tabs: ['证件建档', '合同用证', '证件用量', '计划段次用证', '证书齐备'],
tabs: ['证件建档', '客户用证', '证件用量', '计划段次用证', '证书齐备'],
filters: [],
caption: '正在加载运输证件管理'
}
+1 -1
View File
@@ -80,7 +80,7 @@ export const plRoutes: AppRouteRecord[] = [
name: 'PlContractQuota',
path: 'contract-quota',
component: '/pl/contract-quota/index',
meta: { title: '合同用证', keepAlive: false, menuCode: 'pl:quota-cert:list' }
meta: { title: '客户用证', keepAlive: false, menuCode: 'pl:quota-cert:list' }
},
{
id: 'PL_CERTIFICATE_USAGE',
+8 -2
View File
@@ -171,11 +171,17 @@ export const staticRoutes: AppRouteRecordRaw[] = [
component: () => import('@views/m/pl/plan-cert/archive-detail.vue'),
meta: { title: '证件建档', isHideTab: true, isMpWebview: true }
},
{
path: '/m/pl/plan-cert/customer/:id',
name: 'MpPlPlanCertCustomer',
component: () => import('@views/m/pl/plan-cert/customer-detail.vue'),
meta: { title: '客户用证', isHideTab: true, isMpWebview: true }
},
{
path: '/m/pl/plan-cert/contract/:id',
name: 'MpPlPlanCertContract',
component: () => import('@views/m/pl/plan-cert/contract-detail.vue'),
meta: { title: '合同用证', isHideTab: true, isMpWebview: true }
redirect: { name: 'MpPlPlanCert', query: { tab: 'contract' } },
meta: { title: '客户用证', isHideTab: true, isMpWebview: true }
},
{
path: '/m/pl/plan-cert/usage/:kind/:id',
+10 -6
View File
@@ -227,10 +227,15 @@ export const useSettingStore = defineStore(
}
/**
* 切换菜单按钮显示
* 切换菜单按钮显示(产品要求顶栏始终可收起侧栏,禁止关闭)
*/
const setButton = () => {
showMenuButton.value = !showMenuButton.value
showMenuButton.value = true
}
/** 强制显示顶栏侧栏收起按钮,修复旧 localStorage 中 false 残留 */
const ensureMenuButtonVisible = () => {
showMenuButton.value = true
}
/**
@@ -423,6 +428,7 @@ export const useSettingStore = defineStore(
setContainerWidth,
setUniqueOpened,
setButton,
ensureMenuButtonVisible,
setFastEnter,
setAutoClose,
setShowRefreshButton,
@@ -458,10 +464,8 @@ export const useSettingStore = defineStore(
} else if (width === 290) {
ctx.store.setMenuOpenWidth(270)
}
// 旧本地配置把收起按钮关掉了;产品需要顶栏始终能收起侧栏
if (!ctx.store.showMenuButton) {
ctx.store.setButton()
}
// 旧本地配置(sys-v*-setting)可能残留 showMenuButton:false;必须赋值 true,禁止用 toggle
ctx.store.ensureMenuButtonVisible()
}
}
}
@@ -0,0 +1,27 @@
/** 归档用证拦截弹窗:只提醒,不在归档界面提供「证书齐备」操作。 */
export type ArchiveQuotaBlockMode = 'alert-pending' | 'alert-plain'
export type ArchiveQuotaBlockPlanFlags = {
quotaCertPendingFulfill?: number | boolean | null
quotaCertWaived?: number | boolean | null
}
function flagOn(value: number | boolean | null | undefined) {
return value === true || Number(value || 0) === 1
}
export function resolveArchiveQuotaBlockMode(
message: string,
title: string,
plan?: ArchiveQuotaBlockPlanFlags | null
): ArchiveQuotaBlockMode {
const pendingByMessage =
message.includes('待完善') ||
message.includes('完善并关闭') ||
message.includes('证书齐备待完善')
const pendingByPlan = flagOn(plan?.quotaCertPendingFulfill) || flagOn(plan?.quotaCertWaived)
if (title !== '用证没有完成') return 'alert-plain'
if (pendingByPlan || pendingByMessage) return 'alert-pending'
return 'alert-plain'
}
@@ -2,6 +2,7 @@ import assert from 'node:assert/strict'
import { describe, it } from 'node:test'
import {
canManualToggleStopDibang,
resolveCustomerSameCityFlag,
resolveStopDibangDefaults,
toxicStopCertBindingMessage
} from './pl-plan-stop-form'
@@ -24,6 +25,18 @@ describe('isPlDibangOptionalVehiclePlate', () => {
})
})
describe('resolveCustomerSameCityFlag', () => {
it('normalizes customer master sameCity to 0/1', () => {
assert.equal(resolveCustomerSameCityFlag(1), 1)
assert.equal(resolveCustomerSameCityFlag(true), 1)
assert.equal(resolveCustomerSameCityFlag('1' as unknown as number), 1)
assert.equal(resolveCustomerSameCityFlag(0), 0)
assert.equal(resolveCustomerSameCityFlag(false), 0)
assert.equal(resolveCustomerSameCityFlag(null), 0)
assert.equal(resolveCustomerSameCityFlag(undefined), 0)
})
})
describe('toxicStopCertBindingMessage', () => {
it('same-city stop only requires the purchase certificate', () => {
assert.equal(
+5
View File
@@ -468,6 +468,11 @@ export function resolveStopProductsForView(
return enrichStopProductsDisplayFromPlan(rows, planProducts)
}
/** 客户主数据 / options 的同市标记 → 段次 sameCity(0/1) */
export function resolveCustomerSameCityFlag(value?: boolean | number | null): number {
return value === true || Number(value) === 1 ? 1 : 0
}
export function createEmptyLoadForm(): PlanLoadForm {
return {
customerId: '',
@@ -504,13 +504,12 @@
/>
</el-tab-pane>
<el-tab-pane v-if="canViewQuotaCert" label="合同证件与额度" name="quota" lazy>
<ContractQuotaPanel
<el-tab-pane v-if="canViewQuotaCert" label="客户证件与额度" name="quota" lazy>
<CustomerCertQuotaPanel
v-if="visible && detailActiveTab === 'quota' && detailContract?.id && String(detailContract.id) === String(currentDetailId)"
:key="detailContract.id"
:contract-id="String(detailContract.id)"
:key="String(detailContract.customerId || detailContract.id)"
:customer-id="detailContract.customerId"
:active="detailActiveTab === 'quota'"
embedded
/>
</el-tab-pane>
@@ -1060,7 +1059,7 @@ import UploadDialog from './UploadDialog.vue';
import ContractFormDialog from './ContractFormDialog.vue';
import ViewKvTable from '@/components/business/system-view-dialog/ViewKvTable.vue';
import type { ViewField } from '@/components/business/system-view-dialog/types';
import ContractQuotaPanel from '@/views/pl/contract-quota/ContractQuotaPanel.vue';
import CustomerCertQuotaPanel from '@/views/pl/contract-quota/CustomerCertQuotaPanel.vue';
import StopDocuments from '@/views/pl/legal-use-document/StopDocuments.vue';
import PlContractLinkedPlansPanel from '@/components/business/pl-contract-linked-plans-panel/index.vue';
import {
@@ -1769,6 +1768,13 @@ const detailBasicViewFields = computed<ViewField[]>(() => {
label: '结算方式',
value: c.settlementMethod ? dictStore.getLabel('crm_settlement_method', c.settlementMethod) : '—',
danger: true
},
{
label: '备注',
value: c.remark || '—',
long: true,
span: 'full',
fullSpan: true
}
];
});
@@ -705,6 +705,17 @@
:biz-type="CRM_UPLOAD_BIZ_TYPE.CONTRACT_ATTACHMENT"
/>
</el-form-item>
<el-form-item label="备注" prop="remark" class="form-col-span-2">
<el-input
v-model="form.remark"
type="textarea"
:rows="2"
placeholder="请输入备注"
maxlength="500"
show-word-limit
/>
</el-form-item>
</el-form>
</div>
@@ -198,6 +198,19 @@
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="备注">
<el-input
type="textarea"
:rows="2"
:model-value="contract.remark || '-'"
readonly
/>
</el-form-item>
</el-col>
</el-row>
<!-- 供方信息 -->
<el-divider content-position="left">供方信息</el-divider>
<el-row :gutter="20">
+11
View File
@@ -480,6 +480,17 @@
:biz-type="CRM_UPLOAD_BIZ_TYPE.CONTRACT_ATTACHMENT"
/>
</el-form-item>
<el-form-item label="备注" prop="remark" class="form-col-span-2">
<el-input
v-model="form.remark"
type="textarea"
:rows="2"
placeholder="请输入备注"
maxlength="500"
show-word-limit
/>
</el-form-item>
</div>
<!-- 底部操作按钮 -->
@@ -841,7 +841,11 @@ const viewSections = computed<ViewSection[]>(() => {
tagField('所属行业', 'crm_customer_industry', c.industry),
tagField('企业规模', 'crm_company_scale', c.scale),
tagField('所在园区', 'crm_customer_park', c.parkArea),
{ label: '地址', value: address, span: true }
{ label: '地址', value: address, span: true },
{
label: '是否同市',
value: Number(c.sameCity) === 1 ? '是(同市运输只需购买证)' : '否'
}
]
const bizFields: ViewField[] = [
@@ -132,6 +132,15 @@
<el-form-item label="详细地址" class="form-field-span-2">
<el-input v-model="form.address" placeholder="请输入详细地址" maxlength="255" />
</el-form-item>
<el-form-item class="form-field-span-2">
<template #label>
是否同市<span class="form-label-tip">同市运输只需购买证</span>
</template>
<el-switch
:model-value="Number(form.sameCity) === 1"
@update:model-value="(checked) => (form.sameCity = checked ? 1 : 0)"
/>
</el-form-item>
</div>
<el-divider content-position="left">分配信息</el-divider>
@@ -361,6 +370,7 @@ const form = ref<CustomerFormType>({
city: undefined,
district: undefined,
address: undefined,
sameCity: 0,
ownerUserId: undefined,
nextTime: undefined,
clueId: undefined,
@@ -601,6 +611,7 @@ const open = async (id?: number | string) => {
const res = await fetchCustomerDetail({ id: String(id) })
const data = unwrapApiData(res as Record<string, unknown> | { data?: Record<string, unknown> })
Object.assign(form.value, data)
form.value.sameCity = Number((data as any)?.sameCity) === 1 ? 1 : 0
form.value.businessLicenseImages =
(data as any)?.businessLicenseImages || (data as any)?.businessLicenseImg || undefined
delete (form.value as Record<string, unknown>).businessLicenseImg
@@ -626,6 +637,7 @@ function buildSubmitPayload() {
// 显式传空串:后端按「重新生成」处理;有值则手改入库
payload.namePinyinAbbr = (form.value.namePinyinAbbr || '').trim()
payload.customerName = (form.value.customerName || '').trim()
payload.sameCity = Number(form.value.sameCity) === 1 ? 1 : 0
return payload
}
@@ -699,6 +711,7 @@ const reset = () => {
city: undefined,
district: undefined,
address: undefined,
sameCity: 0,
ownerUserId: undefined,
nextTime: undefined,
clueId: undefined,
+2
View File
@@ -75,6 +75,8 @@
if (!settingStore.showCrumbs) {
settingStore.setCrumbs()
}
// 纠正版本化 localStorage 中 showMenuButton:false,保证折叠钮始终可见
settingStore.ensureMenuButtonVisible()
})
</script>
@@ -0,0 +1,180 @@
<template>
<div class="mp-customer-cert-quota">
<p v-if="!customerId" class="mp-wv-empty">合同未关联客户,无法展示证件</p>
<p v-else-if="error" class="mp-wv-empty" role="alert">
{{ error }}
<button class="mp-wv-btn" type="button" @click="load">重试</button>
</p>
<div v-else-if="loading" class="mp-cert-page-loading"><van-loading /></div>
<template v-else>
<p class="mp-customer-cert-quota__tip">
展示该客户全部购买证、运输证;证件关联客户,不再按合同绑定。
</p>
<van-empty v-if="!rows.length" description="该客户暂无购买证或运输证" />
<article
v-for="row in rows"
:key="row.certType + row.id"
class="mp-wv-section"
role="button"
tabindex="0"
@click="openDetail(row)"
@keydown.enter.prevent="openDetail(row)"
>
<div class="mp-wv-card__head">
<div>
<h3>{{ row.certNo || '—' }}</h3>
<p>{{ row.productNameOnCert || '未填写证面品名' }}</p>
<p>有效期:{{ row.validFrom || '—' }} 至 {{ row.validTo || '—' }}</p>
</div>
</div>
<div class="mp-cert-tags">
<span
class="status-tag mp-cert-kind-tag"
:class="`status-tag--${certKindMobileTone(row.certType)}`"
>{{ certKindLabel(row.certType) }}</span
>
<span class="status-tag" :class="`status-tag--${statusTone(row.status)}`">{{
certStatusLabel(row.status)
}}</span>
<span v-if="row.singleUseConsumed" class="status-tag status-tag--danger"
>已使用不可再用</span
>
</div>
<div class="mp-wv-card__kv">
<div class="mp-wv-card__kv-row"
><span>有效次数</span><span>{{ row.validUseText || '—' }}</span></div
>
<div class="mp-wv-card__kv-row"
><span>核定</span><span>{{ qtyText(row.totalQty, row.quantityUnit) }}</span></div
>
<div class="mp-wv-card__kv-row"
><span>预占</span><span>{{ qtyText(row.reservedQty, row.quantityUnit) }}</span></div
>
<div class="mp-wv-card__kv-row"
><span>已用</span><span>{{ qtyText(row.usedQty, row.quantityUnit) }}</span></div
>
<div class="mp-wv-card__kv-row"
><span>余量</span><span>{{ qtyText(row.availableQty, row.quantityUnit) }}</span></div
>
</div>
</article>
</template>
</div>
</template>
<script setup lang="ts">
import { useRouter } from 'vue-router'
import { useDictStore } from '@/store/modules/dict'
import { getProductUnitLabel } from '@/utils/crm-product-display'
import { quotaCertApi, type CertType, type QuotaCert } from '@/api/pl/quota-cert'
import { certKindLabel, certKindMobileTone } from '@/views/pl/quota-cert/cert-list-face'
import { formatCertQty } from '@/views/pl/quota-cert/model'
type CustomerCertRow = QuotaCert & { certType: CertType }
const props = withDefaults(
defineProps<{ customerId?: string | number | null; active?: boolean }>(),
{ active: true }
)
const router = useRouter()
const dictStore = useDictStore()
const loading = ref(false)
const error = ref('')
const rows = ref<CustomerCertRow[]>([])
let loadEpoch = 0
function unitLabel(unit?: string | null) {
const label = getProductUnitLabel(dictStore.getLabel, unit)
return !label || label === '—' ? '' : label
}
function qtyText(value: unknown, unit?: string | null) {
const text = formatCertQty(value)
const name = unitLabel(unit)
return name ? `${text} ${name}` : text
}
function certStatusLabel(status?: string | null) {
return (
{
draft: '待核对',
active: '证件已启用',
suspended: '证件已停用',
closed: '证件已核销',
void: '证件已作废'
}[status || ''] ||
status ||
'—'
)
}
function statusTone(status?: string | null) {
if (status === 'active') return 'success'
if (status === 'suspended') return 'warning'
if (status === 'closed' || status === 'void') return 'danger'
return 'info'
}
async function load() {
const customerId = props.customerId == null ? '' : String(props.customerId).trim()
const epoch = ++loadEpoch
if (!customerId) {
rows.value = []
error.value = ''
loading.value = false
return
}
loading.value = true
error.value = ''
try {
const [purchase, transport] = await Promise.all([
quotaCertApi.list('purchase', { customerId }),
quotaCertApi.list('transport', { customerId })
])
if (epoch !== loadEpoch) return
rows.value = [
...(purchase || []).map((item) => ({ ...item, certType: 'purchase' as const })),
...(transport || []).map((item) => ({ ...item, certType: 'transport' as const }))
].sort((a, b) => String(b.createTime || '').localeCompare(String(a.createTime || '')))
} catch (e: any) {
if (epoch !== loadEpoch) return
rows.value = []
error.value = e?.message || '加载客户证件失败'
} finally {
if (epoch === loadEpoch) loading.value = false
}
}
function openDetail(row: CustomerCertRow) {
void router.push(`/m/pl/plan-cert/archive/${row.certType}/${row.id}`)
}
watch(
() => [props.customerId, props.active],
([, active]) => {
if (active) void load()
},
{ immediate: true }
)
</script>
<style scoped lang="scss">
.mp-customer-cert-quota__tip {
margin: 0 0 12px;
font-size: 12px;
line-height: 1.5;
color: var(--mp-text-muted, #64748b);
}
.mp-wv-section {
cursor: pointer;
}
.mp-cert-tags {
display: flex;
flex-wrap: wrap;
gap: 8px;
margin: 8px 0 12px;
}
</style>
+49 -9
View File
@@ -120,6 +120,9 @@
}}</span></span
>
</div>
<div class="mp-wv-kv mp-contract-kv-wide"
><span>备注</span><span class="mp-wv-pre">{{ contract.remark || '—' }}</span></div
>
<div v-if="contract.invalidReason" class="mp-wv-kv mp-contract-kv-wide">
<span>作废原因</span><span class="mp-wv-pre">{{ contract.invalidReason }}</span>
</div>
@@ -342,6 +345,19 @@
</div>
<div v-show="activeTab === 'quota'" class="mp-contract-detail-pane">
<section class="mp-wv-section mp-contract-detail-card">
<h3>客户证件与额度</h3>
<CustomerCertQuotaTab
v-if="canViewQuotaCert && activeTab === 'quota'"
:key="String(contract.customerId || contract.id)"
:customer-id="contract.customerId"
:active="activeTab === 'quota'"
/>
<p v-else class="mp-wv-card__meta">无证件查看权限</p>
</section>
</div>
<div v-show="activeTab === 'plans'" class="mp-contract-detail-pane">
<section class="mp-wv-section mp-contract-detail-card">
<h3>运输计划</h3>
@@ -933,6 +949,8 @@
} from '@/utils/mp-webview'
import { useUserStore } from '@/store/modules/user'
import { useDictStore } from '@/store/modules/dict'
import { fetchGetMenuCodes } from '@/api/auth'
import CustomerCertQuotaTab from './CustomerCertQuotaTab.vue'
import '@/styles/mp-webview.scss'
import '../customer/customer.scss'
@@ -970,6 +988,7 @@
type DetailTabKey =
| 'contract'
| 'plans'
| 'quota'
| 'payment'
| 'invoice'
| 'approval'
@@ -979,6 +998,7 @@
const acting = ref(false)
const errorText = ref('')
const activeTab = ref<DetailTabKey>('contract')
const canViewQuotaCert = ref(false)
const detailBody = ref<HTMLElement>()
const partiesExpanded = ref(false)
const approverPickerOpen = ref(false)
@@ -1056,14 +1076,34 @@
}
}
const detailTabs: Array<{ key: DetailTabKey; label: string }> = [
{ key: 'contract', label: '合同信息' },
{ key: 'plans', label: '运输计划' },
{ key: 'payment', label: '回款记录' },
{ key: 'invoice', label: '开票记录' },
{ key: 'approval', label: '审批流程' },
{ key: 'operation', label: '操作记录' }
]
const detailTabs = computed(() => {
const tabs: Array<{ key: DetailTabKey; label: string }> = [
{ key: 'contract', label: '合同信息' },
{ key: 'plans', label: '运输计划' }
]
if (canViewQuotaCert.value) tabs.push({ key: 'quota', label: '客户证件与额度' })
tabs.push(
{ key: 'payment', label: '回款记录' },
{ key: 'invoice', label: '开票记录' },
{ key: 'approval', label: '审批流程' },
{ key: 'operation', label: '操作记录' }
)
return tabs
})
async function refreshQuotaCertPermission() {
try {
const permissions = await fetchGetMenuCodes()
const codes = permissions?.menuCodes || []
canViewQuotaCert.value =
!!permissions?.all || !!permissions?.isSuperAdmin || codes.includes('pl:quota-cert:list')
} catch {
canViewQuotaCert.value = false
}
if (!canViewQuotaCert.value && activeTab.value === 'quota') {
activeTab.value = 'contract'
}
}
const unreceivedAmount = computed(() => {
const amount = Number(contract.value?.amount) || 0
@@ -1573,7 +1613,7 @@
}
loading.value = true
try {
const res = await getContract(id)
const [res] = await Promise.all([getContract(id), refreshQuotaCertPermission()])
if (!isCurrentLoad(requestSeq, id)) return
const data = ((res as any)?.data ?? res) as ContractVO
if (String(data?.id || '') !== id) throw new Error('合同不存在或无权查看')
@@ -121,7 +121,8 @@ test('客户详情资料分组与 Web 查看弹窗一致', () => {
['基本信息', '业务信息', '备注']
)
assert.equal(sections[0].model.addressLine, '安徽 安庆 大观 某路')
assert.equal(sections[0].fields.at(-1)?.label, '地址')
assert.equal(sections[0].fields.at(-1)?.label, '是否同市')
assert.equal(sections[0].fields.at(-2)?.label, '地址')
assert.deepEqual(
sections[1].fields.map((field) => field.label),
['客户级别', '客户来源', '客户状态', '成交状态', '成交金额', '负责人', '创建人', '创建时间', '跟进天数', '下次联系时间']
+8 -3
View File
@@ -49,7 +49,8 @@ export const customerGroups: { title: string; fields: Field[] }[] = [
{ key: 'province', label: '省份', required: true, max: 50 },
{ key: 'city', label: '城市', required: true, max: 50 },
{ key: 'district', label: '区县', required: true, max: 50 },
{ key: 'address', label: '详细地址', max: 255 }
{ key: 'address', label: '详细地址', max: 255 },
{ key: 'sameCity', label: '是否同市', type: 'switch' }
]
},
{
@@ -166,7 +167,8 @@ export function customerDetailSections(customer: Row = {}): CustomerDetailSectio
{ key: 'industry', label: '所属行业', dict: 'crm_customer_industry' },
{ key: 'scale', label: '企业规模', dict: 'crm_company_scale' },
{ key: 'parkArea', label: '所在园区', dict: 'crm_customer_park' },
{ key: 'addressLine', label: '地址' }
{ key: 'addressLine', label: '地址' },
{ key: 'sameCity', label: '是否同市', type: 'switch' }
]
const bizFields: Field[] = [
{ key: 'level', label: '客户级别', dict: 'crm_customer_level' },
@@ -346,7 +348,7 @@ export function stageSuggestion(stage: string): Row {
return pair ? { stagePercent: pair[0], winRate: pair[1] } : {}
}
export function customerForm(row: Row = {}): Row {
return {
const form = {
...Object.fromEntries(customerGroups.flatMap((g) => g.fields).map((f) => [f.key, ''])),
customerType: '未分类',
level: 'normal',
@@ -357,6 +359,8 @@ export function customerForm(row: Row = {}): Row {
businessPermitImages: row.businessPermitImages ?? '',
otherCertImages: row.otherCertImages ?? ''
}
form.sameCity = Number(row.sameCity ?? form.sameCity) === 1 ? 1 : 0
return form
}
export function customerPayload(form: Row): Row {
const keys = [
@@ -371,6 +375,7 @@ export function customerPayload(form: Row): Row {
data.namePinyinAbbr = String(data.namePinyinAbbr).trim()
data.ownerUserId = String(data.ownerUserId || '')
data.nextTime = apiTime(data.nextTime)
data.sameCity = Number(data.sameCity) === 1 ? 1 : 0
return data
}
export async function saveCustomerAndInvoice(
@@ -25,6 +25,12 @@
}}</span>
</div>
<div class="mp-wv-card__kv">
<div class="mp-wv-card__kv-row"
><span>系统客户</span><span>{{ row.customerName || '—' }}</span></div
>
<div class="mp-wv-card__kv-row"
><span>证用品类</span><span>{{ certCategoryLabel(row) }}</span></div
>
<div class="mp-wv-card__kv-row"
><span>销售单位</span><span>{{ salePartyName(row) || '—' }}</span></div
>
@@ -60,12 +66,12 @@
>编辑</button
>
<button
v-if="canEdit && row.status !== 'void' && row.status !== 'closed'"
v-if="canEdit && row.openingConfirmed && row.status !== 'void' && row.status !== 'closed'"
class="mp-wv-btn"
type="button"
@click="confirmRow = row"
>
{{ row.openingConfirmed ? '复核' : '期初确认' }}
复核
</button>
</div>
</article>
@@ -119,7 +125,7 @@
} from '@/views/pl/quota-cert/cert-list-face'
import { useDictStore } from '@/store/modules/dict'
import { getProductUnitLabel } from '@/utils/crm-product-display'
import { certStatusLabels } from './face-model'
import { certCategoryLabel, certStatusLabels } from './face-model'
const props = defineProps<{
keyword: string
@@ -8,37 +8,21 @@
:close-on-click-overlay="!saving"
@update:show="onShow"
>
<van-nav-bar
:title="row?.openingConfirmed ? '复核证件' : '期初核对'"
left-text="关闭"
@click-left="!saving && emit('close')"
/>
<van-nav-bar title="复核证件" left-text="关闭" @click-left="!saving && emit('close')" />
<div v-if="row" class="mp-cert-confirm-sheet__body mp-cert-form">
<p class="plan-empty-hint">{{ row.certNo }} · {{ row.openingConfirmed ? '复核已启用的证件' : '核对历史用量后启用' }}</p>
<template v-if="!row.openingConfirmed">
<van-field v-model="opening.usedQty" label="历史已用量" label-align="top" type="number" :disabled="saving" />
<van-cell title="一次有效证已有使用记录" center>
<template #right-icon>
<van-switch v-model="opening.singleUseConsumed" :disabled="saving" size="20px" />
</template>
</van-cell>
<van-field v-model="opening.sourceNote" label="历史来源说明" label-align="top" type="textarea" rows="2" :disabled="saving" />
<p class="plan-empty-hint">核对凭据</p>
<AttachmentUploadField v-model="opening.evidenceUrls" folder="pl/quota-cert" :disabled="saving" hint="" />
</template>
<p class="plan-empty-hint">{{ row.certNo }} · 复核已启用的证件</p>
<van-field v-model="opening.reason" label="核对说明" label-align="top" type="textarea" rows="2" :disabled="saving" />
</div>
<footer>
<button class="mp-wv-btn" type="button" :disabled="saving" @click="emit('close')">取消</button>
<button class="mp-wv-btn mp-wv-btn--primary" type="button" :disabled="saving" @click="submit">
{{ saving ? '正在提交…' : '确认启用' }}
{{ saving ? '正在提交…' : '确认复核' }}
</button>
</footer>
</van-popup>
</template>
<script setup lang="ts">
import { ElMessage } from 'element-plus'
import AttachmentUploadField from '@/components/business/attachment-upload-field/index.vue'
import { quotaCertApi, type CertType, type QuotaCert } from '@/api/pl/quota-cert'
import { randomOperationId } from '@/utils/random-id'
import './cert-mobile.scss'
@@ -76,19 +60,15 @@
opening.reason = opening.reason.trim()
saving.value = true
try {
if (props.row.openingConfirmed) {
await quotaCertApi.verify(kind, props.row.id, {
operationId: opening.operationId,
reason: opening.reason
})
} else {
await quotaCertApi.confirm(kind, props.row.id, { ...opening })
}
ElMessage.success(props.row.openingConfirmed ? '证件已复核' : '期初已确认')
await quotaCertApi.verify(kind, props.row.id, {
operationId: opening.operationId,
reason: opening.reason
})
ElMessage.success('证件已复核')
emit('saved')
emit('close')
} catch {
ElMessage.error('核对没有提交,请重试')
ElMessage.error('复核没有提交,请重试')
} finally {
saving.value = false
}
@@ -1,144 +1,7 @@
<template>
<main class="mp-h5-list-content mp-plan-cert-list">
<p class="mp-contract-quota-tip">
新规则已生效:安排选证改为客户+证用品类。本页合同用证仅供历史查看与旧规则计划,请勿再作为新计划的用证操作入口。
</p>
<p v-if="error" class="mp-wv-empty" role="alert">
{{ error }}
<button class="mp-wv-btn" type="button" @click="reload">重试</button>
</p>
<div v-else-if="authReady && !allowed" class="mp-wv-empty">
<div class="mp-wv-empty__title">无证件查看权限</div>
</div>
<van-list v-else v-model:loading="loading" :finished="finished" finished-text="" @load="load">
<article
v-for="row in rows"
:key="row.id"
class="mp-wv-card mp-wv-flat-card"
@click="open(row.id)"
>
<div class="mp-wv-card__head">
<div>
<div class="mp-wv-card__no">{{ row.contractNo || '未编号合同' }}</div>
<div class="mp-wv-card__sub">{{ row.contractName || '—' }}</div>
</div>
<span class="status-tag status-tag--info">{{ contractTypeLabel(row.contractType) }}</span>
</div>
<div class="mp-wv-card__kv">
<div class="mp-wv-card__kv-row">
<span>关联证件数</span><span>{{ row.certCount }}</span>
</div>
</div>
<div class="mp-wv-card-actions mp-wv-card-actions--single" @click.stop>
<button class="mp-wv-btn mp-wv-btn--primary" type="button" @click="open(row.id)">查看</button>
</div>
</article>
</van-list>
<van-empty
v-if="authReady && allowed && !loading && finished && !error && !rows.length"
description="暂无合同用证数据"
/>
</main>
<CustomerTab :keyword="keyword" />
</template>
<script setup lang="ts">
import { fetchGetMenuCodes } from '@/api/auth'
import { quotaStatisticsApi, type ContractStatisticsSummary } from '@/api/pl/quota-cert'
import { contractTypeLabel } from '@/views/pl/quota-statistics/labels'
const props = defineProps<{ keyword: string }>()
const router = useRouter()
const rows = ref<ContractStatisticsSummary[]>([])
const loading = ref(true)
const finished = ref(false)
const error = ref('')
const allowed = ref(false)
const authReady = ref(false)
const page = ref(1)
let epoch = 0
let checking = true
function open(id: string) {
void router.push(`/m/pl/plan-cert/contract/${id}`)
}
async function init() {
const current = epoch
try {
const permissions = await fetchGetMenuCodes()
if (current !== epoch) return
const codes = permissions?.menuCodes || []
allowed.value =
!!permissions?.all || !!permissions?.isSuperAdmin || codes.includes('pl:quota-cert:list')
authReady.value = true
checking = false
if (!allowed.value) {
finished.value = true
loading.value = false
return
}
await load()
} catch {
if (current !== epoch) return
checking = false
authReady.value = true
finished.value = true
loading.value = false
error.value = '权限加载失败,请重新打开页面'
}
}
function reload() {
if (!allowed.value) {
void init()
return
}
epoch++
page.value = 1
rows.value = []
loading.value = true
finished.value = false
error.value = ''
void load()
}
async function load() {
if (checking || !allowed.value) return
const current = epoch
loading.value = true
try {
const data = await quotaStatisticsApi.contracts({
page: page.value,
pageSize: 20,
keyword: props.keyword || undefined
})
if (current !== epoch) return
const list = data?.list || []
rows.value = page.value === 1 ? list : rows.value.concat(list)
finished.value = rows.value.length >= (data?.total || 0) || list.length < 20
page.value += 1
} catch {
if (current === epoch) {
error.value = '统计加载失败,请重试'
finished.value = true
}
} finally {
if (current === epoch) loading.value = false
}
}
watch(
() => props.keyword,
() => {
if (!checking && allowed.value) reload()
}
)
void init()
import CustomerTab from './CustomerTab.vue'
defineProps<{ keyword: string }>()
</script>
<style scoped>
.mp-contract-quota-tip {
margin: 8px 12px 0;
padding: 10px 12px;
border-radius: 8px;
background: #ecfdf5;
color: #065f46;
font-size: 12px;
line-height: 1.5;
}
</style>
@@ -0,0 +1,143 @@
<template>
<main class="mp-h5-list-content mp-plan-cert-list">
<p class="mp-customer-quota-tip">按客户展示购买证、运输证;证件关联客户,不再按合同绑定。</p>
<p v-if="error" class="mp-wv-empty" role="alert">
{{ error }}
<button class="mp-wv-btn" type="button" @click="reload">重试</button>
</p>
<div v-else-if="authReady && !allowed" class="mp-wv-empty">
<div class="mp-wv-empty__title">无证件查看权限</div>
</div>
<van-list v-else v-model:loading="loading" :finished="finished" finished-text="" @load="load">
<article
v-for="row in rows"
:key="row.id"
class="mp-wv-card mp-wv-flat-card"
@click="open(row.id)"
>
<div class="mp-wv-card__head">
<div>
<div class="mp-wv-card__no">{{ row.customerName || '未命名客户' }}</div>
<div class="mp-wv-card__sub">{{ row.customerNo || '—' }}</div>
</div>
</div>
<div class="mp-wv-card__kv">
<div class="mp-wv-card__kv-row">
<span>关联证件数</span><span>{{ row.certCount }}</span>
</div>
</div>
<div class="mp-wv-card-actions mp-wv-card-actions--single" @click.stop>
<button class="mp-wv-btn mp-wv-btn--primary" type="button" @click="open(row.id)"
>查看</button
>
</div>
</article>
</van-list>
<van-empty
v-if="authReady && allowed && !loading && finished && !error && !rows.length"
description="暂无客户用证数据"
/>
</main>
</template>
<script setup lang="ts">
import { fetchGetMenuCodes } from '@/api/auth'
import { quotaStatisticsApi, type CustomerStatisticsSummary } from '@/api/pl/quota-cert'
const props = defineProps<{ keyword: string }>()
const router = useRouter()
const rows = ref<CustomerStatisticsSummary[]>([])
const loading = ref(true)
const finished = ref(false)
const error = ref('')
const allowed = ref(false)
const authReady = ref(false)
const page = ref(1)
let epoch = 0
let checking = true
function open(id: string) {
void router.push(`/m/pl/plan-cert/customer/${id}`)
}
async function init() {
const current = epoch
try {
const permissions = await fetchGetMenuCodes()
if (current !== epoch) return
const codes = permissions?.menuCodes || []
allowed.value =
!!permissions?.all || !!permissions?.isSuperAdmin || codes.includes('pl:quota-cert:list')
authReady.value = true
checking = false
if (!allowed.value) {
finished.value = true
loading.value = false
return
}
await load()
} catch {
if (current !== epoch) return
checking = false
authReady.value = true
finished.value = true
loading.value = false
error.value = '权限加载失败,请重新打开页面'
}
}
function reload() {
if (!allowed.value) {
void init()
return
}
epoch++
page.value = 1
rows.value = []
loading.value = true
finished.value = false
error.value = ''
void load()
}
async function load() {
if (checking || !allowed.value) return
const current = epoch
loading.value = true
try {
const data = await quotaStatisticsApi.customers({
page: page.value,
pageSize: 20,
keyword: props.keyword || undefined
})
if (current !== epoch) return
const list = data?.list || []
rows.value = page.value === 1 ? list : rows.value.concat(list)
finished.value = rows.value.length >= (data?.total || 0) || list.length < 20
page.value += 1
} catch {
if (current === epoch) {
error.value = '统计加载失败,请重试'
finished.value = true
}
} finally {
if (current === epoch) loading.value = false
}
}
watch(
() => props.keyword,
() => {
if (!checking && allowed.value) reload()
}
)
void init()
</script>
<style scoped>
.mp-customer-quota-tip {
margin: 8px 12px 0;
padding: 10px 12px;
border-radius: 8px;
background: #ecfdf5;
color: #065f46;
font-size: 12px;
line-height: 1.5;
}
</style>
Loaded 100 of 117 files, more files were not shown because too many files have changed in this diff. Show more