From 119400c7c31772a4cd85aea1cade201ad7b0fdac Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 29 Oct 2025 18:52:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?demand:=20=20=20=20TMS-=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86--=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E9=94=80=E8=B4=A6=E7=94=B3=E8=AF=B7=E3=80=81=E8=B4=A2=E5=8A=A1?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=94=80=E8=B4=A6=E5=AE=A1=E6=A0=B8=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E8=B4=A6=E7=94=B3=E8=AF=B7-?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C-=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=20+=20=E5=B7=B2=E6=94=B6=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=20<=3D=20=E8=BF=90=E8=B4=B9=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/emis/service/impl/EmisWriteoffApplyServiceImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWriteoffApplyServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWriteoffApplyServiceImpl.java
index 0597f559c..b21056543 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWriteoffApplyServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWriteoffApplyServiceImpl.java
@@ -148,7 +148,7 @@ public class EmisWriteoffApplyServiceImpl extends EmisBaseService implements IEm
             if (detail.getEmisSettleSubBill() == null) {
                 throw new EmisBizError("运单号 " + detail.getBillCode() + " 的子账单信息为空");
             }
-            BigDecimal recMoney = detail.getEmisSettleBill().getRecMoney();
+            BigDecimal recMoney = detail.getEmisSettleSubBill().getBillFee();
             if (recMoney == null) {
                 throw new EmisBizError("运单号 " + detail.getBillCode() + " 的账单应收金额为空");
             }

From 6549f6a94d2e5cc5d2a6a7c4fef3511c701cd431 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Thu, 30 Oct 2025 11:32:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?demand:=20=20=20=20TMS=E7=B3=BB=E7=BB=9F=20?=
 =?UTF-8?q?-=20=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=20-=20=E8=BF=9B?=
 =?UTF-8?q?=E4=BB=93=E5=AF=B9=E8=B4=A7=20-=20=E5=AF=BC=E5=87=BA=E8=B4=A7?=
 =?UTF-8?q?=E7=89=A9=E6=98=8E=E7=BB=86=20-=20=E7=BC=BA=E5=B0=91=20?=
 =?UTF-8?q?=E4=BB=B6=E6=95=B0=E5=92=8C=E9=87=8D=E9=87=8F=20=E4=B8=A4?=
 =?UTF-8?q?=E4=B8=AA=E6=95=B0=E5=80=BC=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/EmisWarehouseInMapper.xml  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
index 80f710b37..c7f80aa2e 100644
--- a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisWarehouseInMapper">
-    
+
     <resultMap type="EmisWarehouseIn" id="BaseEmisWarehouseInResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="serialNo"    column="serial_no"    />
@@ -158,7 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectEmisWarehouseInList" parameterType="EmisWarehouseIn" resultMap="EmisWarehouseInResult">
         select id, serial_no, in_no, order_sn, bill_code, customer_code, customer_name, entry_date, confirm_status, confirm_date, used_status, status, stock_in_flag, bl_upload_pic, total_parcel_qty, total_volume, total_weight, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_warehouse_in a
-        <where>  
+        <where>
              del_flag='0'
             <if test="id != null "> and id = #{id}</if>
             <if test="serialNo != null  and serialNo != ''"> and serial_no like concat('%', #{serialNo}, '%')</if>
@@ -295,7 +295,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by create_time desc
     </select>
-  
+
     <select id="selectEmisWarehouseInById" parameterType="Long" resultMap="EmisWarehouseInResult">
         select id, serial_no, in_no, order_sn, bill_code, customer_code, customer_name, entry_date, confirm_status, confirm_date, used_status, status, stock_in_flag, bl_upload_pic, total_parcel_qty, total_volume, total_weight, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_warehouse_in a
@@ -324,8 +324,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         wib.in_no as batch_in_no,
         wib.in_batch_no as in_batch_no,
         wib.entry_date as batch_entry_date,
-        wib.total_parcel_qty as batch_total_parcel_qty,
-        wib.total_weight as batch_total_weight,
+        wib.parcel_qty as batch_total_parcel_qty,
+        wib.bill_weight as batch_total_weight,
         wib.total_volume as batch_total_volume,
         wib.prepare_in_express,
         wib.prepare_in_bill_code,
@@ -482,4 +482,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>