Compare commits

...

66 Commits

Author SHA1 Message Date
qianshijiang
d4664c0228 解决依赖无法拉取的问题 2026-02-28 17:47:03 +08:00
潘荣晟
ff67eb5cb5 委托加工金属元素处理优化 2026-02-28 10:09:22 +08:00
潘荣晟
6743d1fcca 委托加工金属元素处理优化 2026-02-28 09:36:11 +08:00
潘荣晟
83e4a5fdc7 委托加工金属元素处理优化 2026-02-28 09:29:42 +08:00
潘荣晟
04716c022e 来料加工 2026-02-28 08:57:10 +08:00
潘荣晟
74e8d88a66 来料加工 2026-02-27 16:36:37 +08:00
潘荣晟
72f38c5075 来料加工 2026-02-27 14:42:34 +08:00
潘荣晟
da974408f7 Merge remote-tracking branch 'origin/dev' into dev 2026-02-26 16:41:47 +08:00
潘荣晟
924896b435 委托加工更新提交erp优化 2026-02-26 16:40:42 +08:00
ranke
75c1257d22 物料主数据同步定时任务: http://172.16.46.63:31560/index.php?m=task&f=view&taskID=810 2026-02-26 16:17:03 +08:00
潘荣晟
403c385eae 委托加工更新提交erp优化 2026-02-26 14:56:41 +08:00
潘荣晟
956d939cc6 委托加工更新提交erp优化 2026-02-26 11:26:43 +08:00
潘荣晟
3ad1353a00 委托加工更新提交erp优化 2026-02-26 10:51:52 +08:00
潘荣晟
9d6e410720 委托加工更新提交erp优化 2026-02-25 11:04:59 +08:00
潘荣晟
ecebf1d610 委托加工更新提交erp优化 2026-02-25 10:56:21 +08:00
潘荣晟
24c8734840 委托加工更新提交erp优化 2026-02-12 17:21:31 +08:00
潘荣晟
5bf2e818e6 委托加工更新提交erp优化 2026-02-12 17:12:31 +08:00
潘荣晟
19d2e9896a 委托加工更新提交erp优化 2026-02-12 15:37:54 +08:00
潘荣晟
2dfb9b4c10 委托加工更新提交erp优化 2026-02-12 15:37:06 +08:00
潘荣晟
9c3e7b0651 委托加工更新提交erp优化 2026-02-12 15:24:06 +08:00
潘荣晟
0653598751 swagger文档内容优化。 2026-02-12 14:58:23 +08:00
潘荣晟
8e44b89c5e swagger文档内容优化。 2026-02-12 10:41:40 +08:00
潘荣晟
c08351a830 订单绑定优化 2026-02-11 18:13:46 +08:00
潘荣晟
2f36a4013b 委托加工和来料加工feign接口字段映射 2026-02-11 17:36:13 +08:00
潘荣晟
7142fcc86f 委托加工和来料加工feign接口字段映射 2026-02-11 17:19:33 +08:00
潘荣晟
a6f3b028fb 委托加工和来料加工feign接口字段映射 2026-02-11 17:12:00 +08:00
潘荣晟
92375c0dde 订单绑定相关 2026-02-11 11:29:33 +08:00
潘荣晟
10698e4aeb 订单绑定相关 2026-02-11 09:31:51 +08:00
潘荣晟
6037f038d2 订单绑定相关 2026-02-10 19:03:43 +08:00
潘荣晟
f233076fd0 订单绑定相关 2026-02-10 19:00:02 +08:00
潘荣晟
5a38bca0da 计划相关Feign接口 2026-02-10 18:01:58 +08:00
潘荣晟
70634dbb6d 计划相关Feign接口 2026-02-10 15:54:46 +08:00
潘荣晟
7ccb6e09e2 委托加工添加发货工厂字段和明细添加金属元素字段 2026-02-10 14:39:55 +08:00
潘荣晟
355701f70c 委托加工添加发货工厂字段和明细添加金属元素字段 2026-02-10 14:39:00 +08:00
潘荣晟
7f698802b1 委托加工添加发货工厂字段和明细添加金属元素字段 2026-02-10 11:02:25 +08:00
潘荣晟
356e330c7c 委托加工添加发货工厂字段和明细添加金属元素字段 2026-02-09 16:52:56 +08:00
潘荣晟
c8302e4d23 委托加工添加发货工厂字段和明细添加金属元素字段 2026-02-09 16:14:35 +08:00
潘荣晟
287ec65de4 委托加工添加发货工厂字段和明细添加金属元素字段 2026-02-09 14:18:14 +08:00
潘荣晟
42d152d54b 物料优化 2026-02-09 11:03:53 +08:00
潘荣晟
d580e2878b 物料优化 2026-02-06 17:59:33 +08:00
潘荣晟
0c6f349683 委托加工订单接口相关实现 2026-02-05 17:55:14 +08:00
潘荣晟
723daf8ee5 委托加工订单接口相关实现 2026-02-05 16:49:16 +08:00
qianshijiang
3b33b9b65b erp修改 2026-02-04 17:51:21 +08:00
潘荣晟
4a091f54c3 委托加工和回收率管理优化 2026-02-04 16:28:24 +08:00
潘荣晟
7ba5dc2fc3 Merge branch 'dev' into test 2026-02-03 17:58:49 +08:00
潘荣晟
0ecdb01a0b 委托加工和回收率管理优化 2026-02-03 17:40:22 +08:00
潘荣晟
291ede4093 Merge branch 'dev' into test 2026-02-03 15:51:32 +08:00
潘荣晟
6e72c30207 委托加工和回收率管理优化 2026-02-03 15:50:12 +08:00
chenbowen
2b2404c6f2 base 模块配置额外 dns 解析 2026-02-03 11:15:48 +08:00
潘荣晟
daeeb83624 委托加工和回收率管理优化 2026-02-03 10:14:26 +08:00
潘荣晟
0033bdc4c5 新增库位绑定Feign接口与合并采购销售订单 2026-02-02 17:53:14 +08:00
qianshijiang
726303ce81 日志记录 2026-02-02 16:34:01 +08:00
wsh12
d00917f7cb 【新增】添加了erp中083和084的dto 2026-02-02 09:51:44 +08:00
yangchaojin
e930818d27 添加物料属性表VAL字段联合索引 2026-01-30 16:49:43 +08:00
潘荣晟
33fa3cf7d2 新增库位绑定Feign接口与合并采购销售订单 2026-01-30 16:06:22 +08:00
潘荣晟
925860aaff 新增库位绑定Feign接口与合并采购销售订单 2026-01-30 16:00:31 +08:00
qianshijiang
d28ff3be7f erp修改 2026-01-30 15:34:08 +08:00
潘荣晟
dbd5abb797 Merge remote-tracking branch 'origin/dev' into dev 2026-01-30 14:19:15 +08:00
潘荣晟
99f82629da 新增库位绑定Feign接口与合并采购销售订单 2026-01-30 14:17:55 +08:00
qianshijiang
9c05d8ac0f erp修改 2026-01-30 11:48:26 +08:00
qianshijiang
61d88714da erp修改 2026-01-30 11:44:11 +08:00
qianshijiang
0ad9b60c91 erp修改 2026-01-30 11:38:08 +08:00
潘荣晟
37714cafb9 新增库位绑定Feign接口与合并采购销售订单 2026-01-30 11:31:26 +08:00
潘荣晟
499da0a9b2 新增库位绑定Feign接口与合并采购销售订单 2026-01-30 11:11:01 +08:00
qianshijiang
de66bd6b12 erp修改 2026-01-30 09:45:49 +08:00
qianshijiang
73fffba37f erp修改 2026-01-29 09:02:35 +08:00
151 changed files with 6805 additions and 660 deletions

View File

@@ -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

View File

@@ -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
View File

@@ -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>

View File

@@ -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)
);

View File

@@ -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, "同步日期不能为空");
}

View File

@@ -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);
}

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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