From 825d22ed7b3c86016ef238f5c7e73fdca05abd3d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 27 Dec 2020 12:24:57 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java
index dc235c4..d8acf42 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java
@@ -438,6 +438,10 @@
             return DateUtil.stringToDate("9999-12-31", DateUtil.DATE_FORMAT_DD);
         }
 
+        if (type == 2 && shoppingGoods.getUseDateNum() == null && StringUtils.isNotBlank(shoppingGoods.getBuyDateUnit())) {
+            return DateUtil.stringToDate("9999-12-31", DateUtil.DATE_FORMAT_DD);
+        }
+
         if (type == 2 && buyDate == null) {
             throw new GlobleException("购买日期不能为空");
         }

--
Gitblit v1.9.1