aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-05-31 06:05:37 +08:00
parent b8aa738906
commit 57322742a9
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
View File

@ -296,6 +296,20 @@ public class EmisWaybillController extends BaseController
emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName());
}
if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
String[] billCodeSortList = emisWaybill.getBillCode().split(",");
if(billCodeSortList.length>1){
emisWaybill.getParams().put("billCodeSortList",billCodeSortList);
}
}
if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){
String[] orderSnSortList = emisWaybill.getOrderSn().split(",");
if(orderSnSortList.length>1){
emisWaybill.getParams().put("orderSnSortList",orderSnSortList);
}
}
List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
return getDataTable(list);
}

15
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -553,6 +553,21 @@
</if>
</where>
<if test="params.orderSnSortList != null and orderSnSortList.size >0 ">
ORDER BY FIELD
<foreach collection="orderSnSortList" item="name" open="(order_sn," separator="," close=")">
#{name}
</foreach>
,
</if>
<if test="params.billCodeSortList != null and billCodeSortList.size >0 ">
ORDER BY FIELD
<foreach collection="billCodeSortList" item="name" open="(bill_code," separator="," close=")">
#{name}
</foreach>
,
</if>
order by create_time desc
</select>