From 96a7409444a62ab867354c630055758580da00ae Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Wed, 11 Feb 2026 11:13:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E7=94=A8=E6=88=B7=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E9=80=89=E6=8B=A9=E8=BF=87=E6=9C=9F=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=EF=BC=8C=E5=88=99=E4=B8=BA=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4?= =?UTF-8?q?+=E6=96=99=E5=8F=B7=E7=9A=84=E9=BB=98=E8=AE=A4=E4=BF=9D?= =?UTF-8?q?=E8=B4=A8=E6=9C=9F=EF=BC=88=E5=A6=82=E6=9E=9C=E6=9C=89=E7=9A=84?= =?UTF-8?q?=E8=AF=9D=EF=BC=89=E8=AE=BE=E7=BD=AE=E8=BF=87=E6=9C=9F=E6=97=A5?= =?UTF-8?q?=E6=9C=9F;=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E4=BF=9D=E8=B4=A8=E6=9C=9F=EF=BC=8C=E5=88=99=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=80=E4=B8=AA=E9=BB=98=E8=AE=A4=E7=9A=84=E8=BF=87?= =?UTF-8?q?=E6=9C=9F=E6=97=A5=E6=9C=9F=EF=BC=88=E4=BE=8B=E5=A6=82=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E6=97=B6=E9=97=B4+365=E5=A4=A9=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProductionInboundServiceImpl.java | 20 +++++++++++++------ .../service/impl/SalesReturnServiceImpl.java | 20 +++++++++++++------ 2 files changed, 28 insertions(+), 12 deletions(-) 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 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 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();