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

Merge branch 'dev' into dev_WMS20260401

Browse Source 
# Conflicts:
#	mhd-user-center/src/main/resources/bootstrap.yml
#	mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java
#	mhd_oms/src/main/resources/bootstrap.yml
#	mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml
This commit is contained in:
王奎兴
2026-06-16 11:11:48 +08:00
parent b05baac0e5 9922fee6cc
commit dd4fc13adc
46 changed files with 660 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/resources/bootstrap.yml
+9 -16
View File
@@ -18,27 +18,20 @@ spring:
discovery:
# server-addr: 127.0.0.1:8848
# 线上测试环境配置 容器名+端口号
server-addr: 10.33.0.129:6010
# server-addr: 10.102.192.30:6848
# username: nacos
# password: manhuoda@2023
# server-addr: 10.33.0.129:6010
server-addr: 10.102.192.30:6848
username: nacos
password: manhuoda@2023
config:
# server-addr: 127.0.0.1:8848
# 线上测试环境配置 容器名+端口号
server-addr: 10.33.0.129:6010
# server-addr: 10.102.192.30:6848
# username: nacos
# password: manhuoda@2023
# server-addr: 10.33.0.129:6010
server-addr: 10.102.192.30:6848
username: nacos
password: manhuoda@2023
#线上正式环境
# server-addr: 10.102.192.105:6848
# 锁定server端的配置文件（读取它的配置项）
namespace: # 命名空间id
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
file-extension: yml #默认properties
# GW推送配置
gw:
push:
url: http://10.33.0.100/nagu-erp-api/transfer/pushData
verify-key1: FuDjK3iuftzwf8kWJ44DDZJ9icZmL9Ee4Valv8Qz6VfsdW60fNEzNSEtrKlUr6OI
verify-key2: ESLuxAmB6VXCgbqP1eFzxTPVRagkQ62BUkfhElrgQ6XmE/g2reHVflY/SiCSU7JD
file-extension: yml #默认properties
mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml
+15 -1
View File
@@ -44,7 +44,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and eo.CREATE_TIME >= #{createStartTime}
</if>
<if test="invoiceStatus != null">
and eo.INVOICE_Status = #{invoiceStatus}
and eo.INVOICE_STATUS = #{invoiceStatus}
</if>
<if test="invoiceNumber != null and invoiceNumber != ''">
and eo.INVOICE_NUMBER like concat('%', #{invoiceNumber}, '%')
</if>
<if test="createEndTime != null">
and eo.CREATE_TIME &lt;= #{createEndTime} + 1 - 1/86400
@@ -105,6 +108,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</sql>
<update id="updateTmsOrderImage">
UPDATE NGWL_TEST_WLHY.TMS_TRANSPORT_NOTE
SET UNLOAD_IMAGE = #{pictureUrl},
UNLOAD_TIME = NOW(),
RECEIPT_TIME = NOW()
WHERE TRANSPORTATION_NUMBER IN (
SELECT GOODS_NUMBER
FROM NGWL_TEST_WLHY.TMS_ORDER
WHERE EXECUTE_ORDER_NUMBER = #{executeOrderNumber}
)
</update>
<select id="queryList" parameterType="com.mhd.oms.domain.executeOrder.repository.todo.ExecuteOrderDO" resultMap="ExecuteOrderResult">
<include refid="selectExecuteOrderPo"/>
mhd_oms/src/main/resources/mapper/reservationDeliveryDetailsLink/ReservationDeliveryDetailsLinkMapper.xml
+1 -1
View File
@@ -61,6 +61,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<update id="updateW">
update NGWL_TEST_WMS.DELIVERY_DETAILS_LINK set RETURN_ORDER_NUMBER = #{returnOrderNumber} where ORDER_NUMBER = #{ordernumber}
update NGWL_TEST_WMS.DELIVERY_DETAILS_LINK set RETURN_ORDER_NUMBER = #{returnOrderNumber} where ORDER_NUMBER = #{orderNumber}
</update>
</mapper>