From f5794c9348430ab9776c0f16b017a422976e0345 Mon Sep 17 00:00:00 2001
From: yumoqing <yumoqing@gmail.com>
Date: Mon, 13 Jul 2026 14:34:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BE=9B=E9=94=80=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E6=8A=98=E6=89=A3=E6=98=8E=E7=BB=86=E6=8C=89=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E6=96=B9=E8=BF=87=E6=BB=A4=E4=BA=A7=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

正确链路: product.resource_ref_id → product_resource_supplier.supplier_org_id
JOIN product_resource_supplier 按 supplier_org_id 过滤，而非 product_supplier_mapping
---
 supplychain/__pycache__/init.cpython-310.pyc | Bin 29168 -> 28755 bytes
 supplychain/init.py                          |  32 ++++++-------------
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/supplychain/__pycache__/init.cpython-310.pyc b/supplychain/__pycache__/init.cpython-310.pyc
index a7d51037bd6917319e9208a610e69a291a33d99d..34fa21678df13a476187771172a02c55519e35b9 100644
GIT binary patch
delta 951
zcmZ`$O=uHA7@gVOY?969r)k8dQo0yQE0(Ar*q>AoTQF5pY;v$@8`?|~HjUkMc2mL5
z5;af-4~lbAduZ`eyh%@@H?LX*FCvOo@8Z!z4}QC*S}D%(c4pr9=I#4-e|*F5zTl7%
z3@QkQd^=ZZynGgl=ff%-1AtcmQxkaG)If?zwq%J+B%Y>l5~UH5&Y?$LwugDvBq9?p
z6Lh>T{N`<$$#js(#1}^uk1g>xQ(cYpHH?unrvOYcC(9^{%E<P*uKqo)11(pD1eo-%
z>nNJ;wtdXICNp2f3-AH_0EOCCz*(Dk0TUH=YVDT025T!sB|+b+ybb{t=bbRqkN1Yr
zk?m(*`e|Q#J*^<2{p~>z6@vIGAwZafR|V$8@TSn>3%A|(d*1+UD$EOa`t1OO3Xn(&
zkv3SPDFn~<IAZ=KbRSb6xVYyyA|kM^5*qu<M&qc7TQ?Q>3<0;RZKh<=ky!mX{ISWR
zRj1rDm(Ex9g?Y^~G_zi-RrMk@wIzLaNUKqU)C-pOb>)FZi>6Vhg<_r-OL?8RoT9;K
ziGXhjc1@DIn>@cWcQ{zij$If#o72psLCgI0T=5{i1R-XhVuV_y(R4PK&hV|m-HYQB
z>CFGFp<-$iAV~gsYb(}>Q%dg3q!Ye#`4qoL4vA3a%Z1L^narrGHLY2zZfYZ1?}=Xi
z@yclrZG%MoVR0Ep_<>S4kIr=PQmGTG{AQ`gAA!uY%Ta8V#(PR|5^hB07?xnlSQ4C_
zfMrqHkz^J3{gnI?e>*d*hHwmbU=^w~vAI#cF5v`ERP(rxH>(YK2n-7%|9q@tQ@i>d
zs~^OgPUtYOG{rlO<9L{#H~Kw;KrC@)9L0m18^#kHNjM7UGIdHc#J9ukd||O6j;Wbn
Da25ds

delta 1331
zcmZ`&O>7%Q6rQ&`Ua!~dwVkAiO<S^xT4I;PG^j!dLJA~CO@*S;lr~Wlg6mnLbrX9t
zyD7-sm0MhKK#CM;5C@b)qTZ2EPF#=>Tz~^0Kp+dLAS47A#0f-cfVYktf+}Y8y?OiQ
z{d{j`_KWY}*B`*BB@!CJ@zM2jm1FO{V`LYSDg2BhK0vr1N+Lb`=xIg+iimi!FSAHf
zIzc80qo>GQ1A*czo0KUm>Pt3kNxSwS>PPvLew3+MQi%k#qbWf|Oucw`{>;k&B%HGd
zpSrV)WSV%<CJEI4tq}96A7R>tv{xhM$0o?U8fd<{srp(awuM<&ys$!J?LQS%_sy`v
zA_?N{{PBGqJl*L)XNgUX87z5&`04~{!WQ%qmg*xm*{g_MVa5JH_v4#!U$5wh1j0Zh
z`6pf~T$@mZLoAJI+WD-#b~#_NH0#<>+63Qi6a0BUL7M~#KfVsUa8LUWbm(>8d%#E~
zfmHNLH=>92Y)F1cMjs{Xu%cbS3!;RQro4M4K&tvk=i1hx;pX=fz>_ijI3^qpl1Mqp
z4vZ4ki)-H~L7B-CKXC=q@>wj={>~C6qqXgcegA9i%i`H}A`LvHWY{zkde}FnNj_VD
z<E-Vaa=}WIhf3Tsm+b0gi<w@{bXOf`$+oy_Ua?E2_;e<t44KuMXA1q&z<@tpe6~1#
z&U6bkzG$-{RBUFJ+`X^`@%SZ6s^1W6bN%A$nbd%J;Z*T#(R96%x9XZtn1dsO=2KG>
zX6|mG1>wx~h>`O>_v7x7tFFz0Bl*0<(?AG+A74M8K~eunJa+Mnkjp2<&c#Q>$K`{K
zu=3=TnY#@`W%S(}5^6HS4Us`{o%m!v8h}T9Xu^4X>?;z(hnR<{JhUjc9G;h2QsH<@
zc5KEC4A~WF)LOC8MXPGP;_$H)#e@hVUF#)vD2Rr2u(vR}R4bR3+_A!*U;SiWd^<NL
zX4zFZAiiS#*|ji{>{=fGCQMF|Zi`lGc2%Tb$O_%M4^m>#I+_dpc=+e@!=X#u;Wf5e
z_7-gBw$$a4<Ji?jw*|}MdFyoJb@Y?2bwzrB;#7c26hd7BMb_?6MFSmjzf%qOq+Poz
zX*+7f0O{}CZK`5a$KFMyJ5mTm`$LUUP@xx6pzWaFZ#1pk%?jFID$QW@u|KJ*rqN9W
z12;1$De&R#_)B#P!{W8d0-O*(RvO9#c2Snat%ow(&C9=l&X1yj7en!k2$qjSQM|o8
o6d6autK!!3gD}1wuik{zaOe>R^KgqB;`?N`_`KGTpVO!Q0mYa<y8r+H

diff --git a/supplychain/init.py b/supplychain/init.py
index 7bd9afc..0f4b7f9 100644
--- a/supplychain/init.py
+++ b/supplychain/init.py
@@ -995,51 +995,39 @@ async def get_agreement_discount_items(request):
 async def get_contract_discount_items(request):
     """Return products with discount status for a supply contract.
     
-    Products are linked to suppliers via product_supplier_mapping, not org_id.
+    Products link to suppliers via: product → resource_ref_id → 
+    product_resource_supplier.supplier_org_id.
     """
     params_kw = getattr(request._run_ns, 'params_kw', {}) or {}
     contract_id = params_kw.get('contract_id') or params_kw.get('id')
     if not contract_id:
         return []
     env = request._run_ns
-    # Get supplier info from contract
+    # Get supplier orgid from contract
     supplier_orgid = None
-    supplier_id = None
     async with get_sor_context(env, 'supplychain') as sor:
         rows = await sor.sqlExe(
-            "SELECT s.orgid, s.id as supplier_id FROM suppliers s "
+            "SELECT s.orgid FROM suppliers s "
             "JOIN supply_contracts sc ON sc.supplier_id = s.id "
             "WHERE sc.id = ${cid}$",
             {'cid': contract_id}
         )
         if rows:
             supplier_orgid = rows[0].orgid
-            supplier_id = rows[0].supplier_id
     if not supplier_orgid:
         return []
-    # Get product IDs mapped to this supplier via product_supplier_mapping
-    product_ids = set()
-    async with get_sor_context(env, 'supplychain') as sor:
-        mappings = await sor.sqlExe(
-            "SELECT product_id FROM product_supplier_mapping "
-            "WHERE status = '1' AND (supplier_org_id = ${oid}$ OR external_supplier_id = ${sid}$)",
-            {'oid': supplier_orgid, 'sid': supplier_id}
-        )
-        for m in mappings:
-            product_ids.add(m.product_id)
-    if not product_ids:
-        return []
-    # Get products from sage
+    # Get products from sage — join through product_resource_supplier
     products = []
     async with get_sor_context(env, 'sage') as sor:
         rows = await sor.sqlExe(
-            "SELECT p.id as productid, p.product_name, p.product_code, p.price as sale_price, "
-            "pc.id as category_id, pc.name as category_name "
+            "SELECT DISTINCT p.id as productid, p.product_name, p.product_code, "
+            "p.price as sale_price, pc.id as category_id, pc.name as category_name "
             "FROM product p "
+            "JOIN product_resource_supplier prs ON p.resource_ref_id = prs.product_resource_id "
             "LEFT JOIN product_category pc ON p.category_id = pc.id "
-            "WHERE p.status = '1' AND p.id IN (" + ",".join(repr(pid) for pid in product_ids) + ") "
+            "WHERE p.status = '1' AND prs.supplier_org_id = ${oid}$ AND prs.status = '1' "
             "ORDER BY pc.sort_order, pc.name, p.sort_order, p.product_name",
-            {}
+            {'oid': supplier_orgid}
         )
         for r in rows:
             products.append({