Commit a2427123 authored by chenzhao's avatar chenzhao

发货管理优化 详情接口

parent 923a4c29
...@@ -148,6 +148,9 @@ public class PreparationMoney extends BaseEntity { ...@@ -148,6 +148,9 @@ public class PreparationMoney extends BaseEntity {
@TableField(exist = false) @TableField(exist = false)
private List<PreparationMoneyLog> preparationMoneyLog; //发货单流水 private List<PreparationMoneyLog> preparationMoneyLog; //发货单流水
@TableField(exist = false)
private String instance_id; //发货单流水
//订单状态 //订单状态
@TableField("order_status") @TableField("order_status")
private String orderStatus; private String orderStatus;
......
...@@ -13,7 +13,7 @@ LEFT JOIN hygf_document_station on hygf_document_station.station_id=hygf_peasan ...@@ -13,7 +13,7 @@ LEFT JOIN hygf_document_station on hygf_document_station.station_id=hygf_peasan
</select> </select>
<select id="selectPageList" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney"> <select id="selectPageList" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney">
SELECT * FROM hygf_preparation_money SELECT hygf_preparation_money.*,(select instance_id from hygf_preparation_money_auditing where preparation_money_id = hygf_preparation_money.sequence_nbr limit 1 ) as instanceId FROM hygf_preparation_money
<where> <where>
<if test="dto.consigneeRegion != null and dto.consigneeRegion != ''"> <if test="dto.consigneeRegion != null and dto.consigneeRegion != ''">
and hygf_preparation_money.consignee_region like concat ('%',#{dto.consigneeRegion},'%') and hygf_preparation_money.consignee_region like concat ('%',#{dto.consigneeRegion},'%')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment