angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(SaOrderItemMapper-Sale): 发货清单未合单列表移除系统类型字段

This commit is contained in:
woody 2025-05-21 15:01:31 +08:00 committed by cabbage
parent 8c193a52da
commit f20d0017e3
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverUnhandledVO.java
View File

@ -251,13 +251,7 @@ public class DeliverUnhandledVO {
*/ */
@Excel(name = "备注") @Excel(name = "备注")
private String remark; private String remark;
/**
* 系统类型（0=会员系统，1=海圣优选）
*/
@Excel(name = "系统类型", readConverterExp = "0=会员系统,1=海圣优选")
private Integer systemType;
/** /**
* 创建时间 * 创建时间
*/ */

6
bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml
View File

@ -80,8 +80,7 @@
null null
end original_order_code, end original_order_code,
bs.name storehouse_name, bs.name storehouse_name,
bu.name unit_name, bu.name unit_name
so.SYSTEM_TYPE
from SA_ORDER so from SA_ORDER so
left join sa_order_items soi left join sa_order_items soi
on soi.pk_order = so.pk_id on soi.pk_order = so.pk_id
@ -100,9 +99,6 @@
left join bd_storehouse bs left join bd_storehouse bs
on bs.pk_id = so.pk_storehouse on bs.pk_id = so.pk_storehouse
<include refid="deliverUnhandledQuery"/> <include refid="deliverUnhandledQuery"/>
<if test="param.systemType != null">
and so.SYSTEM_TYPE = #{param.systemType}
</if>
<if test="param.fhck != null and param.fhck != ''"> <if test="param.fhck != null and param.fhck != ''">
and bs.name like #{param.fhck} || '%' and bs.name like #{param.fhck} || '%'
</if> </if>