From 6c926cf3d5d5e47155891ccd91f1d81fb280ac4f Mon Sep 17 00:00:00 2001
From: yumoqing <yumoqing@gmail.com>
Date: Thu, 9 Jul 2026 14:07:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20add=20status=20codes=20to=20models=20?=
 =?UTF-8?q?=E2=80=94=20prevents=20empty=20code=20field=20in=20search=5Ffor?=
 =?UTF-8?q?m?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/sub_distributors.json                 | 300 ++++++-------
 models/suppliers.json                        | 420 ++++++++++---------
 supplychain/__pycache__/init.cpython-310.pyc | Bin 23346 -> 24713 bytes
 3 files changed, 376 insertions(+), 344 deletions(-)

diff --git a/models/sub_distributors.json b/models/sub_distributors.json
index 91a061a..02972c8 100644
--- a/models/sub_distributors.json
+++ b/models/sub_distributors.json
@@ -1,143 +1,159 @@
 {
-    "summary": [
-        {
-            "name": "sub_distributors",
-            "title": "二级分销商表",
-            "primary": ["id"],
-            "catelog": "entity"
-        }
-    ],
-    "fields": [
-        {
-            "name": "id",
-            "title": "主键ID",
-            "type": "str",
-            "length": 32,
-            "nullable": "no"
-        },
-        {
-            "name": "resellerid",
-            "title": "所属主分销商机构ID",
-            "type": "str",
-            "length": 32,
-            "nullable": "no"
-        },
-        {
-            "name": "sub_dist_code",
-            "title": "二级分销商编号",
-            "type": "str",
-            "length": 64,
-            "nullable": "no"
-        },
-        {
-            "name": "sub_dist_name",
-            "title": "二级分销商名称",
-            "type": "str",
-            "length": 255,
-            "nullable": "no"
-        },
-        {
-            "name": "contact_person",
-            "title": "联系人",
-            "type": "str",
-            "length": 100
-        },
-        {
-            "name": "contact_phone",
-            "title": "联系电话",
-            "type": "str",
-            "length": 50
-        },
-        {
-            "name": "contact_email",
-            "title": "联系邮箱",
-            "type": "str",
-            "length": 255
-        },
-        {
-            "name": "address",
-            "title": "地址",
-            "type": "str",
-            "length": 500
-        },
-        {
-            "name": "tax_number",
-            "title": "税号",
-            "type": "str",
-            "length": 64
-        },
-        {
-            "name": "bank_name",
-            "title": "开户银行",
-            "type": "str",
-            "length": 255
-        },
-        {
-            "name": "bank_account",
-            "title": "银行账号",
-            "type": "str",
-            "length": 64
-        },
-        {
-            "name": "managed_by",
-            "title": "负责销售ID",
-            "type": "str",
-            "length": 32
-        },
-        {
-            "name": "status",
-            "title": "状态",
-            "type": "char",
-            "length": 1,
-            "nullable": "no",
-            "default": "1"
-        },
-        {
-            "name": "remark",
-            "title": "备注",
-            "type": "text"
-        },
-        {
-            "name": "created_by",
-            "title": "创建人",
-            "type": "str",
-            "length": 32
-        },
-        {
-            "name": "created_at",
-            "title": "创建时间",
-            "type": "datetime",
-            "nullable": "no"
-        },
-        {
-            "name": "updated_at",
-            "title": "更新时间",
-            "type": "datetime"
-        }
-    ],
-    "indexes": [
-        {
-            "name": "idx_sd_reseller",
-            "idxtype": "index",
-            "idxfields": ["resellerid"]
-        },
-        {
-            "name": "idx_sd_code",
-            "idxtype": "unique",
-            "idxfields": ["resellerid", "sub_dist_code"]
-        },
-        {
-            "name": "idx_sd_manager",
-            "idxtype": "index",
-            "idxfields": ["managed_by"]
-        }
-    ],
-    "codes": [
-        {
-            "field": "resellerid",
-            "table": "organization",
-            "valuefield": "id",
-            "textfield": "orgname"
-        }
-    ]
-}
+  "summary": [
+    {
+      "name": "sub_distributors",
+      "title": "二级分销商表",
+      "primary": [
+        "id"
+      ],
+      "catelog": "entity"
+    }
+  ],
+  "fields": [
+    {
+      "name": "id",
+      "title": "主键ID",
+      "type": "str",
+      "length": 32,
+      "nullable": "no"
+    },
+    {
+      "name": "resellerid",
+      "title": "所属主分销商机构ID",
+      "type": "str",
+      "length": 32,
+      "nullable": "no"
+    },
+    {
+      "name": "sub_dist_code",
+      "title": "二级分销商编号",
+      "type": "str",
+      "length": 64,
+      "nullable": "no"
+    },
+    {
+      "name": "sub_dist_name",
+      "title": "二级分销商名称",
+      "type": "str",
+      "length": 255,
+      "nullable": "no"
+    },
+    {
+      "name": "contact_person",
+      "title": "联系人",
+      "type": "str",
+      "length": 100
+    },
+    {
+      "name": "contact_phone",
+      "title": "联系电话",
+      "type": "str",
+      "length": 50
+    },
+    {
+      "name": "contact_email",
+      "title": "联系邮箱",
+      "type": "str",
+      "length": 255
+    },
+    {
+      "name": "address",
+      "title": "地址",
+      "type": "str",
+      "length": 500
+    },
+    {
+      "name": "tax_number",
+      "title": "税号",
+      "type": "str",
+      "length": 64
+    },
+    {
+      "name": "bank_name",
+      "title": "开户银行",
+      "type": "str",
+      "length": 255
+    },
+    {
+      "name": "bank_account",
+      "title": "银行账号",
+      "type": "str",
+      "length": 64
+    },
+    {
+      "name": "managed_by",
+      "title": "负责销售ID",
+      "type": "str",
+      "length": 32
+    },
+    {
+      "name": "status",
+      "title": "状态",
+      "type": "char",
+      "length": 1,
+      "nullable": "no",
+      "default": "1"
+    },
+    {
+      "name": "remark",
+      "title": "备注",
+      "type": "text"
+    },
+    {
+      "name": "created_by",
+      "title": "创建人",
+      "type": "str",
+      "length": 32
+    },
+    {
+      "name": "created_at",
+      "title": "创建时间",
+      "type": "datetime",
+      "nullable": "no"
+    },
+    {
+      "name": "updated_at",
+      "title": "更新时间",
+      "type": "datetime"
+    }
+  ],
+  "indexes": [
+    {
+      "name": "idx_sd_reseller",
+      "idxtype": "index",
+      "idxfields": [
+        "resellerid"
+      ]
+    },
+    {
+      "name": "idx_sd_code",
+      "idxtype": "unique",
+      "idxfields": [
+        "resellerid",
+        "sub_dist_code"
+      ]
+    },
+    {
+      "name": "idx_sd_manager",
+      "idxtype": "index",
+      "idxfields": [
+        "managed_by"
+      ]
+    }
+  ],
+  "codes": [
+    {
+      "field": "resellerid",
+      "table": "organization",
+      "valuefield": "id",
+      "textfield": "orgname"
+    },
+    {
+      "field": "status",
+      "table": "appcodes_kv",
+      "valuefield": "k",
+      "textfield": "v",
+      "cond": "parentid='sub_distributor_status'"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/models/suppliers.json b/models/suppliers.json
index aeb083b..f1da846 100644
--- a/models/suppliers.json
+++ b/models/suppliers.json
@@ -1,203 +1,219 @@
 {
-    "summary": [
-        {
-            "name": "suppliers",
-            "title": "供应商表",
-            "primary": ["id"],
-            "catelog": "entity"
-        }
-    ],
-    "fields": [
-        {
-            "name": "id",
-            "title": "主键ID",
-            "type": "str",
-            "length": 32,
-            "nullable": "no"
-        },
-        {
-            "name": "resellerid",
-            "title": "所属分销商机构ID",
-            "type": "str",
-            "length": 32,
-            "nullable": "no"
-        },
-        {
-            "name": "supplier_code",
-            "title": "供应商编号",
-            "type": "str",
-            "length": 64,
-            "nullable": "no"
-        },
-        {
-            "name": "supplier_name",
-            "title": "供应商名称",
-            "type": "str",
-            "length": 255,
-            "nullable": "no"
-        },
-        {
-            "name": "contact_person",
-            "title": "联系人",
-            "type": "str",
-            "length": 100
-        },
-        {
-            "name": "contact_phone",
-            "title": "联系电话",
-            "type": "str",
-            "length": 50
-        },
-        {
-            "name": "contact_email",
-            "title": "联系邮箱",
-            "type": "str",
-            "length": 255
-        },
-        {
-            "name": "address",
-            "title": "地址",
-            "type": "str",
-            "length": 500
-        },
-        {
-            "name": "tax_number",
-            "title": "税号",
-            "type": "str",
-            "length": 64
-        },
-        {
-            "name": "bank_name",
-            "title": "开户银行",
-            "type": "str",
-            "length": 255
-        },
-        {
-            "name": "bank_account",
-            "title": "银行账号",
-            "type": "str",
-            "length": 64
-        },
-        {
-            "name": "orgid",
-            "title": "机构ID",
-            "type": "str",
-            "length": 32,
-            "nullable": "no"
-        },
-        {
-            "name": "is_external",
-            "title": "是否外部供应商",
-            "type": "char",
-            "length": 1,
-            "nullable": "no",
-            "default": "1"
-        },
-        {
-            "name": "settlement_cycle",
-            "title": "结算周期",
-            "type": "str",
-            "length": 20
-        },
-        {
-            "name": "settlement_day",
-            "title": "结算日",
-            "type": "int"
-        },
-        {
-            "name": "payment_type",
-            "title": "付款方式",
-            "type": "str",
-            "length": 20
-        },
-        {
-            "name": "status",
-            "title": "状态",
-            "type": "char",
-            "length": 1,
-            "nullable": "no",
-            "default": "1"
-        },
-        {
-            "name": "remark",
-            "title": "备注",
-            "type": "text"
-        },
-        {
-            "name": "created_by",
-            "title": "创建人",
-            "type": "str",
-            "length": 32
-        },
-        {
-            "name": "created_at",
-            "title": "创建时间",
-            "type": "datetime",
-            "nullable": "no"
-        },
-        {
-            "name": "updated_at",
-            "title": "更新时间",
-            "type": "datetime"
-        }
-    ],
-    "indexes": [
-        {
-            "name": "idx_suppliers_reseller",
-            "idxtype": "index",
-            "idxfields": ["resellerid"]
-        },
-        {
-            "name": "idx_suppliers_orgid",
-            "idxtype": "index",
-            "idxfields": ["orgid"]
-        },
-        {
-            "name": "idx_suppliers_code",
-            "idxtype": "unique",
-            "idxfields": ["resellerid", "supplier_code"]
-        }
-    ],
-    "codes": [
-        {
-            "field": "resellerid",
-            "table": "organization",
-            "valuefield": "id",
-            "textfield": "orgname"
-        },
-        {
-            "field": "orgid",
-            "table": "organization",
-            "valuefield": "id",
-            "textfield": "orgname"
-        },
-        {
-            "field": "is_external",
-            "table": "appcodes_kv",
-            "valuefield": "k",
-            "textfield": "v",
-            "cond": "parentid='supplier_is_external'"
-        },
-        {
-            "field": "payment_type",
-            "table": "appcodes_kv",
-            "valuefield": "k",
-            "textfield": "v",
-            "cond": "parentid='supplier_payment_type'"
-        },
-        {
-            "field": "settlement_cycle",
-            "table": "appcodes_kv",
-            "valuefield": "k",
-            "textfield": "v",
-            "cond": "parentid='supplier_settle_cycle'"
-        },
-        {
-            "field": "status",
-            "table": "appcodes_kv",
-            "valuefield": "k",
-            "textfield": "v",
-            "cond": "parentid='supplier_status'"
-        }
-    ]
-}
+  "summary": [
+    {
+      "name": "suppliers",
+      "title": "供应商表",
+      "primary": [
+        "id"
+      ],
+      "catelog": "entity"
+    }
+  ],
+  "fields": [
+    {
+      "name": "id",
+      "title": "主键ID",
+      "type": "str",
+      "length": 32,
+      "nullable": "no"
+    },
+    {
+      "name": "resellerid",
+      "title": "所属分销商机构ID",
+      "type": "str",
+      "length": 32,
+      "nullable": "no"
+    },
+    {
+      "name": "supplier_code",
+      "title": "供应商编号",
+      "type": "str",
+      "length": 64,
+      "nullable": "no"
+    },
+    {
+      "name": "supplier_name",
+      "title": "供应商名称",
+      "type": "str",
+      "length": 255,
+      "nullable": "no"
+    },
+    {
+      "name": "contact_person",
+      "title": "联系人",
+      "type": "str",
+      "length": 100
+    },
+    {
+      "name": "contact_phone",
+      "title": "联系电话",
+      "type": "str",
+      "length": 50
+    },
+    {
+      "name": "contact_email",
+      "title": "联系邮箱",
+      "type": "str",
+      "length": 255
+    },
+    {
+      "name": "address",
+      "title": "地址",
+      "type": "str",
+      "length": 500
+    },
+    {
+      "name": "tax_number",
+      "title": "税号",
+      "type": "str",
+      "length": 64
+    },
+    {
+      "name": "bank_name",
+      "title": "开户银行",
+      "type": "str",
+      "length": 255
+    },
+    {
+      "name": "bank_account",
+      "title": "银行账号",
+      "type": "str",
+      "length": 64
+    },
+    {
+      "name": "orgid",
+      "title": "机构ID",
+      "type": "str",
+      "length": 32,
+      "nullable": "no"
+    },
+    {
+      "name": "is_external",
+      "title": "是否外部供应商",
+      "type": "char",
+      "length": 1,
+      "nullable": "no",
+      "default": "1"
+    },
+    {
+      "name": "settlement_cycle",
+      "title": "结算周期",
+      "type": "str",
+      "length": 20
+    },
+    {
+      "name": "settlement_day",
+      "title": "结算日",
+      "type": "int"
+    },
+    {
+      "name": "payment_type",
+      "title": "付款方式",
+      "type": "str",
+      "length": 20
+    },
+    {
+      "name": "status",
+      "title": "状态",
+      "type": "char",
+      "length": 1,
+      "nullable": "no",
+      "default": "1"
+    },
+    {
+      "name": "remark",
+      "title": "备注",
+      "type": "text"
+    },
+    {
+      "name": "created_by",
+      "title": "创建人",
+      "type": "str",
+      "length": 32
+    },
+    {
+      "name": "created_at",
+      "title": "创建时间",
+      "type": "datetime",
+      "nullable": "no"
+    },
+    {
+      "name": "updated_at",
+      "title": "更新时间",
+      "type": "datetime"
+    }
+  ],
+  "indexes": [
+    {
+      "name": "idx_suppliers_reseller",
+      "idxtype": "index",
+      "idxfields": [
+        "resellerid"
+      ]
+    },
+    {
+      "name": "idx_suppliers_orgid",
+      "idxtype": "index",
+      "idxfields": [
+        "orgid"
+      ]
+    },
+    {
+      "name": "idx_suppliers_code",
+      "idxtype": "unique",
+      "idxfields": [
+        "resellerid",
+        "supplier_code"
+      ]
+    }
+  ],
+  "codes": [
+    {
+      "field": "resellerid",
+      "table": "organization",
+      "valuefield": "id",
+      "textfield": "orgname"
+    },
+    {
+      "field": "orgid",
+      "table": "organization",
+      "valuefield": "id",
+      "textfield": "orgname"
+    },
+    {
+      "field": "is_external",
+      "table": "appcodes_kv",
+      "valuefield": "k",
+      "textfield": "v",
+      "cond": "parentid='supplier_is_external'"
+    },
+    {
+      "field": "payment_type",
+      "table": "appcodes_kv",
+      "valuefield": "k",
+      "textfield": "v",
+      "cond": "parentid='supplier_payment_type'"
+    },
+    {
+      "field": "settlement_cycle",
+      "table": "appcodes_kv",
+      "valuefield": "k",
+      "textfield": "v",
+      "cond": "parentid='supplier_settle_cycle'"
+    },
+    {
+      "field": "status",
+      "table": "appcodes_kv",
+      "valuefield": "k",
+      "textfield": "v",
+      "cond": "parentid='supplier_status'"
+    },
+    {
+      "field": "status",
+      "table": "appcodes_kv",
+      "valuefield": "k",
+      "textfield": "v",
+      "cond": "parentid='supplier_status'"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/supplychain/__pycache__/init.cpython-310.pyc b/supplychain/__pycache__/init.cpython-310.pyc
index c09cad69a2ccb1a1d88e539ac278fd47d878f937..35e0935420049c6e5e9f9a47dc0dae18a0be8f32 100644
GIT binary patch
delta 6672
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

delta 5255
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
Um^0Kb$y{ZgX-=Zf4cVgl|2T8v)Bpeg