From 05fb2811c8495a768fbd5abe6c148d16b9d41311 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 22 Jul 2024 15:26:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=85=E5=8A=A9=E6=8E=92=E4=BA=A7=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=B1=BB=E5=9E=8Bbug=E4=BF=AE=E5=A4=8D2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/op/common/core/utils/StringUtils.java | 4 +++- .../java/com/op/plan/service/impl/ProOrderServiceImpl.java | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/op-common/op-common-core/src/main/java/com/op/common/core/utils/StringUtils.java b/op-common/op-common-core/src/main/java/com/op/common/core/utils/StringUtils.java index c58179ad3..f3e7defac 100644 --- a/op-common/op-common-core/src/main/java/com/op/common/core/utils/StringUtils.java +++ b/op-common/op-common-core/src/main/java/com/op/common/core/utils/StringUtils.java @@ -475,7 +475,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * * @param factoryCode 工厂代码 * @param lineCode 产线编码 - * @param productDate 生产日期 + * @param productDate 生产日期 生产日期减一天位有效期 * @param version 订单生产版本号最后一位 * @param productStatus 产出状态：正常是A * @param content 内容物 (根据产品，一般为0) @@ -488,6 +488,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { calendar.setTime(productDate); // Add three years to the current date calendar.add(Calendar.YEAR, 3); + // Subtract one day from the new date + calendar.add(Calendar.DAY_OF_MONTH, -1); // Get the new date Date futureDate = calendar.getTime(); // Format the new date diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java index 7101c05c9..b1f2380e6 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java @@ -1506,7 +1506,6 @@ public class ProOrderServiceImpl implements IProOrderService { }else{ workOrder.setProdType(pOrder.getOrderType()); } - workOrder.setProdType(proOrder.getOrderType()); workOrder.setFactoryCode(pOrder.getFactoryCode()); workOrder.setEndFlag(proOrder.getEndFlag()); workOrder.setSortNo(pOrder.getSortNo());