合并供应链代码
This commit is contained in:
@@ -42,6 +42,12 @@
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-module-bpm-api</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- 业务组件 -->
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
@@ -131,21 +137,21 @@
|
||||
<build>
|
||||
<!-- 设置构建的 jar 包名 -->
|
||||
<finalName>${project.artifactId}</finalName>
|
||||
<plugins>
|
||||
<!-- 打包 -->
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<version>${spring.boot.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
<!-- <plugins>-->
|
||||
<!-- <!– 打包 –>-->
|
||||
<!-- <plugin>-->
|
||||
<!-- <groupId>org.springframework.boot</groupId>-->
|
||||
<!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
|
||||
<!-- <version>${spring.boot.version}</version>-->
|
||||
<!-- <executions>-->
|
||||
<!-- <execution>-->
|
||||
<!-- <goals>-->
|
||||
<!-- <goal>repackage</goal> <!– 将引入的 jar 打入其中 –>-->
|
||||
<!-- </goals>-->
|
||||
<!-- </execution>-->
|
||||
<!-- </executions>-->
|
||||
<!-- </plugin>-->
|
||||
<!-- </plugins>-->
|
||||
</build>
|
||||
|
||||
</project>
|
||||
|
||||
@@ -8,7 +8,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
*
|
||||
* @author ZT
|
||||
*/
|
||||
@SpringBootApplication
|
||||
//@SpringBootApplication
|
||||
public class CapitalServerApplication {
|
||||
|
||||
public static void main(String[] args) {
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
package cn.iocoder.yudao.module.capital.controller.admin.capital;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
||||
|
||||
/**
|
||||
* Capital 控制器
|
||||
*
|
||||
* @author ZT
|
||||
*/
|
||||
@Tag(name = "管理后台 - Capital")
|
||||
@RestController
|
||||
@RequestMapping("/admin/capital/capital")
|
||||
public class CapitalController {
|
||||
|
||||
@GetMapping("/hello")
|
||||
@Operation(summary = "Hello Capital")
|
||||
public CommonResult<String> hello() {
|
||||
return success("Hello, Capital!");
|
||||
}
|
||||
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,73 @@
|
||||
package cn.iocoder.yudao.module.capital.controller.admin.capital.splyAmountCredit.vo;
|
||||
|
||||
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
|
||||
import cn.iocoder.yudao.module.capital.enums.CapitalDictTypeConstants;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
||||
@Schema(description = "管理后台 - 授信额度变动记录 Response VO")
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class AmountCreditChangeExcelVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "8514")
|
||||
@ExcelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "关联单据号;收款单/付款单/结算单", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("关联单据号;收款单/付款单/结算单")
|
||||
private String referenceNumber;
|
||||
|
||||
@Schema(description = "授信表主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "5903")
|
||||
//@ExcelProperty("授信表主键")
|
||||
private Long creditId;
|
||||
|
||||
@Schema(description = "变动单号", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("变动单号")
|
||||
private String changeNumber;
|
||||
|
||||
@Schema(description = "客商名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
|
||||
@ExcelProperty("客商名称")
|
||||
private String partnerName;
|
||||
|
||||
@Schema(description = "客商编码", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("客商编码")
|
||||
private String partnerNumber;
|
||||
|
||||
@Schema(description = "变动类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||
@ExcelProperty("变动类型")
|
||||
@DictFormat(CapitalDictTypeConstants.SPLY_AMT_CRDT_CHG_CHANGE_TYPE)
|
||||
private String changeType;
|
||||
|
||||
@Schema(description = "变动金额", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("变动金额")
|
||||
private BigDecimal amount;
|
||||
|
||||
@Schema(description = "变动原因")
|
||||
@ExcelProperty("变动原因")
|
||||
private String cause;
|
||||
|
||||
@Schema(description = "关联交易类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||
@ExcelProperty("关联交易类型")
|
||||
@DictFormat(CapitalDictTypeConstants.SPLY_AMT_CRDT_CHG_REFERENCE_TYPE)
|
||||
private String referenceType;
|
||||
|
||||
@Schema(description = "凭证日期", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("凭证日期")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime voucherDate;
|
||||
|
||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("创建时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime createTime;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,52 @@
|
||||
package cn.iocoder.yudao.module.capital.controller.admin.capital.splyAmountCredit.vo;
|
||||
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import java.math.BigDecimal;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
||||
@Schema(description = "管理后台 - 授信额度变动记录分页 Request VO")
|
||||
@Data
|
||||
public class AmountCreditChangePageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "关联单据号;收款单/付款单/结算单")
|
||||
private String referenceNumber;
|
||||
|
||||
@Schema(description = "授信表主键", example = "5903")
|
||||
private Long creditId;
|
||||
|
||||
@Schema(description = "变动单号")
|
||||
private String changeNumber;
|
||||
|
||||
@Schema(description = "客商名称", example = "王五")
|
||||
private String partnerName;
|
||||
|
||||
@Schema(description = "客商编码")
|
||||
private String partnerNumber;
|
||||
|
||||
@Schema(description = "变动类型", example = "1")
|
||||
private String changeType;
|
||||
|
||||
@Schema(description = "变动金额")
|
||||
private BigDecimal amount;
|
||||
|
||||
@Schema(description = "变动原因")
|
||||
private String cause;
|
||||
|
||||
@Schema(description = "关联交易类型", example = "1")
|
||||
private String referenceType;
|
||||
|
||||
@Schema(description = "凭证日期")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] voucherDate;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] createTime;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
package cn.iocoder.yudao.module.capital.controller.admin.capital.splyAmountCredit.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
import java.math.BigDecimal;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import java.time.LocalDateTime;
|
||||
import com.alibaba.excel.annotation.*;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
||||
@Schema(description = "管理后台 - 授信额度变动记录 Response VO")
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class AmountCreditChangeRespVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "8514")
|
||||
@ExcelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "关联单据号;收款单/付款单/结算单", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("关联单据号;收款单/付款单/结算单")
|
||||
private String referenceNumber;
|
||||
|
||||
@Schema(description = "授信表主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "5903")
|
||||
//@ExcelProperty("授信表主键")
|
||||
private Long creditId;
|
||||
|
||||
@Schema(description = "变动单号", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("变动单号")
|
||||
private String changeNumber;
|
||||
|
||||
@Schema(description = "客商名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
|
||||
@ExcelProperty("客商名称")
|
||||
private String partnerName;
|
||||
|
||||
@Schema(description = "客商编码", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("客商编码")
|
||||
private String partnerNumber;
|
||||
|
||||
@Schema(description = "变动类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||
@ExcelProperty("变动类型")
|
||||
private String changeType;
|
||||
|
||||
@Schema(description = "变动金额", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("变动金额")
|
||||
private BigDecimal amount;
|
||||
|
||||
@Schema(description = "变动原因")
|
||||
@ExcelProperty("变动原因")
|
||||
private String cause;
|
||||
|
||||
@Schema(description = "关联交易类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||
@ExcelProperty("关联交易类型")
|
||||
private String referenceType;
|
||||
|
||||
@Schema(description = "凭证日期", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("凭证日期")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime voucherDate;
|
||||
|
||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("创建时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime createTime;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
package cn.iocoder.yudao.module.capital.controller.admin.capital.splyAmountCredit.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
import jakarta.validation.constraints.*;
|
||||
import java.math.BigDecimal;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
||||
@Schema(description = "管理后台 - 授信额度变动记录新增/修改 Request VO")
|
||||
@Data
|
||||
public class AmountCreditChangeSaveReqVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "8514")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "关联单据号;收款单/付款单/结算单", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@NotEmpty(message = "关联单据号;收款单/付款单/结算单不能为空")
|
||||
private String referenceNumber;
|
||||
|
||||
@Schema(description = "授信表主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "5903")
|
||||
@NotEmpty(message = "授信表主键不能为空")
|
||||
private Long creditId;
|
||||
|
||||
@Schema(description = "变动单号", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@NotEmpty(message = "变动单号不能为空")
|
||||
private String changeNumber;
|
||||
|
||||
@Schema(description = "客商名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
|
||||
@NotEmpty(message = "客商名称不能为空")
|
||||
private String partnerName;
|
||||
|
||||
@Schema(description = "客商编码", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@NotEmpty(message = "客商编码不能为空")
|
||||
private String partnerNumber;
|
||||
|
||||
@Schema(description = "变动类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||
@NotEmpty(message = "变动类型不能为空")
|
||||
private String changeType;
|
||||
|
||||
@Schema(description = "变动金额", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@NotNull(message = "变动金额不能为空")
|
||||
private BigDecimal amount;
|
||||
|
||||
@Schema(description = "变动原因")
|
||||
private String cause;
|
||||
|
||||
@Schema(description = "关联交易类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||
@NotEmpty(message = "关联交易类型不能为空")
|
||||
private String referenceType;
|
||||
|
||||
@Schema(description = "凭证日期", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@NotNull(message = "凭证日期不能为空")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime voucherDate;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
package cn.iocoder.yudao.module.capital.controller.admin.capital.splyAmountCredit.vo;
|
||||
|
||||
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
|
||||
import cn.iocoder.yudao.module.capital.enums.CapitalDictTypeConstants;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
||||
@Schema(description = "管理后台 - 授信额度 Response VO")
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class AmountCreditExcelVO {
|
||||
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "11717")
|
||||
@ExcelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "客商名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
|
||||
@ExcelProperty("客商名称")
|
||||
private String partnerName;
|
||||
|
||||
@Schema(description = "客商编码", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("客商编码")
|
||||
private String partnerNumber;
|
||||
|
||||
@Schema(description = "授信类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||
@ExcelProperty("授信类型")
|
||||
@DictFormat(CapitalDictTypeConstants.SPLY_AMT_CRDT_CREDIT_TYPE)
|
||||
private String creditType;
|
||||
|
||||
@Schema(description = "开始日期", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("开始日期")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime startDate;
|
||||
|
||||
@Schema(description = "结束日期", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("结束日期")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime endDate;
|
||||
|
||||
@Schema(description = "授信额度上限", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("授信额度上限")
|
||||
private BigDecimal amountLimit;
|
||||
|
||||
@Schema(description = "授信使用额度")
|
||||
@ExcelProperty("授信使用额度")
|
||||
private BigDecimal useAmount;
|
||||
|
||||
@Schema(description = "授信剩余余额")
|
||||
@ExcelProperty("授信剩余余额")
|
||||
private BigDecimal remaineAmount;
|
||||
|
||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("创建时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime createTime;
|
||||
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user