楚江ERP:应收款台账明细相关接口开发

@@ -958,3 +958,19 @@ create table if not exists customer_visit_record(
     create_time datetime default now() comment '创建时间',
     update_time datetime default now() comment '更新时间'
 );
+
+CREATE TABLE `tbl_recapitalize` (
+    `id` varchar(32) NOT NULL COMMENT 'ID',
+    `recapitalize_date` date DEFAULT NULL COMMENT '资金回笼日期',
+    `ordering_unit` varchar(100) DEFAULT NULL COMMENT '订货单位ID',
+    `returned_amount` decimal(15,4) DEFAULT NULL COMMENT '回笼金额',
+    `dept_id` varchar(32) DEFAULT NULL COMMENT '办事处ID',
+    `factory_type` varchar(50) DEFAULT NULL COMMENT '厂别',
+    `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID',
+    `create_by` varchar(20) NOT NULL COMMENT '创建人',
+    `update_by_id` varchar(32) NOT NULL COMMENT '更新人ID',
+    `update_by` varchar(20) NOT NULL COMMENT '更新人',
+    `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='回笼资金表'

@@ -7,7 +7,6 @@ import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.bo.BaseBo;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;
@@ -27,6 +26,9 @@ public class GetReceiptLedgerInfoBo extends BaseBo<ReceiptLedgerInfo> {
     @ApiModelProperty("ID")
     private String id;
 
+    @ApiModelProperty("父ID")
+    private String parentId;
+
     /**
      * 客户简称ID
      */
@@ -187,6 +189,12 @@ public class GetReceiptLedgerInfoBo extends BaseBo<ReceiptLedgerInfo> {
     private Integer delFlag;
 
     /**
+     * 是否拆分
+     */
+    @ApiModelProperty("是否拆分")
+    private boolean spilt;
+
+    /**
      * 创建人ID
      */
     @ApiModelProperty("创建人ID")

@@ -7,7 +7,6 @@ import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.bo.BaseBo;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;
@@ -27,6 +26,9 @@ public class QueryReceiptLedgerInfoBo extends BaseBo<ReceiptLedgerInfo> {
     @ApiModelProperty("ID")
     private String id;
 
+    @ApiModelProperty("父ID")
+    private String parentId;
+
     /**
      * 客户简称ID
      */
@@ -181,6 +183,12 @@ public class QueryReceiptLedgerInfoBo extends BaseBo<ReceiptLedgerInfo> {
     private String description;
 
     /**
+     * 是否拆分
+     */
+    @ApiModelProperty("是否拆分")
+    private boolean spilt;
+
+    /**
      * 创建人ID
      */
     @ApiModelProperty("创建人ID")

@@ -11,6 +11,7 @@ import com.lframework.starter.web.core.utils.PageResultUtil;
 import javax.annotation.Resource;
 import javax.validation.constraints.NotBlank;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.xingyun.sc.vo.ledger.receipt.ReceiptLedgerInfoSplitVo;
 import com.lframework.xingyun.sc.vo.ledger.receipt.UpdateReceiptLedgerInfoVo;
 import io.swagger.annotations.ApiOperation;
 import com.lframework.starter.common.utils.CollectionUtil;
@@ -38,19 +39,14 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/ledger/receipt")
 public class ReceiptLedgerInfoController extends DefaultBaseController {
-
-
-
     @Resource
     private ReceiptLedgerInfoService receiptLedgerInfoService;
 
-
-
     /**
      * 查询列表
      */
     @ApiOperation("查询列表")
-    @HasPermission({"ledger:receipt:query"})
+    @HasPermission({"account-manage:ledger-detail:query"})
     @GetMapping("/query")
     public InvokeResult<PageResult<QueryReceiptLedgerInfoBo>> query(@Valid QueryReceiptLedgerInfoVo vo) {
         PageResult<ReceiptLedgerInfo> pageResult = receiptLedgerInfoService.query(getPageIndex(vo), getPageSize(vo), vo);
@@ -68,7 +64,7 @@ public class ReceiptLedgerInfoController extends DefaultBaseController {
      */
     @ApiOperation("根据ID查询")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"ledger:receipt:query"})
+    @HasPermission({"account-manage:ledger-detail:query"})
     @GetMapping
     public InvokeResult<GetReceiptLedgerInfoBo> get(@NotBlank(message = "id不能为空！") String id) {
         ReceiptLedgerInfo data = receiptLedgerInfoService.findById(id);
@@ -84,19 +80,43 @@ public class ReceiptLedgerInfoController extends DefaultBaseController {
      * 新增
      */
     @ApiOperation("新增")
-    @HasPermission({"ledger:receipt:add"})
+    @HasPermission({"account-manage:ledger-detail:add"})
     @PostMapping
-    public InvokeResult<Void> create(@Valid CreateReceiptLedgerInfoVo vo) {
+    public InvokeResult<Void> create(@Valid @RequestBody CreateReceiptLedgerInfoVo vo) {
         receiptLedgerInfoService.create(vo);
         return InvokeResultBuilder.success();
     }
 
+
+    /**
+     * 编辑
+     */
+    @ApiOperation("编辑")
+    @HasPermission({"account-manage:ledger-detail:modify"})
+    @PutMapping
+    public InvokeResult<Void> update(@Valid @RequestBody UpdateReceiptLedgerInfoVo vo) {
+        receiptLedgerInfoService.update(vo);
+        return InvokeResultBuilder.success();
+    }
+
+
+    /**
+     * 拆分
+     */
+    @ApiOperation("拆分")
+    @HasPermission({"account-manage:ledger-detail:split"})
+    @PostMapping("/split")
+    public InvokeResult<Void> split(@Valid @RequestBody ReceiptLedgerInfoSplitVo vo) {
+        receiptLedgerInfoService.split(vo);
+        return InvokeResultBuilder.success();
+    }
+
     /**
      * 根据ID删除
      */
     @ApiOperation("根据ID删除")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"ledger:receipt:delete"})
+    @HasPermission({"account-manage:ledger-detail:delete"})
     @DeleteMapping
     public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
         receiptLedgerInfoService.deleteById(id);

@@ -30,6 +30,11 @@ public class ReceiptLedgerInfo extends BaseEntity implements BaseDto {
     private String id;
 
     /**
+     * 父ID
+     */
+    private String parentId;
+
+    /**
      * 客户简称ID
      */
     private String customerShortId;
@@ -191,6 +196,11 @@ public class ReceiptLedgerInfo extends BaseEntity implements BaseDto {
     private Integer delFlag;
 
     /**
+     * 是否拆分
+     */
+    private boolean spilt;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

 package com.lframework.xingyun.sc.impl.ledger;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.starter.common.utils.ObjectUtil;
+import com.lframework.starter.common.utils.StringUtil;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.xingyun.sc.entity.ReceiptLedgerInfo;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
@@ -11,6 +17,9 @@ 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.utils.CommonUtil;
+import com.lframework.xingyun.sc.vo.ledger.receipt.ReceiptLedgerInfoSplitVo;
+import com.lframework.xingyun.sc.vo.ledger.receipt.UpdateReceiptLedgerInfoVo;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.ReceiptLedgerInfoMapper;
 import com.lframework.xingyun.sc.service.ledger.ReceiptLedgerInfoService;
@@ -18,6 +27,8 @@ import com.lframework.xingyun.sc.vo.ledger.receipt.CreateReceiptLedgerInfoVo;
 import com.lframework.xingyun.sc.vo.ledger.receipt.QueryReceiptLedgerInfoVo;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -53,6 +64,7 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
     public String create(CreateReceiptLedgerInfoVo vo) {
         ReceiptLedgerInfo data = new ReceiptLedgerInfo();
         data.setId(IdUtil.getId());
+        data.setParentId(vo.getParentId());
         data.setCustomerShortId(vo.getCustomerShortId());
         data.setQuota(vo.getQuota());
         data.setSettleTerm(vo.getSettleTerm());
@@ -77,7 +89,7 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         data.setFourthCoordinateDate(vo.getFourthCoordinateDate());
         data.setFifthCoordinateDate(vo.getFifthCoordinateDate());
         data.setDescription(vo.getDescription());
-
+        data.setSpilt(vo.isSpilt());
         getBaseMapper().insert(data);
 
         OpLogUtil.setVariable("id", data.getId());
@@ -86,6 +98,115 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         return data.getId();
     }
 
+    @OpLog(type = OtherOpLogType.class, name = "修改应收款台账明细，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void update(UpdateReceiptLedgerInfoVo vo) {
+        ReceiptLedgerInfo data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("应收款台账明细不存在！");
+        }
+        LambdaUpdateWrapper<ReceiptLedgerInfo> updateWrapper = Wrappers.lambdaUpdate(ReceiptLedgerInfo.class)
+                .set(ReceiptLedgerInfo::getDescription, StringUtil.isBlank(vo.getDescription()) ? null : vo.getDescription())
+                .set(ReceiptLedgerInfo::getProcessedDate, vo.getProcessedDate() == null ? null : vo.getProcessedDate())
+                .set(ReceiptLedgerInfo::getRemark, StringUtil.isBlank(vo.getRemark()) ? null : vo.getRemark())
+                .eq(ReceiptLedgerInfo::getId, vo.getId());
+
+        getBaseMapper().update(updateWrapper);
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "逻辑删除应收款台账明细，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void logicalDelete(String id) {
+        ReceiptLedgerInfo data = getBaseMapper().selectById(id);
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("应收款台账明细不存在！");
+        }
+        LambdaUpdateWrapper<ReceiptLedgerInfo> updateWrapper = Wrappers.lambdaUpdate(ReceiptLedgerInfo.class)
+                .set(ReceiptLedgerInfo::getDelFlag, 1)
+                .eq(ReceiptLedgerInfo::getId, id);
+
+        getBaseMapper().update(updateWrapper);
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(id);
+    }
+
+    /**
+     * 拆分
+     *
+     * @param vo 条件
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void split(ReceiptLedgerInfoSplitVo vo) {
+        String id = vo.getId();
+        ReceiptLedgerInfo receiptLedgerInfo = findById(id);
+        if (receiptLedgerInfo == null) {
+            throw new DefaultClientException("应收款台账明细不存在！");
+        }
+        // 判断拆分后总数量是否变化
+        List<BigDecimal> splitQuantityList = vo.getSplitQuantityList();
+        boolean match = CommonUtil.isQuantityMatchWithScale(splitQuantityList, receiptLedgerInfo.getStartAccountReceivable(), 4);
+        if (!match) {
+            throw new DefaultClientException("拆分金额总和必须等于原先期初应收账款金额！");
+        }
+        // 封装数据
+        List<ReceiptLedgerInfo> detailList = new ArrayList<>();
+        for (BigDecimal quantity : splitQuantityList) {
+            ReceiptLedgerInfo data = getReceiptLedgerInfo(quantity, receiptLedgerInfo);
+            detailList.add(data);
+        }
+        getBaseMapper().batchAdd(detailList);
+        //删除应收款台账明细（逻辑删除）
+        logicalDelete(id);
+    }
+
+
+    /**
+     * 封装应收款台账明细数据
+     *
+     * @param quantity 数量
+     * @param vo       原数据
+     * @return ReceiptLedgerInfo
+     */
+    private static ReceiptLedgerInfo getReceiptLedgerInfo(BigDecimal quantity, ReceiptLedgerInfo vo) {
+        String userId = SecurityUtil.getCurrentUser().getId();
+        ReceiptLedgerInfo data = new ReceiptLedgerInfo();
+        data.setId(IdUtil.getId());
+        data.setParentId(vo.getId());
+        data.setCustomerShortId(vo.getCustomerShortId());
+        data.setQuota(vo.getQuota());
+        data.setSettleTerm(vo.getSettleTerm());
+        data.setDeptId(vo.getDeptId());
+        data.setRegion(vo.getRegion());
+        data.setStockUpCompanyId(vo.getStockUpCompanyId());
+        data.setCustomerId(vo.getCustomerId());
+        data.setFactoryType(vo.getFactoryType());
+        data.setShipmentDate(vo.getShipmentDate());
+        data.setStartAccountReceivable(quantity);
+        data.setArrivalDate(vo.getArrivalDate());
+        data.setProcessedDate(vo.getProcessedDate());
+        data.setActualReturnedDate(vo.getActualReturnedDate());
+        data.setReturnedAmount(vo.getReturnedAmount());
+        data.setActualReturnedAmount(vo.getActualReturnedAmount());
+        data.setEndAccountReceivable(vo.getEndAccountReceivable());
+        data.setApplyStatus(vo.getApplyStatus());
+        data.setCoordinateDate(vo.getCoordinateDate());
+        data.setRemark(vo.getRemark());
+        data.setSecondCoordinateDate(vo.getSecondCoordinateDate());
+        data.setThirdCoordinateDate(vo.getThirdCoordinateDate());
+        data.setFourthCoordinateDate(vo.getFourthCoordinateDate());
+        data.setFifthCoordinateDate(vo.getFifthCoordinateDate());
+        data.setDescription(vo.getDescription());
+        data.setSpilt(true);
+        data.setCreateById(userId);
+        data.setUpdateById(userId);
+        return data;
+    }
+
     @OpLog(type = OtherOpLogType.class, name = "删除应收款台账明细，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Override

@@ -22,4 +22,12 @@ public interface ReceiptLedgerInfoMapper extends BaseMapper<ReceiptLedgerInfo> {
      * @return      List<ReceiptLedgerInfo>
      */
     List<ReceiptLedgerInfo> query(@Param("vo") QueryReceiptLedgerInfoVo vo);
+
+
+    /**
+     * 批量新增
+     *
+     * @param dataList  数据实体
+     */
+    void batchAdd(List<ReceiptLedgerInfo> dataList);
 }

@@ -5,6 +5,8 @@ import com.lframework.xingyun.sc.vo.ledger.receipt.QueryReceiptLedgerInfoVo;
 import com.lframework.xingyun.sc.entity.ReceiptLedgerInfo;
 import com.lframework.starter.web.core.service.BaseMpService;
 import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.xingyun.sc.vo.ledger.receipt.ReceiptLedgerInfoSplitVo;
+import com.lframework.xingyun.sc.vo.ledger.receipt.UpdateReceiptLedgerInfoVo;
 import java.util.List;
 
 /**
@@ -43,6 +45,26 @@ public interface ReceiptLedgerInfoService extends BaseMpService<ReceiptLedgerInf
      */
     String create(CreateReceiptLedgerInfoVo vo);
 
+    /**
+     * 更新
+     *
+     * @param vo 数据实体
+     */
+    void update(UpdateReceiptLedgerInfoVo vo);
+
+    /**
+     * 逻辑删除
+     *
+     * @param id 主键
+     */
+    void logicalDelete(String id);
+
+    /**
+     * 拆分
+     *
+     * @param vo 数据实体
+     */
+    void split(ReceiptLedgerInfoSplitVo vo);
 
     /**
      * 根据ID删除

@@ -4,7 +4,6 @@ import com.lframework.starter.web.core.components.validation.IsNumberPrecision;
 import java.math.BigDecimal;
 import javax.validation.constraints.NotBlank;
 import java.time.LocalDate;
-import com.lframework.starter.web.core.utils.IdUtil;
 import com.lframework.starter.web.core.vo.BaseVo;
 import javax.validation.constraints.NotNull;
 import io.swagger.annotations.ApiModelProperty;
@@ -18,6 +17,10 @@ public class CreateReceiptLedgerInfoVo implements BaseVo, Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty("父ID")
+    @Length(message = "父ID最多允许32个字符！")
+    private String parentId;
+
     /**
      * 客户简称ID
      */
@@ -215,4 +218,10 @@ public class CreateReceiptLedgerInfoVo implements BaseVo, Serializable {
     @Length(message = "说明最多允许200个字符！")
     private String description;
 
+    /**
+     * 是否拆分
+     */
+    @ApiModelProperty("是否拆分")
+    private boolean spilt;
+
 }

+package com.lframework.xingyun.sc.vo.ledger.receipt;
+
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import com.lframework.starter.web.core.vo.BaseVo;
+import com.lframework.starter.web.core.vo.PageVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class ReceiptLedgerInfoSplitVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 应收款台账明细ID
+     */
+    @ApiModelProperty("应收款台账明细ID")
+    @NotBlank(message = "应收款台账明细ID不能为空！")
+    private String id;
+
+    /**
+     * 拆分金额集合
+     */
+    @ApiModelProperty("拆分金额集合")
+    @NotEmpty(message = "拆分金额不能为空")
+    @TypeMismatch(message = "拆分金额格式有误！")
+    private List<BigDecimal> splitQuantityList;
+}

@@ -4,6 +4,7 @@
 
     <resultMap id="ReceiptLedgerInfo" type="com.lframework.xingyun.sc.entity.ReceiptLedgerInfo">
         <id column="id" property="id"/>
+        <result column="parent_id" property="parentId"/>
         <result column="customer_short_id" property="customerShortId"/>
         <result column="customer_short_name" property="customerShortName"/>
         <result column="customer_type" property="customerType"/>
@@ -35,6 +36,7 @@
         <result column="fifth_coordinate_date" property="fifthCoordinateDate"/>
         <result column="description" property="description"/>
         <result column="del_flag" property="delFlag"/>
+        <result column="spilt" property="spilt"/>
         <result column="create_by_id" property="createById"/>
         <result column="update_by_id" property="updateById"/>
         <result column="create_time" property="createTime"/>
@@ -44,6 +46,7 @@
     <sql id="ReceiptLedgerInfo_sql">
         SELECT
             tb.id,
+            tb.parent_id,
             tb.customer_short_id,
             cs.short_name as customer_short_name,
             cs.type as customer_type,
@@ -64,6 +67,7 @@
             tb.processed_date,
             tb.actual_returned_date,
             tb.returned_amount,
+            tb.actual_returned_amount,
             tb.end_account_receivable,
             tb.apply_status,
             tb.coordinate_date,
@@ -74,6 +78,7 @@
             tb.fifth_coordinate_date,
             tb.description,
             tb.del_flag,
+            tb.spilt,
             tb.create_by_id,
             tb.update_by_id,
             tb.create_time,
@@ -112,4 +117,75 @@
             </if>
         </where>
     </select>
+
+    <insert id="batchAdd">
+        INSERT INTO receipt_ledger_info (
+        id,
+        parent_id,
+        customer_short_id,
+        quota,
+        settle_term,
+        dept_id,
+        region,
+        stock_up_company_id,
+        customer_id,
+        factory_type,
+        shipment_date,
+        start_account_receivable,
+        arrival_date,
+        processed_date,
+        actual_returned_date,
+        returned_amount,
+        actual_returned_amount
+        end_account_receivable,
+        apply_status,
+        coordinate_date,
+        remark,
+        second_coordinate_date,
+        third_coordinate_date,
+        fourth_coordinate_date,
+        fifth_coordinate_date,
+        description,
+        spilt,
+        create_by_id,
+        update_by_id,
+        create_time,
+        update_time
+        ) VALUES
+        <foreach collection="list" item="item" separator=",">
+            (
+            #{item.id},
+            #{item.parentId},
+            #{item.customerShortId},
+            #{item.quota},
+            #{item.settleTerm},
+            #{item.deptId},
+            #{item.region},
+            #{item.stockUpCompanyId},
+            #{item.customerId},
+            #{item.factoryType},
+            #{item.shipmentDate},
+            #{item.startAccountReceivable},
+            #{item.arrivalDate},
+            #{item.processedDate},
+            #{item.actualReturnedDate},
+            #{item.returnedAmount},
+            #{item.actualReturnedAmount},
+            #{item.endAccountReceivable},
+            #{item.applyStatus},
+            #{item.coordinateAate},
+            #{item.remark},
+            #{item.secondCoordinateDate},
+            #{item.thirdCoordinateDate},
+            #{item.fourthCoordinateDate},
+            #{item.fifthCoordinateDate},
+            #{item.description},
+            #{item.spilt},
+            #{item.createById},
+            #{item.updateById},
+            #{item.createTime},
+            #{item.updateTime}
+            )
+        </foreach>
+    </insert>
 </mapper>