diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 295e21a6d..641db804c 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -229,7 +229,6 @@ public class InvWarehouseController extends BaseController { } FilterInvSubWarehouseRequest filterInvWarehouseRequest = new FilterInvSubWarehouseRequest(); - filterInvWarehouseRequest.setParentId(invWarehouseEntity.getParentId()); InvWarehouseEntity codeEntity = invWarehouseService.selectMaxCode(filterInvWarehouseRequest); DeptEntity pEntity = deptService.selectByCode(invWarehouseEntity.getParentId()); if (codeEntity == null) { diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java index d7df4709b..d4dbaf346 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -99,7 +99,9 @@ public class IoOrderDetailResultController extends BaseController { } orderDetailResultRequest.setActions(actions); AuthAdmin authAdmin= customerService.getUserBean(); - orderDetailResultRequest.setInvCode(authAdmin.getLocInvCode()); + if (StrUtil.isBlank(orderDetailResultRequest.getInvCode())){ + orderDetailResultRequest.setInvCode(authAdmin.getLocInvCode()); + } List list = orderDetailResultService.filterOrderList(orderDetailResultRequest); for (IoOrderDetailResultResponse orderDetailResultResponse : list) { diff --git a/src/main/java/com/glxp/api/util/udi/FilterUdiUtils.java b/src/main/java/com/glxp/api/util/udi/FilterUdiUtils.java index 720d1fdd1..05f50f7b8 100644 --- a/src/main/java/com/glxp/api/util/udi/FilterUdiUtils.java +++ b/src/main/java/com/glxp/api/util/udi/FilterUdiUtils.java @@ -109,7 +109,7 @@ public class FilterUdiUtils { String expireDate = ""; String serialNo = null; String udi = ""; - String[] spilts = data.split("#"); + String[] spilts = data.split("#",data.length()); if (spilts != null && spilts.length >= 5) { udi = spilts[1]; produceDate = spilts[2];