From bfc50f2364dcf96100d5cb807df15434deb55b47 Mon Sep 17 00:00:00 2001 From: Hermes Agent Date: Wed, 17 Jun 2026 15:03:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A1=A5=E5=85=85=E4=BE=9B=E9=94=80?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=92=8C=E5=8D=8F=E8=AE=AE=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=8A=98=E6=89=A3CRUD=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 json/supply_contracts_list.json CRUD定义（供销协议管理） - 新增 json/supply_contract_items_list.json CRUD定义（协议产品明细折扣） - 修复 json/suppliers_list.json JSON语法错误（缺少逗号） - 修复6个API dspy文件违规（移除import/print，改用return） - 新增4个搜索API（供应商/合同/产品分类/产品下拉数据） - 新增 supplychain/__init__.py 导出所有公共函数 - 重新生成CRUD UI文件并修正editable URL指向自定义API - 更新load_path.py注册新路径 - 添加.gitignore排除自动生成文件 --- .gitignore | 20 +++++ json/suppliers_list.json | 3 +- json/supply_contract_items_list.json | 40 +++++++++- json/supply_contracts_list.json | 78 +++++++++++++++---- scripts/load_path.py | 5 ++ supplychain/__init__.py | 34 ++++++++ wwwroot/api/get_search_contract_id.dspy | 16 ++++ wwwroot/api/get_search_prodtypeid.dspy | 13 ++++ wwwroot/api/get_search_productid.dspy | 13 ++++ wwwroot/api/get_search_supplier_id.dspy | 16 ++++ wwwroot/api/supply_contract_items_create.dspy | 11 +-- wwwroot/api/supply_contract_items_delete.dspy | 11 +-- wwwroot/api/supply_contract_items_update.dspy | 11 +-- wwwroot/api/supply_contracts_create.dspy | 11 +-- wwwroot/api/supply_contracts_delete.dspy | 11 +-- wwwroot/api/supply_contracts_update.dspy | 11 +-- .../get_supply_contract_items.dspy | 2 +- wwwroot/supply_contract_items_list/index.ui | 40 ++++++++-- wwwroot/supply_contracts_list/index.ui | 32 ++++++-- 19 files changed, 290 insertions(+), 88 deletions(-) create mode 100644 .gitignore create mode 100644 supplychain/__init__.py create mode 100644 wwwroot/api/get_search_contract_id.dspy create mode 100644 wwwroot/api/get_search_prodtypeid.dspy create mode 100644 wwwroot/api/get_search_productid.dspy create mode 100644 wwwroot/api/get_search_supplier_id.dspy diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bc2ad73 --- /dev/null +++ b/.gitignore @@ -0,0 +1,20 @@ +# Python +__pycache__/ +*.pyc +*.egg-info/ +build/ +dist/ + +# Auto-generated CRUD directories (regenerated by build.sh) +wwwroot/suppliers_list/ +wwwroot/supply_contracts_list/ +wwwroot/supply_contract_items_list/ +wwwroot/sub_resellers_list/ +wwwroot/sub_distributors_list/ +wwwroot/distribution_agreements_list/ +wwwroot/distribution_agreement_items_list/ +wwwroot/sales_ledger_list/ +wwwroot/supplychain_accounting_list/ +wwwroot/platform_supply_relations_list/ +wwwroot/platform_supply_products_list/ +wwwroot/product_supplier_mapping_list/ diff --git a/json/suppliers_list.json b/json/suppliers_list.json index 0860f7f..03c31bc 100644 --- a/json/suppliers_list.json +++ b/json/suppliers_list.json @@ -15,8 +15,9 @@ "supplier_name": "供应商名称", "status": "状态" }, + "editexclouded": ["id", "resellerid", "created_by", "created_at", "updated_at"], "browserfields": { - "exclouded": ["id"], + "exclouded": ["id", "resellerid" ], "alters": { "status": { "uitype": "code", diff --git a/json/supply_contract_items_list.json b/json/supply_contract_items_list.json index 7107280..892dcb9 100644 --- a/json/supply_contract_items_list.json +++ b/json/supply_contract_items_list.json @@ -1,17 +1,49 @@ { "tblname": "supply_contract_items", "alias": "supply_contract_items_list", - "title": "供销合同产品折扣", + "title": "协议产品明细折扣管理", "params": { - "sortby": ["prodtypeid", "productid"], + "sortby": [ + "prodtypeid", + "productid" + ], "logined_userorgid": "resellerid", "browserfields": { - "exclouded": ["id", "contract_id", "resellerid"] + "exclouded": [ + "id", + "contract_id", + "resellerid" + ], + "alters": { + "contract_id": { + "uitype": "code", + "dataurl": "{{entire_url('../api/get_search_contract_id.dspy')}}", + "valueField": "contract_id", + "textField": "contract_id_text" + }, + "prodtypeid": { + "uitype": "code", + "dataurl": "{{entire_url('../api/get_search_prodtypeid.dspy')}}", + "valueField": "prodtypeid", + "textField": "prodtypeid_text" + }, + "productid": { + "uitype": "code", + "dataurl": "{{entire_url('../api/get_search_productid.dspy')}}", + "valueField": "productid", + "textField": "productid_text" + } + } }, + "editexclouded": [ + "id", + "resellerid", + "created_at" + ], "editable": { "new_data_url": "{{entire_url('../api/supply_contract_items_create.dspy')}}", "update_data_url": "{{entire_url('../api/supply_contract_items_update.dspy')}}", "delete_data_url": "{{entire_url('../api/supply_contract_items_delete.dspy')}}" } } -} +} \ No newline at end of file diff --git a/json/supply_contracts_list.json b/json/supply_contracts_list.json index 6f4d2c6..cce1155 100644 --- a/json/supply_contracts_list.json +++ b/json/supply_contracts_list.json @@ -1,35 +1,86 @@ { "tblname": "supply_contracts", "alias": "supply_contracts_list", - "title": "供销合同管理", + "title": "供销协议管理", "params": { - "sortby": ["created_at desc"], + "sortby": [ + "created_at desc" + ], "logined_userorgid": "resellerid", "data_filter": { "AND": [ - {"field": "contract_name", "op": "LIKE", "var": "contract_name"}, - {"field": "contract_code", "op": "LIKE", "var": "contract_code"}, - {"field": "status", "op": "=", "var": "status"} + { + "field": "contract_name", + "op": "LIKE", + "var": "contract_name" + }, + { + "field": "contract_code", + "op": "LIKE", + "var": "contract_code" + }, + { + "field": "supplier_id", + "op": "=", + "var": "supplier_id" + }, + { + "field": "status", + "op": "=", + "var": "status" + } ] }, "filter_labels": { "contract_name": "合同名称", "contract_code": "合同编号", + "supplier_id": "供应商", "status": "状态" }, "browserfields": { - "exclouded": ["id"], + "exclouded": [ + "id", + "resellerid" + ], "alters": { + "supplier_id": { + "uitype": "code", + "dataurl": "{{entire_url('../api/get_search_supplier_id.dspy')}}", + "valueField": "supplier_id", + "textField": "supplier_id_text" + }, "status": { "uitype": "code", "data": [ - {"value": "1", "text": "生效中"}, - {"value": "2", "text": "已到期"}, - {"value": "0", "text": "已终止"} + { + "value": "1", + "text": "生效中" + }, + { + "value": "2", + "text": "已到期" + }, + { + "value": "0", + "text": "已终止" + } ] } } }, + "editexclouded": [ + "id", + "resellerid", + "contract_code", + "created_by", + "created_at", + "updated_at" + ], + "editable": { + "new_data_url": "{{entire_url('../api/supply_contracts_create.dspy')}}", + "update_data_url": "{{entire_url('../api/supply_contracts_update.dspy')}}", + "delete_data_url": "{{entire_url('../api/supply_contracts_delete.dspy')}}" + }, "subtables": [ { "field": "contract_id", @@ -37,11 +88,6 @@ "url": "{{entire_url('../supply_contract_items_list')}}", "subtable": "supply_contract_items" } - ], - "editable": { - "new_data_url": "{{entire_url('../api/supply_contracts_create.dspy')}}", - "update_data_url": "{{entire_url('../api/supply_contracts_update.dspy')}}", - "delete_data_url": "{{entire_url('../api/supply_contracts_delete.dspy')}}" - } + ] } -} +} \ No newline at end of file diff --git a/scripts/load_path.py b/scripts/load_path.py index 3bdde7f..0ed1924 100755 --- a/scripts/load_path.py +++ b/scripts/load_path.py @@ -94,6 +94,11 @@ PATHS_LOGINED = [ "/supplychain/api/supply_contract_items_create.dspy", "/supplychain/api/supply_contract_items_update.dspy", "/supplychain/api/supply_contract_items_delete.dspy", + # Search API — filter dropdowns + "/supplychain/api/get_search_supplier_id.dspy", + "/supplychain/api/get_search_contract_id.dspy", + "/supplychain/api/get_search_prodtypeid.dspy", + "/supplychain/api/get_search_productid.dspy", # CRUD API — sub_distributors "/supplychain/api/sub_distributors_create.dspy", "/supplychain/api/sub_distributors_update.dspy", diff --git a/supplychain/__init__.py b/supplychain/__init__.py new file mode 100644 index 0000000..88ad172 --- /dev/null +++ b/supplychain/__init__.py @@ -0,0 +1,34 @@ +from .init import ( + create_supplier, + update_supplier, + delete_supplier, + create_supply_contract, + update_supply_contract, + delete_supply_contract, + create_supply_contract_item, + update_supply_contract_item, + delete_supply_contract_item, + create_sub_reseller, + update_sub_reseller, + delete_sub_reseller, + create_distribution_agreement, + update_distribution_agreement, + delete_distribution_agreement, + create_distribution_agreement_item, + update_distribution_agreement_item, + delete_distribution_agreement_item, + create_sales_ledger, + update_sales_ledger, + delete_sales_ledger, + calculate_sale_amounts, + create_platform_supply_relations, + update_platform_supply_relations, + delete_platform_supply_relations, + create_platform_supply_products, + update_platform_supply_products, + delete_platform_supply_products, + create_product_supplier_mapping, + update_product_supplier_mapping, + delete_product_supplier_mapping, + load_supplychain, +) diff --git a/wwwroot/api/get_search_contract_id.dspy b/wwwroot/api/get_search_contract_id.dspy new file mode 100644 index 0000000..b92b7fb --- /dev/null +++ b/wwwroot/api/get_search_contract_id.dspy @@ -0,0 +1,16 @@ +result = [{'contract_id': '', 'contract_id_text': '全部'}] +try: + userorgid = await get_userorgid() + if not userorgid: + return json.dumps(result, ensure_ascii=False) + db = DBPools() + dbname = get_module_dbname('supplychain') + async with db.sqlorContext(dbname) as sor: + rows = await sor.sqlExe( + "select id as contract_id, contract_name as contract_id_text from supply_contracts where resellerid = ${userorgid}$ and status = '1' order by contract_name", + {"userorgid": userorgid} + ) + return json.dumps(result + list(rows), ensure_ascii=False) +except Exception as e: + debug(f'get_search_contract_id error: {e}') +return json.dumps(result, ensure_ascii=False) diff --git a/wwwroot/api/get_search_prodtypeid.dspy b/wwwroot/api/get_search_prodtypeid.dspy new file mode 100644 index 0000000..ae90511 --- /dev/null +++ b/wwwroot/api/get_search_prodtypeid.dspy @@ -0,0 +1,13 @@ +result = [{'prodtypeid': '', 'prodtypeid_text': '全部'}] +try: + db = DBPools() + dbname = get_module_dbname('supplychain') + async with db.sqlorContext(dbname) as sor: + rows = await sor.sqlExe( + "select id as prodtypeid, type_name as prodtypeid_text from product_types order by type_name", + {} + ) + return json.dumps(result + list(rows), ensure_ascii=False) +except Exception as e: + debug(f'get_search_prodtypeid error: {e}') +return json.dumps(result, ensure_ascii=False) diff --git a/wwwroot/api/get_search_productid.dspy b/wwwroot/api/get_search_productid.dspy new file mode 100644 index 0000000..de949fa --- /dev/null +++ b/wwwroot/api/get_search_productid.dspy @@ -0,0 +1,13 @@ +result = [{'productid': '', 'productid_text': '全部'}] +try: + db = DBPools() + dbname = get_module_dbname('supplychain') + async with db.sqlorContext(dbname) as sor: + rows = await sor.sqlExe( + "select id as productid, product_name as productid_text from products order by product_name", + {} + ) + return json.dumps(result + list(rows), ensure_ascii=False) +except Exception as e: + debug(f'get_search_productid error: {e}') +return json.dumps(result, ensure_ascii=False) diff --git a/wwwroot/api/get_search_supplier_id.dspy b/wwwroot/api/get_search_supplier_id.dspy new file mode 100644 index 0000000..78b0149 --- /dev/null +++ b/wwwroot/api/get_search_supplier_id.dspy @@ -0,0 +1,16 @@ +result = [{'supplier_id': '', 'supplier_id_text': '全部'}] +try: + userorgid = await get_userorgid() + if not userorgid: + return json.dumps(result, ensure_ascii=False) + db = DBPools() + dbname = get_module_dbname('supplychain') + async with db.sqlorContext(dbname) as sor: + rows = await sor.sqlExe( + "select id as supplier_id, supplier_name as supplier_id_text from suppliers where resellerid = ${userorgid}$ and status = '1' order by supplier_name", + {"userorgid": userorgid} + ) + return json.dumps(result + list(rows), ensure_ascii=False) +except Exception as e: + debug(f'get_search_supplier_id error: {e}') +return json.dumps(result, ensure_ascii=False) diff --git a/wwwroot/api/supply_contract_items_create.dspy b/wwwroot/api/supply_contract_items_create.dspy index 3dd4d13..6485fb4 100644 --- a/wwwroot/api/supply_contract_items_create.dspy +++ b/wwwroot/api/supply_contract_items_create.dspy @@ -1,9 +1,2 @@ -import json -from ahserver.serverenv import ServerEnv -env = ServerEnv() -create_func = getattr(env, 'create_supply_contract_items', None) -if create_func is None: - print(json.dumps({"status": "error", "message": "create_supply_contract_items function not found"})) -else: - result = await create_func(request, params_kw) - print(result) +result = await create_supply_contract_items(request, params_kw) +return json.loads(result) if isinstance(result, str) else result diff --git a/wwwroot/api/supply_contract_items_delete.dspy b/wwwroot/api/supply_contract_items_delete.dspy index 5571c53..cb05818 100644 --- a/wwwroot/api/supply_contract_items_delete.dspy +++ b/wwwroot/api/supply_contract_items_delete.dspy @@ -1,9 +1,2 @@ -import json -from ahserver.serverenv import ServerEnv -env = ServerEnv() -delete_func = getattr(env, 'delete_supply_contract_items', None) -if delete_func is None: - print(json.dumps({"status": "error", "message": "delete_supply_contract_items function not found"})) -else: - result = await delete_func(request, params_kw) - print(result) +result = await delete_supply_contract_items(request, params_kw) +return json.loads(result) if isinstance(result, str) else result diff --git a/wwwroot/api/supply_contract_items_update.dspy b/wwwroot/api/supply_contract_items_update.dspy index 2ca3b45..0df1987 100644 --- a/wwwroot/api/supply_contract_items_update.dspy +++ b/wwwroot/api/supply_contract_items_update.dspy @@ -1,9 +1,2 @@ -import json -from ahserver.serverenv import ServerEnv -env = ServerEnv() -update_func = getattr(env, 'update_supply_contract_items', None) -if update_func is None: - print(json.dumps({"status": "error", "message": "update_supply_contract_items function not found"})) -else: - result = await update_func(request, params_kw) - print(result) +result = await update_supply_contract_items(request, params_kw) +return json.loads(result) if isinstance(result, str) else result diff --git a/wwwroot/api/supply_contracts_create.dspy b/wwwroot/api/supply_contracts_create.dspy index 7668759..84d3735 100644 --- a/wwwroot/api/supply_contracts_create.dspy +++ b/wwwroot/api/supply_contracts_create.dspy @@ -1,9 +1,2 @@ -import json -from ahserver.serverenv import ServerEnv -env = ServerEnv() -create_func = getattr(env, 'create_supply_contracts', None) -if create_func is None: - print(json.dumps({"status": "error", "message": "create_supply_contracts function not found"})) -else: - result = await create_func(request, params_kw) - print(result) +result = await create_supply_contracts(request, params_kw) +return json.loads(result) if isinstance(result, str) else result diff --git a/wwwroot/api/supply_contracts_delete.dspy b/wwwroot/api/supply_contracts_delete.dspy index 0472fea..31acc7a 100644 --- a/wwwroot/api/supply_contracts_delete.dspy +++ b/wwwroot/api/supply_contracts_delete.dspy @@ -1,9 +1,2 @@ -import json -from ahserver.serverenv import ServerEnv -env = ServerEnv() -delete_func = getattr(env, 'delete_supply_contracts', None) -if delete_func is None: - print(json.dumps({"status": "error", "message": "delete_supply_contracts function not found"})) -else: - result = await delete_func(request, params_kw) - print(result) +result = await delete_supply_contracts(request, params_kw) +return json.loads(result) if isinstance(result, str) else result diff --git a/wwwroot/api/supply_contracts_update.dspy b/wwwroot/api/supply_contracts_update.dspy index c19b103..36f1ce8 100644 --- a/wwwroot/api/supply_contracts_update.dspy +++ b/wwwroot/api/supply_contracts_update.dspy @@ -1,9 +1,2 @@ -import json -from ahserver.serverenv import ServerEnv -env = ServerEnv() -update_func = getattr(env, 'update_supply_contracts', None) -if update_func is None: - print(json.dumps({"status": "error", "message": "update_supply_contracts function not found"})) -else: - result = await update_func(request, params_kw) - print(result) +result = await update_supply_contracts(request, params_kw) +return json.loads(result) if isinstance(result, str) else result diff --git a/wwwroot/supply_contract_items_list/get_supply_contract_items.dspy b/wwwroot/supply_contract_items_list/get_supply_contract_items.dspy index 3822469..c771b35 100644 --- a/wwwroot/supply_contract_items_list/get_supply_contract_items.dspy +++ b/wwwroot/supply_contract_items_list/get_supply_contract_items.dspy @@ -23,7 +23,7 @@ if not ns.get('page'): if not ns.get('sort'): - ns['sort'] = ["prodtypeid","productid"] + ns['sort'] = ["prodtypeid", "productid"] diff --git a/wwwroot/supply_contract_items_list/index.ui b/wwwroot/supply_contract_items_list/index.ui index 7f0ba62..94998eb 100644 --- a/wwwroot/supply_contract_items_list/index.ui +++ b/wwwroot/supply_contract_items_list/index.ui @@ -20,13 +20,13 @@ "editable":{ - "new_data_url":"{{entire_url('add_supply_contract_items.dspy')}}", + "new_data_url":"{{entire_url('../api/supply_contract_items_create.dspy')}}", - "delete_data_url":"{{entire_url('delete_supply_contract_items.dspy')}}", + "delete_data_url":"{{entire_url('../api/supply_contract_items_delete.dspy')}}", - "update_data_url":"{{entire_url('update_supply_contract_items.dspy')}}" + "update_data_url":"{{entire_url('../api/supply_contract_items_update.dspy')}}" }, @@ -44,10 +44,36 @@ "id", "contract_id", "resellerid" - ] + ], + "alters": { + "contract_id": { + "uitype": "code", + "dataurl": "{{entire_url('../api/get_search_contract_id.dspy')}}", + "valueField": "contract_id", + "textField": "contract_id_text" + }, + "prodtypeid": { + "uitype": "code", + "dataurl": "{{entire_url('../api/get_search_prodtypeid.dspy')}}", + "valueField": "prodtypeid", + "textField": "prodtypeid_text" + }, + "productid": { + "uitype": "code", + "dataurl": "{{entire_url('../api/get_search_productid.dspy')}}", + "valueField": "productid", + "textField": "productid_text" + } + } }, + "editexclouded":[ + "id", + "resellerid", + "created_at" +], + "fields":[ { "name": "id", @@ -78,7 +104,7 @@ "valueField": "contract_id", "textField": "contract_id_text" }, - "dataurl": "{{entire_url('/appbase/get_code.dspy')}}" + "dataurl": "{{entire_url('../api/get_search_contract_id.dspy')}}" }, { "name": "resellerid", @@ -108,7 +134,7 @@ "valueField": "prodtypeid", "textField": "prodtypeid_text" }, - "dataurl": "{{entire_url('/appbase/get_code.dspy')}}" + "dataurl": "{{entire_url('../api/get_search_prodtypeid.dspy')}}" }, { "name": "productid", @@ -127,7 +153,7 @@ "valueField": "productid", "textField": "productid_text" }, - "dataurl": "{{entire_url('/appbase/get_code.dspy')}}" + "dataurl": "{{entire_url('../api/get_search_productid.dspy')}}" }, { "name": "discount", diff --git a/wwwroot/supply_contracts_list/index.ui b/wwwroot/supply_contracts_list/index.ui index 9f77251..c019a18 100644 --- a/wwwroot/supply_contracts_list/index.ui +++ b/wwwroot/supply_contracts_list/index.ui @@ -31,13 +31,13 @@ "editable":{ - "new_data_url":"{{entire_url('add_supply_contracts.dspy')}}", + "new_data_url":"{{entire_url('../api/supply_contracts_create.dspy')}}", - "delete_data_url":"{{entire_url('delete_supply_contracts.dspy')}}", + "delete_data_url":"{{entire_url('../api/supply_contracts_delete.dspy')}}", - "update_data_url":"{{entire_url('update_supply_contracts.dspy')}}" + "update_data_url":"{{entire_url('../api/supply_contracts_update.dspy')}}" }, @@ -52,9 +52,16 @@ "browserfields": { "exclouded": [ - "id" + "id", + "resellerid" ], "alters": { + "supplier_id": { + "uitype": "code", + "dataurl": "{{entire_url('../api/get_search_supplier_id.dspy')}}", + "valueField": "supplier_id", + "textField": "supplier_id_text" + }, "status": { "uitype": "code", "data": [ @@ -76,6 +83,15 @@ }, + "editexclouded":[ + "id", + "resellerid", + "contract_code", + "created_by", + "created_at", + "updated_at" +], + "fields":[ { "name": "id", @@ -126,7 +142,7 @@ "valueField": "supplier_id", "textField": "supplier_id_text" }, - "dataurl": "{{entire_url('/appbase/get_code.dspy')}}" + "dataurl": "{{entire_url('../api/get_search_supplier_id.dspy')}}" }, { "name": "contract_code", @@ -271,6 +287,11 @@ "op": "LIKE", "var": "contract_code" }, + { + "field": "supplier_id", + "op": "=", + "var": "supplier_id" + }, { "field": "status", "op": "=", @@ -283,6 +304,7 @@ "filter_labels":{ "contract_name": "合同名称", "contract_code": "合同编号", + "supplier_id": "供应商", "status": "状态" },