bug修复

dev
郑明梁 2 years ago
parent aa17be0b83
commit d79a83de2d

@ -229,7 +229,6 @@ public class InvWarehouseController extends BaseController {
} }
FilterInvSubWarehouseRequest filterInvWarehouseRequest = new FilterInvSubWarehouseRequest(); FilterInvSubWarehouseRequest filterInvWarehouseRequest = new FilterInvSubWarehouseRequest();
filterInvWarehouseRequest.setParentId(invWarehouseEntity.getParentId());
InvWarehouseEntity codeEntity = invWarehouseService.selectMaxCode(filterInvWarehouseRequest); InvWarehouseEntity codeEntity = invWarehouseService.selectMaxCode(filterInvWarehouseRequest);
DeptEntity pEntity = deptService.selectByCode(invWarehouseEntity.getParentId()); DeptEntity pEntity = deptService.selectByCode(invWarehouseEntity.getParentId());
if (codeEntity == null) { if (codeEntity == null) {

@ -99,7 +99,9 @@ public class IoOrderDetailResultController extends BaseController {
} }
orderDetailResultRequest.setActions(actions); orderDetailResultRequest.setActions(actions);
AuthAdmin authAdmin= customerService.getUserBean(); AuthAdmin authAdmin= customerService.getUserBean();
orderDetailResultRequest.setInvCode(authAdmin.getLocInvCode()); if (StrUtil.isBlank(orderDetailResultRequest.getInvCode())){
orderDetailResultRequest.setInvCode(authAdmin.getLocInvCode());
}
List<IoOrderDetailResultResponse> list = orderDetailResultService.filterOrderList(orderDetailResultRequest); List<IoOrderDetailResultResponse> list = orderDetailResultService.filterOrderList(orderDetailResultRequest);
for (IoOrderDetailResultResponse orderDetailResultResponse : list) { for (IoOrderDetailResultResponse orderDetailResultResponse : list) {

@ -109,7 +109,7 @@ public class FilterUdiUtils {
String expireDate = ""; String expireDate = "";
String serialNo = null; String serialNo = null;
String udi = ""; String udi = "";
String[] spilts = data.split("#"); String[] spilts = data.split("#",data.length());
if (spilts != null && spilts.length >= 5) { if (spilts != null && spilts.length >= 5) {
udi = spilts[1]; udi = spilts[1];
produceDate = spilts[2]; produceDate = spilts[2];

Loading…
Cancel
Save