楚江erp：删除三天还未生成发货单的数据

@@ -23,7 +23,7 @@ import io.swagger.annotations.ApiOperation;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.common.utils.CollectionUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
-import com.lframework.starter.web.core.annotations.security.HasPermission;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
@@ -139,4 +139,15 @@ public class ShipmentsPlanDetailController extends DefaultBaseController {
         shipmentsPlanDetailService.batchDelete(ids);
         shipmentsPlanDetailService.batchDelete(ids);
         return InvokeResultBuilder.success();
         return InvokeResultBuilder.success();
     }
     }
+
+    /**
+     * 检查是否有过时的数据
+     * 删除三天还未生成发货单的数据
+     *
+     */
+    @Scheduled(cron = "0 30 1 * * ?")
+    @GetMapping("/checkOutdated")
+    public void checkOutdated() {
+        shipmentsPlanDetailService.checkOutdated();
+    }
 }
 }

@@ -321,7 +321,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                 list.add(detail);
                 list.add(detail);
             }
             }
             if (MapUtils.isEmpty(detailMap)) {
             if (MapUtils.isEmpty(detailMap)) {
-                throw new DefaultClientException("发货明细数据不存在！");
+                throw new DefaultClientException("发货明细数据不存在或存在需要手动发货的数据！");
             }
             }
             // todo 如果客户很多，则此处需要优化
             // todo 如果客户很多，则此处需要优化
             for (Map.Entry<String, List<ShipmentsPlanDetail>> entry : detailMap.entrySet()) {
             for (Map.Entry<String, List<ShipmentsPlanDetail>> entry : detailMap.entrySet()) {

@@ -37,6 +37,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.LocalTime;
 import java.util.*;
 import java.util.*;
 import java.util.function.Function;
 import java.util.function.Function;
@@ -479,6 +480,30 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         }
         }
     }
     }
 
 
+    @Override
+    public void checkOutdated() {
+        LocalTime now = LocalTime.now();
+        // 获取三天前的时间
+        LocalDateTime threeDaysAgoTime = LocalDate.now().minusDays(3).atStartOfDay();
+        // 根据时间获取还未发货的有效数据
+        LambdaQueryWrapper<ShipmentsPlanDetail> queryWrapper = Wrappers.lambdaQuery(ShipmentsPlanDetail.class);
+        queryWrapper.eq(ShipmentsPlanDetail::getDelFlag, Boolean.FALSE)
+                .eq(ShipmentsPlanDetail::getPreShipments, Boolean.FALSE)
+                .lt(ShipmentsPlanDetail::getCreateTime, threeDaysAgoTime)
+                .and(wq -> wq
+                        .isNull(ShipmentsPlanDetail::getShipmentOrderId)  // shipmentOrderId is null
+                        .or()  // 或者
+                        .eq(ShipmentsPlanDetail::getShipmentOrderId, "")  // shipmentOrderId = ''
+                );
+        List<ShipmentsPlanDetail> detailList = getBaseMapper().selectList(queryWrapper);
+        if (CollectionUtils.isEmpty(detailList)) {
+            return;
+        }
+        // 删除数据
+        List<String> ids = detailList.stream().map(ShipmentsPlanDetail::getId).collect(Collectors.toList());
+        getBaseMapper().deleteBatchIds(ids);
+    }
+
 
 
     /**
     /**
      * 封装发货计划明细数据
      * 封装发货计划明细数据

@@ -139,4 +139,11 @@ public interface ShipmentsPlanDetailService extends BaseMpService<ShipmentsPlanD
      * @param status    状态
      * @param status    状态
      */
      */
     void checkDataIntegrity(String planId, String status);
     void checkDataIntegrity(String planId, String status);
+
+    /**
+     * 检查是否有过时的数据
+     * 删除三天还未生成发货单的数据
+     *
+     */
+    void checkOutdated();
 }
 }