From 0c3e45f225be8a8ba4f2d57fce116eb8855c113a Mon Sep 17 00:00:00 2001
From: yumoqing <yumoqing@gmail.com>
Date: Thu, 9 Jul 2026 13:39:11 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20providerid=E2=86=92supplychain.supp?=
 =?UTF-8?q?liers,=20resellerid=E2=86=92auto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/agreement.json | 272 +++++++++++++++++++++---------------------
 models/biz_order.json | 228 +++++++++++++++++------------------
 models/pr_link.json   | 122 +++++++++----------
 models/product.json   | 224 +++++++++++++++++-----------------
 models/resource.json  | 196 +++++++++++++++---------------
 5 files changed, 509 insertions(+), 533 deletions(-)

diff --git a/models/agreement.json b/models/agreement.json
index 804900c..0042de1 100644
--- a/models/agreement.json
+++ b/models/agreement.json
@@ -1,141 +1,135 @@
 {
-    "summary": [
-        {
-            "name": "agreement",
-            "title": "分销协议",
-            "primary": [
-                "id"
-            ]
-        }
-    ],
-    "fields": [
-        {
-            "name": "id",
-            "title": "id",
-            "type": "str",
-            "length": 32
-        },
-        {
-            "name": "name",
-            "title": "协议名称",
-            "type": "str",
-            "length": 100
-        },
-        {
-            "name": "providerid",
-            "title": "供应商机构id",
-            "type": "str",
-            "length": 32,
-            "nullable": "yes"
-        },
-        {
-            "name": "resellerid",
-            "title": "商户id",
-            "type": "str",
-            "length": 32,
-            "nullable": "no"
-        },
-        {
-            "name": "prodpricing_mode",
-            "title": "产品计价模式",
-            "type": "str",
-            "length": 1,
-            "nullable": "no"
-        },
-        {
-            "name": "settle_mode",
-            "title": "结算方式",
-            "type": "str",
-            "length": 1
-        },
-        {
-            "name": "settle_dp",
-            "title": "结算日期模版",
-            "type": "str",
-            "length": 255
-        },
-        {
-            "name": "protocolfile",
-            "title": "协议文件",
-            "type": "str",
-            "length": 255
-        },
-        {
-            "name": "enable_date",
-            "title": "起效日期",
-            "type": "date"
-        },
-        {
-            "name": "expire_date",
-            "title": "失效日期",
-            "type": "date"
-        },
-        {
-            "name": "auto_renew",
-            "title": "自动续期",
-            "type": "str",
-            "length": 1
-        },
-        {
-            "name": "agree_state",
-            "title": "协议状态",
-            "type": "str",
-            "length": 1
-        },
-        {
-            "name": "provideruid",
-            "title": "供应方uid",
-            "type": "str",
-            "length": 32
-        }
-    ],
-    "codes": [
-        {
-            "field": "providerid",
-            "table": "organization",
-            "valuefield": "id",
-            "textfield": "orgname"
-        },
-        {
-            "field": "resellerid",
-            "table": "organization",
-            "valuefield": "id",
-            "textfield": "orgname"
-        },
-        {
-            "field": "auto_renew",
-            "table": "appcodes_kv",
-            "valuefield": "k",
-            "textfield": "v",
-            "cond": "parentid='yesno'"
-        },
-        {
-            "field": "prodpricing_mode",
-            "table": "appcodes_kv",
-            "valuefield": "k",
-            "textfield": "v",
-            "cond": "parentid='prodpricing_mode'"
-        },
-        {
-            "field": "settle_mode",
-            "table": "appcodes_kv",
-            "valuefield": "k",
-            "textfield": "v",
-            "cond": "parentid='settle_mode'"
-        },
-        {
-            "field": "agree_state",
-            "table": "appcodes_kv",
-            "valuefield": "k",
-            "textfield": "v",
-            "cond": "parentid='agree_state'"
-        },
-        {
-            "field": "provideruid",
-            "table": "users",
-            "valuefield": "id",
-            "textfield": "username",
-            "cond": "orgid=[[userorgid]]"
-        }
-    ]
+  "summary": [
+    {
+      "name": "agreement",
+      "title": "分销协议",
+      "primary": [
+        "id"
+      ]
+    }
+  ],
+  "fields": [
+    {
+      "name": "id",
+      "title": "id",
+      "type": "str",
+      "length": 32
+    },
+    {
+      "name": "name",
+      "title": "协议名称",
+      "type": "str",
+      "length": 100
+    },
+    {
+      "name": "providerid",
+      "title": "供应商机构id",
+      "type": "str",
+      "length": 32,
+      "nullable": "yes"
+    },
+    {
+      "name": "resellerid",
+      "title": "商户id",
+      "type": "str",
+      "length": 32,
+      "nullable": "no"
+    },
+    {
+      "name": "prodpricing_mode",
+      "title": "产品计价模式",
+      "type": "str",
+      "length": 1,
+      "nullable": "no"
+    },
+    {
+      "name": "settle_mode",
+      "title": "结算方式",
+      "type": "str",
+      "length": 1
+    },
+    {
+      "name": "settle_dp",
+      "title": "结算日期模版",
+      "type": "str",
+      "length": 255
+    },
+    {
+      "name": "protocolfile",
+      "title": "协议文件",
+      "type": "str",
+      "length": 255
+    },
+    {
+      "name": "enable_date",
+      "title": "起效日期",
+      "type": "date"
+    },
+    {
+      "name": "expire_date",
+      "title": "失效日期",
+      "type": "date"
+    },
+    {
+      "name": "auto_renew",
+      "title": "自动续期",
+      "type": "str",
+      "length": 1
+    },
+    {
+      "name": "agree_state",
+      "title": "协议状态",
+      "type": "str",
+      "length": 1
+    },
+    {
+      "name": "provideruid",
+      "title": "供应方uid",
+      "type": "str",
+      "length": 32
+    }
+  ],
+  "codes": [
+    {
+      "field": "providerid",
+      "table": "supplychain.suppliers",
+      "valuefield": "id",
+      "textfield": "supplier_name"
+    },
+    {
+      "field": "auto_renew",
+      "table": "appcodes_kv",
+      "valuefield": "k",
+      "textfield": "v",
+      "cond": "parentid='yesno'"
+    },
+    {
+      "field": "prodpricing_mode",
+      "table": "appcodes_kv",
+      "valuefield": "k",
+      "textfield": "v",
+      "cond": "parentid='prodpricing_mode'"
+    },
+    {
+      "field": "settle_mode",
+      "table": "appcodes_kv",
+      "valuefield": "k",
+      "textfield": "v",
+      "cond": "parentid='settle_mode'"
+    },
+    {
+      "field": "agree_state",
+      "table": "appcodes_kv",
+      "valuefield": "k",
+      "textfield": "v",
+      "cond": "parentid='agree_state'"
+    },
+    {
+      "field": "provideruid",
+      "table": "users",
+      "valuefield": "id",
+      "textfield": "username",
+      "cond": "orgid=[[userorgid]]"
+    }
+  ]
 }
