md
This commit is contained in:
parent
4366c9666a
commit
77ae499763
@ -294,11 +294,14 @@ public class EmisWaybillController extends EmisBaseController
|
|||||||
|
|
||||||
startPage();
|
startPage();
|
||||||
|
|
||||||
// 设置通用权限查询参数
|
setPrivParams(emisWaybill);
|
||||||
|
|
||||||
;
|
|
||||||
|
|
||||||
if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
|
if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
|
||||||
|
StringBuilder sb = new StringBuilder(emisWaybill.getBillCode());
|
||||||
|
sb.deleteCharAt(sb.lastIndexOf(","));
|
||||||
|
emisWaybill.setBillCode(sb.toString());
|
||||||
|
|
||||||
String[] billCodeSortList = emisWaybill.getBillCode().split(",");
|
String[] billCodeSortList = emisWaybill.getBillCode().split(",");
|
||||||
if(billCodeSortList.length>1){
|
if(billCodeSortList.length>1){
|
||||||
emisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
|
emisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
|
||||||
@ -306,15 +309,15 @@ public class EmisWaybillController extends EmisBaseController
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){
|
if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){
|
||||||
|
StringBuilder sb = new StringBuilder(emisWaybill.getOrderSn());
|
||||||
|
sb.deleteCharAt(sb.lastIndexOf(","));
|
||||||
|
emisWaybill.setOrderSn(sb.toString());
|
||||||
String[] orderSnSortList = emisWaybill.getOrderSn().split(",");
|
String[] orderSnSortList = emisWaybill.getOrderSn().split(",");
|
||||||
if(orderSnSortList.length>1){
|
if(orderSnSortList.length>1){
|
||||||
emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
|
emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
setPrivParams(emisWaybill);
|
|
||||||
log.error("====================");
|
|
||||||
log.error(JSON.toJSONString(emisWaybill.getParams()));
|
|
||||||
|
|
||||||
List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
|
List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
|
||||||
return getDataTable(list);
|
return getDataTable(list);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user