diff --git a/src/main/java/com/gaotao/modules/production/service/impl/ProductionInboundServiceImpl.java b/src/main/java/com/gaotao/modules/production/service/impl/ProductionInboundServiceImpl.java
index 27f3ceb..6256e1f 100644
--- a/src/main/java/com/gaotao/modules/production/service/impl/ProductionInboundServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/production/service/impl/ProductionInboundServiceImpl.java
@@ -572,12 +572,20 @@ public class ProductionInboundServiceImpl implements ProductionInboundService {
         if (dto.getIfsExpiryDate() == null) {
             List<InventoryPartVo> parts = ifsApiIssueAndReturnService.getInventoryPart(dto.getPartNo(),dto.getSite());
             // 如果用户没有选择过期日期，则为当前时间+料号的默认保质期（如果有的话）设置过期日期
-            if (!parts.isEmpty() && parts.getFirst().getDurabilityDays() > 0) {
-                // 当前时间+365天作为过期日期
-                Calendar calendar = Calendar.getInstance();
-                calendar.setTime(new Date());
-                calendar.add(Calendar.DAY_OF_YEAR, parts.getFirst().getDurabilityDays());
-                dto.setIfsExpiryDate(calendar.getTime());
+            if (!parts.isEmpty()) {
+                if (parts.getFirst().getDurabilityDays() > 0) {
+                    // 当前时间+365天作为过期日期
+                    Calendar calendar = Calendar.getInstance();
+                    calendar.setTime(new Date());
+                    calendar.add(Calendar.DAY_OF_YEAR, parts.getFirst().getDurabilityDays());
+                    dto.setIfsExpiryDate(calendar.getTime());
+                } else {
+                    // 如果没有默认保质期，则设置一个默认的过期日期（例如当前时间+365天）
+                    Calendar calendar = Calendar.getInstance();
+                    calendar.setTime(new Date());
+                    calendar.add(Calendar.DAY_OF_YEAR, 365);
+                    dto.setIfsExpiryDate(calendar.getTime());
+                }
             }
         }
         // 用于收集创建的HU unitIds
diff --git a/src/main/java/com/gaotao/modules/salesreturn/service/impl/SalesReturnServiceImpl.java b/src/main/java/com/gaotao/modules/salesreturn/service/impl/SalesReturnServiceImpl.java
index bfa7235..72ff0a2 100644
--- a/src/main/java/com/gaotao/modules/salesreturn/service/impl/SalesReturnServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/salesreturn/service/impl/SalesReturnServiceImpl.java
@@ -166,12 +166,20 @@ public class SalesReturnServiceImpl implements SalesReturnService {
             if (dto.getExpiryDate() == null) {
                 List<InventoryPartVo> parts = ifsApiIssueAndReturnService.getInventoryPart(dto.getPartNo(),dto.getSite());
                 // 如果用户没有选择过期日期，则为当前时间+料号的默认保质期（如果有的话）设置过期日期
-                if (!parts.isEmpty() && parts.getFirst().getDurabilityDays() > 0) {
-                    // 当前时间+365天作为过期日期
-                    Calendar calendar = Calendar.getInstance();
-                    calendar.setTime(new Date());
-                    calendar.add(Calendar.DAY_OF_YEAR, parts.getFirst().getDurabilityDays());
-                    dto.setExpiryDate(calendar.getTime());
+                if (!parts.isEmpty()) {
+                    if (parts.getFirst().getDurabilityDays() > 0) {
+                        // 当前时间+365天作为过期日期
+                        Calendar calendar = Calendar.getInstance();
+                        calendar.setTime(new Date());
+                        calendar.add(Calendar.DAY_OF_YEAR, parts.getFirst().getDurabilityDays());
+                        dto.setExpiryDate(calendar.getTime());
+                    } else {
+                        // 如果没有默认保质期，则设置一个默认的过期日期（例如当前时间+365天）
+                        Calendar calendar = Calendar.getInstance();
+                        calendar.setTime(new Date());
+                        calendar.add(Calendar.DAY_OF_YEAR, 365);
+                        dto.setExpiryDate(calendar.getTime());
+                    }
                 }
             }
             SysUserEntity currentUser = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();