\ No newline at end of file
diff --git a/models/biz_order.json b/models/biz_order.json
index 015198d..9667ec2 100644
--- a/models/biz_order.json
+++ b/models/biz_order.json
@@ -1,119 +1,113 @@
 {
-    "summary": [
-        {
-            "name": "biz_order",
-            "title": "订单",
-            "primary": [
-                "id"
-            ]
-        }
-    ],
-    "fields": [
-        {
-            "name": "id",
-            "title": "id",
-            "type": "str",
-            "length": 32
-        },
-        {
-            "name": "customerid",
-            "title": "客户id",
-            "type": "str",
-            "length": 32
-        },
-        {
-            "name": "resellerid",
-            "title": "分销商id",
-            "type": "str",
-            "length": 32
-        },
-        {
-            "name": "order_date",
-            "title": "订单日期",
-            "type": "date"
-        },
-        {
-            "name": "order_status",
-            "title": "订单状态",
-            "type": "str",
-            "length": 1
-        },
-        {
-            "name": "business_op",
-            "title": "业务操作",
-            "type": "str",
-            "length": 255
-        },
-        {
-            "name": "amount",
-            "title": "金额",
-            "type": "float",
-            "length": 18,
-            "dec": 2
-        },
-        {
-            "name": "userid",
-            "title": "用户id",
-            "type": "str",
-            "length": 32
-        },
-        {
-            "name": "ordertype",
-            "title": "订单类型",
-            "type": "str",
-            "length": 10
-        },
-        {
-            "name": "pay_date",
-            "title": "支付时间",
-            "type": "timestamp"
-        },
-        {
-            "name": "origin_orderid",
-            "title": "原订单",
-            "type": "str",
-            "length": 32
-        }
-    ],
-    "codes": [
-        {
-            "field": "customerid",
-            "table": "organization",
-            "valuefield": "id",
-            "textfield": "orgname"
-        },
-        {
-            "field": "resellerid",
-            "table": "organization",
-            "valuefield": "id",
-            "textfield": "orgname"
-        },
-        {
-            "field": "order_status",
-            "table": "appcodes_kv",
-            "valuefield": "k",
-            "textfield": "v",
-            "cond": "parentid='order_status'"
-        },
-        {
-            "field": "business_op",
-            "table": "appcodes_kv",
-            "valuefield": "k",
-            "textfield": "v",
-            "cond": "parentid='business_op'"
-        },
-        {
-            "field": "userid",
-            "table": "users",
-            "valuefield": "id",
-            "textfield": "name"
-        },
-        {
-            "field": "ordertype",
-            "table": "appcodes_kv",
-            "valuefield": "k",
-            "textfield": "v",
-            "cond": "parentid='ordertype'"
-        }
-    ]
+  "summary": [
+    {
+      "name": "biz_order",
+      "title": "订单",
+      "primary": [
+        "id"
+      ]
+    }
+  ],
+  "fields": [
+    {
+      "name": "id",
+      "title": "id",
+      "type": "str",
+      "length": 32
+    },
+    {
+      "name": "customerid",
+      "title": "客户id",
+      "type": "str",
+      "length": 32
+    },
+    {
+      "name": "resellerid",
+      "title": "分销商id",
+      "type": "str",
+      "length": 32
+    },
+    {
+      "name": "order_date",
+      "title": "订单日期",
+      "type": "date"
+    },
+    {
+      "name": "order_status",
+      "title": "订单状态",
+      "type": "str",
+      "length": 1
+    },
+    {
+      "name": "business_op",
+      "title": "业务操作",
+      "type": "str",
+      "length": 255
+    },
+    {
+      "name": "amount",
+      "title": "金额",
+      "type": "float",
+      "length": 18,
+      "dec": 2
+    },
+    {
+      "name": "userid",
+      "title": "用户id",
+      "type": "str",
+      "length": 32
+    },
+    {
+      "name": "ordertype",
+      "title": "订单类型",
+      "type": "str",
+      "length": 10
+    },
+    {
+      "name": "pay_date",
+      "title": "支付时间",
+      "type": "timestamp"
+    },
+    {
+      "name": "origin_orderid",
+      "title": "原订单",
+      "type": "str",
+      "length": 32
+    }
+  ],
+  "codes": [
+    {
+      "field": "customerid",
+      "table": "organization",
+      "valuefield": "id",
+      "textfield": "orgname"
+    },
+    {
+      "field": "order_status",
+      "table": "appcodes_kv",
+      "valuefield": "k",
+      "textfield": "v",
+      "cond": "parentid='order_status'"
+    },
+    {
+      "field": "business_op",
+      "table": "appcodes_kv",
+      "valuefield": "k",
+      "textfield": "v",
+      "cond": "parentid='business_op'"
+    },
+    {
+      "field": "userid",
+      "table": "users",
+      "valuefield": "id",
+      "textfield": "name"
+    },
+    {
+      "field": "ordertype",
+      "table": "appcodes_kv",
+      "valuefield": "k",
+      "textfield": "v",
+      "cond": "parentid='ordertype'"
+    }
+  ]
 }
