Gjm
|
5e1bbc3905
|
feat(core): 添加出库申请定时任务和二维码生成功能
- 新增 OutboundApplicationJob 定时任务处理出货单据二维码生成
- 添加 ScmgiplanEntity 和 ScmGiPlanItemEntity 实体类定义
- 创建 ScmgiplanQrEntity 和 ScmgiPlanSyncLogEntity 二维码相关实体
- 实现 ScmgiPlanService 服务接口及 ScmgiPlanServiceImpl 实现类
- 添加 ScmgiPlanItemMapper、ScmgiPlanMapper、ScmgiPlanQrMapper 等数据访问层
- 集成二维码生成工具类 QrCodeUtil 支持数据压缩功能
- 创建 QrOutboundApplicationController 提供出库申请相关接口
- 修改数据库配置将 schema 从 ERPCS 和 ERP 统一为 GSSERVER
|
2026-05-15 16:59:52 +08:00 |
|
Gjm
|
656b0995f4
|
feat(bom): 新增BOM管理功能和到货通知任务
- 添加WarehouseNotificationJob定时任务处理到货通知
- 创建JsbomBackUpEntity和JsbomzxBackUpEntity实体类用于BOM备份
- 添加ArrivalOrderEntity和ArrivalOrderItemEntity实体类用于到货订单
- 创建BomMaterialBackUpMapper和JsbomzxBackUpMapper数据访问接口
- 配置application-local.yaml和application-prod.yaml中的销售系统相关URL
- 更新达梦数据库连接配置和Redis密码设置
|
2026-05-12 09:10:25 +08:00 |
|
Gjm
|
0cf4e4433f
|
chore(config): 同步往来单位基础数据及物料信息（定时任务）
- 移除本地配置中注释掉的MySQL数据库连接配置
- 修改达梦数据库连接地址和用户名密码配置
- 重命名erp数据源为erp_dev并新增mes_dev数据源配置
- 添加销售系统相关API接口地址配置
- 更新生产环境数据库连接地址和API接口地址
- 新增BOM基本数据信息同步任务类
- 在ERP基本数据信息任务中添加BOM材料服务和仓库批次等相关资源注入
|
2026-04-30 16:43:56 +08:00 |
|
Gjm
|
fc089943bc
|
refactor(config): 更新配置和ERP数据同步功能
- 将生产环境数据库配置从MySQL切换到达梦数据库
- 添加多个达梦数据库连接配置包括主库、从库、日志库等
- 配置往来单位和物料相关的API接口URL列表
- 重构ERP基础数据同步任务，支持双向同步（ERP↔数据中心）
- 优化计量单位数据同步逻辑，改用编码匹配方式进行增改操作
- 添加物料信息及往来单位子表的批量同步处理功能
- 实现通用数据同步方法，统一异常处理和日志记录
- 调整定时任务执行逻辑，支持ERP到数据中心和反向同步流程
|
2026-04-17 13:58:42 +08:00 |
|
shih
|
bc902e2da2
|
达梦数据库驱动
|
2026-04-11 17:58:47 +08:00 |
|
Gjm
|
40fd80192d
|
config(database): 配置文件中的数据库连接从MySQL切换到达梦数据库
- 将主库、从库和日志库的驱动程序更改为达梦数据库驱动
- 更新所有数据源的连接URL以使用达梦数据库协议
- 修改数据库用户名为sysdba并更新相应的密码配置
- 添加新的erp和数据中台数据源配置
- 注释掉原有的MySQL和Oracle数据库配置选项
|
2026-04-11 16:57:24 +08:00 |
|
king
|
51bd73d9de
|
删除日志打印
|
2026-03-25 17:51:02 +08:00 |
|
king
|
853c3f59c2
|
综合销售情况表 调整月度,年度 报表数据
|
2026-03-25 17:43:40 +08:00 |
|
chy
|
6e9bdfd81c
|
修改验证码水印
|
2026-03-23 11:20:13 +08:00 |
|
chy
|
eb410b992d
|
修改验证码水印
|
2026-03-22 22:01:25 +08:00 |
|
chy
|
21fe5196be
|
添加能耗采集定时任务
|
2026-03-13 09:58:32 +08:00 |
|
chy
|
eca53d5424
|
添加单点登录接口和退出接口
|
2026-03-11 00:23:07 +08:00 |
|
chy
|
32627270d1
|
添加单点登录接口和退出接口
|
2026-03-11 00:01:32 +08:00 |
|
chy
|
56cb31c616
|
根据tokne获取用户信息
|
2026-03-10 14:23:28 +08:00 |
|
chy
|
de1774b2d3
|
修改配置文件
|
2026-03-10 11:13:56 +08:00 |
|
chy
|
43e66ea9c6
|
根据ticket获取用户信息
|
2026-03-10 11:09:46 +08:00 |
|
hardy.liu
|
8bae1cbd35
|
销售明细表定时任务
|
2026-03-06 15:00:08 +08:00 |
|
chy
|
ee7510f41e
|
修改统一身份认证
|
2026-03-02 15:15:41 +08:00 |
|
chy
|
390172f426
|
合并hhl代码
|
2026-02-11 10:11:14 +08:00 |
|
chy
|
bb986102f3
|
修改配置代码
|
2026-02-10 10:50:32 +08:00 |
|
chy
|
549da7ec80
|
应用表单增加回调url和应用分类字段，重定向url改为单个字符串
|
2026-02-10 10:35:11 +08:00 |
|
chy
|
8b9f4a5013
|
修改代码
|
2026-02-10 00:19:46 +08:00 |
|
chy
|
3de7be34b2
|
删除无用文件
|
2026-02-09 23:49:37 +08:00 |
|
chy
|
da95ddf810
|
合并董潘祥冲突
|
2026-02-09 23:44:07 +08:00 |
|
chy
|
72331c5e1e
|
合并20260204分支
|
2026-02-09 23:34:56 +08:00 |
|
chy
|
fa8c84f349
|
Merge branch '20260204'
# Conflicts:
# .idea/compiler.xml
# .idea/vcs.xml
# lidee-admin/src/main/resources/application-local.yaml
# lidee-admin/target/classes/application-local.yaml
# lidee-admin/target/lidee-admin.jar
# lidee-admin/target/lidee-admin.jar.original
# lidee-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
# lidee-core/src/main/java/com/lideeyunji/core/framework/entity/ReportFieldEntity.java
# lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/ReportServiceImpl.java
# lidee-core/target/classes/com/lideeyunji/core/framework/entity/ReportFieldEntity.class
# lidee-core/target/classes/com/lideeyunji/core/framework/service/impl/ReportServiceImpl.class
# lidee-core/target/lidee-core-2.2.4.jar
# lidee-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
# lidee-module/lidee-module-api/target/lidee-module-api-2.2.4.jar
# lidee-module/lidee-module-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
# lidee-module/lidee-module-biz/target/lidee-module-biz-2.2.4.jar
# lidee-module/lidee-module-biz/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
# lidee-service/lidee-service-infra-api/target/lidee-service-infra-api-2.2.4.jar
# lidee-service/lidee-service-infra-biz/target/lidee-service-infra-biz-2.2.4.jar
# lidee-service/lidee-service-system-api/target/lidee-service-system-api-2.2.4.jar
# lidee-service/lidee-service-system-biz/target/lidee-service-system-biz-2.2.4.jar
# lidee-tool/tool-common/target/tool-common-2.2.4.jar
# lidee-tool/tool-spring-boot-starter-ai/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
# lidee-tool/tool-spring-boot-starter-ai/target/tool-spring-boot-starter-ai-2.2.4.jar
# lidee-tool/tool-spring-boot-starter-captcha/target/tool-spring-boot-starter-captcha-2.2.4.jar
# lidee-tool/tool-spring-boot-starter-dict/target/tool-spring-boot-starter-dict-2.2.4.jar
# lidee-tool/tool-spring-boot-starter-excel/target/tool-spring-boot-starter-excel-2.2.4.jar
# lidee-tool/tool-spring-boot-starter-exception/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
# lidee-tool/tool-spring-boot-starter-exception/target/tool-spring-boot-starter-exception-2.2.4.jar
# lidee-tool/tool-spring-boot-starter-file/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
# lidee-tool/tool-spring-boot-starter-file/target/tool-spring-boot-starter-file-2.2.4.jar
# lidee-tool/tool-spring-boot-starter-flowable/target/tool-spring-boot-starter-flowable-2.2.4.jar
# lidee-tool/tool-spring-boot-starter-ip/target/tool-spring-boot-starter-ip-2.2.4.jar
# lidee-tool/tool-spring-boot-starter-job/target/tool-spring-boot-starter-job-2.2.4.jar
# lidee-tool/tool-spring-boot-starter-monitor/target/tool-spring-boot-starter-monitor-2.2.4.jar
# lidee-tool/tool-spring-boot-starter-mybatis/target/tool-spring-boot-starter-mybatis-2.2.4.jar
# lidee-tool/tool-spring-boot-starter-operatelog/target/tool-spring-boot-starter-operatelog-2.2.4.jar
# lidee-tool/tool-spring-boot-starter-permission/target/tool-spring-boot-starter-permission-2.2.4.jar
# lidee-tool/tool-spring-boot-starter-protection/target/tool-spring-boot-starter-protection-2.2.4.jar
# lidee-tool/tool-spring-boot-starter-redis/target/tool-spring-boot-starter-redis-2.2.4.jar
# lidee-tool/tool-spring-boot-starter-security/target/tool-spring-boot-starter-security-2.2.4.jar
# lidee-tool/tool-spring-boot-starter-sql/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
# lidee-tool/tool-spring-boot-starter-sql/target/tool-spring-boot-starter-sql-2.2.4.jar
# lidee-tool/tool-spring-boot-starter-tenant/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
# lidee-tool/tool-spring-boot-starter-tenant/target/tool-spring-boot-starter-tenant-2.2.4.jar
# lidee-tool/tool-spring-boot-starter-test/target/tool-spring-boot-starter-test-2.2.4.jar
# lidee-tool/tool-spring-boot-starter-web/target/tool-spring-boot-starter-web-2.2.4.jar
# lidee-tool/tool-spring-boot-starter-websocket/target/tool-spring-boot-starter-websocket-2.2.4.jar
# lidee-tool/tool-spring-boot-starter-yunji/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
# lidee-tool/tool-spring-boot-starter-yunji/target/tool-spring-boot-starter-yunji-2.2.4.jar
# logs/lideeyunji-error.log
# logs/lideeyunji-info.log
|
2026-02-09 23:30:06 +08:00 |
|
chy
|
16a985e8cc
|
修改
|
2026-02-09 11:14:17 +08:00 |
|
chy
|
55d050fbd7
|
111
|
2026-02-09 00:27:50 +08:00 |
|
chy
|
861f082e66
|
·1
|
2026-02-09 00:16:21 +08:00 |
|
dongpx
|
b629c574f1
|
Changes
|
2026-02-08 22:20:56 +08:00 |
|
dongpx
|
918ec6c498
|
Changes
|
2026-02-05 13:20:41 +08:00 |
|
chy
|
92674cff52
|
Merge branch 'main' of http://8.130.49.250:3000/admin/gr_report_java
Signed-off-by: chy <chy@163.com>
|
2026-02-05 13:12:17 +08:00 |
|
dongpx
|
3c9eb35f2c
|
Signed-off-by: dongpx <2112323174@qq.com>
|
2026-02-04 10:55:43 +08:00 |
|
chy
|
e392221045
|
更新董潘祥代码
|
2026-02-03 15:50:37 +08:00 |
|
chy
|
1c212fb3b3
|
Signed-off-by: chy <chy@163.com>
|
2026-02-02 23:21:53 +08:00 |
|