From 909de9ba77382777438ac9abad670add4239a1cf Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Sun, 4 Jan 2026 15:54:27 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=20-=20=E9=94=80=E5=94=AE?= =?UTF-8?q?=E5=9B=9E=E6=AC=BE=E7=BB=9F=E8=AE=A1=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=9A=E5=B8=90=E5=8D=95=E6=95=B0=E3=80=81=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E3=80=81=E8=B4=A6=E6=9C=9F=E5=86=85=E6=94=B6?= =?UTF-8?q?=E6=AC=BE=E9=87=91=E9=A2=9D=E6=95=B0=E5=80=BC=E4=B8=8E=E5=8E=9F?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BF=BB1=E5=80=8D=20=20=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E6=97=A0=E6=B3=95=E5=9C=B0=E5=9D=80=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=AE=9A=E4=BD=8D=E8=A7=A3=E5=86=B3=20commit?= =?UTF-8?q?ter:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xdadan/erp/emis/utils/WaybillHelper.java | 2 +- .../src/main/resources/mapper/EmisSettleBillMapper.xml | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java index 3f252e233..4a6a98dfc 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java @@ -254,7 +254,7 @@ public class WaybillHelper { } public static JSONObject parseChinaAddress(String content) throws EmisBizError { - String url = "http://api2.xdadan.com/api/qcdata/query/express/parseChinaAddress"; + String url = "http://api.ai.xdadan.com/api/qcdata/query/express/parseChinaAddress"; Map postData = new HashMap(); postData.put("content", content); postData.put("appID", "tanex"); diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml index 38bc7b1e5..95556e2e5 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml @@ -1102,7 +1102,13 @@ GROUP BY a.settle_bill_no ) tbc ON tba.settle_bill_no = tbc.settle_bill_no - ) tbMA left join emis_commission_profit ecp on tbMA.salesmen=ecp.emp_name and tbMA.billMonth = ecp.bill_month + ) tbMA left join ( + SELECT emp_name, bill_month, + max(money) as money, + max(month_money) as month_money + FROM emis_commission_profit + GROUP BY emp_name, bill_month + ) ecp on tbMA.salesmen=ecp.emp_name and tbMA.billMonth = ecp.bill_month group by tbMA.salesmen,tbMA.billMonth