\ No newline at end of file
diff --git a/models/pr_link.json b/models/pr_link.json
index b8de6b6..956b5ae 100644
--- a/models/pr_link.json
+++ b/models/pr_link.json
@@ -1,66 +1,60 @@
 {
-    "summary": [
-        {
-            "name": "pr_link",
-            "title": "供销链",
-            "primary": [
-                "id"
-            ],
-            "catelog": "entity"
-        }
-    ],
-    "fields": [
-        {
-            "name": "id",
-            "title": "id",
-            "type": "str",
-            "length": 32
-        },
-        {
-            "name": "odid",
-            "title": "订单明细id",
-            "type": "str",
-            "length": 32
-        },
-        {
-            "name": "providerid",
-            "title": "供应方id",
-            "type": "str",
-            "length": 32
-        },
-        {
-            "name": "resellerid",
-            "title": "分销方id",
-            "type": "str",
-            "length": 32
-        },
-        {
-            "name": "pr_amount",
-            "title": "供销金额",
-            "type": "float",
-            "length": 18,
-            "dec": 2
-        },
-        {
-            "name": "list_amount",
-            "title": "报价",
-            "type": "float",
-            "length": 18,
-            "dec": 2
-        }
-    ],
-    "codes": [
-        {
-            "field": "providerid",
-            "table": "organization",
-            "valuefield": "id",
-            "textfield": "orgname"
-        },
-        {
-            "field": "resellerid",
-            "table": "organization",
-            "valuefield": "id",
-            "textfield": "orgname"
-        }
-    ]
+  "summary": [
+    {
+      "name": "pr_link",
+      "title": "供销链",
+      "primary": [
+        "id"
+      ],
+      "catelog": "entity"
+    }
+  ],
+  "fields": [
+    {
+      "name": "id",
+      "title": "id",
+      "type": "str",
+      "length": 32
+    },
+    {
+      "name": "odid",
+      "title": "订单明细id",
+      "type": "str",
+      "length": 32
+    },
+    {
+      "name": "providerid",
+      "title": "供应方id",
+      "type": "str",
+      "length": 32
+    },
+    {
+      "name": "resellerid",
+      "title": "分销方id",
+      "type": "str",
+      "length": 32
+    },
+    {
+      "name": "pr_amount",
+      "title": "供销金额",
+      "type": "float",
+      "length": 18,
+      "dec": 2
+    },
+    {
+      "name": "list_amount",
+      "title": "报价",
+      "type": "float",
+      "length": 18,
+      "dec": 2
+    }
+  ],
+  "codes": [
+    {
+      "field": "providerid",
+      "table": "supplychain.suppliers",
+      "valuefield": "id",
+      "textfield": "supplier_name"
+    }
+  ]
 }
