楚江erp: 1、发货明细报表数据生成接口开发；2、发货单增加是否准时发货逻辑；3、应收款台账数据生成时机调整；4、自动生成发货明细统计数据接口开发（用于处理历史数据）

@@ -4,11 +4,9 @@ import com.lframework.starter.mq.core.utils.ExportTaskUtil;
 import com.lframework.xingyun.sc.bo.statistics.shipmentDetail.QueryShipmentDetailStatisticsBo;
 import com.lframework.xingyun.sc.bo.statistics.shipmentDetail.QueryShipmentDetailStatisticsBo;
 import com.lframework.xingyun.sc.enums.ExportType;
 import com.lframework.xingyun.sc.enums.ExportType;
 import com.lframework.xingyun.sc.excel.statistics.ShipmentDetailReportExportTaskWorker;
 import com.lframework.xingyun.sc.excel.statistics.ShipmentDetailReportExportTaskWorker;
-import com.lframework.xingyun.sc.vo.ledger.receipt.ReceiptLedgerReportVo;
 import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.QueryShipmentDetailStatisticsVo;
 import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.QueryShipmentDetailStatisticsVo;
 import com.lframework.xingyun.sc.service.statistics.ShipmentDetailStatisticsService;
 import com.lframework.xingyun.sc.service.statistics.ShipmentDetailStatisticsService;
 import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.CreateShipmentDetailStatisticsVo;
 import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.CreateShipmentDetailStatisticsVo;
-import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.UpdateShipmentDetailStatisticsVo;
 import com.lframework.xingyun.sc.entity.ShipmentDetailStatistics;
 import com.lframework.xingyun.sc.entity.ShipmentDetailStatistics;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.PageResult;
