Merge remote-tracking branch 'origin/master_cj_zq' into master_cj_zq

@@ -16,6 +16,7 @@ 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 org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.basedata.mappers.CustomerShortMapper;
 import com.lframework.xingyun.basedata.mappers.CustomerShortMapper;
@@ -25,6 +26,7 @@ import com.lframework.xingyun.basedata.vo.customer.QueryCustomerShortVo;
 import com.lframework.xingyun.basedata.vo.customer.UpdateCustomerShortVo;
 import com.lframework.xingyun.basedata.vo.customer.UpdateCustomerShortVo;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.util.Collections;
 import java.util.List;
 import java.util.List;
 
 
 @Service
 @Service
@@ -122,4 +124,15 @@ public class CustomerShortServiceImpl extends BaseMpServiceImpl<CustomerShortMap
 
 
         return getBaseMapper().selectOne(queryWrapper);
         return getBaseMapper().selectOne(queryWrapper);
     }
     }
+
+    @Override
+    public List<CustomerShort> listByCustomerId(List<String> customerIds) {
+        if (CollectionUtils.isEmpty(customerIds)) {
+            return Collections.emptyList();
+        }
+        LambdaQueryWrapper<CustomerShort> queryWrapper = Wrappers.lambdaQuery(CustomerShort.class);
+        queryWrapper.in(CustomerShort::getCustomerId, customerIds);
+
+        return getBaseMapper().selectList(queryWrapper);
+    }
 }
 }

@@ -65,4 +65,12 @@ public interface CustomerShortService extends BaseMpService<CustomerShort> {
      * @return              CustomerShort
      * @return              CustomerShort
      */
      */
     CustomerShort getByCustomerId(String customerId);
     CustomerShort getByCustomerId(String customerId);
+
+    /**
+     * 根据客户ID获取客户简称
+     *
+     * @param customerIds   客户ID集合
+     * @return              List<CustomerShort>
+     */
+    List<CustomerShort> listByCustomerId(List<String> customerIds);
 }
 }

@@ -158,12 +158,6 @@ public class GetReceiptLedgerInfoBo extends BaseBo<ReceiptLedgerInfo> {
     private BigDecimal returnedAmount;
     private BigDecimal returnedAmount;
 
 
     /**
     /**
-     * 实际回笼金额
-     */
-    @ApiModelProperty("实际回笼金额")
-    private BigDecimal actualReturnedAmount;
-
-    /**
      * 期末应收账款
      * 期末应收账款
      */
      */
     @ApiModelProperty("期末应收账款")
     @ApiModelProperty("期末应收账款")

@@ -7,6 +7,8 @@ import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.bo.BaseBo;
 import com.lframework.starter.web.core.bo.BaseBo;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 
 
 import lombok.Data;
 import lombok.Data;
@@ -155,12 +157,6 @@ public class QueryReceiptLedgerInfoBo extends BaseBo<ReceiptLedgerInfo> {
     private BigDecimal returnedAmount;
     private BigDecimal returnedAmount;
 
 
     /**
     /**
-     * 实际回笼金额
-     */
-    @ApiModelProperty("实际回笼金额")
-    private BigDecimal actualReturnedAmount;
-
-    /**
      * 期末应收账款
      * 期末应收账款
      */
      */
     @ApiModelProperty("期末应收账款")
     @ApiModelProperty("期末应收账款")
@@ -226,6 +222,18 @@ public class QueryReceiptLedgerInfoBo extends BaseBo<ReceiptLedgerInfo> {
     private boolean spilt;
     private boolean spilt;
 
 
     /**
     /**
+     * 占用天数
+     */
+    @ApiModelProperty("占用天数")
+    private Long occupiedDays;
+
+    /**
+     * 到货天数
+     */
+    @ApiModelProperty("到货天数")
+    private Long deliveryDays;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @ApiModelProperty("创建人ID")
     @ApiModelProperty("创建人ID")
@@ -275,5 +283,14 @@ public class QueryReceiptLedgerInfoBo extends BaseBo<ReceiptLedgerInfo> {
         } else if ("GJ".equals(dto.getFactoryType())) {
         } else if ("GJ".equals(dto.getFactoryType())) {
             this.factoryType = "安徽楚江高精铜带有限公司";
             this.factoryType = "安徽楚江高精铜带有限公司";
         }
         }
+        LocalDate now = LocalDate.now();
+        LocalDate dtoShipmentDate = dto.getShipmentDate();
+        if (dtoShipmentDate != null) {
+            this.occupiedDays = ChronoUnit.DAYS.between(dtoShipmentDate, now) + 1;
+        }
+        LocalDate dtoArrivalDate = dto.getArrivalDate();
+        if (dtoArrivalDate != null) {
+            this.deliveryDays = ChronoUnit.DAYS.between(dtoArrivalDate, now) + 1;
+        }
     }
     }
 }
 }

@@ -141,11 +141,6 @@ public class ReceiptLedgerInfo extends BaseEntity implements BaseDto {
     private BigDecimal returnedAmount;
     private BigDecimal returnedAmount;
 
 
     /**
     /**
-     * 实际回笼金额
-     */
-    private BigDecimal actualReturnedAmount;
-
-    /**
      * 期末应收账款
      * 期末应收账款
      */
      */
     private BigDecimal endAccountReceivable;
     private BigDecimal endAccountReceivable;

@@ -110,6 +110,11 @@ public class ShipmentsOrderInfo extends BaseEntity implements BaseDto {
     private String receiptsName;
     private String receiptsName;
 
 
     /**
     /**
+     * 签收时间
+     */
+    private LocalDateTime deliveryTime;
+
+    /**
      * 状态
      * 状态
      */
      */
     private String status;
     private String status;

@@ -2064,6 +2064,18 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
         OpLogUtil.setExtra(vo);
         OpLogUtil.setExtra(vo);
     }
     }
 
 
+    @Override
+    public List<CustomerCredit> listByCustomerId(List<String> customerIds) {
+        if (CollectionUtils.isEmpty(customerIds)) {
+            return Collections.emptyList();
+        }
+        LambdaQueryWrapper<CustomerCredit> queryWrapper = Wrappers.lambdaQuery(CustomerCredit.class);
+        queryWrapper.eq(CustomerCredit::getFrozenStatus, "NORMAL")
+                .in(CustomerCredit::getCompanyId, customerIds);
+
+        return getBaseMapper().selectList(queryWrapper);
+    }
+
 
 
     @Override
     @Override
     public void cleanCacheByKey(Serializable key) {
     public void cleanCacheByKey(Serializable key) {

@@ -9,7 +9,11 @@ import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.inner.entity.SysDataDicItem;
 import com.lframework.starter.web.inner.entity.SysDataDicItem;
 import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
-import com.lframework.xingyun.sc.entity.ReceiptLedgerInfo;
+import com.lframework.xingyun.basedata.entity.Customer;
+import com.lframework.xingyun.basedata.entity.CustomerShort;
+import com.lframework.xingyun.basedata.service.customer.CustomerService;
+import com.lframework.xingyun.basedata.service.customer.CustomerShortService;
+import com.lframework.xingyun.sc.entity.*;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 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.utils.OpLogUtil;
 import com.lframework.starter.web.core.utils.OpLogUtil;
@@ -19,6 +23,9 @@ import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.common.utils.Assert;
+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.utils.CommonUtil;
 import com.lframework.xingyun.sc.utils.CommonUtil;
 import com.lframework.xingyun.sc.vo.ledger.receipt.ReceiptLedgerInfoSplitVo;
 import com.lframework.xingyun.sc.vo.ledger.receipt.ReceiptLedgerInfoSplitVo;
 import com.lframework.xingyun.sc.vo.ledger.receipt.UpdateReceiptLedgerInfoVo;
 import com.lframework.xingyun.sc.vo.ledger.receipt.UpdateReceiptLedgerInfoVo;
@@ -32,10 +39,10 @@ import org.springframework.stereotype.Service;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 @Service
 @Service
@@ -44,6 +51,16 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
 
 
     @Resource
     @Resource
     private SysDataDicItemService sysDataDicItemService;
     private SysDataDicItemService sysDataDicItemService;
+    @Resource
+    private CustomerService customerService;
+    @Resource
+    private CustomerCreditService customerCreditService;
+    @Resource
+    private CustomerShortService customerShortService;
+    @Resource
+    private PurchaseOrderInfoService purchaseOrderInfoService;
+    @Resource
+    private PurchaseOrderLineService purchaseOrderLineService;
 
 
 
 
 
 
@@ -81,7 +98,8 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
     public ReceiptLedgerInfo findById(String id) {
     public ReceiptLedgerInfo findById(String id) {
         QueryReceiptLedgerInfoVo ledgerInfoVo = new QueryReceiptLedgerInfoVo();
         QueryReceiptLedgerInfoVo ledgerInfoVo = new QueryReceiptLedgerInfoVo();
         ledgerInfoVo.setId(id);
         ledgerInfoVo.setId(id);
-        return getBaseMapper().query(ledgerInfoVo).get(0);
+        List<ReceiptLedgerInfo> infoList = getBaseMapper().query(ledgerInfoVo);
+        return CollectionUtils.isEmpty(infoList) ? null : infoList.get(0);
     }
     }
 
 
     @OpLog(type = OtherOpLogType.class, name = "新增应收款台账明细，ID：{}", params = {"#id"})
     @OpLog(type = OtherOpLogType.class, name = "新增应收款台账明细，ID：{}", params = {"#id"})
@@ -105,7 +123,6 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         data.setProcessedDate(vo.getProcessedDate());
         data.setProcessedDate(vo.getProcessedDate());
         data.setActualReturnedDate(vo.getActualReturnedDate());
         data.setActualReturnedDate(vo.getActualReturnedDate());
         data.setReturnedAmount(vo.getReturnedAmount());
         data.setReturnedAmount(vo.getReturnedAmount());
-        data.setActualReturnedAmount(vo.getActualReturnedAmount());
         data.setEndAccountReceivable(vo.getEndAccountReceivable());
         data.setEndAccountReceivable(vo.getEndAccountReceivable());
         data.setApplyStatus(vo.getApplyStatus());
         data.setApplyStatus(vo.getApplyStatus());
         data.setCoordinateDate(vo.getCoordinateDate());
         data.setCoordinateDate(vo.getCoordinateDate());
@@ -131,10 +148,13 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         if (ObjectUtil.isNull(data)) {
         if (ObjectUtil.isNull(data)) {
             throw new DefaultClientException("应收款台账明细不存在！");
             throw new DefaultClientException("应收款台账明细不存在！");
         }
         }
+        // 获取欠款状态
+        String settlementStatus = getSettlementStatus(data.getEndAccountReceivable(), data.getProcessedDate());
         LambdaUpdateWrapper<ReceiptLedgerInfo> updateWrapper = Wrappers.lambdaUpdate(ReceiptLedgerInfo.class)
         LambdaUpdateWrapper<ReceiptLedgerInfo> updateWrapper = Wrappers.lambdaUpdate(ReceiptLedgerInfo.class)
                 .set(ReceiptLedgerInfo::getDescription, StringUtil.isBlank(vo.getDescription()) ? null : vo.getDescription())
                 .set(ReceiptLedgerInfo::getDescription, StringUtil.isBlank(vo.getDescription()) ? null : vo.getDescription())
                 .set(ReceiptLedgerInfo::getProcessedDate, vo.getProcessedDate() == null ? null : vo.getProcessedDate())
                 .set(ReceiptLedgerInfo::getProcessedDate, vo.getProcessedDate() == null ? null : vo.getProcessedDate())
                 .set(ReceiptLedgerInfo::getRemark, StringUtil.isBlank(vo.getRemark()) ? null : vo.getRemark())
                 .set(ReceiptLedgerInfo::getRemark, StringUtil.isBlank(vo.getRemark()) ? null : vo.getRemark())
+                .set(ReceiptLedgerInfo::getDebtStatus, settlementStatus)
                 .eq(ReceiptLedgerInfo::getId, vo.getId());
                 .eq(ReceiptLedgerInfo::getId, vo.getId());
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
@@ -214,7 +234,6 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         data.setProcessedDate(vo.getProcessedDate());
         data.setProcessedDate(vo.getProcessedDate());
         data.setActualReturnedDate(vo.getActualReturnedDate());
         data.setActualReturnedDate(vo.getActualReturnedDate());
         data.setReturnedAmount(vo.getReturnedAmount());
         data.setReturnedAmount(vo.getReturnedAmount());
-        data.setActualReturnedAmount(vo.getActualReturnedAmount());
         //拆分的时候期末应收账款=期初-回笼资金（这时候为0）
         //拆分的时候期末应收账款=期初-回笼资金（这时候为0）
         data.setEndAccountReceivable(quantity);
         data.setEndAccountReceivable(quantity);
         data.setApplyStatus(vo.getApplyStatus());
         data.setApplyStatus(vo.getApplyStatus());
@@ -236,4 +255,152 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
     public void deleteById(String id) {
     public void deleteById(String id) {
         getBaseMapper().deleteById(id);
         getBaseMapper().deleteById(id);
     }
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void generateLedgerInfo(List<ShipmentsOrderInfo> shipmentsOrderInfoList) {
+        if (CollectionUtils.isEmpty(shipmentsOrderInfoList)) {
+            log.error("generateLedgerInfo invoke failed: orderInfoList is empty!");
+            return;
+        }
+        List<String> customerIds = new ArrayList<>();
+        List<String> orderIds = new ArrayList<>();
+        List<String> orderSpecIds = new ArrayList<>();
+        for (ShipmentsOrderInfo orderInfo : shipmentsOrderInfoList) {
+            String customerId = orderInfo.getCustomerId();
+            if (!customerIds.contains(customerId)) {
+                customerIds.add(customerId);
+            }
+            List<ShipmentsPlanDetail> detailList = orderInfo.getDetailList();
+            for (ShipmentsPlanDetail detail : detailList) {
+                String orderId = detail.getOrderId();
+                String orderSpecId = detail.getOrderSpecId();
+                if (!orderIds.contains(orderId)) {
+                    orderIds.add(orderId);
+                }
+                if (!orderSpecIds.contains(orderSpecId)) {
+                    orderSpecIds.add(orderSpecId);
+                }
+            }
+        }
+        // 客户基本信息
+        Map<String, Customer> customerMap = new HashMap<>();
+        List<Customer> customers = customerService.listByIds(customerIds);
+        if (CollectionUtils.isNotEmpty(customers)) {
+            customerMap = customers.stream().collect(Collectors.toMap(Customer::getId, Function.identity()));
+        }
+        // 客户资信数据
+        Map<String, CustomerCredit> customerCreditMap = new HashMap<>();
+        List<CustomerCredit> customerCreditList = customerCreditService.listByCustomerId(customerIds);
+        if (CollectionUtils.isNotEmpty(customerCreditList)) {
+            customerCreditMap = customerCreditList.stream().collect(Collectors.toMap(CustomerCredit::getCompanyId, Function.identity()
+                    , (v1, v2) -> v1));
+        }
+        // 客户简称数据
+        Map<String, String> customerShortNameMap = new HashMap<>();
+        List<CustomerShort> customerShortList = customerShortService.listByCustomerId(customerIds);
+        if (CollectionUtils.isNotEmpty(customerShortList)) {
+            customerShortNameMap = customerShortList.stream().collect(Collectors.toMap(CustomerShort::getCustomerId, CustomerShort::getId
+                    , (v1, v2) -> v1));
+        }
+        // 订货单信息
+        Map<String, PurchaseOrderInfo> orderInfoMap = new HashMap<>();
+        List<PurchaseOrderInfo> orderInfoList = purchaseOrderInfoService.listByIds(orderIds);
+        if (CollectionUtils.isNotEmpty(orderInfoList)) {
+            orderInfoMap = orderInfoList.stream().collect(Collectors.toMap(PurchaseOrderInfo::getId, Function.identity()));
+        }
+        // 订货单规格信息
+        Map<String, PurchaseOrderLine> orderSpecMap = new HashMap<>();
+        List<PurchaseOrderLine> orderSpecList = purchaseOrderLineService.listByIds(orderIds);
+        if (CollectionUtils.isNotEmpty(orderSpecList)) {
+            orderSpecMap = orderSpecList.stream().collect(Collectors.toMap(PurchaseOrderLine::getId, Function.identity()));
+        }
+        List<ReceiptLedgerInfo> dataList = new ArrayList<>();
+        for (ShipmentsOrderInfo shipmentsOrderInfo : shipmentsOrderInfoList) {
+            String customerId = shipmentsOrderInfo.getCustomerId();
+            ReceiptLedgerInfo data = new ReceiptLedgerInfo();
+            data.setId(IdUtil.getId());
+            String shortNameId = customerShortNameMap.get(customerId);
+            data.setCustomerShortId(shortNameId);
+            CustomerCredit credit = customerCreditMap.get(customerId);
+            if (credit != null) {
+                String companyCreditLimit = credit.getCompanyCreditLimit();
+                if (companyCreditLimit != null) {
+                    data.setQuota(new BigDecimal(credit.getCompanyCreditLimit()));
+                } else {
+                    data.setQuota(BigDecimal.ZERO);
+                }
+                data.setSettleTerm(credit.getCompanySettlementPeriod());
+            }
+            data.setDeptId(shipmentsOrderInfo.getDeptId());
+            data.setRegion(shipmentsOrderInfo.getRegion());
+            data.setCustomerId(shipmentsOrderInfo.getCustomerId());
+            data.setShipmentDate(shipmentsOrderInfo.getShipmentsDate());
+            List<String> supplyUnitList = new ArrayList<>();
+            // 计算期初应收款
+            BigDecimal startAccountReceivable = BigDecimal.ZERO;
+            List<ShipmentsPlanDetail> detailList = shipmentsOrderInfo.getDetailList();
+            for (ShipmentsPlanDetail detail : detailList) {
+                String orderSpecId = detail.getOrderSpecId();
+                PurchaseOrderLine orderLine = orderSpecMap.get(orderSpecId);
+                BigDecimal salesPrice = BigDecimal.ZERO;
+                if (orderLine != null && orderLine.getSalesPrice() != null) {
+                    salesPrice = orderLine.getSalesPrice();
+                }
+                Double actualShipmentQuantity = detail.getActualShipmentQuantity();
+                startAccountReceivable = salesPrice.multiply(new BigDecimal(actualShipmentQuantity));
+                // 厂别数据处理
+                PurchaseOrderInfo orderInfo = orderInfoMap.get(detail.getOrderId());
+                String supplyUnit = orderInfo.getSupplyUnit();
+                if (!supplyUnitList.contains(supplyUnit)) {
+                    supplyUnitList.add(supplyUnit);
+                }
+            }
+            String factoryType = String.join(",", supplyUnitList);
+            data.setFactoryType(factoryType);
+            data.setStartAccountReceivable(startAccountReceivable);
+            if (shipmentsOrderInfo.getDeliveryTime() != null) {
+                data.setArrivalDate(shipmentsOrderInfo.getDeliveryTime().toLocalDate());
+            }
+            data.setEndAccountReceivable(startAccountReceivable);
+
+            dataList.add(data);
+        }
+        getBaseMapper().batchAdd(dataList);
+    }
+
+
+
+    /**
+     * 获取结算状态
+     * @return 状态字符串
+     */
+    public String getSettlementStatus(BigDecimal endAccountReceivable, LocalDate settleTerm) {
+        // 检查期末应收账款是否为0
+        if (endAccountReceivable.compareTo(BigDecimal.ZERO) == 0) {
+            return "SETTLE_UP";
+        }
+        // 检查期末应收账款是否为负数
+        if (endAccountReceivable.compareTo(BigDecimal.ZERO) < 0) {
+            return "DEPOSIT";
+        }
+        // 正数情况下，检查是否超期
+        try {
+            LocalDate currentDate = LocalDate.now();
+            // 计算超期天数
+            long overdueDays = ChronoUnit.DAYS.between(settleTerm, currentDate);
+            if (overdueDays <= 0) {
+                return "AGREEMENT";
+            } else if (overdueDays <= 5) {
+                return "FIRST_COORDINATE";
+            } else if (overdueDays <= 10) {
+                return "SECOND";
+            } else {
+                return "CLEAR_DEBTS";
+            }
+        } catch (Exception e) {
+            // 日期解析错误或空值处理
+            throw new DefaultClientException("日期数据异常！");
+        }
+    }
 }
 }

@@ -26,6 +26,7 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog;
 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.handlers.MessageHandler;
 import com.lframework.xingyun.sc.handlers.MessageHandler;
+import com.lframework.xingyun.sc.service.ledger.ReceiptLedgerInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
@@ -51,6 +52,7 @@ import org.springframework.stereotype.Service;
 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.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.*;
@@ -87,6 +89,8 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
     private MqProducerService mqProducerService;
     private MqProducerService mqProducerService;
     @Resource
     @Resource
     private PurchaseOrderLineService purchaseOrderLineService;
     private PurchaseOrderLineService purchaseOrderLineService;
+    @Resource
+    private ReceiptLedgerInfoService receiptLedgerInfoService;
 
 
 
 
     @Override
     @Override
@@ -383,6 +387,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             if (detailVo == null) {
             if (detailVo == null) {
                 continue;
                 continue;
             }
             }
+            info.setActualShipmentQuantity(detailVo.getActualShipmentQuantity());
             detail.setActualShipmentQuantity(detailVo.getActualShipmentQuantity());
             detail.setActualShipmentQuantity(detailVo.getActualShipmentQuantity());
             detail.setNum(detailVo.getNum());
             detail.setNum(detailVo.getNum());
             detail.setYieldBatchNo(detailVo.getYieldBatchNo());
             detail.setYieldBatchNo(detailVo.getYieldBatchNo());
@@ -396,6 +401,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                 orderIds.add(info.getOrderId());
                 orderIds.add(info.getOrderId());
             }
             }
         }
         }
+        orderInfo.setDetailList(shipmentsOrderDetailList);
         // 更新发货明细
         // 更新发货明细
         shipmentsPlanDetailService.updateBatchById(dataList);
         shipmentsPlanDetailService.updateBatchById(dataList);
         // 更新发货单状态
         // 更新发货单状态
@@ -425,6 +431,13 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             }
             }
             messageHandler.sendMsg(userIds, title, title, shipmentsOrderId, null);
             messageHandler.sendMsg(userIds, title, title, shipmentsOrderId, null);
         }
         }
+        // 判断当前日期是否大于等于发货日期
+        LocalDate now = LocalDate.now();
+        LocalDate shipmentsDate = orderInfo.getShipmentsDate();
+        if (!now.isBefore(shipmentsDate)) {
+            // 生成应收款台账明细数据
+            receiptLedgerInfoService.generateLedgerInfo(Collections.singletonList(orderInfo));
+        }
     }
     }
 
 
     @Override
     @Override
@@ -434,6 +447,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         updateWrapper.set(ShipmentsOrderInfo::getReceiptsId, vo.getFileId())
         updateWrapper.set(ShipmentsOrderInfo::getReceiptsId, vo.getFileId())
                 .set(ShipmentsOrderInfo::getReceiptsName, vo.getFileName())
                 .set(ShipmentsOrderInfo::getReceiptsName, vo.getFileName())
                 .set(ShipmentsOrderInfo::getStatus, "DELIVERED")
                 .set(ShipmentsOrderInfo::getStatus, "DELIVERED")
+                .set(ShipmentsOrderInfo::getDeliveryTime, LocalDateTime.now())
                 .eq(ShipmentsOrderInfo::getId, vo.getShipmentsOrderId());
                 .eq(ShipmentsOrderInfo::getId, vo.getShipmentsOrderId());
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
         // 更新订货单状态
         // 更新订货单状态

@@ -157,4 +157,12 @@ public interface CustomerCreditService extends BaseMpService<CustomerCredit> {
      * @param vo
      * @param vo
      */
      */
     void updateChange(UpdateCustomerCreditVo vo);
     void updateChange(UpdateCustomerCreditVo vo);
+
+    /**
+     * 根据客户ID获取资信数据
+     *
+     * @param customerIds   客户ID
+     * @return              List<CustomerCredit>
+     */
+    List<CustomerCredit> listByCustomerId(List<String> customerIds);
 }
 }

 package com.lframework.xingyun.sc.service.ledger;
 package com.lframework.xingyun.sc.service.ledger;
 
 
+import com.lframework.xingyun.sc.entity.ShipmentsOrderInfo;
 import com.lframework.xingyun.sc.vo.ledger.receipt.CreateReceiptLedgerInfoVo;
 import com.lframework.xingyun.sc.vo.ledger.receipt.CreateReceiptLedgerInfoVo;
 import com.lframework.xingyun.sc.vo.ledger.receipt.QueryReceiptLedgerInfoVo;
 import com.lframework.xingyun.sc.vo.ledger.receipt.QueryReceiptLedgerInfoVo;
 import com.lframework.xingyun.sc.entity.ReceiptLedgerInfo;
 import com.lframework.xingyun.sc.entity.ReceiptLedgerInfo;
@@ -72,4 +73,11 @@ public interface ReceiptLedgerInfoService extends BaseMpService<ReceiptLedgerInf
      * @param id    主键ID
      * @param id    主键ID
      */
      */
     void deleteById(String id);
     void deleteById(String id);
+
+    /**
+     * 生成台账明细
+     *
+     * @param orderInfoList 发货单数据
+     */
+    void generateLedgerInfo(List<ShipmentsOrderInfo> orderInfoList);
 }
 }

@@ -137,15 +137,6 @@ public class CreateReceiptLedgerInfoVo implements BaseVo, Serializable {
     private BigDecimal returnedAmount;
     private BigDecimal returnedAmount;
 
 
     /**
     /**
-     * 实际回笼金额
-     */
-    @ApiModelProperty(value = "实际回笼金额", required = true)
-    @NotNull(message = "请输入实际回笼金额！")
-    @TypeMismatch(message = "实际回笼金额格式有误！")
-    @IsNumberPrecision(message = "实际回笼金额最多允许4位小数！", value = 4)
-    private BigDecimal actualReturnedAmount;
-
-    /**
      * 期末应收账款
      * 期末应收账款
      */
      */
     @ApiModelProperty(value = "期末应收账款", required = true)
     @ApiModelProperty(value = "期末应收账款", required = true)

@@ -25,7 +25,6 @@
         <result column="processed_date" property="processedDate"/>
         <result column="processed_date" property="processedDate"/>
         <result column="actual_returned_date" property="actualReturnedDate"/>
         <result column="actual_returned_date" property="actualReturnedDate"/>
         <result column="returned_amount" property="returnedAmount"/>
         <result column="returned_amount" property="returnedAmount"/>
-        <result column="actual_returned_amount" property="actualReturnedAmount"/>
         <result column="end_account_receivable" property="endAccountReceivable"/>
         <result column="end_account_receivable" property="endAccountReceivable"/>
         <result column="apply_status" property="applyStatus"/>
         <result column="apply_status" property="applyStatus"/>
         <result column="coordinate_date" property="coordinateDate"/>
         <result column="coordinate_date" property="coordinateDate"/>
@@ -66,7 +65,6 @@
             tb.processed_date,
             tb.processed_date,
             tb.actual_returned_date,
             tb.actual_returned_date,
             tb.returned_amount,
             tb.returned_amount,
-            tb.actual_returned_amount,
             tb.end_account_receivable,
             tb.end_account_receivable,
             tb.apply_status,
             tb.apply_status,
             tb.coordinate_date,
             tb.coordinate_date,
@@ -144,7 +142,6 @@
         processed_date,
         processed_date,
         actual_returned_date,
         actual_returned_date,
         returned_amount,
         returned_amount,
-        actual_returned_amount,
         end_account_receivable,
         end_account_receivable,
         apply_status,
         apply_status,
         coordinate_date,
         coordinate_date,
@@ -177,7 +174,6 @@
             #{item.processedDate},
             #{item.processedDate},
             #{item.actualReturnedDate},
             #{item.actualReturnedDate},
             #{item.returnedAmount},
             #{item.returnedAmount},
-            #{item.actualReturnedAmount},
             #{item.endAccountReceivable},
             #{item.endAccountReceivable},
             #{item.applyStatus},
             #{item.applyStatus},
             #{item.coordinateDate},
             #{item.coordinateDate},