\ No newline at end of file
diff --git a/models/product.json b/models/product.json
index 11bac0c..91eb29b 100644
--- a/models/product.json
+++ b/models/product.json
@@ -1,114 +1,114 @@
 {
-    "summary": [
-        {
-            "name": "product",
-            "title": "产品",
-            "primary": [
-                "id"
-            ],
-            "catelog": "entity"
-        }
-    ],
-    "fields": [
-        {
-            "name": "id",
-            "title": "id",
-            "type": "str",
-            "length": 32
-        },
-        {
-            "name": "name",
-            "title": "产品名称",
-            "type": "str",
-            "length": 100
-        },
-        {
-            "name": "prodtypeid",
-            "title": "产品类型id",
-            "type": "str",
-            "length": 32
-        },
-        {
-            "name": "orgid",
-            "title": "产品机构",
-            "type": "str",
-            "length": 32
-        },
-        {
-            "name": "providerid",
-            "title": "供应商编号",
-            "type": "str",
-            "length": 32
-        },
-        {
-            "name": "agreeid",
-            "title": "分销协议id",
-            "type": "str",
-            "length": 32
-        },
-        {
-            "name": "providerpid",
-            "title": "供应方产品id",
-            "type": "str",
-            "length": 255
-        },
-        {
-            "name": "description",
-            "title": "描述",
-            "type": "str",
-            "length": 255
-        },
-        {
-            "name": "prod_state",
-            "title": "状态",
-            "type": "str",
-            "length": 32
-        },
-        {
-            "name": "product_code",
-            "title": "产品编码",
-            "type": "str",
-            "length": 100
-        },
-        {
-            "name": "spec_note",
-            "title": "规格说明",
-            "type": "str",
-            "length": 400
-        }
-    ],
-    "codes": [
-        {
-            "field": "prodtypeid",
-            "table": "prodtype",
-            "valuefield": "id",
-            "textfield": "name"
-        },
-        {
-            "field": "providerid",
-            "table": "organization",
-            "valuefield": "id",
-            "textfield": "orgname"
-        },
-        {
-            "field": "agreeid",
-            "table": "agreement",
-            "valuefield": "id",
-            "textfield": "name",
-            "cond": "resellerid=[[userorgid]]"
-        },
-        {
-            "field": "providerpid",
-            "table": "product",
-            "valuefield": "id",
-            "textfield": "name"
-        },
-        {
-            "field": "prod_state",
-            "table": "appcodes_kv",
-            "valuefield": "k",
-            "textfield": "v",
-            "cond": "parentid='prod_state'"
-        }
-    ]
+  "summary": [
+    {
+      "name": "product",
+      "title": "产品",
+      "primary": [
+        "id"
+      ],
+      "catelog": "entity"
+    }
+  ],
+  "fields": [
+    {
+      "name": "id",
+      "title": "id",
+      "type": "str",
+      "length": 32
+    },
+    {
+      "name": "name",
+      "title": "产品名称",
+      "type": "str",
+      "length": 100
+    },
+    {
+      "name": "prodtypeid",
+      "title": "产品类型id",
+      "type": "str",
+      "length": 32
+    },
+    {
+      "name": "orgid",
+      "title": "产品机构",
+      "type": "str",
+      "length": 32
+    },
+    {
+      "name": "providerid",
+      "title": "供应商编号",
+      "type": "str",
+      "length": 32
+    },
+    {
+      "name": "agreeid",
+      "title": "分销协议id",
+      "type": "str",
+      "length": 32
+    },
+    {
+      "name": "providerpid",
+      "title": "供应方产品id",
+      "type": "str",
+      "length": 255
+    },
+    {
+      "name": "description",
+      "title": "描述",
+      "type": "str",
+      "length": 255
+    },
+    {
+      "name": "prod_state",
+      "title": "状态",
+      "type": "str",
+      "length": 32
+    },
+    {
+      "name": "product_code",
+      "title": "产品编码",
+      "type": "str",
+      "length": 100
+    },
+    {
+      "name": "spec_note",
+      "title": "规格说明",
+      "type": "str",
+      "length": 400
+    }
+  ],
+  "codes": [
+    {
+      "field": "prodtypeid",
+      "table": "prodtype",
+      "valuefield": "id",
+      "textfield": "name"
+    },
+    {
+      "field": "providerid",
+      "table": "supplychain.suppliers",
+      "valuefield": "id",
+      "textfield": "supplier_name"
+    },
+    {
+      "field": "agreeid",
+      "table": "agreement",
+      "valuefield": "id",
+      "textfield": "name",
+      "cond": "resellerid=[[userorgid]]"
+    },
+    {
+      "field": "providerpid",
+      "table": "product",
+      "valuefield": "id",
+      "textfield": "name"
+    },
+    {
+      "field": "prod_state",
+      "table": "appcodes_kv",
+      "valuefield": "k",
+      "textfield": "v",
+      "cond": "parentid='prod_state'"
+    }
+  ]
 }
