From cfcc7fe2a310d5e944de967ae2f9b5039afa36ca Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Tue, 14 Jun 2022 16:25:01 +0800
Subject: [PATCH] =?UTF-8?q?pda=20=E5=85=B6=E5=AE=83=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=9C=89=E6=95=88=E6=9C=9F=202022-06-14=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../finishedProduct/service/impl/CRollinfoServiceImpl.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java
index 3cba5ce..bf9d876 100644
--- a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java
@@ -495,7 +495,7 @@ public class CRollinfoServiceImpl extends ServiceImpl<CRollinfoDao, CRollinfoEnt
             // 失效日期等于 入库日期加 part的有效期
             // 获取有效天数
             Part part = partService.getPart(cRollInfoStorageVo.getPartNo());
-            if (part != null && part.getToexpiredays() != null) {
+            if (part != null && part.getToexpiredays() != null && "Y".equals(part.getExpiredatecontrolflag())) {
                 Date expDate = DateUtils.addDateDays(date, part.getToexpiredays().intValue());
                 cRollinfoEntity.setExpireddate(expDate);
             }