Merge remote-tracking branch 'origin/dev' into test

zt-module-base/zt-module-base-server/pom.xml

@@ -166,6 +166,12 @@
             <artifactId>zt-spring-boot-starter-biz-business</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>com.zt.plat</groupId>
+            <artifactId>zt-module-contract-order-api</artifactId>
+            <version>3.0.47-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/erpmonthproductiveplancheck/vo/ErpMonthProductivePlanCheckDetailPageReqVO.java

@@ -0,0 +1,34 @@
+package com.zt.plat.module.base.controller.admin.erpmonthproductiveplancheck.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zt.plat.framework.common.pojo.PageParam;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - ERP月度产品计划核对明细分页 Request VO")
+@Data
+public class ErpMonthProductivePlanCheckDetailPageReqVO extends PageParam {
+
+    @Schema(description = "日期（格式：YYYY-MM-DD）")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String[] date;
+
+    @Schema(description = "排序")
+    private Integer sort;
+
+    @Schema(description = "值")
+    private BigDecimal value;
+
+    @Schema(description = "主数据ID（关联主表ID）", example = "3745")
+    private Long mainId;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/erpmonthproductiveplancheck/vo/ErpMonthProductivePlanCheckDetailRespVO.java

@@ -0,0 +1,40 @@
+package com.zt.plat.module.base.controller.admin.erpmonthproductiveplancheck.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - ERP月度产品计划核对明细 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class ErpMonthProductivePlanCheckDetailRespVO {
+
+    @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14111")
+    @ExcelProperty("主键ID")
+    private Long id;
+
+    @Schema(description = "日期（格式：YYYY-MM-DD）")
+    @ExcelProperty("日期（格式：YYYY-MM-DD）")
+    private String date;
+
+    @Schema(description = "排序")
+    @ExcelProperty("排序")
+    private Integer sort;
+
+    @Schema(description = "值")
+    @ExcelProperty("值")
+    private BigDecimal value;
+
+    @Schema(description = "主数据ID（关联主表ID）", example = "3745")
+    @ExcelProperty("主数据ID（关联主表ID）")
+    private Long mainId;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/erpmonthproductiveplancheck/vo/ErpMonthProductivePlanCheckDetailSaveReqVO.java

@@ -0,0 +1,28 @@
+package com.zt.plat.module.base.controller.admin.erpmonthproductiveplancheck.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+import java.math.BigDecimal;
+
+@Schema(description = "管理后台 - ERP月度产品计划核对明细新增/修改 Request VO")
+@Data
+public class ErpMonthProductivePlanCheckDetailSaveReqVO {
+
+    @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14111")
+    private Long id;
+
+    @Schema(description = "日期（格式：YYYY-MM-DD）")
+    private String date;
+
+    @Schema(description = "排序")
+    private Integer sort;
+
+    @Schema(description = "值")
+    private BigDecimal value;
+
+    @Schema(description = "主数据ID（关联主表ID）", example = "3745")
+    private Long mainId;
+
+}

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/erpmonthproductiveplancheck/vo/ErpMonthProductivePlanCheckPageReqVO.java

@@ -0,0 +1,33 @@
+package com.zt.plat.module.base.controller.admin.erpmonthproductiveplancheck.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zt.plat.framework.common.pojo.PageParam;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - ERP月度产品计划核对分页 Request VO")
+@Data
+public class ErpMonthProductivePlanCheckPageReqVO extends PageParam {
+
+    @Schema(description = "产品名")
+    private String product;
+
+    @Schema(description = "年度")
+    private String year;
+
+    @Schema(description = "月份")
+    private String month;
+
+    @Schema(description = "月计划量")
+    private BigDecimal monthPlan;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/erpmonthproductiveplancheck/vo/ErpMonthProductivePlanCheckRespVO.java

@@ -0,0 +1,43 @@
+package com.zt.plat.module.base.controller.admin.erpmonthproductiveplancheck.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - ERP月度产品计划核对 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class ErpMonthProductivePlanCheckRespVO {
+
+    @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19081")
+    @ExcelProperty("主键ID")
+    private Long id;
+
+    @Schema(description = "产品名")
+    @ExcelProperty("产品名")
+    private String product;
+
+    @Schema(description = "年度")
+    @ExcelProperty("年度")
+    private String year;
+
+    @Schema(description = "月份")
+    @ExcelProperty("月份")
+    private String month;
+
+    @Schema(description = "月计划量")
+    @ExcelProperty("月计划量")
+    private BigDecimal monthPlan;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+    @Schema(description = "详情")
+    @ExcelProperty("详情")
+    private List<ErpMonthProductivePlanCheckDetailRespVO> details;
+
+}

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/erpmonthproductiveplancheck/vo/ErpMonthProductivePlanCheckSaveReqVO.java

@@ -0,0 +1,31 @@
+package com.zt.plat.module.base.controller.admin.erpmonthproductiveplancheck.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+import java.math.BigDecimal;
+
+@Schema(description = "管理后台 - ERP月度产品计划核对新增/修改 Request VO")
+@Data
+public class ErpMonthProductivePlanCheckSaveReqVO {
+
+    @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19081")
+    private Long id;
+
+    @Schema(description = "产品名")
+    private String product;
+
+    @Schema(description = "年度")
+    private String year;
+
+    @Schema(description = "月份")
+    private String month;
+
+    @Schema(description = "月计划量")
+    private BigDecimal monthPlan;
+
+    @Schema(description = "月计划明细")
+    private List<ErpMonthProductivePlanCheckDetailSaveReqVO> details;
+
+}

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/plandate/PlanDateController.java

@@ -113,7 +113,7 @@ public class PlanDateController implements BusinessControllerMarker {
     @GetMapping("/tree/list-all")
     @Operation(summary = "查询所有计划数据（树形结构）")
     @PreAuthorize("@ss.hasPermission('base:plan-date:query')")
-    public List<PlanDateRespVO> listAllPlanDateTree() {
-        return planDateService.listPlanDateTree();
+    public CommonResult<List<PlanDateRespVO>> listAllPlanDateTree() {
+        return success(planDateService.listPlanDateTree());
     }
 }