\ No newline at end of file
diff --git a/models/resource.json b/models/resource.json
index 777e51e..0bc3ecb 100644
--- a/models/resource.json
+++ b/models/resource.json
@@ -1,103 +1,97 @@
 {
-    "summary": [
-        {
-            "name": "resource",
-            "title": "客户资源",
-            "primary": [
-                "id"
-            ]
-        }
-    ],
-    "fields": [
-        {
-            "name": "id",
-            "title": "id",
-            "type": "str",
-            "length": 32
-        },
-        {
-            "name": "orgid",
-            "title": "机构id",
-            "type": "str",
-            "length": 32
-        },
-        {
-            "name": "resellerid",
-            "title": "商户id",
-            "type": "str",
-            "length": 32
-        },
-        {
-            "name": "orderid",
-            "title": "订单id",
-            "type": "str",
-            "length": 32
-        },
-        {
-            "name": "prodid",
-            "title": "产品id",
-            "type": "str",
-            "length": 32
-        },
-        {
-            "name": "providerrid",
-            "title": "供应商资源id",
-            "type": "str",
-            "length": 100
-        },
-        {
-            "name": "attachedrid",
-            "title": "关联产品id",
-            "type": "str",
-            "length": 32
-        },
-        {
-            "name": "enable_date",
-            "title": "开始日期",
-            "type": "date"
-        },
-        {
-            "name": "expire_date",
-            "title": "失效日期",
-            "type": "date"
-        },
-        {
-            "name": "spec_data",
-            "title": "规格数据",
-            "type": "str",
-            "length": 4000
-        },
-        {
-            "name": "access_info",
-            "title": "登录信息",
-            "type": "str",
-            "length": 4000
-        }
-    ],
-    "codes": [
-        {
-            "field": "orgid",
-            "table": "organization",
-            "valuefield": "id",
-            "textfield": "orgname"
-        },
-        {
-            "field": "resellerid",
-            "table": "organization",
-            "valuefield": "id",
-            "textfield": "orgname"
-        },
-        {
-            "field": "prodid",
-            "table": "product",
-            "valuefield": "id",
-            "textfield": "name"
-        },
-        {
-            "field": "attachedrid",
-            "table": "resource",
-            "valuefield": "id",
-            "textfield": "name"
-        }
-    ]
+  "summary": [
+    {
+      "name": "resource",
+      "title": "客户资源",
+      "primary": [
+        "id"
+      ]
+    }
+  ],
+  "fields": [
+    {
+      "name": "id",
+      "title": "id",
+      "type": "str",
+      "length": 32
+    },
+    {
+      "name": "orgid",
+      "title": "机构id",
+      "type": "str",
+      "length": 32
+    },
+    {
+      "name": "resellerid",
+      "title": "商户id",
+      "type": "str",
+      "length": 32
+    },
+    {
+      "name": "orderid",
+      "title": "订单id",
+      "type": "str",
+      "length": 32
+    },
+    {
+      "name": "prodid",
+      "title": "产品id",
+      "type": "str",
+      "length": 32
+    },
+    {
+      "name": "providerrid",
+      "title": "供应商资源id",
+      "type": "str",
+      "length": 100
+    },
+    {
+      "name": "attachedrid",
+      "title": "关联产品id",
+      "type": "str",
+      "length": 32
+    },
+    {
+      "name": "enable_date",
+      "title": "开始日期",
+      "type": "date"
+    },
+    {
+      "name": "expire_date",
+      "title": "失效日期",
+      "type": "date"
+    },
+    {
+      "name": "spec_data",
+      "title": "规格数据",
+      "type": "str",
+      "length": 4000
+    },
+    {
+      "name": "access_info",
+      "title": "登录信息",
+      "type": "str",
+      "length": 4000
+    }
+  ],
+  "codes": [
+    {
+      "field": "orgid",
+      "table": "organization",
+      "valuefield": "id",
+      "textfield": "orgname"
+    },
+    {
+      "field": "prodid",
+      "table": "product",
+      "valuefield": "id",
+      "textfield": "name"
+    },
+    {
+      "field": "attachedrid",
+      "table": "resource",
+      "valuefield": "id",
+      "textfield": "name"
+    }
+  ]
 }
\ No newline at end of file