weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_WMS20260401' into dev

Browse Source 
# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
#	mhd_oms/src/main/resources/bootstrap.yml
This commit is contained in:
王奎兴
2026-06-18 16:05:17 +08:00
parent eea6898404 229540a720
commit 4fbe36f949
12 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml
+3 -3
View File
@@ -767,10 +767,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and CREATE_COMPANY_ID = #{createCompanyId}
</if>
<if test="createStartTime != null">
and CREATE_TIME &gt;= #{createStartTime}
and o.CREATE_TIME &gt;= #{createStartTime}
</if>
<if test="createEndTime != null">
and CREATE_TIME &lt;= #{createEndTime} + 1 - 1/86400
and o.CREATE_TIME &lt;= #{createEndTime} + 1 - 1/86400
</if>
<!-- <if test="updateTime != null ">-->
@@ -1122,7 +1122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and SALESMAN_ID = #{salesmanId}
</if>
<if test="isDeclare != null ">
and IS_DECLARE = #{isDeclare}
and o.IS_DECLARE = #{isDeclare}
</if>
<if test="route != null and route != ''">
and ROUTE = #{route}