wenshijun/smart_management_dev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wenshijun
2026-02-04 16:32:48 +08:00
parent d141676788 c362acece6
commit 6ffafc81f4
4 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/mybatis/wisdom/RkBillMapper.xml
View File

@@ -104,7 +104,7 @@
<select id="selectRkBillList" parameterType="RkBill" resultMap="RkBillResult">
<include refid="selectRkBillVo"/>
<where>
AND rb.is_delivery ='1'
<if test="wlType != null and wlType != ''">
AND rb.wl_type = #{wlType}
</if>

28
src/main/resources/mybatis/wisdom/RkRecordMapper.xml
View File

@@ -81,7 +81,11 @@
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="isDelete" column="is_delete"/>
<result property="operationTypeName" column="operationTypeName"/>
<result property="wlTypeName" column="wlTypeName"/>
<result property="operatorName" column="operatorName"/>
<result property="parentWarehouseName" column="parentWarehouseName"/>
<result property="warehouseName" column="warehouseName"/>
</resultMap>
<!-- ===================== 查询字段（统一视图） ===================== -->
@@ -730,10 +734,24 @@
<select id="selectByBillNo"
resultMap="RkRecordResult">
SELECT *
FROM rk_record
WHERE bill_no = #{billNo}
AND is_delete = '0'
SELECT
rr.*,
sit.type_name AS operationTypeName,
mt.type_name AS wlTypeName,
su.user_name AS operatorName,
IFNULL(wh.parent_warehouse_name, '') AS parentWarehouseName,
IFNULL(wh.warehouse_name, '') AS warehouseName
FROM rk_record rr
LEFT JOIN stock_out_type sit
ON rr.operation_type = sit.type_code
LEFT JOIN material_type mt
ON rr.wl_type = mt.type_code
LEFT JOIN sys_user su
ON rr.operator = su.user_id
LEFT JOIN warehouse_info wh
ON rr.cangku = wh.warehouse_code
WHERE rr.bill_no = #{billNo}
AND rr.is_delete = '0'
</select>