yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整请领单-请领车物料查询接口 - 增加返回内容：购物车id、已请领物品数量

This commit is contained in:
1378012178@qq.com 2025-11-26 16:07:38 +08:00
parent e5db8cd238
commit 8575b943f2
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java
View File

@ -195,8 +195,9 @@ public class BlWarehouseMaterialInfo implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private java.lang.String medicationName; private java.lang.String medicationName;
@TableField(exist = false) @TableField(exist = false)
private java.lang.String zhiDingId; private java.lang.String zhiDingId;//置顶Id
@TableField(exist = false) @TableField(exist = false)
private Date zhiDingTime; private Date zhiDingTime;//置顶时间
@TableField(exist = false)
private String gwcId;//购物车ID
} }

6
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml
View File

@ -146,10 +146,12 @@
c.item_text as tagName, c.item_text as tagName,
if(d.wl_id is null, '0', '1') as isAdd, if(d.wl_id is null, '0', '1') as isAdd,
e.id AS zhiDingId, e.id AS zhiDingId,
e.create_time AS zhiDingTime e.create_time AS zhiDingTime,
d.id AS gwcId,
d.ql_num AS qlNum
from nu_warehouse_material_info a from nu_warehouse_material_info a
left join nu_config_material_info b on a.wl_id = b.id left join nu_config_material_info b on a.wl_id = b.id
left join (select wl_id from nu_invoicing_qld_gwc where nu_id = #{dto.nuId} and elder_id = #{dto.elderId} GROUP BY wl_id) d on a.wl_id = d.wl_id left join (select id,wl_id,ql_num from nu_invoicing_qld_gwc where nu_id = #{dto.nuId} and elder_id = #{dto.elderId} GROUP BY id,wl_id,ql_num) d on a.wl_id = d.wl_id
left join sys_dict_item c on b.tag_type = c.item_value and c.dict_id = '1978662656563613698' left join sys_dict_item c on b.tag_type = c.item_value and c.dict_id = '1978662656563613698'
left join nu_invoicing_qld_wlzd e on b.id = e.wl_id and e.nu_id = #{dto.nuId} and e.elder_id = #{dto.elderId} left join nu_invoicing_qld_wlzd e on b.id = e.wl_id and e.nu_id = #{dto.nuId} and e.elder_id = #{dto.elderId}
) a ) a