feature 代码提交

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -2748,16 +2748,18 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 .set(ApsBlankOrderDo::getPromisedateend, newEndDate));
         logger.debug("坯料计划新的承诺交货日期：{}-{},旧的为{}-{}", newStartDate, newEndDate,
                 apsBlankOrderDo.getPromisedatestart(), apsBlankOrderDo.getPromisedateend());
-
-
         List<String> updateIds = new ArrayList<>();
         List<String> removeIds = new ArrayList<>();
-        if (startDate.compareTo(newStartDate) > 0) {
+        // modify at [ 2024-10-14 11:51:18 ] by xh: 按照项目经理要求只比较日期的日期部分
+
+        //如果排程交货期-起>承诺交货期-起
+        if (DateCompare(startDate,newStartDate)>0) {
             updateIds.add(blankDeliveryDate.get(0).getId());
         } else {
             removeIds.add(blankDeliveryDate.get(0).getId());
         }
-        if (endDate.compareTo(newEndDate) > 0) {
+        // 如果排程交货期-止>承诺交货期-止
+        if (DateCompare(endDate,newEndDate)>0) {
             updateIds.add(blankDeliveryDate.get(1).getId());
         } else {
             removeIds.add(blankDeliveryDate.get(1).getId());
@@ -2804,6 +2806,22 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         return calendar.getTime();
     }
 
+    public int DateCompare(Date date1, Date date2){
+        Calendar calendar1 = Calendar.getInstance();
+        calendar1.setTime(date1);
+        calendar1.set(Calendar.HOUR_OF_DAY, 0);
+        calendar1.set(Calendar.MINUTE, 0);
+        calendar1.set(Calendar.SECOND, 0);
+        calendar1.set(Calendar.MILLISECOND, 0);
+
+        Calendar calendar2 = Calendar.getInstance();
+        calendar2.setTime(date2);
+        calendar2.set(Calendar.HOUR_OF_DAY, 0);
+        calendar2.set(Calendar.MINUTE, 0);
+        calendar2.set(Calendar.SECOND, 0);
+        calendar2.set(Calendar.MILLISECOND, 0);
+        return calendar1.compareTo(calendar2);
+    }
 
     @Override
     public R productPlanReport(CriteriaQuery req) {