Merge branch 'dev' into dev_WMS20260401
# Conflicts: # mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/entity/MaterialBaseInfo.java # mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java # mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java # mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java # mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java # mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java # mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java # mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java # mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java # mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/facade/IReceiptMaterialDetailService.java # mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java # mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/todo/ShelfMaterialDetailDO.java # mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java # mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java # mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java # mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java # mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/po/StockReceiptOrderPO.java # mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java # mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java # mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockReceiptOrder/StockReceiptOrderApi.java # mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApp/stockReceiptOrder/StockReceiptOrderAppApi.java # mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml # mhd_wms/src/main/resources/mapper/stockReceiptOrder/StockReceiptOrderMapper.xml
This commit is contained in:
王奎兴
+3
@@ -186,6 +186,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<!-- <if test="realCreateName != null and realCreateName != ''">-->
|
||||
<!-- and REAL_CREATE_NAME like concat('%', #{realCreateName}, '%')-->
|
||||
<!-- </if>-->
|
||||
<if test="orderSource != null and orderSource != ''">
|
||||
and ORDER_SOURCE = #{orderSource}
|
||||
</if>
|
||||
|
||||
<if test="createCompanyId != null and createCompanyId != ''">
|
||||
and CREATE_COMPANY_ID = #{createCompanyId}
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.mhd.oms.domain.businessOrderAccount.repository.mapper.BusinessOrderAccountMapper">
|
||||
|
||||
<resultMap type="com.mhd.oms.domain.businessOrderAccount.BusinessOrderAccount" id="BusinessOrderAccountResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="sysOrgCode" column="sys_org_code" />
|
||||
<result property="isDelete" column="is_delete" />
|
||||
<result property="orgName" column="org_name" />
|
||||
<result property="organizationId" column="organization_id" />
|
||||
<result property="topOrganizationId" column="top_organization_id" />
|
||||
<result property="organizationName" column="organization_name" />
|
||||
<result property="orderId" column="order_id" />
|
||||
<result property="accountId" column="account_id" />
|
||||
<result property="accountType" column="account_type" />
|
||||
<result property="subjectCode" column="subject_code" />
|
||||
<result property="subjectName" column="subject_name" />
|
||||
<result property="rate" column="rate" />
|
||||
<result property="amount" column="amount" />
|
||||
<result property="taxFreeFee" column="tax_free_fee" />
|
||||
<result property="taxAmount" column="tax_amount" />
|
||||
<result property="receiveAccount" column="receive_account" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectBusinessOrderAccountVo">
|
||||
select id, create_by, create_time, update_by, update_time, sys_org_code, is_delete, org_name,
|
||||
organization_id, top_organization_id, organization_name, order_id, account_id, account_type,
|
||||
subject_code, subject_name, rate, amount, tax_free_fee, tax_amount, receive_account
|
||||
from business_order_account
|
||||
</sql>
|
||||
|
||||
<select id="selectBusinessOrderAccountList" parameterType="com.mhd.oms.domain.businessOrderAccount.BusinessOrderAccount" resultMap="BusinessOrderAccountResult">
|
||||
<include refid="selectBusinessOrderAccountVo"/>
|
||||
<where>
|
||||
is_delete = 0
|
||||
<if test="createBy != null and createBy != ''">
|
||||
and create_by like concat('%', #{createBy}, '%')
|
||||
</if>
|
||||
<if test="orderId != null and orderId != ''">
|
||||
and order_id = #{orderId}
|
||||
</if>
|
||||
<if test="accountId != null">
|
||||
and account_id = #{accountId}
|
||||
</if>
|
||||
<if test="accountType != null">
|
||||
and account_type = #{accountType}
|
||||
</if>
|
||||
<if test="subjectCode != null and subjectCode != ''">
|
||||
and subject_code like concat('%', #{subjectCode}, '%')
|
||||
</if>
|
||||
<if test="subjectName != null and subjectName != ''">
|
||||
and subject_name like concat('%', #{subjectName}, '%')
|
||||
</if>
|
||||
<if test="organizationId != null">
|
||||
and organization_id = #{organizationId}
|
||||
</if>
|
||||
</where>
|
||||
order by create_time desc
|
||||
</select>
|
||||
|
||||
<select id="selectBusinessOrderAccountByOrderId" parameterType="String" resultMap="BusinessOrderAccountResult">
|
||||
<include refid="selectBusinessOrderAccountVo"/>
|
||||
where order_id = #{orderId} and is_delete = 0
|
||||
order by create_time desc
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user