楚江ERP:发货计划中延期一天自动加入后日预发

@@ -135,6 +135,25 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         OpLogUtil.setExtra(vo);
         OpLogUtil.setExtra(vo);
     }
     }
 
 
+    @OpLog(type = OtherOpLogType.class, name = "修改发货计划明细，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateShipmentDate(String id, LocalDate shipmentDate) {
+
+        ShipmentsPlanDetail data = getBaseMapper().selectById(id);
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("发货计划明细不存在！");
+        }
+
+        LambdaUpdateWrapper<ShipmentsPlanDetail> updateWrapper = Wrappers.lambdaUpdate(ShipmentsPlanDetail.class)
+                .set(ShipmentsPlanDetail::getShipmentsDate, shipmentDate)
+                .eq(ShipmentsPlanDetail::getId, id);
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(id);
+    }
+
     /**
     /**
      * 获取可以发货的列表数据
      * 获取可以发货的列表数据
      *
      *

@@ -163,13 +163,16 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
             for (CreateDelayedShipmentDetailVo createDelayedShipmentDetailVo : delayedShipmentDetailList) {
             for (CreateDelayedShipmentDetailVo createDelayedShipmentDetailVo : delayedShipmentDetailList) {
                 createDelayedShipmentDetailVo.setDelayedShipmentId(data.getId());
                 createDelayedShipmentDetailVo.setDelayedShipmentId(data.getId());
                 id = delayedShipmentDetailService.create(createDelayedShipmentDetailVo);
                 id = delayedShipmentDetailService.create(createDelayedShipmentDetailVo);
-                ids.add(createDelayedShipmentDetailVo.getShipmentsPlanDetailId());
                 LocalDate deliveryDate = createDelayedShipmentDetailVo.getDeliveryDate();
                 LocalDate deliveryDate = createDelayedShipmentDetailVo.getDeliveryDate();
                 applyShipmentDate = createDelayedShipmentDetailVo.getApplyShipmentDate();
                 applyShipmentDate = createDelayedShipmentDetailVo.getApplyShipmentDate();
                 if (deliveryDate != null && applyShipmentDate != null) {
                 if (deliveryDate != null && applyShipmentDate != null) {
                     long daysBetween = Math.abs(ChronoUnit.DAYS.between(deliveryDate, applyShipmentDate));
                     long daysBetween = Math.abs(ChronoUnit.DAYS.between(deliveryDate, applyShipmentDate));
                     if (daysBetween > 1) {
                     if (daysBetween > 1) {
+                        ids.add(createDelayedShipmentDetailVo.getShipmentsPlanDetailId());
                         delayedExceedOneDay = true;
                         delayedExceedOneDay = true;
+                    } else {
+                        //延期等于1天的自动加入后日预发
+                        shipmentsPlanDetailService.updateShipmentDate(createDelayedShipmentDetailVo.getShipmentsPlanDetailId(), applyShipmentDate);
                     }
                     }
                 }
                 }
             }
             }

@@ -7,6 +7,8 @@ import com.lframework.xingyun.sc.vo.shipments.plan.UpdateShipmentsPlanDetailVo;
 import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
 import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
 import com.lframework.starter.web.core.service.BaseMpService;
 import com.lframework.starter.web.core.service.BaseMpService;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.PageResult;
+
+import java.time.LocalDate;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -46,6 +48,13 @@ public interface ShipmentsPlanDetailService extends BaseMpService<ShipmentsPlanD
     void create(CreateShipmentsPlanDetailVo vo);
     void create(CreateShipmentsPlanDetailVo vo);
 
 
     /**
     /**
+     * 更新发货日期
+     *
+     * @param shipmentDate 发货日期
+     */
+    void updateShipmentDate(String id, LocalDate shipmentDate);
+
+    /**
      * 修改
      * 修改
      *
      *
      * @param vo    数据实体
      * @param vo    数据实体