## 兼容调换货产品之后的发货清单;
This commit is contained in:
parent
cb12579d70
commit
c6b86a093d
|
|
@ -106,6 +106,10 @@ public class SaDeliverUnhandledController extends BaseController {
|
||||||
param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList());
|
param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList());
|
||||||
param.setVertexIdList(userAuthorityDTO.getVertexIdList());
|
param.setVertexIdList(userAuthorityDTO.getVertexIdList());
|
||||||
param.setTeamList(userAuthorityDTO.getUserTeamList());
|
param.setTeamList(userAuthorityDTO.getUserTeamList());
|
||||||
|
// 兼容调换货产品
|
||||||
|
if (CollectionUtil.isEmpty(param.getPkWaresList())) {
|
||||||
|
param.setPkWaresList(Collections.singletonList(0));
|
||||||
|
}
|
||||||
|
|
||||||
startPage();
|
startPage();
|
||||||
List<DeliverUnhandledVO> resultList = iSaOrderItemsService.queryDeliverUnhandledList(param, pkCountry);
|
List<DeliverUnhandledVO> resultList = iSaOrderItemsService.queryDeliverUnhandledList(param, pkCountry);
|
||||||
|
|
@ -149,6 +153,10 @@ public class SaDeliverUnhandledController extends BaseController {
|
||||||
param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList());
|
param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList());
|
||||||
param.setVertexIdList(userAuthorityDTO.getVertexIdList());
|
param.setVertexIdList(userAuthorityDTO.getVertexIdList());
|
||||||
param.setTeamList(userAuthorityDTO.getUserTeamList());
|
param.setTeamList(userAuthorityDTO.getUserTeamList());
|
||||||
|
// 兼容调换货产品
|
||||||
|
if (CollectionUtil.isEmpty(param.getPkWaresList())) {
|
||||||
|
param.setPkWaresList(Collections.singletonList(0));
|
||||||
|
}
|
||||||
|
|
||||||
List<DeliverUnhandledVO> resultList = iSaOrderItemsService.queryDeliverUnhandledList(param, pkCountry);
|
List<DeliverUnhandledVO> resultList = iSaOrderItemsService.queryDeliverUnhandledList(param, pkCountry);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue