楚江erp：定时任务生成应收款台账数据

@@ -4,7 +4,6 @@ import com.lframework.starter.mq.core.utils.ExportTaskUtil;
 import com.lframework.xingyun.sc.bo.ledger.receipt.GetReceiptLedgerInfoBo;
 import com.lframework.xingyun.sc.bo.ledger.receipt.QueryReceiptLedgerInfoBo;
 import com.lframework.xingyun.sc.bo.ledger.receipt.ReceiptLedgerReportBo;
-import com.lframework.xingyun.sc.enums.ExportType;
 import com.lframework.xingyun.sc.excel.ledger.LedgerReportExportTaskWorker;
 import com.lframework.xingyun.sc.utils.CommonUtil;
 import com.lframework.xingyun.sc.vo.ledger.receipt.*;
@@ -19,6 +18,7 @@ import io.swagger.annotations.ApiOperation;
 import com.lframework.starter.common.utils.CollectionUtil;
 import io.swagger.annotations.Api;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
@@ -42,6 +42,8 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/ledger/receipt")
 public class ReceiptLedgerInfoController extends DefaultBaseController {
+
+
     @Resource
     private ReceiptLedgerInfoService receiptLedgerInfoService;
 
@@ -157,4 +159,27 @@ public class ReceiptLedgerInfoController extends DefaultBaseController {
         ExportTaskUtil.exportTask("应收款台账报表信息", LedgerReportExportTaskWorker.class, vo);
         return InvokeResultBuilder.success();
     }
+
+
+    /**
+     * 自动生成台账明细数据
+     */
+    @ApiOperation("自动生成台账明细数据")
+    @GetMapping("/autoGenerate")
+    @Scheduled(cron = "0 10 2 * * ?")
+    public InvokeResult<Void> autoGenerate() {
+        receiptLedgerInfoService.autoGenerate();
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 重新生成新的台账数据
+     */
+    @ApiOperation("自动生成台账明细数据")
+    @GetMapping("/againGenerate")
+    @Scheduled(cron = "0 30 2 1 * ?")
+    public InvokeResult<Void> againGenerate() {
+        receiptLedgerInfoService.againGenerate();
+        return InvokeResultBuilder.success();
+    }
 }

@@ -203,6 +203,11 @@ public class ReceiptLedgerInfo extends BaseEntity implements BaseDto {
     private Integer delFlag;
 
     /**
+     * 发货单ID
+     */
+    private String shipmentOrderId;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

@@ -138,7 +138,7 @@ public class LedgerReportExportHandler implements ExportHandler {
                     builder.deleteCharAt(builder.length() - 1);
                 }
             }
-            dataMap.put("titleSuffix", "——" + builder.toString());
+            dataMap.put("titleSuffix", "——" + builder);
             ExcelUtil.processTemplate(workbook, dataMap);
             // 将workbook写入文件
             try (FileOutputStream outputStream = new FileOutputStream(xlsxFile)) {

 package com.lframework.xingyun.sc.impl.ledger;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
@@ -25,13 +26,17 @@ import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.common.utils.Assert;
+import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsOrderInfoService;
+import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.utils.CommonUtil;
 import com.lframework.xingyun.sc.vo.ledger.receipt.*;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.ReceiptLedgerInfoMapper;
 import com.lframework.xingyun.sc.service.ledger.ReceiptLedgerInfoService;
@@ -41,11 +46,15 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+
+@Slf4j
 @Service
 public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedgerInfoMapper, ReceiptLedgerInfo> implements ReceiptLedgerInfoService {
 
@@ -64,6 +73,10 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
     private PurchaseOrderLineService purchaseOrderLineService;
     @Resource
     private ShipmentsOrderInfoService shipmentsOrderInfoService;
+    @Resource
+    private ShipmentsPlanDetailService shipmentsPlanDetailService;
+    @Resource
+    private ContractDistributorStandardService contractDistributorStandardService;
 
 
     // 定义状态优先级顺序（从高到低）
@@ -336,10 +349,17 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
             customerShortNameMap = customerShortList.stream().collect(Collectors.toMap(CustomerShort::getCustomerId, CustomerShort::getId
                     , (v1, v2) -> v1));
         }
+        List<String> contractIds = new ArrayList<>();
         // 订货单信息
         Map<String, PurchaseOrderInfo> orderInfoMap = new HashMap<>();
         List<PurchaseOrderInfo> orderInfoList = purchaseOrderInfoService.listByIds(orderIds);
         if (CollectionUtils.isNotEmpty(orderInfoList)) {
+            for (PurchaseOrderInfo orderInfo : orderInfoList) {
+                if (!contractIds.contains(orderInfo.getContractId())) {
+                    contractIds.add(orderInfo.getContractId());
+                }
+                orderInfoMap.put(orderInfo.getId(), orderInfo);
+            }
             orderInfoMap = orderInfoList.stream().collect(Collectors.toMap(PurchaseOrderInfo::getId, Function.identity()));
         }
         // 订货单规格信息
@@ -348,11 +368,18 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         if (CollectionUtils.isNotEmpty(orderSpecList)) {
             orderSpecMap = orderSpecList.stream().collect(Collectors.toMap(PurchaseOrderLine::getId, Function.identity()));
         }
+        // 合同信息
+        Map<String, ContractDistributorStandard> contractMap = new HashMap<>();
+        List<ContractDistributorStandard> contractList = contractDistributorStandardService.listByIds(contractIds);
+        if (CollectionUtils.isNotEmpty(contractList)) {
+            contractMap = contractList.stream().collect(Collectors.toMap(ContractDistributorStandard::getId, Function.identity()));
+        }
         List<ReceiptLedgerInfo> dataList = new ArrayList<>();
         for (ShipmentsOrderInfo shipmentsOrderInfo : shipmentsOrderInfoList) {
             String customerId = shipmentsOrderInfo.getCustomerId();
             ReceiptLedgerInfo data = new ReceiptLedgerInfo();
             data.setId(IdUtil.getId());
+            data.setShipmentOrderId(shipmentsOrderInfo.getId());
             String shortNameId = customerShortNameMap.get(customerId);
             data.setCustomerShortId(shortNameId);
             CustomerCredit credit = customerCreditMap.get(customerId);
@@ -369,6 +396,8 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
             data.setRegion(shipmentsOrderInfo.getRegion());
             data.setCustomerId(shipmentsOrderInfo.getCustomerId());
             data.setShipmentDate(shipmentsOrderInfo.getShipmentsDate());
+
+            String contractType = null;
             List<String> supplyUnitList = new ArrayList<>();
             // 计算期初应收款
             BigDecimal startAccountReceivable = BigDecimal.ZERO;
@@ -388,6 +417,11 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
                 if (!supplyUnitList.contains(supplyUnit)) {
                     supplyUnitList.add(supplyUnit);
                 }
+                // 获取合同类型
+                ContractDistributorStandard contract = contractMap.get(orderInfo.getContractId());
+                if (contract != null && StringUtils.isBlank(contractType)) {
+                    contractType = contract.getType();
+                }
             }
             String factoryType = String.join(",", supplyUnitList);
             data.setFactoryType(factoryType);
@@ -396,6 +430,13 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
                 data.setArrivalDate(shipmentsOrderInfo.getDeliveryTime().toLocalDate());
             }
             data.setEndAccountReceivable(startAccountReceivable);
+            // 内外贸区分
+            if ("INTL_STD_CONTRACT".equals(contractType) || "INTL_INVENTORY_AGMT".equals(contractType) || "INTL_OPEN_SPEC_AGMT".equals(contractType)) {
+                // 外贸
+                data.setType("OUTSIDE");
+            } else {
+                data.setType("INSIDE");
+            }
 
             dataList.add(data);
         }
