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

Merge branch 'dev' into dev-ty1.2

Browse Source 
# Conflicts:
#	mhd_wms/src/main/resources/bootstrap.yml
This commit is contained in:
王奎兴
2026-08-22 13:59:22 +08:00
parent 5fc491f612 072a4f7d1f
commit 1b3b1a6394
41 changed files with 471 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/resources/bootstrap.yml
+4 -4
View File
@@ -14,18 +14,18 @@ spring:
nacos:
discovery:
# server-addr: 127.0.0.1:8848
server-addr: 10.33.0.129:6010
# server-addr: 10.33.0.129:6010
# 线上测试环境配置 容器名+端口号
# server-addr: 10.102.192.30:6848
server-addr: 10.102.192.30:6848
username: nacos
password: manhuoda@2023
#线上正式环境
# server-addr: 10.102.192.105:6848
config:
# server-addr: 127.0.0.1:8848
server-addr: 10.33.0.129:6010
# server-addr: 10.33.0.129:6010
# 线上测试环境配置 容器名+端口号
# server-addr: 10.102.192.30:6848
server-addr: 10.102.192.30:6848
username: nacos
password: manhuoda@2023
#线上正式环境
mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml
+4 -3
View File
@@ -68,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="insureAmount" column="insure_amount" />
<result property="chargeStandard" column="charge_standard" />
<result property="chargeStandardClass" column="charge_standard_class" />
<result property="isNormalMaterial" column="is_normal_material" />
</resultMap>
@@ -77,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
material_shape_name, a.material_size, a.material_length, a.material_width, a.material_height, a.remark, a.nullify, a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag, a.common,
sku_code, a.unit_price, a.currency, a.origin_country, a.hs_code, a.declaration_unit, a.statutory_unit, a.statutory_second_unit, a.copy_code,
a.push_status,a.push_time,a.push_by,a.goods_type,a.gross_weight,a.push_by_name,a.unit,a.INSURE_AMOUNT,a.CHARGE_STANDARD,
specification_model as specification_model,nvl(b.stock_qty,0) as stock_quantity,c.charge_standard as charge_standard_class
specification_model as specification_model,nvl(b.stock_qty,0) as stock_quantity,c.charge_standard as charge_standard_class,a.is_normal_material
from material_base_info a left join (
select material_base_info_id, sum(INVENTORY_QUANTITY) as stock_qty from MATERIAL_INVENTORY group by material_base_info_id
@@ -121,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.top_organization_id = #{topOrganizationId}
</if>
<if test="shipperId != null ">
and a.shipper_id = #{shipperId}
and (a.shipper_id = #{shipperId} or a.shipper_id is null or a.shipper_id = 0)
</if>
<if test="shipperCode != null and shipperCode != ''">
and a.shipper_code like concat('%', #{shipperCode}, '%')
@@ -267,7 +268,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM ... LEFT JOIN material_base_info b ON ...
因此这里所有列名都加上 b. 前缀以避免和主表列名歧义 -->
<if test="shipperId != null ">
and b.shipper_id = #{shipperId}
and (b.shipper_id = #{shipperId} or b.shipper_id is null or b.shipper_id = 0)
</if>
<if test="shipperCode != null and shipperCode != ''">
and b.shipper_code like concat('%', #{shipperCode}, '%')
mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml
+4 -4
View File
@@ -624,7 +624,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getMaxStockInOrderByPrefixAndOrgAndWarehouse" resultType="java.lang.String">
SELECT in_order_number FROM NGWL_TEST_OMS.reserve_stock_in_order
WHERE in_order_number LIKE concat(#{prefix}, '%')
AND del_flag = 1
<if test="organizationId != null">
AND organization_id = #{organizationId}
</if>
@@ -636,7 +636,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT in_order_number FROM NGWL_TEST_OMS.reservation_stock_in_order
WHERE in_order_number LIKE concat(#{prefix}, '%')
AND del_flag = 1
<if test="organizationId != null">
AND organization_id = #{organizationId}
</if>
@@ -648,7 +648,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT in_order_number FROM NGWL_TEST_OMS.execution_stock_in_order
WHERE in_order_number LIKE concat(#{prefix}, '%')
AND del_flag = 1
<if test="organizationId != null">
AND organization_id = #{organizationId}
</if>
@@ -660,7 +660,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT in_order_number FROM stock_in_order
WHERE in_order_number LIKE concat(#{prefix}, '%')
AND del_flag = 1
<if test="organizationId != null">
AND organization_id = #{organizationId}
</if>
mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml
+4 -4
View File
@@ -531,7 +531,7 @@
<select id="getMaxStockOutOrderByPrefixAndOrgAndWarehouse" resultType="java.lang.String">
SELECT out_order_number FROM NGWL_TEST_OMS.reserve_stock_out_order
WHERE out_order_number LIKE concat(#{prefix}, '%')
AND del_flag = 1
<if test="organizationId != null">
AND organization_id = #{organizationId}
</if>
@@ -543,7 +543,7 @@
SELECT out_order_number FROM NGWL_TEST_OMS.reservation_stock_out_order
WHERE out_order_number LIKE concat(#{prefix}, '%')
AND del_flag = 1
<if test="organizationId != null">
AND organization_id = #{organizationId}
</if>
@@ -555,7 +555,7 @@
SELECT out_order_number FROM NGWL_TEST_OMS.execution_stock_out_order
WHERE out_order_number LIKE concat(#{prefix}, '%')
AND del_flag = 1
<if test="organizationId != null">
AND organization_id = #{organizationId}
</if>
@@ -567,7 +567,7 @@
SELECT out_order_number FROM stock_out_order
WHERE out_order_number LIKE concat(#{prefix}, '%')
AND del_flag = 1
<if test="organizationId != null">
AND organization_id = #{organizationId}
</if>