diff --git a/order-management-common/src/main/java/com/dxhy/order/model/CommonOrderInfo.java b/order-management-common/src/main/java/com/dxhy/order/model/CommonOrderInfo.java index 75f77f5d..7582696b 100644 --- a/order-management-common/src/main/java/com/dxhy/order/model/CommonOrderInfo.java +++ b/order-management-common/src/main/java/com/dxhy/order/model/CommonOrderInfo.java @@ -141,4 +141,10 @@ public class CommonOrderInfo implements Serializable { * 组织ID */ private String entId; + + + /** + * 判断是否为接口数据 + */ + private String interfaceType; } diff --git a/order-management-common/src/main/java/com/dxhy/order/model/OrderInfo.java b/order-management-common/src/main/java/com/dxhy/order/model/OrderInfo.java index 9a59a324..a58efed2 100644 --- a/order-management-common/src/main/java/com/dxhy/order/model/OrderInfo.java +++ b/order-management-common/src/main/java/com/dxhy/order/model/OrderInfo.java @@ -415,4 +415,10 @@ public class OrderInfo implements Serializable { */ private String yhbh; + + /** + * 判断是否为接口数据 + */ + private String interfaceType; + } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateOrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateOrderInfoServiceImpl.java index 071912a1..5d91dd39 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateOrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateOrderInfoServiceImpl.java @@ -135,6 +135,7 @@ public class ValidateOrderInfoServiceImpl implements ValidateOrderInfoService { checkResultMap.put(OrderManagementConstant.ERRORCODE, OrderInfoContentEnum.SUCCESS.getKey()); OrderInfo orderInfo = commonOrderInfo.getOrderInfo(); + orderInfo.setInterfaceType(commonOrderInfo.getInterfaceType()); List orderItemInfo = commonOrderInfo.getOrderItemInfo(); if (Double.parseDouble(orderInfo.getKphjje()) <= 0) { checkResultMap = CheckParamUtil.generateErrorMap(orderInfo.getFpqqlsh(), "", OrderInfoContentEnum.INVOICE_HJJE_ZERO_ERROR); @@ -270,7 +271,7 @@ public class ValidateOrderInfoServiceImpl implements ValidateOrderInfoService { } //成品油的单位只能为吨或者升 TaxClassCodeEntity taxClassCodeEntity = taxClassCodeService.queryTaxClassCodeFromCache(orderItemInfo.getSpbm()); - + String interfaceType = orderInfo.getInterfaceType(); if (ObjectUtil.isNotNull(taxClassCodeEntity)) { if (i == 0) { @@ -292,8 +293,8 @@ public class ValidateOrderInfoServiceImpl implements ValidateOrderInfoService { } } - - if (orderItemInfos.size() > ConfigureConstant.INT_8) { + //项目定制化,后期如有运维问题找松哥 + if ((orderItemInfos.size() > ConfigureConstant.INT_8) && StringUtils.isBlank(interfaceType)) { checkResultMap = CheckParamUtil.generateErrorMap(orderInfo.getFpqqlsh(), "", OrderInfoContentEnum.ORDER__CPY_XMMX_SL_OVER_8_ERROR); log.error("{}成品油明细不能超过8行", LOGGER_MSG); return checkResultMap; @@ -301,12 +302,12 @@ public class ValidateOrderInfoServiceImpl implements ValidateOrderInfoService { } //放到生成预制发票时校验 - /*if (!isCpySpbm.equals(taxClassCodeEntity.getCpy())) { + if (!isCpySpbm.equals(taxClassCodeEntity.getCpy()) && StringUtils.isBlank(interfaceType)) { //成品油商品编码和非成品油商品编码混开 log.error("{}发票只能为成品油或者非成品油", LOGGER_MSG); checkResultMap = CheckParamUtil.generateErrorMap(orderInfo.getFpqqlsh(), errorMsgString, OrderInfoContentEnum.ORDER_SPBM_CPY_ERROR); return checkResultMap; - }*/ + } } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java index e87e8424..e5b20cc7 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java @@ -374,7 +374,7 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt //价税分离后订单信息补全处理 completeOrderInfo(orderInfo, orderBatchRequest.getFpzldm(), kpjh, sldid, orderItemInfos.get(0).getKce(), terminalCode); - + taxSeparationService.setInterfaceType(ConfigureConstant.STRING_0000); //校验价税分离后的数据 Map checkInvParam = validateOrderInfoService.checkInvoiceData(taxSeparationService); if (!ConfigureConstant.STRING_0000.equals(checkInvParam.get(OrderManagementConstant.ERRORCODE))) {