@@ -642,6 +683,70 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         OpLogUtil.setExtra(vo);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    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);
+        if (CollectionUtils.isEmpty(shipmentsOrderInfos)) {
+            log.info("========================== 没有需要生成台账数据的发货单！");
+            return;
+        }
+        List<String> shipmentOrderIds = shipmentsOrderInfos.stream().map(ShipmentsOrderInfo::getId).collect(Collectors.toList());
+        Map<String, List<ShipmentsPlanDetail>> shipmentDetailMap = new HashMap<>();
+        // 获取发货明细数据
+        List<ShipmentsPlanDetail> detailList = shipmentsPlanDetailService.listByShipmentOrderId(shipmentOrderIds);
+        for (ShipmentsPlanDetail detail : detailList) {
+            String shipmentOrderId = detail.getShipmentOrderId();
+            List<ShipmentsPlanDetail> list = shipmentDetailMap.computeIfAbsent(shipmentOrderId, k -> new ArrayList<>());
+            list.add(detail);
+        }
+        // 数据组装
+        for (ShipmentsOrderInfo orderInfo : shipmentsOrderInfos) {
+            String id = orderInfo.getId();
+            List<ShipmentsPlanDetail> shipmentDetails = shipmentDetailMap.get(id);
+            orderInfo.setDetailList(shipmentDetails);
+        }
+        generateLedgerInfo(shipmentsOrderInfos);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void againGenerate() {
+        // 获取当前日期
+        LocalDate now = LocalDate.now();
+        // 获取上个月的第一天
+        LocalDateTime startDateTime = now.minusMonths(1).withDayOfMonth(1).atStartOfDay();
+        // 获取上个月的最后一天
+        LocalDateTime endDateTime  = now.minusMonths(1).with(TemporalAdjusters.lastDayOfMonth())
+                .atTime(23, 59, 59);
+        LambdaQueryWrapper<ReceiptLedgerInfo> queryWrapper = Wrappers.lambdaQuery(ReceiptLedgerInfo.class);
+        queryWrapper.eq(ReceiptLedgerInfo::getDelFlag, Boolean.FALSE)
+                .ge(ReceiptLedgerInfo::getCreateTime, startDateTime)
+                .le(ReceiptLedgerInfo::getCreateTime, endDateTime)
+                .gt(ReceiptLedgerInfo::getEndAccountReceivable, BigDecimal.ZERO);
+        List<ReceiptLedgerInfo> ledgerInfoList = getBaseMapper().selectList(queryWrapper);
+        if (CollectionUtils.isEmpty(ledgerInfoList)) {
+            log.info("======================== 上个月没有应收款台账数据！");
+            return;
+        }
+        LocalDateTime nowTime = LocalDateTime.now();
+        for (ReceiptLedgerInfo ledgerInfo : ledgerInfoList) {
+            ledgerInfo.setId(IdUtil.getId());
+            ledgerInfo.setStartAccountReceivable(ledgerInfo.getEndAccountReceivable());
+            ledgerInfo.setActualReturnedDate(null);
+            ledgerInfo.setReturnedAmount(null);
+            ledgerInfo.setCreateTime(nowTime);
+            ledgerInfo.setUpdateTime(null);
+        }
+        baseMapper.batchAdd(ledgerInfoList);
+    }
+
 
     /**
      * 从多个状态中获取最高优先级的状态

@@ -112,4 +112,15 @@ public interface ReceiptLedgerInfoService extends BaseMpService<ReceiptLedgerInf
      * @param vo 数据
      */
     void reconciliation(UpdateReceiptLedgerInfoVo vo);
+
+    /**
+     * 自动生成台账明细数据
+     * 今天要发货并且已填完实发数的数据
+     */
+    void autoGenerate();
+
+    /**
+     * 重新生成新的台账数据
+     */
+    void againGenerate();
 }

@@ -170,6 +170,7 @@
         fourth_coordinate_date,
         fifth_coordinate_date,
         description,
+        shipment_order_id,
         create_by_id,
         update_by_id,
         create_time,
@@ -203,6 +204,7 @@
             #{item.fourthCoordinateDate},
             #{item.fifthCoordinateDate},
             #{item.description},
+            #{item.shipmentOrderId},
             #{item.createById},
             #{item.updateById},
             #{item.createTime},