diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 61405a3b1..98aa95346 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -2,9 +2,11 @@ package com.glxp.api.controller.inout; import com.glxp.api.annotation.CusRedissonAnnotation; import com.glxp.api.constant.*; +import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.entity.basic.*; import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.exception.JsonException; +import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inv.impl.InvProductDetailService; import org.springframework.beans.BeanUtils; @@ -93,6 +95,8 @@ public class IoCodeTempController extends BaseController { IoOrderDetailCodeService ioOrderDetailCodeService; @Resource IoCheckInvService checkInvService; + @Resource + UdiRelevanceDao udiRelevanceDao; /** * PDA-----单据上传 @@ -430,6 +434,17 @@ public class IoCodeTempController extends BaseController { return ResultVOUtils.error(500, "单据只允许录入不需要扫码产品" + ",请检查后重试!"); } } + + //是否需要收费校验 是否已绑定收费项目 + if (IntUtil.value(bussinessTypeEntity.getRequireCost()) == 1 ){ + FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); + filterUdiRelRequest.setUuid(udiInfoEntity.getUuid()); + UdiRelevanceResponse udiRelevanceResponse = udiRelevanceDao.selectOneUdiJoinSup(filterUdiRelRequest); + if(IntUtil.value(udiRelevanceResponse.getRequireCost()) == 1) { + String thirdId = udiRelevanceResponse.getThirdId(); + if (StrUtil.isEmpty(thirdId)) return ResultVOUtils.error(500, "当前产品未绑定收费项目" + ",请检查后重试!"); + } + } } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index 7a241cfee..ae6b35797 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -324,6 +324,13 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { throw new JsonException("单据只允许录入不需要扫码产品" + ",请检查后重试!"); } } + + //是否需要收费校验 是否已绑定收费项目 + if (IntUtil.value(bussinessTypeEntity.getRequireCost()) == 1 && IntUtil.value(udiRelevanceResponse.getRequireCost()) == 1) { + String thirdId = udiRelevanceResponse.getThirdId(); + if (StrUtil.isEmpty(thirdId)) throw new JsonException("当前产品未绑定收费项目" + ",请检查后重试!"); + } + }