@@ -45,7 +43,7 @@ public class ShipmentDetailStatisticsController extends DefaultBaseController {
      * 查询列表
      * 查询列表
      */
      */
     @ApiOperation("查询列表")
     @ApiOperation("查询列表")
-    @HasPermission({"statistics:shipmentDetail:query"})
+    @HasPermission({"statistical-report:delivery-detail:query"})
     @GetMapping("/query")
     @GetMapping("/query")
     public InvokeResult<PageResult<QueryShipmentDetailStatisticsBo>> query(@Valid QueryShipmentDetailStatisticsVo vo) {
     public InvokeResult<PageResult<QueryShipmentDetailStatisticsBo>> query(@Valid QueryShipmentDetailStatisticsVo vo) {
 
 
@@ -63,7 +61,7 @@ public class ShipmentDetailStatisticsController extends DefaultBaseController {
      * 新增
      * 新增
      */
      */
     @ApiOperation("新增")
     @ApiOperation("新增")
-    @HasPermission({"statistics:shipmentDetail:add"})
+    @HasPermission({"statistical-report:delivery-detail:add"})
     @PostMapping
     @PostMapping
     public InvokeResult<Void> create(@RequestBody CreateShipmentDetailStatisticsVo vo) {
     public InvokeResult<Void> create(@RequestBody CreateShipmentDetailStatisticsVo vo) {
 
 
@@ -73,23 +71,10 @@ public class ShipmentDetailStatisticsController extends DefaultBaseController {
     }
     }
 
 
     /**
     /**
-     * 修改
-     */
-    @ApiOperation("修改")
-    @HasPermission({"statistics:shipmentDetail:modify"})
-    @PutMapping
-    public InvokeResult<Void> update(@Valid UpdateShipmentDetailStatisticsVo vo) {
-
-        shipmentDetailStatisticsService.update(vo);
-
-        return InvokeResultBuilder.success();
-    }
-
-    /**
      * 查询发货明细数据
      * 查询发货明细数据
      */
      */
     @ApiOperation("查询发货明细数据")
     @ApiOperation("查询发货明细数据")
-    @HasPermission({"statistics:shipmentDetail:add"})
+    @HasPermission({"statistical-report:delivery-detail:add"})
     @GetMapping("/queryShipmentDetail")
     @GetMapping("/queryShipmentDetail")
     public InvokeResult<PageResult<ShipmentDetailStatistics>> queryShipmentDetail(QueryShipmentDetailStatisticsVo vo) {
     public InvokeResult<PageResult<ShipmentDetailStatistics>> queryShipmentDetail(QueryShipmentDetailStatisticsVo vo) {
         return InvokeResultBuilder.success(shipmentDetailStatisticsService.pageShipmentDetail(getPageIndex(vo), getPageSize(vo), vo));
         return InvokeResultBuilder.success(shipmentDetailStatisticsService.pageShipmentDetail(getPageIndex(vo), getPageSize(vo), vo));
@@ -99,11 +84,23 @@ public class ShipmentDetailStatisticsController extends DefaultBaseController {
      * 发货明细导出
      * 发货明细导出
      */
      */
     @ApiOperation("发货明细导出")
     @ApiOperation("发货明细导出")
-    @HasPermission({"statistics:shipmentDetail:export"})
+    @HasPermission({"statistical-report:delivery-detail:export"})
     @GetMapping("/export")
     @GetMapping("/export")
     public InvokeResult<Void> export(@Valid QueryShipmentDetailStatisticsVo vo) {
     public InvokeResult<Void> export(@Valid QueryShipmentDetailStatisticsVo vo) {
         vo.setExportType(ExportType.SHIPMENT_DETAIL_REPORT.getCode());
         vo.setExportType(ExportType.SHIPMENT_DETAIL_REPORT.getCode());
         ExportTaskUtil.exportTask("发货明细报表", ShipmentDetailReportExportTaskWorker.class, vo);
         ExportTaskUtil.exportTask("发货明细报表", ShipmentDetailReportExportTaskWorker.class, vo);
         return InvokeResultBuilder.success();
         return InvokeResultBuilder.success();
     }
     }
+
+
+    /**
+     * 自动生成发货明细统计数据
+     * 主要用于处理历史数据
+     */
+    @ApiOperation("自动生成发货明细统计数据")
+    @GetMapping("/autoGenerate")
+    public InvokeResult<Void> autoGenerate() {
+        shipmentDetailStatisticsService.autoGenerate();
+        return InvokeResultBuilder.success();
+    }
 }
 }

@@ -276,6 +276,11 @@ public class ShipmentDetailStatistics extends BaseEntity implements BaseDto, Exc
     private String customerType;
     private String customerType;
 
 
     /**
     /**
+     * 是否系统自动生成
+     */
+    private Boolean autoGenerate;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

@@ -125,6 +125,17 @@ public class ShipmentsOrderInfo extends BaseEntity implements BaseDto {
     private String status;
     private String status;
 
 
     /**
     /**
+     * 是否当日发货
+     */
+    private Boolean onTimeShipment;
+
+    /**
+     * 新发货日期
+     * 仅在 onTimeShipment = false 时，需要填写
+     */
+    private LocalDate newShipmentDate;
+
+    /**
      * 发货明细数据
      * 发货明细数据
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)

 package com.lframework.xingyun.sc.excel.statistics;
 package com.lframework.xingyun.sc.excel.statistics;
 
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.components.excel.ExcelModel;
 import com.lframework.starter.web.core.components.excel.ExcelModel;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
-import java.time.LocalDate;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -184,8 +181,7 @@ public class ShipmentDetailStatisticsModel implements ExcelModel {
      * 订货日期
      * 订货日期
      */
      */
     @ExcelProperty("订货日期")
     @ExcelProperty("订货日期")
-    @JsonFormat(pattern = StringPool.DATE_PATTERN)
-    private LocalDate orderDate;
+    private String orderDate;
 
 
     /**
     /**
      * 包装费
      * 包装费
@@ -245,8 +241,7 @@ public class ShipmentDetailStatisticsModel implements ExcelModel {
      * 发货日期
      * 发货日期
      */
      */
     @ExcelProperty("发货日期")
     @ExcelProperty("发货日期")
-    @JsonFormat(pattern = StringPool.DATE_PATTERN)
-    private LocalDate shipmentDate;
+    private String shipmentDate;
 
 
     /**
     /**
      * 发货行业
      * 发货行业

@@ -34,6 +34,7 @@ import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsOrderInfoService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsOrderInfoService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.shipments.car.DraftRequestCarTicketService;
 import com.lframework.xingyun.sc.service.shipments.car.DraftRequestCarTicketService;
+import com.lframework.xingyun.sc.service.statistics.ShipmentDetailStatisticsService;
 import com.lframework.xingyun.sc.utils.CommonUtil;
 import com.lframework.xingyun.sc.utils.CommonUtil;
 import com.lframework.xingyun.sc.vo.ledger.receipt.*;
 import com.lframework.xingyun.sc.vo.ledger.receipt.*;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -88,6 +89,8 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
     private DraftRequestCarTicketService draftRequestCarTicketService;
     private DraftRequestCarTicketService draftRequestCarTicketService;
     @Resource
     @Resource
     private FundOrderingUnitDetailService fundOrderingUnitDetailService;
     private FundOrderingUnitDetailService fundOrderingUnitDetailService;
+    @Resource
+    private ShipmentDetailStatisticsService shipmentDetailStatisticsService;
 
 
 
 
     // 定义状态优先级顺序（从高到低）
     // 定义状态优先级顺序（从高到低）
@@ -765,22 +768,18 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     public void autoGenerate() {
     public void autoGenerate() {
-        List<String> statusList = new ArrayList<>();
-        statusList.add("SHIPMENTS");
-        statusList.add("DELIVERED");
-        LambdaQueryWrapper<ShipmentsOrderInfo> queryWrapper = Wrappers.lambdaQuery(ShipmentsOrderInfo.class);
-        queryWrapper.eq(ShipmentsOrderInfo::getShipmentsDate, LocalDate.now())
-                .in(ShipmentsOrderInfo::getStatus, statusList);
-        List<ShipmentsOrderInfo> shipmentsOrderInfos = shipmentsOrderInfoService.getBaseMapper().selectList(queryWrapper);
+        List<ShipmentsOrderInfo> shipmentsOrderInfos = shipmentsOrderInfoService.queryByShipmentDate(LocalDate.now());
         if (CollectionUtils.isEmpty(shipmentsOrderInfos)) {
         if (CollectionUtils.isEmpty(shipmentsOrderInfos)) {
             log.info("========================== 没有需要生成台账数据的发货单！");
             log.info("========================== 没有需要生成台账数据的发货单！");
             return;
             return;
         }
         }
         List<String> shipmentOrderIds = shipmentsOrderInfos.stream().map(ShipmentsOrderInfo::getId).collect(Collectors.toList());
         List<String> shipmentOrderIds = shipmentsOrderInfos.stream().map(ShipmentsOrderInfo::getId).collect(Collectors.toList());
+        List<String> detailIds = new ArrayList<>();
         Map<String, List<ShipmentsPlanDetail>> shipmentDetailMap = new HashMap<>();
         Map<String, List<ShipmentsPlanDetail>> shipmentDetailMap = new HashMap<>();
         // 获取发货明细数据
         // 获取发货明细数据
         List<ShipmentsPlanDetail> detailList = shipmentsPlanDetailService.listByShipmentOrderId(shipmentOrderIds);
         List<ShipmentsPlanDetail> detailList = shipmentsPlanDetailService.listByShipmentOrderId(shipmentOrderIds);
         for (ShipmentsPlanDetail detail : detailList) {
         for (ShipmentsPlanDetail detail : detailList) {
+            detailIds.add(detail.getId());
             String shipmentOrderId = detail.getShipmentOrderId();
             String shipmentOrderId = detail.getShipmentOrderId();
             List<ShipmentsPlanDetail> list = shipmentDetailMap.computeIfAbsent(shipmentOrderId, k -> new ArrayList<>());
             List<ShipmentsPlanDetail> list = shipmentDetailMap.computeIfAbsent(shipmentOrderId, k -> new ArrayList<>());
             list.add(detail);
             list.add(detail);
@@ -792,6 +791,8 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
             orderInfo.setDetailList(shipmentDetails);
             orderInfo.setDetailList(shipmentDetails);
         }
         }
         generateLedgerInfo(shipmentsOrderInfos);
         generateLedgerInfo(shipmentsOrderInfos);
+        // 生成发货明细报表数据
+        shipmentDetailStatisticsService.generateStatisticsData(detailIds);
     }
     }
 
 
     @Override
     @Override

@@ -286,13 +286,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             throw new DefaultClientException("发货单不存在！");
             throw new DefaultClientException("发货单不存在！");
         }
         }
         LambdaUpdateWrapper<ShipmentsOrderInfo> updateWrapper = Wrappers.lambdaUpdate(ShipmentsOrderInfo.class)
         LambdaUpdateWrapper<ShipmentsOrderInfo> updateWrapper = Wrappers.lambdaUpdate(ShipmentsOrderInfo.class)
-                .set(ShipmentsOrderInfo::getPlanId, vo.getPlanId())
-                .set(ShipmentsOrderInfo::getCustomerId, vo.getCustomerId())
-                .set(ShipmentsOrderInfo::getWorkshopId, vo.getWorkshopId())
-                .set(ShipmentsOrderInfo::getShipmentsDate, vo.getShipmentsDate())
-                .set(ShipmentsOrderInfo::getDeptId, vo.getDeptId())
-                .set(ShipmentsOrderInfo::getDeliveryType, vo.getDeliveryType())
-                .set(ShipmentsOrderInfo::getDestination, vo.getDestination())
+                .set(vo.getNewShipmentDate() != null, ShipmentsOrderInfo::getNewShipmentDate, vo.getNewShipmentDate())
                 .eq(ShipmentsOrderInfo::getId, vo.getId());
                 .eq(ShipmentsOrderInfo::getId, vo.getId());
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
@@ -385,6 +379,11 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         if (orderInfo == null) {
         if (orderInfo == null) {
             throw new DefaultClientException("发货单不存在！");
             throw new DefaultClientException("发货单不存在！");
         }
         }
+        LambdaUpdateWrapper<ShipmentsOrderInfo> updateWrapper = Wrappers.lambdaUpdate(ShipmentsOrderInfo.class);
+        updateWrapper.set(ShipmentsOrderInfo::getOnTimeShipment, vo.getOnTimeShipment())
+                .eq(ShipmentsOrderInfo::getId, shipmentsOrderId);
+        getBaseMapper().update(updateWrapper);
+
         List<ShipmentsOrderDetailVo> detailList = vo.getDetailList();
         List<ShipmentsOrderDetailVo> detailList = vo.getDetailList();
         if (CollectionUtils.isEmpty(detailList)) {
         if (CollectionUtils.isEmpty(detailList)) {
             return;
             return;
@@ -460,7 +459,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         // 判断当前日期是否大于等于发货日期
         // 判断当前日期是否大于等于发货日期
         LocalDate now = LocalDate.now();
         LocalDate now = LocalDate.now();
         LocalDate shipmentsDate = orderInfo.getShipmentsDate();
         LocalDate shipmentsDate = orderInfo.getShipmentsDate();
-        if (!now.isBefore(shipmentsDate)) {
+        if (BooleanUtils.isTrue(vo.getOnTimeShipment()) && !now.isBefore(shipmentsDate)) {
             // 生成应收款台账明细数据
             // 生成应收款台账明细数据
             receiptLedgerInfoService.generateLedgerInfo(Collections.singletonList(orderInfo));
             receiptLedgerInfoService.generateLedgerInfo(Collections.singletonList(orderInfo));
         }
         }
@@ -632,6 +631,50 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         return result;
         return result;
     }
     }
 
 
+    @Override
+    public List<ShipmentsOrderInfo> queryByShipmentDate(LocalDate shipmentDate) {
+        List<String> statusList = new ArrayList<>();
+        statusList.add("SHIPMENTS");
+        statusList.add("DELIVERED");
+        LambdaQueryWrapper<ShipmentsOrderInfo> queryWrapper = Wrappers.lambdaQuery(ShipmentsOrderInfo.class);
+        queryWrapper.in(ShipmentsOrderInfo::getStatus, statusList);
+        if (shipmentDate != null) {
+            LocalDate finalShipmentDate = shipmentDate;
+            queryWrapper.and(wrapper -> wrapper
+                    .eq(ShipmentsOrderInfo::getShipmentsDate, finalShipmentDate)
+                    .or()
+                    .eq(ShipmentsOrderInfo::getNewShipmentDate, finalShipmentDate));
+        } else {
+            // 今天或之前的数据
+            shipmentDate = LocalDate.now();
+            queryWrapper.and(wrapper -> wrapper
+                    .le(ShipmentsOrderInfo::getShipmentsDate, LocalDate.now())
+                    .or()
+                    .le(ShipmentsOrderInfo::getNewShipmentDate, LocalDate.now()));
+        }
+        List<ShipmentsOrderInfo> shipmentsOrderInfos = getBaseMapper().selectList(queryWrapper);
+        if (CollectionUtils.isEmpty(shipmentsOrderInfos)) {
+            return Collections.emptyList();
+        }
+        // 过滤掉不符合条件的数据
+        Iterator<ShipmentsOrderInfo> iterator = shipmentsOrderInfos.iterator();
+        while (iterator.hasNext()) {
+            ShipmentsOrderInfo next = iterator.next();
+            Boolean onTimeShipment = next.getOnTimeShipment();
+            if (BooleanUtils.isFalse(onTimeShipment)) {
+                LocalDate newShipmentDate = next.getNewShipmentDate();
+                if (newShipmentDate == null || newShipmentDate.isAfter(shipmentDate)) {
+                    iterator.remove();
+                }
+            } else {
+                if (next.getShipmentsDate().isAfter(shipmentDate)) {
+                    iterator.remove();
+                }
+            }
+        }
+        return shipmentsOrderInfos;
+    }
+
 
 
     /**
     /**
      * 处理批次数据
      * 处理批次数据

 package com.lframework.xingyun.sc.impl.statistics;
 package com.lframework.xingyun.sc.impl.statistics;
 
 
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
 import com.lframework.starter.web.inner.entity.SysDataDicItem;
 import com.lframework.starter.web.inner.entity.SysDataDicItem;
@@ -19,20 +19,21 @@ import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.utils.OpLogUtil;
 import com.lframework.starter.web.core.utils.OpLogUtil;
-import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.web.core.utils.IdUtil;
 import com.lframework.starter.web.core.utils.IdUtil;
-import com.lframework.starter.common.utils.ObjectUtil;
 import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.entity.ShipmentsOrderInfo;
+import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
 import com.lframework.xingyun.sc.mappers.ShipmentDetailStatisticsMapper;
 import com.lframework.xingyun.sc.mappers.ShipmentDetailStatisticsMapper;
-import com.lframework.xingyun.sc.service.contract.ContractStdProcessingLineService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
+import com.lframework.xingyun.sc.service.shipments.ShipmentsOrderInfoService;
+import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.statistics.ShipmentDetailStatisticsService;
 import com.lframework.xingyun.sc.service.statistics.ShipmentDetailStatisticsService;
 import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.CreateShipmentDetailStatisticsVo;
 import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.CreateShipmentDetailStatisticsVo;
 import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.QueryShipmentDetailStatisticsVo;
 import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.QueryShipmentDetailStatisticsVo;
-import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.UpdateShipmentDetailStatisticsVo;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -43,6 +44,7 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
+@Slf4j
 @Service
 @Service
 public class ShipmentDetailStatisticsServiceImpl extends BaseMpServiceImpl<ShipmentDetailStatisticsMapper, ShipmentDetailStatistics> implements ShipmentDetailStatisticsService {
 public class ShipmentDetailStatisticsServiceImpl extends BaseMpServiceImpl<ShipmentDetailStatisticsMapper, ShipmentDetailStatistics> implements ShipmentDetailStatisticsService {
 
 
@@ -57,9 +59,11 @@ public class ShipmentDetailStatisticsServiceImpl extends BaseMpServiceImpl<Shipm
     @Resource
     @Resource
     private SysDataDicItemService sysDataDicItemService;
     private SysDataDicItemService sysDataDicItemService;
     @Resource
     @Resource
-    private ContractStdProcessingLineService contractStdProcessingLineService;
-    @Resource
     private WorkshopService workshopService;
     private WorkshopService workshopService;
+    @Resource
+    private ShipmentsOrderInfoService shipmentsOrderInfoService;
+    @Resource
+    private ShipmentsPlanDetailService shipmentsPlanDetailService;
 
 
 
 
     @Override
     @Override
@@ -131,6 +135,7 @@ public class ShipmentDetailStatisticsServiceImpl extends BaseMpServiceImpl<Shipm
         data.setSupplier(vo.getSupplier());
         data.setSupplier(vo.getSupplier());
         data.setCustomerShortName(vo.getCustomerShortName());
         data.setCustomerShortName(vo.getCustomerShortName());
         data.setCustomerType(vo.getCustomerType());
         data.setCustomerType(vo.getCustomerType());
+        data.setAutoGenerate(Boolean.FALSE);
 
 
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);
 
 
@@ -140,26 +145,6 @@ public class ShipmentDetailStatisticsServiceImpl extends BaseMpServiceImpl<Shipm
         return data.getId();
         return data.getId();
     }
     }
 
 
-    @OpLog(type = OtherOpLogType.class, name = "修改发货明细统计，ID：{}", params = {"#id"})
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void update(UpdateShipmentDetailStatisticsVo vo) {
-
-        ShipmentDetailStatistics data = getBaseMapper().selectById(vo.getId());
-        if (ObjectUtil.isNull(data)) {
-            throw new DefaultClientException("发货明细统计不存在！");
-        }
-
-        LambdaUpdateWrapper<ShipmentDetailStatistics> updateWrapper = Wrappers.lambdaUpdate(ShipmentDetailStatistics.class)
-                .set(ShipmentDetailStatistics::getActualShipmentQuantity, vo.getActualShipmentQuantity())
-                .eq(ShipmentDetailStatistics::getId, vo.getId());
-
-        getBaseMapper().update(updateWrapper);
-
-        OpLogUtil.setVariable("id", data.getId());
-        OpLogUtil.setExtra(vo);
-    }
-
     @Override
     @Override
     public PageResult<ShipmentDetailStatistics> pageShipmentDetail(Integer pageIndex, Integer pageSize, QueryShipmentDetailStatisticsVo vo) {
     public PageResult<ShipmentDetailStatistics> pageShipmentDetail(Integer pageIndex, Integer pageSize, QueryShipmentDetailStatisticsVo vo) {
         Assert.greaterThanZero(pageIndex);
         Assert.greaterThanZero(pageIndex);
@@ -274,12 +259,17 @@ public class ShipmentDetailStatisticsServiceImpl extends BaseMpServiceImpl<Shipm
             if (StringUtils.isNotBlank(detail.getMaterialProductRatio())) {
             if (StringUtils.isNotBlank(detail.getMaterialProductRatio())) {
                 String materialProductRatio = materialAndQuantityRatioMap.get(detail.getMaterialProductRatio());
                 String materialProductRatio = materialAndQuantityRatioMap.get(detail.getMaterialProductRatio());
                 if ("10".equals(detail.getMaterialProductRatio())) {
                 if ("10".equals(detail.getMaterialProductRatio())) {
-                    detail.setProcessingOrDistribution(materialProductRatio + "加工");
-                } else {
                     detail.setProcessingOrDistribution(detail.getMaterialProductRatioRemarks() + "加工");
                     detail.setProcessingOrDistribution(detail.getMaterialProductRatioRemarks() + "加工");
+                } else {
+                    detail.setProcessingOrDistribution(materialProductRatio + "加工");
                 }
                 }
             } else {
             } else {
-                detail.setProcessingOrDistribution("经销");
+                if ("INTL_STD_CONTRACT".equals(detail.getContractType()) || "INTL_INVENTORY_AGMT".equals(detail.getContractType())
+                        || "INTL_OPEN_SPEC_AGMT".equals(detail.getContractType())) {
+                    detail.setProcessingOrDistribution("外贸");
+                } else {
+                    detail.setProcessingOrDistribution("经销");
+                }
             }
             }
             // 发货公司
             // 发货公司
             String supplier = supplierMap.get(detail.getSupplier());
             String supplier = supplierMap.get(detail.getSupplier());
@@ -287,4 +277,56 @@ public class ShipmentDetailStatisticsServiceImpl extends BaseMpServiceImpl<Shipm
         }
         }
         return shipmentDetailInfo;
         return shipmentDetailInfo;
     }
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void generateStatisticsData(List<String> shipmentDetailIds) {
+        if (CollectionUtils.isEmpty(shipmentDetailIds)) {
+            log.info("========================= 没有可以生成发货明细报表的数据！");
+            return;
+        }
+        List<String> existShipmentOrderNoList = new ArrayList<>();
+        // 获取已有数据
+        LambdaQueryWrapper<ShipmentDetailStatistics> queryWrapper = Wrappers.lambdaQuery(ShipmentDetailStatistics.class);
+        queryWrapper.eq(ShipmentDetailStatistics::getAutoGenerate, Boolean.TRUE);
+        List<ShipmentDetailStatistics> existStatisticsDataList = getBaseMapper().selectList(queryWrapper);
+        if (CollectionUtils.isNotEmpty(existStatisticsDataList)) {
+            existShipmentOrderNoList = existStatisticsDataList.stream().map(ShipmentDetailStatistics::getShipmentOrderNo)
+                    .filter(StringUtils::isNotBlank).distinct().collect(Collectors.toList());
+        }
+        QueryShipmentDetailStatisticsVo vo = new QueryShipmentDetailStatisticsVo();
+        vo.setIds(shipmentDetailIds);
+        List<ShipmentDetailStatistics> needStatisticsDataList = queryShipmentDetail(vo);
+        if (CollectionUtils.isEmpty(needStatisticsDataList)) {
+            return;
+        }
+        Iterator<ShipmentDetailStatistics> iterator = needStatisticsDataList.iterator();
+        while (iterator.hasNext()) {
+            ShipmentDetailStatistics next = iterator.next();
+            String shipmentOrderNo = next.getShipmentOrderNo();
+            if (existShipmentOrderNoList.contains(shipmentOrderNo)) {
+                // 删掉已存在的发货明细数据，防止重复生成
+                // 手动新增的数据可以多次重复操作
+                iterator.remove();
+            }
+        }
+        getBaseMapper().batchAdd(needStatisticsDataList);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void autoGenerate() {
+        List<ShipmentsOrderInfo> shipmentsOrderInfos = shipmentsOrderInfoService.queryByShipmentDate(null);
+        if (CollectionUtils.isEmpty(shipmentsOrderInfos)) {
+            log.info("========================== 没有需要生发货明细统计报表数据的发货单！");
+            return;
+        }
+        List<String> shipmentOrderIds = shipmentsOrderInfos.stream().map(ShipmentsOrderInfo::getId).collect(Collectors.toList());
+        List<ShipmentsPlanDetail> detailList = shipmentsPlanDetailService.listByShipmentOrderId(shipmentOrderIds);
+        if (CollectionUtils.isEmpty(detailList)) {
+            return;
+        }
+        List<String> detailIds = detailList.stream().map(ShipmentsPlanDetail::getId).collect(Collectors.toList());
+        generateStatisticsData(detailIds);
+    }
 }
 }

@@ -29,4 +29,11 @@ public interface ShipmentDetailStatisticsMapper extends BaseMapper<ShipmentDetai
      * @return                                  List<ShipmentDetailStatistics>
      * @return                                  List<ShipmentDetailStatistics>
      */
      */
     List<ShipmentDetailStatistics> getShipmentDetailInfo(@Param("vo") QueryShipmentDetailStatisticsVo vo);
     List<ShipmentDetailStatistics> getShipmentDetailInfo(@Param("vo") QueryShipmentDetailStatisticsVo vo);
+
+    /**
+     * 批量新增
+     *
+     * @param detailStatisticsList  发货明细统计数据
+     */
+    void batchAdd(List<ShipmentDetailStatistics> detailStatisticsList);
 }
 }

@@ -4,6 +4,8 @@ import com.lframework.xingyun.sc.vo.shipments.order.*;
 import com.lframework.xingyun.sc.entity.ShipmentsOrderInfo;
 import com.lframework.xingyun.sc.entity.ShipmentsOrderInfo;
 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;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -116,4 +118,12 @@ public interface ShipmentsOrderInfoService extends BaseMpService<ShipmentsOrderI
      * @return              Map<Integer, Long>
      * @return              Map<Integer, Long>
      */
      */
     Map<String, Long> countWaitDeliveredOrder(List<String> customerNames);
     Map<String, Long> countWaitDeliveredOrder(List<String> customerNames);
+
+    /**
+     * 根据发货日期获取已发货、已签收的数据
+     *
+     * @param shipmentDate  发货日期
+     * @return              List<ShipmentsOrderInfo>
+     */
+    List<ShipmentsOrderInfo> queryByShipmentDate(LocalDate shipmentDate);
 }
 }

@@ -45,13 +45,6 @@ public interface ShipmentDetailStatisticsService extends BaseMpService<ShipmentD
     String create(CreateShipmentDetailStatisticsVo vo);
     String create(CreateShipmentDetailStatisticsVo vo);
 
 
     /**
     /**
-     * 修改
-     *
-     * @param vo    数据实体
-     */
-    void update(UpdateShipmentDetailStatisticsVo vo);
-
-    /**
      * 获取发货明细数据
      * 获取发货明细数据
      *
      *
      * @param QueryShipmentDetailStatisticsVo   查询条件
      * @param QueryShipmentDetailStatisticsVo   查询条件
@@ -66,4 +59,17 @@ public interface ShipmentDetailStatisticsService extends BaseMpService<ShipmentD
      * @return                                  List<ShipmentDetailStatistics>
      * @return                                  List<ShipmentDetailStatistics>
      */
      */
     List<ShipmentDetailStatistics> queryShipmentDetail(QueryShipmentDetailStatisticsVo vo);
     List<ShipmentDetailStatistics> queryShipmentDetail(QueryShipmentDetailStatisticsVo vo);
+
+    /**
+     * 生成发货明细统计数据
+     * 支持批量生成
+     *
+     * @param shipmentDetailIds 发货单明细ID集合
+     */
+    void generateStatisticsData(List<String> shipmentDetailIds);
+
+    /**
+     * 自动生成发货明细统计数据
+     */
+    void autoGenerate();
 }
 }

@@ -7,6 +7,7 @@ import lombok.Data;
 import javax.validation.Valid;
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.List;
 import java.util.List;
 
 
@@ -36,4 +37,11 @@ public class ShipmentsOrderVo implements BaseVo, Serializable {
     @NotEmpty(message = "发货单明细不能为空！")
     @NotEmpty(message = "发货单明细不能为空！")
     @Valid
     @Valid
     private List<ShipmentsOrderDetailVo> detailList;
     private List<ShipmentsOrderDetailVo> detailList;
+
+    /**
+     * 是否当日发货
+     */
+    @ApiModelProperty(value = "是否当日发货", required = true)
+    @NotNull(message = "是否当日发货不能为空！")
+    private Boolean onTimeShipment;
 }
 }

@@ -4,10 +4,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.starter.web.core.vo.BaseVo;
-import javax.validation.constraints.NotNull;
-import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Length;
 import java.io.Serializable;
 import java.io.Serializable;
 
 
 @Data
 @Data
@@ -23,59 +20,9 @@ public class UpdateShipmentsOrderInfoVo implements BaseVo, Serializable {
     private String id;
     private String id;
 
 
     /**
     /**
-     * 发货计划ID
+     * 新发货日期
      */
      */
-    @ApiModelProperty(value = "发货计划ID", required = true)
-    @NotBlank(message = "请输入发货计划ID！")
-    @Length(message = "发货计划ID最多允许32个字符！")
-    private String planId;
-
-    /**
-     * 购货单位ID
-     */
-    @ApiModelProperty(value = "购货单位ID", required = true)
-    @NotBlank(message = "请输入购货单位ID！")
-    @Length(message = "购货单位ID最多允许32个字符！")
-    private String customerId;
-
-    /**
-     * 厂房ID
-     */
-    @ApiModelProperty(value = "厂房ID", required = true)
-    @NotBlank(message = "请输入厂房ID！")
-    @Length(message = "厂房ID最多允许32个字符！")
-    private String workshopId;
-
-    /**
-     * 发货日期
-     */
-    @ApiModelProperty(value = "发货日期", required = true)
-    @TypeMismatch(message = "发货日期格式有误！")
-    @NotNull(message = "请输入发货日期！")
-    private LocalDate shipmentsDate;
-
-    /**
-     * 办事处ID
-     */
-    @ApiModelProperty(value = "办事处ID", required = true)
-    @NotBlank(message = "请输入办事处ID！")
-    @Length(message = "办事处ID最多允许500个字符！")
-    private String deptId;
-
-    /**
-     * 交货方式
-     */
-    @ApiModelProperty(value = "交货方式", required = true)
-    @NotBlank(message = "请输入交货方式！")
-    @Length(message = "交货方式最多允许100个字符！")
-    private String deliveryType;
-
-    /**
-     * 目的地
-     */
-    @ApiModelProperty(value = "目的地", required = true)
-    @NotBlank(message = "请输入目的地！")
-    @Length(message = "目的地最多允许100个字符！")
-    private String destination;
+    @ApiModelProperty(value = "新发货日期")
+    private LocalDate newShipmentDate;
 
 
 }
 }

@@ -150,7 +150,7 @@
             o.workshop_id,
             o.workshop_id,
             o.delivery_method,
             o.delivery_method,
             so.code as shipment_order_no,
             so.code as shipment_order_no,
-            so.create_time as shipment_date,
+            so.shipments_date as shipment_date,
             sc.id as contract_id,
             sc.id as contract_id,
             sc.type as contract_type,
             sc.type as contract_type,
             sc.packaging_requirements,
             sc.packaging_requirements,
@@ -171,11 +171,102 @@
                 </foreach>
                 </foreach>
             </if>
             </if>
             <if test="vo.orderNo != null and vo.orderNo != ''">
             <if test="vo.orderNo != null and vo.orderNo != ''">
-                AND o.order_no LIKE CONCAT('%', #{vo.orderNo}, '%')
+                and o.order_no like concat('%', #{vo.orderNo}, '%')
             </if>
             </if>
             <if test="vo.shipmentOrderNo != null and vo.shipmentOrderNo != ''">
             <if test="vo.shipmentOrderNo != null and vo.shipmentOrderNo != ''">
-                AND so.code LIKE CONCAT('%', #{vo.shipmentOrderNo}, '%')
+                and so.code like concat('%', #{vo.shipmentOrderNo}, '%')
             </if>
             </if>
         </where>
         </where>
+        order by so.create_time desc
     </select>
     </select>
+
+    <insert id="batchAdd">
+        INSERT INTO shipments_detail_statistics (
+            id,
+            shipment_order_no,
+            workshop_name,
+            dept_name,
+            region_name,
+            ordering_unit_name,
+            brand,
+            thickness,
+            width,
+            length,
+            status,
+            quantity,
+            actual_shipment_quantity,
+            sales_price,
+            thickness_tol_pos,
+            thickness_tol_neg,
+            width_tol_pos,
+            width_tol_neg,
+            length_tol_pos,
+            length_tol_neg,
+            assessment_exceeds_agreement,
+            shipping_cost,
+            return_freight,
+            industry,
+            stock_up_company_name,
+            order_no,
+            yield_batch_no,
+            invoicing_status,
+            order_date,
+            packaging_fee,
+            quality,
+            num,
+            settlement_terms,
+            processing_or_distribution,
+            packaging_requirements,
+            shipment_date,
+            supplier,
+            customer_short_name,
+            customer_type,
+            delivery_method
+        ) VALUES
+        <foreach collection="list" item="item" separator=",">
+            (
+                #{item.id},
+                #{item.shipmentOrderNo},
+                #{item.workshopName},
+                #{item.deptName},
+                #{item.regionName},
+                #{item.orderingUnitName},
+                #{item.brand},
+                #{item.thickness},
+                #{item.width},
+                #{item.length},
+                #{item.status},
+                #{item.quantity},
+                #{item.actualShipmentQuantity},
+                #{item.salesPrice},
+                #{item.thicknessTolPos},
+                #{item.thicknessTolNeg},
+                #{item.widthTolPos},
+                #{item.widthTolNeg},
+                #{item.lengthTolPos},
+                #{item.lengthTolNeg},
+                #{item.assessmentExceedsAgreement},
+                #{item.shippingCost},
+                #{item.returnFreight},
+                #{item.industry},
+                #{item.stockUpCompanyName},
+                #{item.orderNo},
+                #{item.yieldBatchNo},
+                #{item.invoicingStatus},
+                #{item.orderDate},
+                #{item.packagingFee},
+                #{item.quality},
+                #{item.num},
+                #{item.settlementTerms},
+                #{item.processingOrDistribution},
+                #{item.packagingRequirements},
+                #{item.shipmentDate},
+                #{item.supplier},
+                #{item.customerShortName},
+                #{item.customerType},
+                #{item.deliveryMethod}
+            )
+        </foreach>
+    </insert>
+
 </mapper>
 </mapper>