Merge branch 'master_after20' into master_cj_zq

@@ -177,13 +177,16 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
                 LocalDate deliveryDate = createDelayedShipmentDetailVo.getDeliveryDate();
                 applyShipmentDate = createDelayedShipmentDetailVo.getApplyShipmentDate();
                 if (deliveryDate != null && applyShipmentDate != null) {
+                    ShipmentsPlanDetail shipmentsPlanDetail = shipmentsPlanDetailService.findById(createDelayedShipmentDetailVo.getShipmentsPlanDetailId());
                     long daysBetween = Math.abs(ChronoUnit.DAYS.between(deliveryDate, applyShipmentDate));
-                    if (daysBetween > 1) {
-                        ids.add(createDelayedShipmentDetailVo.getShipmentsPlanDetailId());
-                        delayedExceedOneDay = true;
-                    } else {
-                        //延期等于1天的自动加入后日预发
+                    if (daysBetween == 1 && StringUtil.isBlank(shipmentsPlanDetail.getShipmentOrderId())) {
+                        // 延期1天且不是发货单：自动加入后日预发（发货计划）
                         shipmentsPlanDetailService.updateShipmentDate(createDelayedShipmentDetailVo.getShipmentsPlanDetailId(), applyShipmentDate);
+                    } else {
+                        ids.add(createDelayedShipmentDetailVo.getShipmentsPlanDetailId());
+                        if (daysBetween > 1) {
+                            delayedExceedOneDay = true;
+                        }
                     }
                 }
             }