From a5e8836d14c5035d7ec774ef792a76dcdab48919 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 30 Jun 2025 15:10:37 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=E6=89=B9=E6=AC=A1=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E6=BC=8F=E7=BB=84=E6=89=B9=E6=AC=A1=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E7=BA=BF=E8=B7=AF014=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xdadan/erp/emis/mapper/EmisTransPlanRuleMapper.java    | 7 +++----
 .../erp/emis/service/impl/EmisWaybillServiceImpl.java      | 4 ++++
 .../src/main/resources/mapper/EmisTransPlanRuleMapper.xml  | 5 +++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransPlanRuleMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransPlanRuleMapper.java
index 249f47942..72961765d 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransPlanRuleMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransPlanRuleMapper.java
@@ -150,14 +150,13 @@ public interface EmisTransPlanRuleMapper {
 
     /**
      * 分页查询供应商线路规划（多线程用）
-     * 
+     *
      * @param emisTransPlanRule 查询条件
      * @param offset            偏移量
-     * @param limit             每页数量
+     * @param pageSize          每页数量
      * @return 供应商线路规划集合
      */
-    List<EmisTransPlanRule> selectRulesForAllScanPaged(@Param("emisTransPlanRule") EmisTransPlanRule emisTransPlanRule,
-            @Param("offset") int offset, @Param("limit") int limit);
+    List<EmisTransPlanRule> selectRulesForAllScanPaged(@Param("emisTransPlanRule") EmisTransPlanRule emisTransPlanRule, @Param("offset") int offset, @Param("pageSize") int pageSize);
 
     /**
      * 查询总数（多线程分页用）
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 0121603d7..d76ec9d93 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -1131,6 +1131,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             emisWaybillSave.setCalcFeeType("3");
         }
 
+        if (StringUtils.isNotEmpty(emisWaybillSave.getMasterBillCode())) {
+            emisWaybillSave.setMasterBillCode(emisWaybillSave.getMasterBillCode());
+        }
+
     }
 
     private List<SysUser> getPayeeList(String userName) {
diff --git a/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
index c31565efc..fd3dab05b 100644
--- a/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
@@ -335,10 +335,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="emisTransPlanRule.supplierCode != null  and emisTransPlanRule.supplierCode != ''">and ( FIND_IN_SET(#{emisTransPlanRule.supplierCode},r.supplier_code) )</if>
             <if test="emisTransPlanRule.startDate != null">and r.start_date = #{emisTransPlanRule.startDate}</if>
             <if test="emisTransPlanRule.endDate != null">and r.end_date = #{emisTransPlanRule.endDate}</if>
-            and r.line_code!='014'
+            and r.line_code not in ('014','012','077')
         </where>
         order by id desc
-        limit #{limit} offset #{offset}
+        limit #{offset}, #{pageSize}
     </select>
 
     <select id="countForAllScan" resultType="int">
@@ -354,6 +354,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="supplierCode != null  and supplierCode != ''">and ( FIND_IN_SET(#{supplierCode},r.supplier_code) )</if>
             <if test="startDate != null">and r.start_date = #{startDate}</if>
             <if test="endDate != null">and r.end_date = #{endDate}</if>
+            and r.line_code not in ('014','012','077')
         </where>
     </select>