Compare commits
66 Commits
1b6772240e
...
d4664c0228
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d4664c0228 | ||
|
|
ff67eb5cb5 | ||
|
|
6743d1fcca | ||
|
|
83e4a5fdc7 | ||
|
|
04716c022e | ||
|
|
74e8d88a66 | ||
|
|
72f38c5075 | ||
|
|
da974408f7 | ||
|
|
924896b435 | ||
|
|
75c1257d22 | ||
|
|
403c385eae | ||
|
|
956d939cc6 | ||
|
|
3ad1353a00 | ||
|
|
9d6e410720 | ||
|
|
ecebf1d610 | ||
|
|
24c8734840 | ||
|
|
5bf2e818e6 | ||
|
|
19d2e9896a | ||
|
|
2dfb9b4c10 | ||
|
|
9c3e7b0651 | ||
|
|
0653598751 | ||
|
|
8e44b89c5e | ||
|
|
c08351a830 | ||
|
|
2f36a4013b | ||
|
|
7142fcc86f | ||
|
|
a6f3b028fb | ||
|
|
92375c0dde | ||
|
|
10698e4aeb | ||
|
|
6037f038d2 | ||
|
|
f233076fd0 | ||
|
|
5a38bca0da | ||
|
|
70634dbb6d | ||
|
|
7ccb6e09e2 | ||
|
|
355701f70c | ||
|
|
7f698802b1 | ||
|
|
356e330c7c | ||
|
|
c8302e4d23 | ||
|
|
287ec65de4 | ||
|
|
42d152d54b | ||
|
|
d580e2878b | ||
|
|
0c6f349683 | ||
|
|
723daf8ee5 | ||
|
|
3b33b9b65b | ||
|
|
4a091f54c3 | ||
|
|
7ba5dc2fc3 | ||
|
|
0ecdb01a0b | ||
|
|
291ede4093 | ||
|
|
6e72c30207 | ||
|
|
2b2404c6f2 | ||
|
|
daeeb83624 | ||
|
|
0033bdc4c5 | ||
|
|
726303ce81 | ||
|
|
d00917f7cb | ||
|
|
e930818d27 | ||
|
|
33fa3cf7d2 | ||
|
|
925860aaff | ||
|
|
d28ff3be7f | ||
|
|
dbd5abb797 | ||
|
|
99f82629da | ||
|
|
9c05d8ac0f | ||
|
|
61d88714da | ||
|
|
0ad9b60c91 | ||
|
|
37714cafb9 | ||
|
|
499da0a9b2 | ||
|
|
de66bd6b12 | ||
|
|
73fffba37f |
@@ -89,6 +89,14 @@ logging:
|
||||
file:
|
||||
name: ${user.home}/logs/${spring.application.name}.log # 日志文件名,全路径
|
||||
|
||||
# 芋道配置项,设置当前项目所有自定义的配置
|
||||
zt:
|
||||
env: # 多环境的配置项
|
||||
tag: ${HOSTNAME}
|
||||
security:
|
||||
mock-enable: true
|
||||
access-log: # 访问日志的配置项
|
||||
enable: true
|
||||
|
||||
justauth:
|
||||
enabled: true
|
||||
|
||||
@@ -20,6 +20,11 @@ spec:
|
||||
labels:
|
||||
app: base-server
|
||||
spec:
|
||||
dnsConfig:
|
||||
nameservers:
|
||||
- 172.16.36.16
|
||||
- 172.16.36.220
|
||||
dnsPolicy: None
|
||||
containers:
|
||||
- name: base-server
|
||||
image: 172.16.46.66:10043/yudao/base-server:VERSION_PLACEHOLDER
|
||||
|
||||
27
pom.xml
27
pom.xml
@@ -146,6 +146,33 @@
|
||||
|
||||
<!-- 使用 huawei / aliyun 的 Maven 源,提升下载速度 -->
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>huaweicloud</id>
|
||||
<name>huawei</name>
|
||||
<url>https://mirrors.huaweicloud.com/repository/maven/</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>aliyunmaven</id>
|
||||
<name>aliyun</name>
|
||||
<url>https://maven.aliyun.com/repository/public</url>
|
||||
</repository>
|
||||
|
||||
<repository>
|
||||
<id>spring-milestones</id>
|
||||
<name>Spring Milestones</name>
|
||||
<url>https://repo.spring.io/milestone</url>
|
||||
<snapshots>
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>spring-snapshots</id>
|
||||
<name>Spring Snapshots</name>
|
||||
<url>https://repo.spring.io/snapshot</url>
|
||||
<releases>
|
||||
<enabled>false</enabled>
|
||||
</releases>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>ZT</id>
|
||||
<name>中铜 ZStack 私服</name>
|
||||
|
||||
@@ -26,4 +26,10 @@ CREATE INDEX idx_mtrl_prps_tenant_deleted_id
|
||||
ON bse_mtrl_prps(tenant_id, deleted, id);
|
||||
|
||||
CREATE INDEX idx_mtrl_prps_cover
|
||||
ON bse_mtrl_prps(tenant_id, deleted, id, CD, NAME, UNT_QTY_ID, DIC_DAT_VAL, DAT_TP, RMK, DEPT_ID);
|
||||
ON bse_mtrl_prps(tenant_id, deleted, id, CD, NAME, UNT_QTY_ID, DIC_DAT_VAL, DAT_TP, RMK, DEPT_ID);
|
||||
|
||||
CREATE INDEX IDX_PRPS_TEN_DEL_VAL64
|
||||
ON JYGK_TEST.BSE_MTRL_HS_PRPS (
|
||||
PRPS_ID, TENANT_ID, DELETED,
|
||||
SUBSTR(VAL, 1, 64)
|
||||
);
|
||||
@@ -72,4 +72,5 @@ public interface ErrorCodeConstants {
|
||||
// ========== 主数据同步 ==========
|
||||
ErrorCode MASTER_DATA_SYNC_DISABLED = new ErrorCode(1_027_900_001, "主数据同步功能已禁用");
|
||||
ErrorCode MASTER_DATA_SYNC_BATCH_SIZE_TOO_LARGE = new ErrorCode(1_027_900_002, "最大批次不得超过 1000");
|
||||
ErrorCode MASTER_DATA_SYNC_SINCE_NULL = new ErrorCode(1_027_900_003, "同步日期不能为空");
|
||||
}
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
package com.zt.plat.module.plandate;
|
||||
|
||||
import com.zt.plat.framework.common.pojo.CommonResult;
|
||||
import com.zt.plat.module.base.enums.ApiConstants;
|
||||
import com.zt.plat.module.plandate.dto.ErpMonthProductivePlanCheckSaveReqDTO;
|
||||
import com.zt.plat.module.plandate.dto.PlanDateSaveReqDTO;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
|
||||
@FeignClient(name = ApiConstants.NAME)
|
||||
@Tag(name = "RPC 服务 - base")
|
||||
public interface PlanApi {
|
||||
String PREFIX = ApiConstants.PREFIX + "/api/plan";
|
||||
|
||||
@PostMapping(PREFIX + "/create")
|
||||
@Operation(summary = "计划创建")
|
||||
CommonResult<Boolean> planCreate(PlanDateSaveReqDTO reqDTO);
|
||||
|
||||
@PostMapping(PREFIX + "/monthProductivePlanCheckCreate")
|
||||
@Operation(summary = "月 productive plan check 创建")
|
||||
CommonResult<Boolean> monthProductivePlanCheckCreate(ErpMonthProductivePlanCheckSaveReqDTO reqDTO);
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
package com.zt.plat.module.plandate.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "管理后台 - ERP月度产品计划核对明细新增 Request DTO")
|
||||
@Data
|
||||
@Validated
|
||||
public class ErpMonthProductivePlanCheckDetailSaveReqDTO {
|
||||
|
||||
@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;
|
||||
|
||||
@Schema(description = "公司ID")
|
||||
private Long companyId;
|
||||
@Schema(description = "公司名称")
|
||||
private String companyName;
|
||||
@Schema(description = "部门ID")
|
||||
private Long deptId;
|
||||
@Schema(description = "部门名称")
|
||||
private Long postId;
|
||||
@Schema(description = "岗位ID")
|
||||
private Long tenantId;
|
||||
@Schema(description = "创建人名称")
|
||||
private String creatorName;
|
||||
@Schema(description = "更新人名称")
|
||||
private String updaterName;
|
||||
@Schema(description = "创建时间")
|
||||
private LocalDateTime createTime;
|
||||
@Schema(description = "更新时间")
|
||||
private LocalDateTime updateTime;
|
||||
@Schema(description = "删除标志")
|
||||
private int deleted;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
package com.zt.plat.module.plandate.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@Schema(description = "管理后台 - ERP月度产品计划核对新增 Request DTO")
|
||||
@Data
|
||||
@Validated
|
||||
public class ErpMonthProductivePlanCheckSaveReqDTO {
|
||||
|
||||
@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<ErpMonthProductivePlanCheckDetailSaveReqDTO> details;
|
||||
@Schema(description = "公司ID")
|
||||
private Long companyId;
|
||||
@Schema(description = "公司名称")
|
||||
private String companyName;
|
||||
@Schema(description = "部门ID")
|
||||
private Long deptId;
|
||||
@Schema(description = "部门名称")
|
||||
private Long postId;
|
||||
@Schema(description = "岗位ID")
|
||||
private Long tenantId;
|
||||
@Schema(description = "创建人名称")
|
||||
private String creatorName;
|
||||
@Schema(description = "更新人名称")
|
||||
private String updaterName;
|
||||
@Schema(description = "创建时间")
|
||||
private LocalDateTime createTime;
|
||||
@Schema(description = "更新时间")
|
||||
private LocalDateTime updateTime;
|
||||
@Schema(description = "删除标志")
|
||||
private int deleted;
|
||||
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -169,8 +169,12 @@
|
||||
<dependency>
|
||||
<groupId>com.zt.plat</groupId>
|
||||
<artifactId>zt-module-contract-order-api</artifactId>
|
||||
<version>3.0.47-SNAPSHOT</version>
|
||||
<scope>compile</scope>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.zt.plat</groupId>
|
||||
<artifactId>zt-module-receive-deliver-api</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user