合并供应链代码
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<artifactId>yudao</artifactId>
|
||||
<artifactId>dsc-supply</artifactId>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<version>${revision}</version>
|
||||
</parent>
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
<name>${project.artifactId}</name>
|
||||
<description>
|
||||
Capital 模块。
|
||||
Capital 模块。资金授信模块。
|
||||
</description>
|
||||
|
||||
</project>
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
package cn.iocoder.yudao.module.capital.enums;
|
||||
|
||||
/**
|
||||
* 资金授信模块 字典类型的枚举类
|
||||
*
|
||||
* @author 芋道源码
|
||||
*/
|
||||
public interface CapitalDictTypeConstants {
|
||||
|
||||
// ========== capital 模块 ==========
|
||||
|
||||
String SPLY_AMT_CRDT_CREDIT_TYPE = "sply_amt_crdt_credit_type"; // 授信台账-授信类型
|
||||
String SPLY_AMT_CRDT_CHG_CHANGE_TYPE = "sply_amt_crdt_chg_change_type"; // 授信台账检索详情-变动类型
|
||||
String SPLY_AMT_CRDT_CHG_REFERENCE_TYPE = "sply_amt_crdt_chg_reference_type"; // 授信台账检索详情-关联交易类型
|
||||
String SPLY_AMT_CRDT_APPL_DTL_PTNRTP = "sply_amt_crdt_appl_dtl_ptnrTp"; // 授信单明细-客户/供应商类别
|
||||
String AMOUNT_CREDIT_APPLY_TYPE = "amount_credit_apply_type"; // 授信单-额度类型
|
||||
String AMOUNT_CREDIT_APPLY_COMPANY_TYPE = "amount_credit_apply_company_type"; // 授信单-企业性质
|
||||
String SPLY_AMT_CRDT_APPL_STS = "sply_amt_crdt_appl_sts"; // 授信单-状态
|
||||
String SPLY_AMT_CRDT_APPL_SGN_STATUS = "sply_amt_crdt_appl_sgn_status"; // 授信单签字确认状态
|
||||
|
||||
}
|
||||
@@ -13,5 +13,15 @@ public interface ErrorCodeConstants {
|
||||
|
||||
// ========== 示例模块 1-001-000-000 ==========
|
||||
ErrorCode EXAMPLE_NOT_EXISTS = new ErrorCode(1_001_000_001, "示例不存在");
|
||||
ErrorCode AMOUNT_CREDIT_APPLY_NOT_EXISTS = new ErrorCode(1_004_000_005, "授信单不存在");
|
||||
ErrorCode AMOUNT_CREDIT_APPLY_DETAIL_NOT_EXISTS = new ErrorCode(1_004_000_006, "授信单明细不存在");
|
||||
ErrorCode AMOUNT_CREDIT_APPLY_SIGN_NOT_EXISTS = new ErrorCode(1_004_000_007, "授信调整签字区域明细不存在");
|
||||
ErrorCode AMOUNT_CREDIT_STATUS_DELETE = new ErrorCode(1_004_000_008, "授信单不是草稿状态,不允许删除");
|
||||
ErrorCode AMOUNT_CREDIT_STATUS_UPDATE = new ErrorCode(1_004_000_009, "授信单是申请中状态,不允许更新");
|
||||
ErrorCode AMOUNT_CREDIT_NOT_EXISTS = new ErrorCode(1_004_002_001, "授信额度不存在");
|
||||
ErrorCode AMOUNT_CREDIT_CHANGE_NOT_EXISTS = new ErrorCode(1_004_002_002, "授信额度变动记录不存在");
|
||||
ErrorCode AMOUNT_CREDIT_APPLY_ID_NOT_EXISTS = new ErrorCode(1_004_002_004, "授信单id不能为空");
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
package cn.iocoder.yudao.module.capital.enums;
|
||||
|
||||
/**
|
||||
* 授信模块-序列号编码常量
|
||||
*/
|
||||
public interface GeneralSequenceConstants {
|
||||
|
||||
String SPLY_AMT_CRDT_APPL_APPL_NUM = "SPLY_AMT_CRDT_APPL_APPL_NUM"; // 资金授信管理-授信单序列号编码
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user