From b95dddfb05406063228126bb17a0bb8cd366cfb8 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Sat, 14 Mar 2026 13:30:50 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20=20=20TMS=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=20-=20=E6=8F=90=E6=88=90=E7=AE=A1=E7=90=86=20-=20=E6=8F=90?=
 =?UTF-8?q?=E6=88=90=E7=BB=9F=E8=AE=A1=20-=20=E8=AE=BE=E7=BD=AE=E7=8E=B0?=
 =?UTF-8?q?=E9=87=91=E6=8F=90=E6=88=90=E3=80=81=E6=9C=88=E7=BB=93=E6=8F=90?=
 =?UTF-8?q?=E6=88=90=E7=9A=84=E6=8F=90=E6=88=90=E9=87=91=E9=A2=9D=E5=B0=8F?=
 =?UTF-8?q?=E6=95=B0=E7=82=B9=E4=BF=9D=E7=95=992=E4=BD=8D=E6=95=B0?=
 =?UTF-8?q?=E4=B8=94=E5=9B=9B=E8=88=8D=E4=BA=94=E5=85=A5=20tms-=E6=8F=90?=
 =?UTF-8?q?=E6=88=90=E7=AE=A1=E7=90=86-=E8=BF=90=E5=8D=95=E5=88=A9?=
 =?UTF-8?q?=E6=B6=A6=E7=BB=9F=E8=AE=A1-=E5=89=94=E9=99=A4=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BB=B6=E7=B1=BB=E5=9E=8B=E4=B8=BA=E8=BF=9B=E5=8F=A3?=
 =?UTF-8?q?/=E8=BF=94=E8=B4=A7=E8=99=9A=E6=8B=9F=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E8=BF=90=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/web/emis/EmisCommissionProfitController.java  | 11 +++++++++++
 .../main/resources/mapper/EmisTmsCostProfitMapper.xml |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java
index 4e5a13823..9ee6df7b5 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java
@@ -198,6 +198,17 @@ public class EmisCommissionProfitController extends BaseController
     {
         startPage();
         List<EmisCommissionProfit> list = emisCommissionProfitService.selectEmisCommissionProfitList(emisCommissionProfit);
+        // 金额类字段统一四舍五入保留两位小数
+        if (list != null && !list.isEmpty()) {
+            for (EmisCommissionProfit item : list) {
+                if (item.getMoney() != null) {
+                    item.setMoney(item.getMoney().setScale(2, BigDecimal.ROUND_HALF_UP));
+                }
+                if (item.getMonthMoney() != null) {
+                    item.setMonthMoney(item.getMonthMoney().setScale(2, BigDecimal.ROUND_HALF_UP));
+                }
+            }
+        }
         return getDataTable(list);
     }
 
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostProfitMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostProfitMapper.xml
index ab85bc8ba..b9d3cbd1f 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsCostProfitMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsCostProfitMapper.xml
@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             a.bill_code=b.bill_code and a.del_flag='0' and  b.del_flag='0'
             and not EXISTS (
-            select 1 from emis_waybill_problem_info ewpi where a.bill_code=ewpi.bill_code and  ewpi.del_flag='0' and  ewpi.`problem_type` in(151)
+            select 1 from emis_waybill_problem_info ewpi where a.bill_code=ewpi.bill_code and  ewpi.del_flag='0' and  ewpi.`problem_type` in(151,170,173)
             )
             <if test="id != null "> and b.id = #{id}</if>
             <if test="billCode != null  and billCode != ''">and ( FIND_IN_SET(b.`bill_code`,#{billCode}) )</if>