辅助排产订单类型bug修复2

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

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());