From d3e4dfca6c64b73475fce20c81c0d3ffb0f687d0 Mon Sep 17 00:00:00 2001
From: liufeilong <liufeilong@ele-cloud.com>
Date: Mon, 24 Apr 2023 16:57:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=88=90=E5=93=81=E6=B2=B9=E6=B7=B7=E5=BC=80?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../validate/service/impl/ValidateOrderInfoServiceImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 b6b4c520..071912a1 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
@@ -300,13 +300,13 @@ public class ValidateOrderInfoServiceImpl implements ValidateOrderInfoService {
                     }
 
                 }
-
-                if (!isCpySpbm.equals(taxClassCodeEntity.getCpy())) {
+                //放到生成预制发票时校验
+                /*if (!isCpySpbm.equals(taxClassCodeEntity.getCpy())) {
                     //成品油商品编码和非成品油商品编码混开
                     log.error("{}发票只能为成品油或者非成品油", LOGGER_MSG);
                     checkResultMap = CheckParamUtil.generateErrorMap(orderInfo.getFpqqlsh(), errorMsgString, OrderInfoContentEnum.ORDER_SPBM_CPY_ERROR);
                     return checkResultMap;
-                }
+                }*/
             }