From 8766afa8c026b4e48c2a34a3bdc751bcf4d34815 Mon Sep 17 00:00:00 2001
From: yumoqing <yumoqing@gmail.com>
Date: Fri, 5 Jun 2026 22:34:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(supplychain):=20=E8=A7=84=E8=8C=83=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20+=20P0=E5=87=BD=E6=95=B0=E6=B3=A8=E5=86=8C=20+=20?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复12个.dspy文件: 移除import/print, 改用return
- init.py: 添加9个P0 CRUD函数 + 单复数兼容注册
- load_path.py: 补充15个CRUD子目录路径
- README.md: 添加P0表说明 + 业务API + 部署清单
- global_menu.ui: 已有supplychain入口(验证通过)
---
 README.md                                     |  24 ++
 scripts/load_path.py                          |  24 ++
 supplychain/__pycache__/init.cpython-310.pyc  | Bin 0 -> 20289 bytes
 supplychain/init.py                           | 225 +++++++++++++++++-
 wwwroot/api/import_supplier_product.dspy      |  30 +--
 .../api/platform_supply_products_create.dspy  |  12 +-
 .../api/platform_supply_products_delete.dspy  |  12 +-
 .../api/platform_supply_products_update.dspy  |  12 +-
 .../api/platform_supply_relations_create.dspy |  12 +-
 .../api/platform_supply_relations_delete.dspy |  12 +-
 .../api/platform_supply_relations_update.dspy |  12 +-
 .../api/product_supplier_mapping_create.dspy  |  12 +-
 .../api/product_supplier_mapping_delete.dspy  |  12 +-
 .../api/product_supplier_mapping_update.dspy  |  12 +-
 wwwroot/api/query_platform_products.dspy      |  25 +-
 wwwroot/api/query_platform_suppliers.dspy     |  25 +-
 16 files changed, 341 insertions(+), 120 deletions(-)
 create mode 100644 supplychain/__pycache__/init.cpython-310.pyc

diff --git a/README.md b/README.md
index 07bb3fa..cb7c1ac 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,22 @@ Manages the complete supply chain workflow for reseller/distributor organization
 | `distribution_agreements` | Distribution agreements between reseller and sub-reseller |
 | `distribution_agreement_items` | Product-level discount details per distribution agreement |
 | `sales_ledger` | Sales transaction records with calculated amounts |
