新增库位新表的相关功能,修复合同收发货规则

This commit is contained in:
潘荣晟
2026-01-08 15:36:07 +08:00
parent 84b297f05f
commit 3827d7050f
22 changed files with 695 additions and 42 deletions

View File

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 收发货规则 Response VO")
@@ -47,11 +48,11 @@ public class ContractReceiveSendRespDTO {
@Schema(description = "区间下限")
@ExcelProperty("区间下限")
private String gradeDown;
private BigDecimal gradeDown;
@Schema(description = "区间上限")
@ExcelProperty("区间上限")
private String gradeUp;
private BigDecimal gradeUp;
@Schema(description = "合同id", example = "22162")
@ExcelProperty("合同id")

View File

@@ -5,6 +5,7 @@ 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 com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -38,10 +39,10 @@ public class ContractReceiveSendPageReqVO extends PageParam {
private String rangeWay;
@Schema(description = "区间下限")
private String gradeDown;
private BigDecimal gradeDown;
@Schema(description = "区间上限")
private String gradeUp;
private BigDecimal gradeUp;
@Schema(description = "合同id", example = "22162")
private Long contractId;

View File

@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 收发货规则 Response VO")
@@ -50,11 +51,11 @@ public class ContractReceiveSendRespVO {
@Schema(description = "区间下限")
@ExcelProperty("区间下限")
private String gradeDown;
private BigDecimal gradeDown;
@Schema(description = "区间上限")
@ExcelProperty("区间上限")
private String gradeUp;
private BigDecimal gradeUp;
@Schema(description = "合同id", example = "22162")
@ExcelProperty("合同id")

View File

@@ -3,6 +3,8 @@ package com.zt.plat.module.contractorder.api.vo.contract;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@Schema(description = "管理后台 - 收发货规则新增/修改 Request VO")
@Data
public class ContractReceiveSendSaveReqVO {
@@ -35,10 +37,10 @@ public class ContractReceiveSendSaveReqVO {
private String rangeWay;
@Schema(description = "区间下限")
private String gradeDown;
private BigDecimal gradeDown;
@Schema(description = "区间上限")
private String gradeUp;
private BigDecimal gradeUp;
@Schema(description = "合同id", example = "22162")
private Long contractId;