diff --git a/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java b/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java index 925ed63f..86e32b00 100644 --- a/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java +++ b/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java @@ -191,12 +191,12 @@ public class SysParamConfigController { filterParamConfigRequest.setParamType(2); filterParamConfigRequest.setParamStatus(1); List systemParamConfigEntities = systemParamConfigService.queryPage(filterParamConfigRequest); - systemParamConfigEntities = systemParamConfigEntities.stream().sorted(Comparator.comparing(SystemParamConfigEntity::getId)) + systemParamConfigEntities = systemParamConfigEntities.stream().sorted(Comparator.comparing(SystemParamConfigEntity::getParamKey)) .collect(Collectors.toList()); ProductRemarkSetEntity productRemarkSetEntity = new ProductRemarkSetEntity(); - if (CollUtil.isNotEmpty(systemParamConfigEntities) && systemParamConfigEntities.size() == 13) { + if (CollUtil.isNotEmpty(systemParamConfigEntities) && systemParamConfigEntities.size() == 8) { for (int i = 0; i < systemParamConfigEntities.size(); i++) { SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntities.get(i); diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index f424050b..f3af635d 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -347,7 +347,7 @@ public class IoCheckInoutService { curCount = codeEntity.getMyReCount(); } if (curCount > bizEntity.getCount()) { - return "当前产品数量超出!"; + return "当前产品" + bizEntity.getCoName() + "数量超出!"; } if (bizEntity.getPrice() != null) codeEntity.setPrice(bizEntity.getPrice());