From 83c1b247bbbd1d9a0527eca7a952bd327ccb7ca1 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Fri, 10 Apr 2026 08:34:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plan/dto/AddLngPlanYearDemandHdrDto.java | 62 +++++ .../dto/AddLngPlanYearDemandHdrEcDto.java | 73 ++++++ .../dto/LngPlanYearDemandHdrEcPageDto.java | 55 +++++ .../plan/dto/LngPlanYearDemandHdrPageDto.java | 56 +++++ .../plan/dto/UpdateLngPlanYearDemandDto.java | 184 +++++++++++++++ .../dto/UpdateLngPlanYearDemandEcDto.java | 175 ++++++++++++++ .../dto/UpdateLngPlanYearDemandHdrDto.java | 104 ++++++++ .../dto/UpdateLngPlanYearDemandHdrEcDto.java | 109 +++++++++ .../module/plan/vo/LngPlanYearDemandEcVo.java | 216 +++++++++++++++++ .../plan/vo/LngPlanYearDemandHdrEcPageVo.java | 67 ++++++ .../plan/vo/LngPlanYearDemandHdrEcVo.java | 132 +++++++++++ .../plan/vo/LngPlanYearDemandHdrPageVo.java | 51 ++++ .../plan/vo/LngPlanYearDemandHdrVo.java | 126 ++++++++++ .../module/plan/vo/LngPlanYearDemandVo.java | 216 +++++++++++++++++ .../PlanYearDemandHdrController.java | 102 ++++++++ .../PlanYearDemandHdrEcController.java | 139 +++++++++++ .../module/plan/entity/LngPlanYearDemand.java | 223 ++++++++++++++++++ .../plan/entity/LngPlanYearDemandEc.java | 220 +++++++++++++++++ .../plan/entity/LngPlanYearDemandHdr.java | 133 +++++++++++ .../plan/entity/LngPlanYearDemandHdrEc.java | 137 +++++++++++ .../mapper/LngPlanYearDemandHdrEcMapper.java | 17 ++ .../mapper/LngPlanYearDemandHdrMapper.java | 17 ++ .../plan/mapper/LngPlanYearDemandMapper.java | 17 ++ .../service/IPlanYearDemandHdrEcService.java | 14 ++ .../service/IPlanYearDemandHdrService.java | 19 ++ .../impl/PlanYearDemandHdrEcServiceImpl.java | 21 ++ .../impl/PlanYearDemandHdrServiceImpl.java | 25 ++ 27 files changed, 2710 insertions(+) create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/AddLngPlanYearDemandHdrDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/AddLngPlanYearDemandHdrEcDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/LngPlanYearDemandHdrEcPageDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/LngPlanYearDemandHdrPageDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandEcDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandHdrDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandHdrEcDto.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandEcVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrEcPageVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrEcVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrPageVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandVo.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/controller/PlanYearDemandHdrController.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/controller/PlanYearDemandHdrEcController.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemand.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandEc.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandHdr.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandHdrEc.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/mapper/LngPlanYearDemandHdrEcMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/mapper/LngPlanYearDemandHdrMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/mapper/LngPlanYearDemandMapper.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/service/IPlanYearDemandHdrEcService.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/service/IPlanYearDemandHdrService.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/service/impl/PlanYearDemandHdrEcServiceImpl.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/service/impl/PlanYearDemandHdrServiceImpl.java diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/AddLngPlanYearDemandHdrDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/AddLngPlanYearDemandHdrDto.java new file mode 100644 index 0000000..acc15e3 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/AddLngPlanYearDemandHdrDto.java @@ -0,0 +1,62 @@ +package com.xjrsoft.module.plan.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + + +/** +* @title: 客户年度需求提报 +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@Data +public class AddLngPlanYearDemandHdrDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + /** + * 年度 + */ + @ApiModelProperty("年度") + private Short planYear; + /** + * 版本(自动生成，每客户每年从1开始) + */ + @ApiModelProperty("版本(自动生成，每客户每年从1开始)") + private Byte demandVerNo; + /** + * 最新版(Y-是，N-否；每客户每年只有一个Y) + */ + @ApiModelProperty("最新版(Y-是，N-否；每客户每年只有一个Y)") + private String lastSign; + /** + * 审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回) + */ + @ApiModelProperty("审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回)") + private String approCode; + /** + * 批复意见 + */ + @ApiModelProperty("批复意见") + private String reply; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/AddLngPlanYearDemandHdrEcDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/AddLngPlanYearDemandHdrEcDto.java new file mode 100644 index 0000000..3951a66 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/AddLngPlanYearDemandHdrEcDto.java @@ -0,0 +1,73 @@ +package com.xjrsoft.module.plan.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; +import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + + + + +/** +* @title: 客户年度需求提报--电商 +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@Data +public class AddLngPlanYearDemandHdrEcDto extends com.xjrsoft.common.model.base.BaseModel { + + private static final long serialVersionUID = 1L; + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + /** + * 年度 + */ + @ApiModelProperty("年度") + private Short planYear; + /** + * 版本(自动生成，每客户每年从1开始) + */ + @ApiModelProperty("版本(自动生成，每客户每年从1开始)") + private Byte demandVerNo; + /** + * 最新版(Y-是，N-否；每客户每年只有一个Y) + */ + @ApiModelProperty("最新版(Y-是，N-否；每客户每年只有一个Y)") + private String lastSign; + /** + * 审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回) + */ + @ApiModelProperty("审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回)") + private String approCode; + /** + * 批复意见 + */ + @ApiModelProperty("批复意见") + private String reply; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/LngPlanYearDemandHdrEcPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/LngPlanYearDemandHdrEcPageDto.java new file mode 100644 index 0000000..9064bbe --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/LngPlanYearDemandHdrEcPageDto.java @@ -0,0 +1,55 @@ +package com.xjrsoft.module.plan.dto; + +import com.xjrsoft.common.page.PageInput; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; + + +/** +* @title: 分页查询入参 +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +public class LngPlanYearDemandHdrEcPageDto extends PageInput { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + /** + * 年度 + */ + @ApiModelProperty("年度") + private Short planYear; + /** + * 版本(自动生成，每客户每年从1开始) + */ + @ApiModelProperty("版本(自动生成，每客户每年从1开始)") + private Byte demandVerNo; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 批复意见 + */ + @ApiModelProperty("批复意见") + private String reply; + /** + * 审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回) + */ + @ApiModelProperty("审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回)") + private String approCode; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/LngPlanYearDemandHdrPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/LngPlanYearDemandHdrPageDto.java new file mode 100644 index 0000000..5193ff5 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/LngPlanYearDemandHdrPageDto.java @@ -0,0 +1,56 @@ +package com.xjrsoft.module.plan.dto; + +import com.xjrsoft.common.page.PageInput; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** +* @title: 分页查询入参 +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +public class LngPlanYearDemandHdrPageDto extends PageInput { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + /** + * 年度 + */ + @ApiModelProperty("年度") + private Short planYear; + /** + * 版本(自动生成，每客户每年从1开始) + */ + @ApiModelProperty("版本(自动生成，每客户每年从1开始)") + private Byte demandVerNo; + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + /** + * 批复意见 + */ + @ApiModelProperty("批复意见") + private String reply; + /** + * 审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回) + */ + @ApiModelProperty("审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回)") + private String approCode; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandDto.java new file mode 100644 index 0000000..510db42 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandDto.java @@ -0,0 +1,184 @@ +package com.xjrsoft.module.plan.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.List; + +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.ValueDirectionType; + + + + +/** +* @title: 客户年度需求提报 +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_plan_year_demand",name="客户年度需求提报") +public class UpdateLngPlanYearDemandDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 年度计划-需求-主表主键(lng_plan_year_demand_hdr.id) + */ + @LogField(name="年度计划-需求-主表主键(lng_plan_year_demand_hdr.id)",index=1) + @ApiModelProperty("年度计划-需求-主表主键(lng_plan_year_demand_hdr.id)") + private Long pydhId; + + /** + * 品种 + */ + @LogField(name="品种",index=2) + @ApiModelProperty("品种") + private String catCode; + + /** + * 单位(隐藏) + */ + @LogField(name="单位(隐藏)",index=3) + @ApiModelProperty("单位(隐藏)") + private String uomCode; + + /** + * 1月 + */ + @LogField(name="1月",index=4) + @ApiModelProperty("1月") + private BigDecimal qty01; + + /** + * 2月 + */ + @LogField(name="2月",index=5) + @ApiModelProperty("2月") + private BigDecimal qty02; + + /** + * 3月 + */ + @LogField(name="3月",index=6) + @ApiModelProperty("3月") + private BigDecimal qty03; + + /** + * 4月 + */ + @LogField(name="4月",index=7) + @ApiModelProperty("4月") + private BigDecimal qty04; + + /** + * 5月 + */ + @LogField(name="5月",index=8) + @ApiModelProperty("5月") + private BigDecimal qty05; + + /** + * 6月 + */ + @LogField(name="6月",index=9) + @ApiModelProperty("6月") + private BigDecimal qty06; + + /** + * 7月 + */ + @LogField(name="7月",index=10) + @ApiModelProperty("7月") + private BigDecimal qty07; + + /** + * 8月 + */ + @LogField(name="8月",index=11) + @ApiModelProperty("8月") + private BigDecimal qty08; + + /** + * 9月 + */ + @LogField(name="9月",index=12) + @ApiModelProperty("9月") + private BigDecimal qty09; + + /** + * 10月 + */ + @LogField(name="10月",index=13) + @ApiModelProperty("10月") + private BigDecimal qty10; + + /** + * 11月 + */ + @LogField(name="11月",index=14) + @ApiModelProperty("11月") + private BigDecimal qty11; + + /** + * 12月 + */ + @LogField(name="12月",index=15) + @ApiModelProperty("12月") + private BigDecimal qty12; + + /** + * 次年1月 + */ + @LogField(name="次年1月",index=16) + @ApiModelProperty("次年1月") + private BigDecimal qtyN1; + + /** + * 次年2月 + */ + @LogField(name="次年2月",index=17) + @ApiModelProperty("次年2月") + private BigDecimal qtyN2; + + /** + * 次年3月 + */ + @LogField(name="次年3月",index=18) + @ApiModelProperty("次年3月") + private BigDecimal qtyN3; + + /** + * 备注 + */ + @LogField(name="备注",index=19) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=20) + @ApiModelProperty("租户id") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandEcDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandEcDto.java new file mode 100644 index 0000000..db987f0 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandEcDto.java @@ -0,0 +1,175 @@ +package com.xjrsoft.module.plan.dto; + +import java.io.Serializable; +import java.math.BigDecimal; + +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + +/** +* @title: 客户年度需求提报 +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_plan_year_demand",name="客户年度需求提报") +public class UpdateLngPlanYearDemandEcDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 年度计划-需求-主表主键(lng_plan_year_demand_hdr.id) + */ + @LogField(name="年度计划-需求-主表主键(lng_plan_year_demand_hdr.id)",index=1) + @ApiModelProperty("年度计划-需求-主表主键(lng_plan_year_demand_hdr.id)") + private Long pydhId; + + /** + * 品种 + */ + @LogField(name="品种",index=2) + @ApiModelProperty("品种") + private String catCode; + + /** + * 单位(隐藏) + */ + @LogField(name="单位(隐藏)",index=3) + @ApiModelProperty("单位(隐藏)") + private String uomCode; + + /** + * 1月 + */ + @LogField(name="1月",index=4) + @ApiModelProperty("1月") + private BigDecimal qty01; + + /** + * 2月 + */ + @LogField(name="2月",index=5) + @ApiModelProperty("2月") + private BigDecimal qty02; + + /** + * 3月 + */ + @LogField(name="3月",index=6) + @ApiModelProperty("3月") + private BigDecimal qty03; + + /** + * 4月 + */ + @LogField(name="4月",index=7) + @ApiModelProperty("4月") + private BigDecimal qty04; + + /** + * 5月 + */ + @LogField(name="5月",index=8) + @ApiModelProperty("5月") + private BigDecimal qty05; + + /** + * 6月 + */ + @LogField(name="6月",index=9) + @ApiModelProperty("6月") + private BigDecimal qty06; + + /** + * 7月 + */ + @LogField(name="7月",index=10) + @ApiModelProperty("7月") + private BigDecimal qty07; + + /** + * 8月 + */ + @LogField(name="8月",index=11) + @ApiModelProperty("8月") + private BigDecimal qty08; + + /** + * 9月 + */ + @LogField(name="9月",index=12) + @ApiModelProperty("9月") + private BigDecimal qty09; + + /** + * 10月 + */ + @LogField(name="10月",index=13) + @ApiModelProperty("10月") + private BigDecimal qty10; + + /** + * 11月 + */ + @LogField(name="11月",index=14) + @ApiModelProperty("11月") + private BigDecimal qty11; + + /** + * 12月 + */ + @LogField(name="12月",index=15) + @ApiModelProperty("12月") + private BigDecimal qty12; + + /** + * 次年1月 + */ + @LogField(name="次年1月",index=16) + @ApiModelProperty("次年1月") + private BigDecimal qtyN1; + + /** + * 次年2月 + */ + @LogField(name="次年2月",index=17) + @ApiModelProperty("次年2月") + private BigDecimal qtyN2; + + /** + * 次年3月 + */ + @LogField(name="次年3月",index=18) + @ApiModelProperty("次年3月") + private BigDecimal qtyN3; + + /** + * 备注 + */ + @LogField(name="备注",index=19) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=20) + @ApiModelProperty("租户id") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandHdrDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandHdrDto.java new file mode 100644 index 0000000..ed38f3c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandHdrDto.java @@ -0,0 +1,104 @@ +package com.xjrsoft.module.plan.dto; + +import java.io.Serializable; +import java.util.List; + +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.ValueDirectionType; +import com.pictc.annotations.datalog.LogJoinColumn; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + + +/** +* @title: 客户年度需求提报 +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_plan_year_demand_hdr",name="客户年度需求提报") +public class UpdateLngPlanYearDemandHdrDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 客户编码 + */ + @LogField(name="客户编码",index=1) + @ApiModelProperty("客户编码") + private String cuCode; + + /** + * 年度 + */ + @LogField(name="年度",index=2) + @ApiModelProperty("年度") + private Short planYear; + + /** + * 版本(自动生成，每客户每年从1开始) + */ + @LogField(name="版本(自动生成，每客户每年从1开始)",index=3) + @ApiModelProperty("版本(自动生成，每客户每年从1开始)") + private Byte demandVerNo; + + /** + * 最新版(Y-是，N-否；每客户每年只有一个Y) + */ + @LogField(name="最新版(Y-是，N-否；每客户每年只有一个Y)",index=4) + @ApiModelProperty("最新版(Y-是，N-否；每客户每年只有一个Y)") + private String lastSign; + + /** + * 审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回) + */ + @LogField(name="审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回)",index=5) + @ApiModelProperty("审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回)") + private String approCode; + + /** + * 批复意见 + */ + @LogField(name="批复意见",index=6) + @ApiModelProperty("批复意见") + private String reply; + + /** + * 备注 + */ + @LogField(name="备注",index=7) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=8) + @ApiModelProperty("租户id") + private Long tenantId; + + /** + * lngPlanYearDemand + */ + @ApiModelProperty("lngPlanYearDemand子表") + @LogJoin(name = "lngPlanYearDemand子表", + columns = { + @LogJoinColumn(field = "id",relatedField = "pydhId", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngPlanYearDemandDto.class, type = JoinType.MANY) + private List lngPlanYearDemandList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandHdrEcDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandHdrEcDto.java new file mode 100644 index 0000000..d566305 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/dto/UpdateLngPlanYearDemandHdrEcDto.java @@ -0,0 +1,109 @@ +package com.xjrsoft.module.plan.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.List; + +import com.pictc.annotations.datalog.LogTable; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.ValueDirectionType; + + + + +/** +* @title: 客户年度需求提报--电商 +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_plan_year_demand_hdr",name="客户年度需求提报--电商") +public class UpdateLngPlanYearDemandHdrEcDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 客户编码 + */ + @LogField(name="客户编码",index=1) + @ApiModelProperty("客户编码") + private String cuCode; + + /** + * 年度 + */ + @LogField(name="年度",index=2) + @ApiModelProperty("年度") + private Short planYear; + + /** + * 版本(自动生成，每客户每年从1开始) + */ + @LogField(name="版本(自动生成，每客户每年从1开始)",index=3) + @ApiModelProperty("版本(自动生成，每客户每年从1开始)") + private Byte demandVerNo; + + /** + * 最新版(Y-是，N-否；每客户每年只有一个Y) + */ + @LogField(name="最新版(Y-是，N-否；每客户每年只有一个Y)",index=4) + @ApiModelProperty("最新版(Y-是，N-否；每客户每年只有一个Y)") + private String lastSign; + + /** + * 审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回) + */ + @LogField(name="审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回)",index=5) + @ApiModelProperty("审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回)") + private String approCode; + + /** + * 批复意见 + */ + @LogField(name="批复意见",index=6) + @ApiModelProperty("批复意见") + private String reply; + + /** + * 备注 + */ + @LogField(name="备注",index=7) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=8) + @ApiModelProperty("租户id") + private Long tenantId; + + /** + * lngPlanYearDemand + */ + @ApiModelProperty("lngPlanYearDemand子表") + @LogJoin(name = "lngPlanYearDemand子表", + columns = { + @LogJoinColumn(field = "id",relatedField = "pydhId", valueDirection = ValueDirectionType.RIGHT) + }, + caseType = JoinCaseType.FULL, target = UpdateLngPlanYearDemandDto.class, type = JoinType.MANY) + private List lngPlanYearDemandList; +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandEcVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandEcVo.java new file mode 100644 index 0000000..33fd20f --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandEcVo.java @@ -0,0 +1,216 @@ +package com.xjrsoft.module.plan.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@Data +public class LngPlanYearDemandEcVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 年度计划-需求-主表主键(lng_plan_year_demand_hdr.id) + */ + @ApiModelProperty("年度计划-需求-主表主键(lng_plan_year_demand_hdr.id)") + private Long pydhId; + + + /** + * 品种 + */ + @ApiModelProperty("品种") + private String catCode; + + + /** + * 单位(隐藏) + */ + @ApiModelProperty("单位(隐藏)") + private String uomCode; + + + /** + * 1月 + */ + @ApiModelProperty("1月") + private BigDecimal qty01; + + + /** + * 2月 + */ + @ApiModelProperty("2月") + private BigDecimal qty02; + + + /** + * 3月 + */ + @ApiModelProperty("3月") + private BigDecimal qty03; + + + /** + * 4月 + */ + @ApiModelProperty("4月") + private BigDecimal qty04; + + + /** + * 5月 + */ + @ApiModelProperty("5月") + private BigDecimal qty05; + + + /** + * 6月 + */ + @ApiModelProperty("6月") + private BigDecimal qty06; + + + /** + * 7月 + */ + @ApiModelProperty("7月") + private BigDecimal qty07; + + + /** + * 8月 + */ + @ApiModelProperty("8月") + private BigDecimal qty08; + + + /** + * 9月 + */ + @ApiModelProperty("9月") + private BigDecimal qty09; + + + /** + * 10月 + */ + @ApiModelProperty("10月") + private BigDecimal qty10; + + + /** + * 11月 + */ + @ApiModelProperty("11月") + private BigDecimal qty11; + + + /** + * 12月 + */ + @ApiModelProperty("12月") + private BigDecimal qty12; + + + /** + * 次年1月 + */ + @ApiModelProperty("次年1月") + private BigDecimal qtyN1; + + + /** + * 次年2月 + */ + @ApiModelProperty("次年2月") + private BigDecimal qtyN2; + + + /** + * 次年3月 + */ + @ApiModelProperty("次年3月") + private BigDecimal qtyN3; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrEcPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrEcPageVo.java new file mode 100644 index 0000000..2372e45 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrEcPageVo.java @@ -0,0 +1,67 @@ +package com.xjrsoft.module.plan.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; + +/** +* @title: 分页列表出参 +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@Data +public class LngPlanYearDemandHdrEcPageVo { + + /** + * 主键 + */ + @ExcelIgnore + @ApiModelProperty("主键") + private String id; + /** + * 年度 + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("年度") + @ApiModelProperty("年度") + private Short planYear; + /** + * 版本(自动生成，每客户每年从1开始) + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("版本号") + @ApiModelProperty("版本(自动生成，每客户每年从1开始)") + private Byte demandVerNo; + /** + * 审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回) + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("状态") + @ApiModelProperty("审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回)") + private String approCode; + /** + * 批复意见 + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("批复意见") + @ApiModelProperty("批复意见") + private String reply; + /** + * 备注 + */ + @ContentStyle(dataFormat = 49) + @ExcelProperty("备注") + @ApiModelProperty("备注") + private String note; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrEcVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrEcVo.java new file mode 100644 index 0000000..6328c19 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrEcVo.java @@ -0,0 +1,132 @@ +package com.xjrsoft.module.plan.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@Data +public class LngPlanYearDemandHdrEcVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + + + /** + * 年度 + */ + @ApiModelProperty("年度") + private Short planYear; + + + /** + * 版本(自动生成，每客户每年从1开始) + */ + @ApiModelProperty("版本(自动生成，每客户每年从1开始)") + private Byte demandVerNo; + + + /** + * 最新版(Y-是，N-否；每客户每年只有一个Y) + */ + @ApiModelProperty("最新版(Y-是，N-否；每客户每年只有一个Y)") + private String lastSign; + + + /** + * 审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回) + */ + @ApiModelProperty("审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回)") + private String approCode; + + + /** + * 批复意见 + */ + @ApiModelProperty("批复意见") + private String reply; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + private List lngPlanYearDemandList; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrPageVo.java new file mode 100644 index 0000000..f2c465a --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrPageVo.java @@ -0,0 +1,51 @@ +package com.xjrsoft.module.plan.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** +* @title: 分页列表出参 +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@Data +public class LngPlanYearDemandHdrPageVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private String id; + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + /** + * 年度 + */ + @ApiModelProperty("年度") + private Short planYear; + /** + * 版本(自动生成，每客户每年从1开始) + */ + @ApiModelProperty("版本(自动生成，每客户每年从1开始)") + private Byte demandVerNo; + /** + * 审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回) + */ + @ApiModelProperty("审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回)") + private String approCode; + /** + * 批复意见 + */ + @ApiModelProperty("批复意见") + private String reply; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrVo.java new file mode 100644 index 0000000..5a252d8 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandHdrVo.java @@ -0,0 +1,126 @@ +package com.xjrsoft.module.plan.vo; + +import java.time.LocalDateTime; +import java.util.List; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@Data +public class LngPlanYearDemandHdrVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + + + /** + * 年度 + */ + @ApiModelProperty("年度") + private Short planYear; + + + /** + * 版本(自动生成，每客户每年从1开始) + */ + @ApiModelProperty("版本(自动生成，每客户每年从1开始)") + private Byte demandVerNo; + + + /** + * 最新版(Y-是，N-否；每客户每年只有一个Y) + */ + @ApiModelProperty("最新版(Y-是，N-否；每客户每年只有一个Y)") + private String lastSign; + + + /** + * 审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回) + */ + @ApiModelProperty("审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回)") + private String approCode; + + + /** + * 批复意见 + */ + @ApiModelProperty("批复意见") + private String reply; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + private List lngPlanYearDemandList; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandVo.java new file mode 100644 index 0000000..0c30979 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/plan/vo/LngPlanYearDemandVo.java @@ -0,0 +1,216 @@ +package com.xjrsoft.module.plan.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + +/** +* @title: 表单出参 +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@Data +public class LngPlanYearDemandVo extends com.xjrsoft.common.model.base.BaseModel{ + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 年度计划-需求-主表主键(lng_plan_year_demand_hdr.id) + */ + @ApiModelProperty("年度计划-需求-主表主键(lng_plan_year_demand_hdr.id)") + private Long pydhId; + + + /** + * 品种 + */ + @ApiModelProperty("品种") + private String catCode; + + + /** + * 单位(隐藏) + */ + @ApiModelProperty("单位(隐藏)") + private String uomCode; + + + /** + * 1月 + */ + @ApiModelProperty("1月") + private BigDecimal qty01; + + + /** + * 2月 + */ + @ApiModelProperty("2月") + private BigDecimal qty02; + + + /** + * 3月 + */ + @ApiModelProperty("3月") + private BigDecimal qty03; + + + /** + * 4月 + */ + @ApiModelProperty("4月") + private BigDecimal qty04; + + + /** + * 5月 + */ + @ApiModelProperty("5月") + private BigDecimal qty05; + + + /** + * 6月 + */ + @ApiModelProperty("6月") + private BigDecimal qty06; + + + /** + * 7月 + */ + @ApiModelProperty("7月") + private BigDecimal qty07; + + + /** + * 8月 + */ + @ApiModelProperty("8月") + private BigDecimal qty08; + + + /** + * 9月 + */ + @ApiModelProperty("9月") + private BigDecimal qty09; + + + /** + * 10月 + */ + @ApiModelProperty("10月") + private BigDecimal qty10; + + + /** + * 11月 + */ + @ApiModelProperty("11月") + private BigDecimal qty11; + + + /** + * 12月 + */ + @ApiModelProperty("12月") + private BigDecimal qty12; + + + /** + * 次年1月 + */ + @ApiModelProperty("次年1月") + private BigDecimal qtyN1; + + + /** + * 次年2月 + */ + @ApiModelProperty("次年2月") + private BigDecimal qtyN2; + + + /** + * 次年3月 + */ + @ApiModelProperty("次年3月") + private BigDecimal qtyN3; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/controller/PlanYearDemandHdrController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/controller/PlanYearDemandHdrController.java new file mode 100644 index 0000000..fb9db19 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/controller/PlanYearDemandHdrController.java @@ -0,0 +1,102 @@ +package com.xjrsoft.module.plan.controller; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.xjrsoft.common.constant.GlobalConstant; +import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.xjrsoft.common.page.ConventPage; +import com.xjrsoft.common.page.PageOutput; +import com.xjrsoft.common.model.result.R; +import com.xjrsoft.common.utils.VoToColumnUtil; +import com.xjrsoft.module.plan.dto.AddLngPlanYearDemandHdrDto; +import com.xjrsoft.module.plan.dto.UpdateLngPlanYearDemandHdrDto; +import cn.dev33.satoken.annotation.SaCheckPermission; + +import com.xjrsoft.module.plan.dto.LngPlanYearDemandHdrPageDto; +import com.xjrsoft.module.plan.entity.LngPlanYearDemandHdr; +import com.xjrsoft.module.plan.service.IPlanYearDemandHdrService; +import com.xjrsoft.module.plan.vo.LngPlanYearDemandHdrPageVo; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.plan.vo.LngPlanYearDemandHdrVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** +* @title: 客户年度需求提报 +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/plan/planYearDemandHdr") +@Api(value = "/plan" + "/planYearDemandHdr",tags = "客户年度需求提报代码") +@AllArgsConstructor +public class PlanYearDemandHdrController { + + + private final IPlanYearDemandHdrService planYearDemandHdrService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngPlanYearDemandHdr列表(分页)") + @SaCheckPermission("planYearDemandHdr:list") + public R page(@Valid LngPlanYearDemandHdrPageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .eq(ObjectUtil.isNotNull(dto.getId()),LngPlanYearDemandHdr::getId,dto.getId()) + //.like(StrUtil.isNotBlank(dto.getPlanYear()),LngPlanYearDemandHdr::getPlanYear,dto.getPlanYear()) + //.like(StrUtil.isNotBlank(dto.getDemandVerNo()),LngPlanYearDemandHdr::getDemandVerNo,dto.getDemandVerNo()) + .like(StrUtil.isNotBlank(dto.getCuCode()),LngPlanYearDemandHdr::getCuCode,dto.getCuCode()) + .like(StrUtil.isNotBlank(dto.getNote()),LngPlanYearDemandHdr::getNote,dto.getNote()) + .like(StrUtil.isNotBlank(dto.getReply()),LngPlanYearDemandHdr::getReply,dto.getReply()) + .like(StrUtil.isNotBlank(dto.getApproCode()),LngPlanYearDemandHdr::getApproCode,dto.getApproCode()) + .orderByDesc(LngPlanYearDemandHdr::getId) + .select(LngPlanYearDemandHdr.class,x -> VoToColumnUtil.fieldsToColumns(LngPlanYearDemandHdrPageVo.class).contains(x.getProperty())); + IPage page = planYearDemandHdrService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngPlanYearDemandHdrPageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngPlanYearDemandHdr信息") + @SaCheckPermission("planYearDemandHdr:detail") + public R info(@RequestParam Long id){ + LngPlanYearDemandHdr lngPlanYearDemandHdr = planYearDemandHdrService.getById(id); + if (lngPlanYearDemandHdr == null) { + return R.error("找不到此数据！"); + } + return R.ok(BeanUtil.toBean(lngPlanYearDemandHdr, LngPlanYearDemandHdrVo.class)); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngPlanYearDemandHdr数据详细日志") + @SaCheckPermission("planYearDemandHdr:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngPlanYearDemandHdrDto.class,id); + return R.ok(logs); + } + + + + @PutMapping + @ApiOperation(value = "修改LngPlanYearDemandHdr") + @SaCheckPermission("planYearDemandHdr:edit") + public R update(@Valid @RequestBody UpdateLngPlanYearDemandHdrDto dto){ + return R.ok(dataService.updateById(dto)); + } + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/controller/PlanYearDemandHdrEcController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/controller/PlanYearDemandHdrEcController.java new file mode 100644 index 0000000..22fcf64 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/controller/PlanYearDemandHdrEcController.java @@ -0,0 +1,139 @@ +package com.xjrsoft.module.plan.controller; + +import java.io.ByteArrayOutputStream; +import java.util.ArrayList; +import java.util.List; + +import javax.validation.Valid; + +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.support.ExcelTypeEnum; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.xjrsoft.common.model.result.R; +import com.xjrsoft.common.page.ConventPage; +import com.xjrsoft.common.page.PageOutput; +import com.xjrsoft.common.utils.ExcelUtil; +import com.xjrsoft.common.utils.VoToColumnUtil; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; +import com.xjrsoft.module.plan.dto.LngPlanYearDemandHdrPageDto; +import com.xjrsoft.module.plan.dto.UpdateLngPlanYearDemandHdrDto; +import com.xjrsoft.module.plan.dto.UpdateLngPlanYearDemandHdrEcDto; +import com.xjrsoft.module.plan.entity.LngPlanYearDemandHdrEc; +import com.xjrsoft.module.plan.service.IPlanYearDemandHdrEcService; +import com.xjrsoft.module.plan.vo.LngPlanYearDemandHdrEcPageVo; +import com.xjrsoft.module.plan.vo.LngPlanYearDemandHdrPageVo; +import com.xjrsoft.module.plan.vo.LngPlanYearDemandHdrVo; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; + +/** +* @title: 客户年度需求提报--电商 +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/plan" + "/planYearDemandHdrEc") +@Api(value = "/plan" + "/planYearDemandHdrEc",tags = "客户年度需求提报--电商代码") +@AllArgsConstructor +public class PlanYearDemandHdrEcController { + + + private final IPlanYearDemandHdrEcService planYearDemandHdrEcService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngPlanYearDemandHdr列表(分页)") + @SaCheckPermission("planYearDemandHdrEc:list") + public R page(@Valid LngPlanYearDemandHdrPageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .eq(ObjectUtil.isNotNull(dto.getId()),LngPlanYearDemandHdrEc::getId,dto.getId()) + //.like(StrUtil.isNotBlank(dto.getPlanYear()),LngPlanYearDemandHdrEc::getPlanYear,dto.getPlanYear()) + //.like(StrUtil.isNotBlank(dto.getDemandVerNo()),LngPlanYearDemandHdrEc::getDemandVerNo,dto.getDemandVerNo()) + .like(StrUtil.isNotBlank(dto.getNote()),LngPlanYearDemandHdrEc::getNote,dto.getNote()) + .like(StrUtil.isNotBlank(dto.getReply()),LngPlanYearDemandHdrEc::getReply,dto.getReply()) + .like(StrUtil.isNotBlank(dto.getApproCode()),LngPlanYearDemandHdrEc::getApproCode,dto.getApproCode()) + .orderByDesc(LngPlanYearDemandHdrEc::getId) + .select(LngPlanYearDemandHdrEc.class,x -> VoToColumnUtil.fieldsToColumns(LngPlanYearDemandHdrEcPageVo.class).contains(x.getProperty())); + IPage page = planYearDemandHdrEcService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngPlanYearDemandHdrEcPageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngPlanYearDemandHdr信息") + @SaCheckPermission("planYearDemandHdrEc:detail") + public R info(@RequestParam Long id){ + LngPlanYearDemandHdrEc lngPlanYearDemandHdr = planYearDemandHdrEcService.getById(id); + if (lngPlanYearDemandHdr == null) { + return R.error("找不到此数据！"); + } + return R.ok(BeanUtil.toBean(lngPlanYearDemandHdr, LngPlanYearDemandHdrVo.class)); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngPlanYearDemandHdr数据详细日志") + @SaCheckPermission("planYearDemandHdrEc:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngPlanYearDemandHdrDto.class,id); + return R.ok(logs); + } + + + @PostMapping + @ApiOperation(value = "新增LngPlanYearDemandHdr") + @SaCheckPermission("planYearDemandHdrEc:add") + public R add(@Valid @RequestBody UpdateLngPlanYearDemandHdrEcDto dto){ + UpdateLngPlanYearDemandHdrEcDto res = dataService.insert(dto); + return R.ok(res.getId()); + } + + @PutMapping + @ApiOperation(value = "修改LngPlanYearDemandHdr") + @SaCheckPermission("planYearDemandHdrEc:edit") + public R update(@Valid @RequestBody UpdateLngPlanYearDemandHdrEcDto dto){ + return R.ok(dataService.updateById(dto)); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("planYearDemandHdrEc:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngPlanYearDemandHdrEcDto.class, ids)); + + } + + + @GetMapping("/export") + @ApiOperation(value = "导出") + @SaCheckPermission("planYearDemandHdrEc:export") + public ResponseEntity exportData(@Valid LngPlanYearDemandHdrPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) { + List customerList = isTemplate != null && isTemplate ? new ArrayList<>() : ((PageOutput) page(dto).getData()).getList(); + ExcelUtil.transExcelData(customerList, false); + ByteArrayOutputStream bot = new ByteArrayOutputStream(); + EasyExcel.write(bot, LngPlanYearDemandHdrPageVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(customerList); + ByteArrayOutputStream resultBot = ExcelUtil.renderExportRequiredHead(bot); + + return R.fileStream(resultBot.toByteArray(), "PlanYearDemandHdrEc" + ExcelTypeEnum.XLSX.getValue()); + } +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemand.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemand.java new file mode 100644 index 0000000..e856e54 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemand.java @@ -0,0 +1,223 @@ +package com.xjrsoft.module.plan.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.Version; +import com.github.yulichang.annotation.EntityMapping; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + +/** +* @title: 客户年度需求提报 +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@Data +@TableName("lng_plan_year_demand") +@ApiModel(value = "客户年度需求提报对象", description = "客户年度需求提报") +public class LngPlanYearDemand implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long id; + + /** + * 年度计划-需求-主表主键(lng_plan_year_demand_hdr.id) + */ + @ApiModelProperty("年度计划-需求-主表主键(lng_plan_year_demand_hdr.id)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long pydhId; + + /** + * 品种 + */ + @ApiModelProperty("品种") + private String catCode; + + /** + * 单位(隐藏) + */ + @ApiModelProperty("单位(隐藏)") + private String uomCode; + + /** + * 1月 + */ + @ApiModelProperty("1月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qty01; + + /** + * 2月 + */ + @ApiModelProperty("2月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qty02; + + /** + * 3月 + */ + @ApiModelProperty("3月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qty03; + + /** + * 4月 + */ + @ApiModelProperty("4月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qty04; + + /** + * 5月 + */ + @ApiModelProperty("5月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qty05; + + /** + * 6月 + */ + @ApiModelProperty("6月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qty06; + + /** + * 7月 + */ + @ApiModelProperty("7月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qty07; + + /** + * 8月 + */ + @ApiModelProperty("8月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qty08; + + /** + * 9月 + */ + @ApiModelProperty("9月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qty09; + + /** + * 10月 + */ + @ApiModelProperty("10月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qty10; + + /** + * 11月 + */ + @ApiModelProperty("11月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qty11; + + /** + * 12月 + */ + @ApiModelProperty("12月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qty12; + + /** + * 次年1月 + */ + @ApiModelProperty("次年1月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyN1; + + /** + * 次年2月 + */ + @ApiModelProperty("次年2月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyN2; + + /** + * 次年3月 + */ + @ApiModelProperty("次年3月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyN3; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandEc.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandEc.java new file mode 100644 index 0000000..36d5935 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandEc.java @@ -0,0 +1,220 @@ +package com.xjrsoft.module.plan.entity; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** +* @title: 客户年度需求提报 +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@Data +@TableName("lng_plan_year_demand") +@ApiModel(value = "客户年度需求提报对象", description = "客户年度需求提报") +public class LngPlanYearDemandEc implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long id; + + /** + * 年度计划-需求-主表主键(lng_plan_year_demand_hdr.id) + */ + @ApiModelProperty("年度计划-需求-主表主键(lng_plan_year_demand_hdr.id)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long pydhId; + + /** + * 品种 + */ + @ApiModelProperty("品种") + private String catCode; + + /** + * 单位(隐藏) + */ + @ApiModelProperty("单位(隐藏)") + private String uomCode; + + /** + * 1月 + */ + @ApiModelProperty("1月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qty01; + + /** + * 2月 + */ + @ApiModelProperty("2月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qty02; + + /** + * 3月 + */ + @ApiModelProperty("3月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qty03; + + /** + * 4月 + */ + @ApiModelProperty("4月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qty04; + + /** + * 5月 + */ + @ApiModelProperty("5月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qty05; + + /** + * 6月 + */ + @ApiModelProperty("6月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qty06; + + /** + * 7月 + */ + @ApiModelProperty("7月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qty07; + + /** + * 8月 + */ + @ApiModelProperty("8月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qty08; + + /** + * 9月 + */ + @ApiModelProperty("9月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qty09; + + /** + * 10月 + */ + @ApiModelProperty("10月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qty10; + + /** + * 11月 + */ + @ApiModelProperty("11月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qty11; + + /** + * 12月 + */ + @ApiModelProperty("12月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qty12; + + /** + * 次年1月 + */ + @ApiModelProperty("次年1月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyN1; + + /** + * 次年2月 + */ + @ApiModelProperty("次年2月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyN2; + + /** + * 次年3月 + */ + @ApiModelProperty("次年3月") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private BigDecimal qtyN3; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandHdr.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandHdr.java new file mode 100644 index 0000000..0a0a592 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandHdr.java @@ -0,0 +1,133 @@ +package com.xjrsoft.module.plan.entity; + +import java.io.Serializable; +import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** +* @title: 客户年度需求提报 +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@Data +@TableName("lng_plan_year_demand_hdr") +@ApiModel(value = "客户年度需求提报对象", description = "客户年度需求提报") +public class LngPlanYearDemandHdr implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long id; + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + + /** + * 年度 + */ + @ApiModelProperty("年度") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Short planYear; + + /** + * 版本(自动生成，每客户每年从1开始) + */ + @ApiModelProperty("版本(自动生成，每客户每年从1开始)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Byte demandVerNo; + + /** + * 最新版(Y-是，N-否；每客户每年只有一个Y) + */ + @ApiModelProperty("最新版(Y-是，N-否；每客户每年只有一个Y)") + private String lastSign; + + /** + * 审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回) + */ + @ApiModelProperty("审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回)") + private String approCode; + + /** + * 批复意见 + */ + @ApiModelProperty("批复意见") + private String reply; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandHdrEc.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandHdrEc.java new file mode 100644 index 0000000..2595449 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/entity/LngPlanYearDemandHdrEc.java @@ -0,0 +1,137 @@ +package com.xjrsoft.module.plan.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.Version; +import com.github.yulichang.annotation.EntityMapping; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; +import java.time.LocalTime; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.List; + + +/** +* @title: 客户年度需求提报--电商 +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@Data +@TableName("lng_plan_year_demand_hdr") +@ApiModel(value = "客户年度需求提报--电商对象", description = "客户年度需求提报--电商") +public class LngPlanYearDemandHdrEc implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long id; + + /** + * 客户编码 + */ + @ApiModelProperty("客户编码") + private String cuCode; + + /** + * 年度 + */ + @ApiModelProperty("年度") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Short planYear; + + /** + * 版本(自动生成，每客户每年从1开始) + */ + @ApiModelProperty("版本(自动生成，每客户每年从1开始)") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Byte demandVerNo; + + /** + * 最新版(Y-是，N-否；每客户每年只有一个Y) + */ + @ApiModelProperty("最新版(Y-是，N-否；每客户每年只有一个Y)") + private String lastSign; + + /** + * 审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回) + */ + @ApiModelProperty("审批状态(WTJ-未提交/YTJ-已提交/YBH-已驳回)") + private String approCode; + + /** + * 批复意见 + */ + @ApiModelProperty("批复意见") + private String reply; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime modifyDate; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/mapper/LngPlanYearDemandHdrEcMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/mapper/LngPlanYearDemandHdrEcMapper.java new file mode 100644 index 0000000..41026b4 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/mapper/LngPlanYearDemandHdrEcMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.plan.mapper; + +import org.apache.ibatis.annotations.Mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.xjrsoft.module.plan.entity.LngPlanYearDemandHdrEc; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@Mapper +public interface LngPlanYearDemandHdrEcMapper extends BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/mapper/LngPlanYearDemandHdrMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/mapper/LngPlanYearDemandHdrMapper.java new file mode 100644 index 0000000..5b3d186 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/mapper/LngPlanYearDemandHdrMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.plan.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.plan.entity.LngPlanYearDemandHdr; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@Mapper +public interface LngPlanYearDemandHdrMapper extends BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/mapper/LngPlanYearDemandMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/mapper/LngPlanYearDemandMapper.java new file mode 100644 index 0000000..5e0e55d --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/mapper/LngPlanYearDemandMapper.java @@ -0,0 +1,17 @@ +package com.xjrsoft.module.plan.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.plan.entity.LngPlanYearDemand; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@Mapper +public interface LngPlanYearDemandMapper extends MPJBaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/service/IPlanYearDemandHdrEcService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/service/IPlanYearDemandHdrEcService.java new file mode 100644 index 0000000..609e65e --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/service/IPlanYearDemandHdrEcService.java @@ -0,0 +1,14 @@ +package com.xjrsoft.module.plan.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.xjrsoft.module.plan.entity.LngPlanYearDemandHdrEc; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ + +public interface IPlanYearDemandHdrEcService extends IService { +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/service/IPlanYearDemandHdrService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/service/IPlanYearDemandHdrService.java new file mode 100644 index 0000000..8d72f34 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/service/IPlanYearDemandHdrService.java @@ -0,0 +1,19 @@ +package com.xjrsoft.module.plan.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.github.yulichang.base.MPJBaseService; +import com.github.yulichang.extension.mapping.base.MPJDeepService; +import com.github.yulichang.extension.mapping.base.MPJRelationService; +import com.xjrsoft.module.plan.entity.LngPlanYearDemandHdr; +import lombok.Data; +import java.util.List; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ + +public interface IPlanYearDemandHdrService extends IService { +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/service/impl/PlanYearDemandHdrEcServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/service/impl/PlanYearDemandHdrEcServiceImpl.java new file mode 100644 index 0000000..1990666 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/service/impl/PlanYearDemandHdrEcServiceImpl.java @@ -0,0 +1,21 @@ +package com.xjrsoft.module.plan.service.impl; + +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.xjrsoft.module.plan.entity.LngPlanYearDemandHdrEc; +import com.xjrsoft.module.plan.mapper.LngPlanYearDemandHdrEcMapper; +import com.xjrsoft.module.plan.service.IPlanYearDemandHdrEcService; + +import lombok.AllArgsConstructor; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class PlanYearDemandHdrEcServiceImpl extends ServiceImpl implements IPlanYearDemandHdrEcService { +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/service/impl/PlanYearDemandHdrServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/service/impl/PlanYearDemandHdrServiceImpl.java new file mode 100644 index 0000000..432d069 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/plan/service/impl/PlanYearDemandHdrServiceImpl.java @@ -0,0 +1,25 @@ +package com.xjrsoft.module.plan.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.xjrsoft.module.plan.entity.LngPlanYearDemandHdr; +import com.xjrsoft.module.plan.mapper.LngPlanYearDemandHdrMapper; +import com.xjrsoft.module.plan.service.IPlanYearDemandHdrService; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; + +/** +* @title: service +* @Author 管理员 +* @Date: 2026-04-09 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class PlanYearDemandHdrServiceImpl extends ServiceImpl implements IPlanYearDemandHdrService { +}