+| `platform_supply_relations` | Platform-level org-to-org supply relationships (P0) |
+| `platform_supply_products` | Product details within platform supply relations (P0) |
+| `product_supplier_mapping` | Unified product-to-supplier mapping across internal/external (P0) |
+
+### P0 Platform Supply Chain (2026-06)
+
+Enables supply chain relationships between organizations on the Sage platform:
+
+- **platform_supply_relations**: Links two organizations (supplier ↔ buyer) with cooperation type (distribution/agency/direct-supply), settlement mode (discount/commission/fixed), and contract period
+- **platform_supply_products**: Product-level pricing within a supply relation — supply price, retail price, discount, commission rate, min order qty
+- **product_supplier_mapping**: Unified view mapping any product to its supplier(s), whether internal (platform org) or external (suppliers table), with preferred supplier flag
+
+Key business APIs:
+- `query_platform_suppliers.dspy` — List platform orgs available as suppliers (excludes current user's org)
+- `query_platform_products.dspy` — List active products owned by a supplier org
+- `import_supplier_product.dspy` — Import a supplier's product into buyer's mapping (creates product_supplier_mapping record)
 
 ### Discount Calculation Logic
 
@@ -165,3 +181,11 @@ result = await env.calculate_sale_amounts(request, {
 })
 # Returns: {contract_id, agreement_id, total_amount, supply_discount, supply_amount, distribution_discount, distribution_amount, profit_amount}
 ```
+
+## Deployment Checklist
+
+1. Execute DDL: `models/mysql.ddl.sql` — creates 3 new tables (platform_supply_relations, platform_supply_products, product_supplier_mapping)
+2. Init appcodes: Run `init/data.json` inserts for 6 appcode groups
+3. Build CRUD UI: `bash build.sh`
+4. Register RBAC: `~/repos/sage/py3/bin/python scripts/load_path.py` (or central load_path.py)
+5. Restart Sage
diff --git a/scripts/load_path.py b/scripts/load_path.py
index 6a823fc..3bdde7f 100755
--- a/scripts/load_path.py
+++ b/scripts/load_path.py
@@ -116,8 +116,20 @@ PATHS_LOGINED = [
     "/supplychain/api/query_dist_discount.dspy",
     # 平台供销关系
     "/supplychain/platform_supply_relations_list/index.ui",
+    "/supplychain/platform_supply_relations_list/get_platform_supply_relations.dspy",
+    "/supplychain/platform_supply_relations_list/add_platform_supply_relations.dspy",
+    "/supplychain/platform_supply_relations_list/update_platform_supply_relations.dspy",
+    "/supplychain/platform_supply_relations_list/delete_platform_supply_relations.dspy",
     "/supplychain/platform_supply_products_list/index.ui",
+    "/supplychain/platform_supply_products_list/get_platform_supply_products.dspy",
+    "/supplychain/platform_supply_products_list/add_platform_supply_products.dspy",
+    "/supplychain/platform_supply_products_list/update_platform_supply_products.dspy",
+    "/supplychain/platform_supply_products_list/delete_platform_supply_products.dspy",
     "/supplychain/product_supplier_mapping_list/index.ui",
+    "/supplychain/product_supplier_mapping_list/get_product_supplier_mapping.dspy",
+    "/supplychain/product_supplier_mapping_list/add_product_supplier_mapping.dspy",
+    "/supplychain/product_supplier_mapping_list/update_product_supplier_mapping.dspy",
+    "/supplychain/product_supplier_mapping_list/delete_product_supplier_mapping.dspy",
     # CRUD API — platform_supply_relations
     "/supplychain/api/platform_supply_relations_create.dspy",
     "/supplychain/api/platform_supply_relations_update.dspy",
@@ -158,16 +170,28 @@ PATHS_OPERATOR = [
     # 平台供销关系管理
     "/supplychain/platform_supply_relations_list",
     "/supplychain/platform_supply_relations_list/index.ui",
+    "/supplychain/platform_supply_relations_list/get_platform_supply_relations.dspy",
+    "/supplychain/platform_supply_relations_list/add_platform_supply_relations.dspy",
+    "/supplychain/platform_supply_relations_list/update_platform_supply_relations.dspy",
+    "/supplychain/platform_supply_relations_list/delete_platform_supply_relations.dspy",
     "/supplychain/api/platform_supply_relations_create.dspy",
     "/supplychain/api/platform_supply_relations_update.dspy",
     "/supplychain/api/platform_supply_relations_delete.dspy",
     "/supplychain/platform_supply_products_list",
     "/supplychain/platform_supply_products_list/index.ui",
+    "/supplychain/platform_supply_products_list/get_platform_supply_products.dspy",
+    "/supplychain/platform_supply_products_list/add_platform_supply_products.dspy",
+    "/supplychain/platform_supply_products_list/update_platform_supply_products.dspy",
+    "/supplychain/platform_supply_products_list/delete_platform_supply_products.dspy",
     "/supplychain/api/platform_supply_products_create.dspy",
     "/supplychain/api/platform_supply_products_update.dspy",
     "/supplychain/api/platform_supply_products_delete.dspy",
     "/supplychain/product_supplier_mapping_list",
     "/supplychain/product_supplier_mapping_list/index.ui",
+    "/supplychain/product_supplier_mapping_list/get_product_supplier_mapping.dspy",
+    "/supplychain/product_supplier_mapping_list/add_product_supplier_mapping.dspy",
+    "/supplychain/product_supplier_mapping_list/update_product_supplier_mapping.dspy",
+    "/supplychain/product_supplier_mapping_list/delete_product_supplier_mapping.dspy",
     "/supplychain/api/product_supplier_mapping_create.dspy",
     "/supplychain/api/product_supplier_mapping_update.dspy",
     "/supplychain/api/product_supplier_mapping_delete.dspy",
diff --git a/supplychain/__pycache__/init.cpython-310.pyc b/supplychain/__pycache__/init.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..5dc0ef3ad6b1ba1b47b4ae367d28378aa4f82350
GIT binary patch
literal 20289
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
E2BN~-VgLXD

literal 0
HcmV?d00001

diff --git a/supplychain/init.py b/supplychain/init.py
index 74c7c76..0d90e2c 100644
--- a/supplychain/init.py
+++ b/supplychain/init.py
@@ -628,6 +628,195 @@ LIMIT 1"""
         return json.dumps({"status": "ok", "data": result})
 
 
+# ============================================================
+# Platform Supply Relations APIs (P0)
+# ============================================================
+
+def _generate_psr_code(supplier_org_id, buyer_org_id):
+    """Generate unique relation code: PSR-{YYYYMMDD}-{seq}."""
+    env = ServerEnv()
+    today = env.strdate(env.today())
+    prefix = f"PSR-{today.replace('-', '')}"
+    db, dbname = _get_sor()
+    with db.sqlorContext(dbname) as sor:
+        sql = """SELECT COUNT(*) as cnt FROM platform_supply_relations
+WHERE supplier_org_id = ${sid}$ AND relation_code LIKE ${prefix}$"""
+        recs = sor.sqlExe(sql, {"sid": supplier_org_id, "prefix": prefix + "%"})
+        seq = (recs[0].cnt if recs else 0) + 1
+    return f"{prefix}-{seq:04d}"
+
+
+async def create_platform_supply_relations(request, params_kw):
+    """Create a platform supply relation."""
+    env = ServerEnv()
+    user_id = await env.get_user()
+    data = params_kw
+    db, dbname = _get_sor()
+    async with db.sqlorContext(dbname) as sor:
+        supplier_org_id = data.get("supplier_org_id")
+        buyer_org_id = data.get("buyer_org_id")
+        relation_code = data.get("relation_code") or _generate_psr_code(supplier_org_id, buyer_org_id)
+        now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        rec = {
+            "id": getID(),
+            "supplier_org_id": supplier_org_id,
+            "buyer_org_id": buyer_org_id,
+            "relation_code": relation_code,
+            "relation_name": data.get("relation_name"),
+            "relation_type": data.get("relation_type", "distribution"),
+            "settlement_mode": data.get("settlement_mode", "discount"),
+            "default_discount": data.get("default_discount", 1.0),
+            "default_commission_rate": data.get("default_commission_rate", 0.0),
+            "sign_date": data.get("sign_date"),
+            "start_date": data.get("start_date"),
+            "end_date": data.get("end_date"),
+            "status": data.get("status", "1"),
+            "remark": data.get("remark"),
+            "created_by": user_id,
+            "created_at": now,
+            "updated_at": now,
+        }
+        await sor.C("platform_supply_relations", rec)
+        return json.dumps({"status": "ok", "data": rec, "message": "创建成功"})
+
+
+async def update_platform_supply_relations(request, params_kw):
+    """Update a platform supply relation."""
+    data = params_kw
+    db, dbname = _get_sor()
+    async with db.sqlorContext(dbname) as sor:
+        now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        rec = {"id": data["id"], "updated_at": now}
+        for key in ["relation_name", "relation_type", "settlement_mode",
+                     "default_discount", "default_commission_rate", "sign_date",
+                     "start_date", "end_date", "status", "remark"]:
+            if key in data:
+                rec[key] = data[key]
+        await sor.U("platform_supply_relations", rec)
+        return json.dumps({"status": "ok", "message": "更新成功"})
+
+
+async def delete_platform_supply_relations(request, params_kw):
+    """Delete a platform supply relation and its products."""
+    data = params_kw
+    db, dbname = _get_sor()
+    async with db.sqlorContext(dbname) as sor:
+        await sor.D("platform_supply_products", {"relation_id": data["id"]})
+        await sor.D("platform_supply_relations", {"id": data["id"]})
+        return json.dumps({"status": "ok", "message": "删除成功"})
+
+
+# ============================================================
+# Platform Supply Products APIs (P0)
+# ============================================================
+
+async def create_platform_supply_products(request, params_kw):
+    """Create a platform supply product item."""
+    data = params_kw
+    db, dbname = _get_sor()
+    async with db.sqlorContext(dbname) as sor:
+        now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        rec = {
+            "id": getID(),
+            "relation_id": data.get("relation_id"),
+            "supplier_org_id": data.get("supplier_org_id"),
+            "buyer_org_id": data.get("buyer_org_id"),
+            "source_product_id": data.get("source_product_id"),
+            "supply_price": data.get("supply_price", 0),
+            "suggested_retail_price": data.get("suggested_retail_price"),
+            "discount": data.get("discount", 1.0),
+            "commission_rate": data.get("commission_rate", 0.0),
+            "min_order_qty": data.get("min_order_qty"),
+            "status": data.get("status", "1"),
+            "remark": data.get("remark"),
+            "created_at": now,
+            "updated_at": now,
+        }
+        await sor.C("platform_supply_products", rec)
+        return json.dumps({"status": "ok", "data": rec, "message": "创建成功"})
+
+
+async def update_platform_supply_products(request, params_kw):
+    """Update a platform supply product item."""
+    data = params_kw
+    db, dbname = _get_sor()
+    async with db.sqlorContext(dbname) as sor:
+        now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        rec = {"id": data["id"], "updated_at": now}
+        for key in ["supply_price", "suggested_retail_price", "discount",
+                     "commission_rate", "min_order_qty", "status", "remark"]:
+            if key in data:
+                rec[key] = data[key]
+        await sor.U("platform_supply_products", rec)
+        return json.dumps({"status": "ok", "message": "更新成功"})
+
+
+async def delete_platform_supply_products(request, params_kw):
+    """Delete a platform supply product item."""
+    data = params_kw
+    db, dbname = _get_sor()
+    async with db.sqlorContext(dbname) as sor:
+        await sor.D("platform_supply_products", {"id": data["id"]})
+        return json.dumps({"status": "ok", "message": "删除成功"})
+
+
+# ============================================================
+# Product Supplier Mapping APIs (P0)
+# ============================================================
+
+async def create_product_supplier_mapping(request, params_kw):
+    """Create a product supplier mapping."""
+    data = params_kw
+    db, dbname = _get_sor()
+    async with db.sqlorContext(dbname) as sor:
+        now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        rec = {
+            "id": getID(),
+            "product_id": data.get("product_id"),
+            "product_category_id": data.get("product_category_id"),
+            "supplier_type": data.get("supplier_type", "internal"),
+            "supplier_org_id": data.get("supplier_org_id"),
+            "external_supplier_id": data.get("external_supplier_id"),
+            "buyer_org_id": data.get("buyer_org_id"),
+            "supply_price": data.get("supply_price"),
+            "currency": data.get("currency", "CNY"),
+            "min_order_qty": data.get("min_order_qty", 1),
+            "lead_time_days": data.get("lead_time_days"),
+            "is_preferred": data.get("is_preferred", "0"),
+            "status": data.get("status", "1"),
+            "relation_id": data.get("relation_id"),
+            "contract_id": data.get("contract_id"),
+            "created_at": now,
+            "updated_at": now,
+        }
+        await sor.C("product_supplier_mapping", rec)
+        return json.dumps({"status": "ok", "data": rec, "message": "创建成功"})
+
+
+async def update_product_supplier_mapping(request, params_kw):
+    """Update a product supplier mapping."""
+    data = params_kw
+    db, dbname = _get_sor()
+    async with db.sqlorContext(dbname) as sor:
+        now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        rec = {"id": data["id"], "updated_at": now}
+        for key in ["supply_price", "currency", "min_order_qty", "lead_time_days",
+                     "is_preferred", "status", "remark", "relation_id", "contract_id"]:
+            if key in data:
+                rec[key] = data[key]
+        await sor.U("product_supplier_mapping", rec)
+        return json.dumps({"status": "ok", "message": "更新成功"})
+
+
+async def delete_product_supplier_mapping(request, params_kw):
+    """Delete a product supplier mapping."""
+    data = params_kw
+    db, dbname = _get_sor()
+    async with db.sqlorContext(dbname) as sor:
+        await sor.D("product_supplier_mapping", {"id": data["id"]})
+        return json.dumps({"status": "ok", "message": "删除成功"})
+
+
 # ============================================================
 # Register functions with ServerEnv
 # ============================================================
@@ -635,34 +824,68 @@ LIMIT 1"""
 def load_supplychain():
     """Register all supplychain functions with ServerEnv."""
     env = ServerEnv()
-    # Supplier
+    # Supplier (register both singular and plural for backward compat)
     env.create_supplier = create_supplier
+    env.create_suppliers = create_supplier
     env.update_supplier = update_supplier
+    env.update_suppliers = update_supplier
     env.delete_supplier = delete_supplier
+    env.delete_suppliers = delete_supplier
     # Supply Contract
     env.create_supply_contract = create_supply_contract
+    env.create_supply_contracts = create_supply_contract
     env.update_supply_contract = update_supply_contract
+    env.update_supply_contracts = update_supply_contract
     env.delete_supply_contract = delete_supply_contract
+    env.delete_supply_contracts = delete_supply_contract
     # Supply Contract Items
     env.create_supply_contract_item = create_supply_contract_item
+    env.create_supply_contract_items = create_supply_contract_item
     env.update_supply_contract_item = update_supply_contract_item
+    env.update_supply_contract_items = update_supply_contract_item
     env.delete_supply_contract_item = delete_supply_contract_item
+    env.delete_supply_contract_items = delete_supply_contract_item
     # Sub-Reseller
     env.create_sub_reseller = create_sub_reseller
+    env.create_sub_resellers = create_sub_reseller
     env.update_sub_reseller = update_sub_reseller
+    env.update_sub_resellers = update_sub_reseller
     env.delete_sub_reseller = delete_sub_reseller
+    env.delete_sub_resellers = delete_sub_reseller
+    # Sub-Distributor (not yet implemented)
     # Distribution Agreement
     env.create_distribution_agreement = create_distribution_agreement
+    env.create_distribution_agreements = create_distribution_agreement
     env.update_distribution_agreement = update_distribution_agreement
+    env.update_distribution_agreements = update_distribution_agreement
     env.delete_distribution_agreement = delete_distribution_agreement
+    env.delete_distribution_agreements = delete_distribution_agreement
     # Distribution Agreement Items
     env.create_distribution_agreement_item = create_distribution_agreement_item
+    env.create_distribution_agreement_items = create_distribution_agreement_item
     env.update_distribution_agreement_item = update_distribution_agreement_item
+    env.update_distribution_agreement_items = update_distribution_agreement_item
     env.delete_distribution_agreement_item = delete_distribution_agreement_item
+    env.delete_distribution_agreement_items = delete_distribution_agreement_item
     # Sales Ledger
     env.create_sales_ledger = create_sales_ledger
+    env.create_sales_ledgers = create_sales_ledger
     env.update_sales_ledger = update_sales_ledger
+    env.update_sales_ledgers = update_sales_ledger
     env.delete_sales_ledger = delete_sales_ledger
+    env.delete_sales_ledgers = delete_sales_ledger
+    # P0: Platform Supply Relations
+    env.create_platform_supply_relations = create_platform_supply_relations
+    env.update_platform_supply_relations = update_platform_supply_relations
+    env.delete_platform_supply_relations = delete_platform_supply_relations
+    # P0: Platform Supply Products
+    env.create_platform_supply_products = create_platform_supply_products
+    env.update_platform_supply_products = update_platform_supply_products
+    env.delete_platform_supply_products = delete_platform_supply_products
+    # P0: Product Supplier Mapping
+    env.create_product_supplier_mapping = create_product_supplier_mapping
+    env.update_product_supplier_mapping = update_product_supplier_mapping
+    env.delete_product_supplier_mapping = delete_product_supplier_mapping
     # Calculation API
     env.calculate_sale_amounts = calculate_sale_amounts
     return True
diff --git a/wwwroot/api/import_supplier_product.dspy b/wwwroot/api/import_supplier_product.dspy
index de1c1dd..5cf283c 100644
--- a/wwwroot/api/import_supplier_product.dspy
+++ b/wwwroot/api/import_supplier_product.dspy
@@ -1,37 +1,28 @@
-import json
-from sqlor import sqlExe
-from uuid import uuid4
-from datetime import datetime
-
-# 引入供应方产品到需求方：创建 product_supplier_mapping 记录
 source_product_id = params_kw.get("source_product_id", "")
 supplier_org_id = params_kw.get("supplier_org_id", "")
 relation_id = params_kw.get("relation_id", "")
 supply_price = params_kw.get("supply_price", "0")
-suggested_retail_price = params_kw.get("suggested_retail_price", "")
 min_order_qty = params_kw.get("min_order_qty", "1")
 
 if not all([source_product_id, supplier_org_id, relation_id]):
-    print(json.dumps({"status": "error", "message": "source_product_id, supplier_org_id, relation_id are required"}))
-else:
-    user_org_id = await get_user_orgid()
-    new_id = uuid4().hex
-    now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+    return json.dumps({"status": "error", "message": "source_product_id, supplier_org_id, relation_id are required"})
 
-    # 获取产品分类
-    prod_sql = "SELECT category_id FROM product WHERE id = ${pid}$"
-    prod = await sqlExe(prod_sql, {"pid": source_product_id})
+user_org_id = await get_userorgid()
+new_id = getID()
+now = curDateString() + " " + timestampstr()[:8]
+
+async with get_sor_context(request._run_ns, 'sage') as sor:
+    prod = await sor.sqlExe("SELECT category_id FROM product WHERE id = ${pid}$", {"pid": source_product_id})
     cat_id = prod[0].category_id if prod else ""
 
-    sql = """
+    await sor.sqlExe("""
     INSERT INTO product_supplier_mapping
     (id, product_id, product_category_id, supplier_type, supplier_org_id,
      buyer_org_id, supply_price, min_order_qty, status, relation_id, created_at)
     VALUES
     (${id}$, ${product_id}$, ${category_id}$, 'internal', ${supplier_org_id}$,
      ${buyer_org_id}$, ${supply_price}$, ${min_order_qty}$, '1', ${relation_id}$, ${created_at}$)
-    """
-    await sqlExe(sql, {
+    """, {
         "id": new_id,
         "product_id": source_product_id,
         "category_id": cat_id,
@@ -42,4 +33,5 @@ else:
         "relation_id": relation_id,
         "created_at": now
     })
-    print(json.dumps({"status": "ok", "message": "产品引入成功", "id": new_id}))
+
+return json.dumps({"status": "ok", "message": "产品引入成功", "id": new_id})
diff --git a/wwwroot/api/platform_supply_products_create.dspy b/wwwroot/api/platform_supply_products_create.dspy
index 49d9ac2..8789bb8 100644
--- a/wwwroot/api/platform_supply_products_create.dspy
+++ b/wwwroot/api/platform_supply_products_create.dspy
@@ -1,9 +1,5 @@
-import json
-from ahserver.serverenv import ServerEnv
-env = ServerEnv()
-create_func = getattr(env, 'create_platform_supply_products', None)
+create_func = create_platform_supply_products
 if create_func is None:
-    print(json.dumps({"status": "error", "message": "create_platform_supply_products function not found"}))
-else:
-    result = await create_func(request, params_kw)
-    print(result)
+    return json.dumps({"status": "error", "message": "create_platform_supply_products not registered"})
+result = await create_func(request, params_kw)
+return result
diff --git a/wwwroot/api/platform_supply_products_delete.dspy b/wwwroot/api/platform_supply_products_delete.dspy
index 995ec57..7855ee8 100644
--- a/wwwroot/api/platform_supply_products_delete.dspy
+++ b/wwwroot/api/platform_supply_products_delete.dspy
@@ -1,9 +1,5 @@
-import json
-from ahserver.serverenv import ServerEnv
-env = ServerEnv()
-delete_func = getattr(env, 'delete_platform_supply_products', None)
+delete_func = delete_platform_supply_products
 if delete_func is None:
-    print(json.dumps({"status": "error", "message": "delete_platform_supply_products function not found"}))
-else:
-    result = await delete_func(request, params_kw)
-    print(result)
+    return json.dumps({"status": "error", "message": "delete_platform_supply_products not registered"})
+result = await delete_func(request, params_kw)
+return result
diff --git a/wwwroot/api/platform_supply_products_update.dspy b/wwwroot/api/platform_supply_products_update.dspy
index 85ce459..bd108dc 100644
--- a/wwwroot/api/platform_supply_products_update.dspy
+++ b/wwwroot/api/platform_supply_products_update.dspy
@@ -1,9 +1,5 @@
-import json
-from ahserver.serverenv import ServerEnv
-env = ServerEnv()
-update_func = getattr(env, 'update_platform_supply_products', None)
+update_func = update_platform_supply_products
 if update_func is None:
-    print(json.dumps({"status": "error", "message": "update_platform_supply_products function not found"}))
-else:
-    result = await update_func(request, params_kw)
-    print(result)
+    return json.dumps({"status": "error", "message": "update_platform_supply_products not registered"})
+result = await update_func(request, params_kw)
+return result
diff --git a/wwwroot/api/platform_supply_relations_create.dspy b/wwwroot/api/platform_supply_relations_create.dspy
index 82bdbae..059df5c 100644
--- a/wwwroot/api/platform_supply_relations_create.dspy
+++ b/wwwroot/api/platform_supply_relations_create.dspy
@@ -1,9 +1,5 @@
-import json
-from ahserver.serverenv import ServerEnv
-env = ServerEnv()
-create_func = getattr(env, 'create_platform_supply_relations', None)
+create_func = create_platform_supply_relations
 if create_func is None:
-    print(json.dumps({"status": "error", "message": "create_platform_supply_relations function not found"}))
-else:
-    result = await create_func(request, params_kw)
-    print(result)
+    return json.dumps({"status": "error", "message": "create_platform_supply_relations not registered"})
+result = await create_func(request, params_kw)
+return result
diff --git a/wwwroot/api/platform_supply_relations_delete.dspy b/wwwroot/api/platform_supply_relations_delete.dspy
index 6e45fd1..00b83a3 100644
--- a/wwwroot/api/platform_supply_relations_delete.dspy
+++ b/wwwroot/api/platform_supply_relations_delete.dspy
@@ -1,9 +1,5 @@
-import json
-from ahserver.serverenv import ServerEnv
-env = ServerEnv()
-delete_func = getattr(env, 'delete_platform_supply_relations', None)
+delete_func = delete_platform_supply_relations
 if delete_func is None:
-    print(json.dumps({"status": "error", "message": "delete_platform_supply_relations function not found"}))
-else:
-    result = await delete_func(request, params_kw)
-    print(result)
+    return json.dumps({"status": "error", "message": "delete_platform_supply_relations not registered"})
+result = await delete_func(request, params_kw)
+return result
diff --git a/wwwroot/api/platform_supply_relations_update.dspy b/wwwroot/api/platform_supply_relations_update.dspy
index 5e592e8..be1dd79 100644
--- a/wwwroot/api/platform_supply_relations_update.dspy
+++ b/wwwroot/api/platform_supply_relations_update.dspy
@@ -1,9 +1,5 @@
-import json
-from ahserver.serverenv import ServerEnv
-env = ServerEnv()
-update_func = getattr(env, 'update_platform_supply_relations', None)
+update_func = update_platform_supply_relations
 if update_func is None:
-    print(json.dumps({"status": "error", "message": "update_platform_supply_relations function not found"}))
-else:
-    result = await update_func(request, params_kw)
-    print(result)
+    return json.dumps({"status": "error", "message": "update_platform_supply_relations not registered"})
+result = await update_func(request, params_kw)
+return result
diff --git a/wwwroot/api/product_supplier_mapping_create.dspy b/wwwroot/api/product_supplier_mapping_create.dspy
index 9dba7e2..1563cfe 100644
--- a/wwwroot/api/product_supplier_mapping_create.dspy
+++ b/wwwroot/api/product_supplier_mapping_create.dspy
@@ -1,9 +1,5 @@
-import json
-from ahserver.serverenv import ServerEnv
-env = ServerEnv()
-create_func = getattr(env, 'create_product_supplier_mapping', None)
+create_func = create_product_supplier_mapping
 if create_func is None:
-    print(json.dumps({"status": "error", "message": "create_product_supplier_mapping function not found"}))
-else:
-    result = await create_func(request, params_kw)
-    print(result)
+    return json.dumps({"status": "error", "message": "create_product_supplier_mapping not registered"})
+result = await create_func(request, params_kw)
+return result
diff --git a/wwwroot/api/product_supplier_mapping_delete.dspy b/wwwroot/api/product_supplier_mapping_delete.dspy
index 7de8d1e..51e53ad 100644
--- a/wwwroot/api/product_supplier_mapping_delete.dspy
+++ b/wwwroot/api/product_supplier_mapping_delete.dspy
@@ -1,9 +1,5 @@
-import json
-from ahserver.serverenv import ServerEnv
-env = ServerEnv()
-delete_func = getattr(env, 'delete_product_supplier_mapping', None)
+delete_func = delete_product_supplier_mapping
 if delete_func is None:
-    print(json.dumps({"status": "error", "message": "delete_product_supplier_mapping function not found"}))
-else:
-    result = await delete_func(request, params_kw)
-    print(result)
+    return json.dumps({"status": "error", "message": "delete_product_supplier_mapping not registered"})
+result = await delete_func(request, params_kw)
+return result
diff --git a/wwwroot/api/product_supplier_mapping_update.dspy b/wwwroot/api/product_supplier_mapping_update.dspy
index fbbaec1..2df171b 100644
--- a/wwwroot/api/product_supplier_mapping_update.dspy
+++ b/wwwroot/api/product_supplier_mapping_update.dspy
@@ -1,9 +1,5 @@
-import json
-from ahserver.serverenv import ServerEnv
-env = ServerEnv()
-update_func = getattr(env, 'update_product_supplier_mapping', None)
+update_func = update_product_supplier_mapping
 if update_func is None:
-    print(json.dumps({"status": "error", "message": "update_product_supplier_mapping function not found"}))
-else:
-    result = await update_func(request, params_kw)
-    print(result)
+    return json.dumps({"status": "error", "message": "update_product_supplier_mapping not registered"})
+result = await update_func(request, params_kw)
+return result
diff --git a/wwwroot/api/query_platform_products.dspy b/wwwroot/api/query_platform_products.dspy
index 6aec17a..09d86b0 100644
--- a/wwwroot/api/query_platform_products.dspy
+++ b/wwwroot/api/query_platform_products.dspy
@@ -1,23 +1,20 @@
-import json
-from sqlor import sqlExe
-
-# 查询某供应方机构的可用产品列表
 supplier_org_id = params_kw.get("supplier_org_id", "")
 if not supplier_org_id:
-    print(json.dumps({"status": "error", "message": "supplier_org_id is required"}))
-else:
-    sql = """
+    return json.dumps({"status": "error", "message": "supplier_org_id is required"})
+
+async with get_sor_context(request._run_ns, 'sage') as sor:
+    rows = await sor.sqlExe("""
     SELECT p.id, p.product_code, p.product_name, p.product_type,
            p.brief_intro, p.price, p.currency, p.status,
            pc.name as category_name
     FROM product p
-    LEFT JOIN product_category pc ON p.category_id = pc.id
+    LEFT JOIN product_category pc ON p.category_id = pc.id AND p.org_id = pc.org_id
     WHERE p.org_id = ${supplier_org_id}$
       AND p.status = '1'
     ORDER BY p.sort_order, p.product_name
-    """
-    rows = await sqlExe(sql, {"supplier_org_id": supplier_org_id})
-    print(json.dumps([{"id": r.id, "product_code": r.product_code,
-        "product_name": r.product_name, "product_type": r.product_type,
-        "brief_intro": r.brief_intro, "price": r.price, "currency": r.currency,
-        "category_name": r.category_name} for r in rows], ensure_ascii=False))
+    """, {"supplier_org_id": supplier_org_id})
+
+return json.dumps([{"id": r.id, "product_code": r.product_code,
+    "product_name": r.product_name, "product_type": r.product_type,
+    "brief_intro": r.brief_intro, "price": r.price, "currency": r.currency,
+    "category_name": r.category_name} for r in rows], ensure_ascii=False)
diff --git a/wwwroot/api/query_platform_suppliers.dspy b/wwwroot/api/query_platform_suppliers.dspy
index 054ad0a..96d3cb2 100644
--- a/wwwroot/api/query_platform_suppliers.dspy
+++ b/wwwroot/api/query_platform_suppliers.dspy
@@ -1,16 +1,13 @@
-import json
-from sqlor import sqlExe
+user_org_id = await get_userorgid()
+async with get_sor_context(request._run_ns, 'sage') as sor:
+    rows = await sor.sqlExe("""
+    SELECT id, orgname, orgabbr, contactor, contactor_phone, main_business
+    FROM organization
+    WHERE id != ${user_org_id}$
+      AND (del_flg IS NULL OR del_flg = '0')
+    ORDER BY orgname
+    """, {"user_org_id": user_org_id})
 
-# 查询平台上所有可作为供应方的机构（排除当前用户的机构）
-user_org_id = await get_user_orgid()
-sql = """
-SELECT id, orgname, orgabbr, contactor, contactor_phone, main_business
-FROM organization
-WHERE id != ${user_org_id}$
-  AND (del_flg IS NULL OR del_flg = '0')
-ORDER BY orgname
-"""
-rows = await sqlExe(sql, {"user_org_id": user_org_id})
-print(json.dumps([{"id": r.id, "orgname": r.orgname, "orgabbr": r.orgabbr,
+return json.dumps([{"id": r.id, "orgname": r.orgname, "orgabbr": r.orgabbr,
     "contactor": r.contactor, "contactor_phone": r.contactor_phone,
-    "main_business": r.main_business} for r in rows], ensure_ascii=False))
+    "main_business": r.main_business} for r in rows], ensure_ascii=False)