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_oms/src/main/resources/mapper/executionInMaterialDetail/executionInMaterialDetailMapper.xml
+7 -1
View File
@@ -97,6 +97,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="erpCurrGw" column="erp_curr_gw" />
<result property="erpPriceGw" column="erp_price_gw" />
<result property="amountGw" column="amount_gw" />
<result property="insureAmount" column="insure_amount" />
<result property="goodsType" column="goods_type" />
</resultMap>
@@ -366,6 +368,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="orderShipperId" column="order_shipper_id" />
<result property="orderShipperCode" column="order_shipper_code" />
<result property="orderShipperName" column="order_shipper_name" />
<result property="warehouseDate" column="warehouse_date" />
</resultMap>
<select id="queryInOrderDetailList" parameterType="com.mhd.oms.domain.executionInMaterialDetail.repository.todo.QueryOrderOverStockDO"
@@ -400,13 +403,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.single_volume, a.single_gross_weight, a.lot_no,
a.drink_date, a.fire_insure_fee, a.unit_price,
a.line_num_gw, a.spec_gw, a.unit_gw, a.qty_gw, a.erp_curr_gw, a.erp_price_gw, a.amount_gw,
c.insure_amount, c.goods_type,
b.shipper_id as order_shipper_id,
b.shipper_code as order_shipper_code,
b.shipper_name as order_shipper_name,
b.status as in_order_status,
b.audit_status as in_order_audit_status
b.audit_status as in_order_audit_status,
b.warehouse_date
from execution_in_material_detail a
left join execution_stock_in_order b on a.in_order_number = b.in_order_number
left join material_base_info c on a.material_base_info_id = c.material_base_info_id
<where>
<if test="organizationId != null ">
and a.organization_id = #{organizationId}
mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml
+4 -4
View File
@@ -835,7 +835,7 @@
<select id="getMaxStockInOrderByPrefixAndOrgAndWarehouse" resultType="java.lang.String">
SELECT in_order_number FROM reserve_stock_in_order
WHERE in_order_number LIKE concat(#{prefix}, '%')
AND del_flag = 1
<if test="organizationId != null">
AND organization_id = #{organizationId}
</if>
@@ -847,7 +847,7 @@
SELECT in_order_number FROM reservation_stock_in_order
WHERE in_order_number LIKE concat(#{prefix}, '%')
AND del_flag = 1
<if test="organizationId != null">
AND organization_id = #{organizationId}
</if>
@@ -859,7 +859,7 @@
SELECT in_order_number FROM execution_stock_in_order
WHERE in_order_number LIKE concat(#{prefix}, '%')
AND del_flag = 1
<if test="organizationId != null">
AND organization_id = #{organizationId}
</if>
@@ -871,7 +871,7 @@
SELECT in_order_number FROM NGWL_TEST_WMS.stock_in_order
WHERE in_order_number LIKE concat(#{prefix}, '%')
AND del_flag = 1
<if test="organizationId != null">
AND organization_id = #{organizationId}
</if>
mhd_oms/src/main/resources/mapper/reserveStockOutOrder/ReserveStockOutOrderMapper.xml
+10 -5
View File
@@ -95,6 +95,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="reservationOrderSource" column="RESERVATION_ORDER_SOURCE" />
<result property="outboundTime" column="OUTBOUND_TIME" />
<result property="businessOrderNo" column="BUSINESS_ORDER_NO" />
<result property="reserveBusinessType" column="RESERVE_BUSINESS_TYPE" />
<result property="reserveBusinessTypeName" column="RESERVE_BUSINESS_TYPE_NAME" />
</resultMap>
@@ -112,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.COMPLETE_TIME,a.ORDER_DATE,a.TRANSPORT_MODE_CODE,a.TRANSPORT_MODE_NAME,a.SUPERVISION_MODE_CODE,a.SUPERVISION_MODE_NAME,
a.CUSTOMS_INSPECTION_FLAG,a.NEED_DECLARE_FLAG,a.NEED_TRANSPORT_FLAG,a.picture_app,a.reservation_audit_time,a.reservation_audit_name
,a.reservation_audit_id,a.issue_name,a.issue_id,a.issue_time,a.issue_status,a.tms_order_number,
a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.RESERVATION_ORDER_SOURCE,a.OUTBOUND_TIME
a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.RESERVATION_ORDER_SOURCE,a.OUTBOUND_TIME,a.RESERVE_BUSINESS_TYPE,a.RESERVE_BUSINESS_TYPE_NAME
</sql>
@@ -132,6 +134,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="outOrderId != null ">
and a.out_order_id = #{outOrderId}
</if>
<if test="reserveBusinessType != null ">
and a.reserve_business_type = #{reserveBusinessType}
</if>
<if test="organizationId != null ">
and a.organization_id = #{organizationId}
</if>
@@ -553,7 +558,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getMaxStockOutOrderByPrefixAndOrgAndWarehouse" resultType="java.lang.String">
SELECT out_order_number FROM reserve_stock_out_order
WHERE out_order_number LIKE concat(#{prefix}, '%')
AND del_flag = 1
<if test="organizationId != null">
AND organization_id = #{organizationId}
</if>
@@ -565,7 +570,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT out_order_number FROM reservation_stock_out_order
WHERE out_order_number LIKE concat(#{prefix}, '%')
AND del_flag = 1
<if test="organizationId != null">
AND organization_id = #{organizationId}
</if>
@@ -577,7 +582,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT out_order_number FROM execution_stock_out_order
WHERE out_order_number LIKE concat(#{prefix}, '%')
AND del_flag = 1
<if test="organizationId != null">
AND organization_id = #{organizationId}
</if>
@@ -589,7 +594,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT out_order_number FROM NGWL_TEST_WMS.stock_out_order
WHERE out_order_number LIKE concat(#{prefix}, '%')
AND del_flag = 1
<if test="organizationId != null">
AND organization_id = #{organizationId}
</if>