diff --git a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java index 6f02c806..68b3c623 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java @@ -88,7 +88,7 @@ public class UdiContrastController { if (keys != null && keys.size() > 0) { for (String key : keys) { //关联添加 - if (udiCombineRequest.getRelId() == null || udiCombineRequest.isIdSpliUdi()) { + if (udiCombineRequest.getRelId() == null) { if (StrUtil.isNotEmpty(udiCombineRequest.getThirdId())) { if (udiContrastService.isExit(key, udiCombineRequest.getThirdId(), null)) { return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!"); @@ -443,6 +443,9 @@ public class UdiContrastController { if (StrUtil.isEmpty(udiProductEntity.getCpms())) { udiProductEntity.setCpms(originProductEntity.getCpms()); } + if (udiProductEntity.getProductsType() == null || udiProductEntity.getProductsType() == 0){ + udiProductEntity.setProductsType(originProductEntity.getProductsType()); + } if (StrUtil.isEmpty(udiProductEntity.getBasicPrductRemak1())) { udiProductEntity.setBasicPrductRemak1(originProductEntity.getBasicPrductRemak1()); } @@ -525,4 +528,5 @@ public class UdiContrastController { } + } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 04574e4e..d58da18e 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -454,11 +454,12 @@ public class IoOrderDetailBizController extends BaseController { .sorted(Comparator.comparing(IoOrderDetailBizResponse::getNameCode)) .collect(Collectors.toList()); } + Integer total = orderDetailBizService.getCount(orderDetailBizRequest); List orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderDetailBizRequest.getOrderIdFk()); ioCheckInoutService.bizOrderCheck2(list, orderDetailCodeEntities); PageInfo pageInfo = new PageInfo<>(list); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setTotal(Long.valueOf(total)); pageSimpleResponse.setList(list); return ResultVOUtils.success(pageSimpleResponse); } diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java index e5b33347..7b8e6209 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java @@ -47,4 +47,6 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus group by io_order_detail_result.id + +