From de1d12faf3c615a17806bd9fc18c69a53b572296 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 11 Sep 2024 14:32:37 +0800
Subject: [PATCH] md

---
 build.sh                                                 | 2 +-
 emis-biz/lib/mvn_install.sh                              | 2 +-
 emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml | 3 ++-
 local_build.sh                                           | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build.sh b/build.sh
index a582b1794..dd9ab36e5 100644
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,6 @@
 git pull
 mvn install:install-file -DgroupId=com.aspose -DartifactId=aspose-words -Dversion=19.1.0 -Dpackaging=jar -Dfile=./emis-biz/lib/aspose-words-19.1-jdk16.jar
-mvn install:install-file -DgroupId=com.mascloud -DartifactId=massdk -Dversion=1.0.3 -Dpackaging=jar -Dfile=./emis-biz/lib/masmgc.sdk.sms-1.0.3-SNAPSHOT.jar
+#mvn install:install-file -DgroupId=com.mascloud -DartifactId=massdk -Dversion=1.0.3 -Dpackaging=jar -Dfile=./emis-biz/lib/masmgc.sdk.sms-1.0.3-SNAPSHOT.jar
 
 mvn clean package deploy -Dmaven.test.skip=true
 
diff --git a/emis-biz/lib/mvn_install.sh b/emis-biz/lib/mvn_install.sh
index ee11a2af8..6d2a92924 100644
--- a/emis-biz/lib/mvn_install.sh
+++ b/emis-biz/lib/mvn_install.sh
@@ -1,2 +1,2 @@
 mvn install:install-file -DgroupId=com.aspose -DartifactId=aspose-words -Dversion=19.1.0 -Dpackaging=jar -Dfile=./aspose-words-19.1-jdk16.jar
-mvn install:install-file -DgroupId=com.mascloud -DartifactId=massdk -Dversion=1.0.3 -Dpackaging=jar -Dfile=./masmgc.sdk.sms-1.0.3-SNAPSHOT.jar
+#mvn install:install-file -DgroupId=com.mascloud -DartifactId=massdk -Dversion=1.0.3 -Dpackaging=jar -Dfile=./masmgc.sdk.sms-1.0.3-SNAPSHOT.jar
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 0f7cd3367..bb9e8da09 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -740,7 +740,8 @@
     <select id="selectOrderList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
         <include refid="selectEmisWaybillVo"/>
         <where>
-            a.del_flag='0'
+            a.del_flag='0' and a.order_type='0'
+
             <if test="id != null "> and a.id = #{id}</if>
             <if test="orderSn != null  and orderSn != ''"> and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') ) </if>
             <if test="billCode != null  and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )  </if>
diff --git a/local_build.sh b/local_build.sh
index 0bc05aaea..9439f61a3 100644
--- a/local_build.sh
+++ b/local_build.sh
@@ -1,6 +1,6 @@
 git pull
 mvn install:install-file -DgroupId=com.aspose -DartifactId=aspose-words -Dversion=19.1.0 -Dpackaging=jar -Dfile=./emis-biz/lib/aspose-words-19.1-jdk16.jar
-mvn install:install-file -DgroupId=com.mascloud -DartifactId=massdk -Dversion=1.0.3 -Dpackaging=jar -Dfile=./emis-biz/lib/masmgc.sdk.sms-1.0.3-SNAPSHOT.jar
+#mvn install:install-file -DgroupId=com.mascloud -DartifactId=massdk -Dversion=1.0.3 -Dpackaging=jar -Dfile=./emis-biz/lib/masmgc.sdk.sms-1.0.3-SNAPSHOT.jar
 
 mvn clean package install -N -Dmaven.test.skip=true