king
|
7a73fbb981
|
计算销售报表-定时任务逻辑调整
|
2026-03-13 15:07:01 +08:00 |
|
king
|
de66384d0c
|
Merge remote-tracking branch 'origin/master'
|
2026-03-13 13:00:54 +08:00 |
|
|
|
f8dc751b86
|
Merge remote-tracking branch 'origin/master'
|
2026-03-13 12:08:54 +08:00 |
|
|
|
8a35bbdede
|
新增能耗数据同步
|
2026-03-13 12:08:37 +08:00 |
|
king
|
62163a5d16
|
计算销售报表-定时任务逻辑调整
|
2026-03-13 11:56:45 +08:00 |
|
king
|
dda951fb71
|
Merge branch 'dev_js_20260313'
|
2026-03-13 10:57:48 +08:00 |
|
king
|
b023ce65f6
|
计算销售报表-定时任务逻辑调整
|
2026-03-13 10:52:59 +08:00 |
|
|
|
21fe5196be
|
添加能耗采集定时任务
|
2026-03-13 09:58:32 +08:00 |
|
king
|
1ed3bc85f6
|
计算销售报表-库存产品占比表对象,产品可销库存对象 同步
|
2026-03-13 09:35:46 +08:00 |
|
king
|
bea29295a5
|
计算销售报表-物料产品库存统计表 同步
|
2026-03-13 08:59:13 +08:00 |
|
king
|
bfc7d11131
|
计算销售报表-经营指标完成情况 同步
|
2026-03-13 08:54:46 +08:00 |
|
king
|
fde5cfe3b2
|
计算销售报表-增加计算字段 调整本年销量，本年销售金额,本年毛利额,本年毛利额
|
2026-03-12 11:22:51 +08:00 |
|
king
|
70e5ed81f6
|
计算销售报表-增加计算字段 调整除0判断
|
2026-03-12 10:57:58 +08:00 |
|
king
|
5b25cb3766
|
计算销售报表-增加计算字段 本月毛利率，本年毛利率，上年毛利率，本月销售金额占比，本年销售金额占比，上年销售金额占比，本月毛利额占比，本年毛利额占比，上年毛利额占比，销售金额增长率，毛利额增长率，毛利变动
|
2026-03-12 10:28:04 +08:00 |
|
king
|
66028bf17a
|
计算销售报表-增加计算字段 本月毛利率，本年毛利率，上年毛利率，本月销售金额占比，本年销售金额占比，上年销售金额占比，本月毛利额占比，本年毛利额占比，上年毛利额占比，销售金额增长率，毛利额增长率，毛利变动
|
2026-03-12 10:26:12 +08:00 |
|
king
|
ebf54b4ecf
|
计算销售报表-调整计算逻辑，增加计算字段
|
2026-03-11 17:11:25 +08:00 |
|
king
|
8f22732f04
|
计算销售报表
|
2026-03-11 14:41:55 +08:00 |
|
king
|
e230587f66
|
计算销售报表
|
2026-03-11 14:41:51 +08:00 |
|
king
|
3fb081217f
|
计算销售报表
|
2026-03-11 14:38:51 +08:00 |
|
king
|
7fc21dcc9b
|
SQL调整 金额已万为单位
|
2026-03-11 09:07:54 +08:00 |
|
king
|
affe6bfed5
|
分组SQL调整
|
2026-03-10 16:52:34 +08:00 |
|
king
|
8523b80eb3
|
分组SQL调整
|
2026-03-10 15:38:16 +08:00 |
|
king
|
b6a6ad88e7
|
分组SQL调整
|
2026-03-10 15:04:48 +08:00 |
|
king
|
3c1274c3d6
|
Merge branch 'master' into dev_js_20260309
|
2026-03-10 14:37:07 +08:00 |
|
king
|
b021d2ef01
|
删除打印
|
2026-03-10 14:36:06 +08:00 |
|
|
|
2fa40c266f
|
Merge pull request '实现前置增强逻辑，再实现“综合销售情况表” 动态分组逻辑' (#25) from dev_js_20260309 into master
Reviewed-on: #25
|
2026-03-10 14:32:51 +08:00 |
|
|
|
56cb31c616
|
根据tokne获取用户信息
|
2026-03-10 14:23:28 +08:00 |
|
king
|
1c9d3b831c
|
实现前置增强逻辑，再实现“综合销售情况表” 动态分组逻辑
|
2026-03-10 14:13:57 +08:00 |
|
|
|
43e66ea9c6
|
根据ticket获取用户信息
|
2026-03-10 11:09:46 +08:00 |
|
hardy.liu
|
8bae1cbd35
|
销售明细表定时任务
|
2026-03-06 15:00:08 +08:00 |
|
dongpx
|
0ef88ce81d
|
新增字段
|
2026-02-28 08:24:32 +08:00 |
|
dongpx
|
1173de364c
|
新增字段
|
2026-02-25 10:06:15 +08:00 |
|
dongpx
|
7fb9543604
|
新增字段
|
2026-02-14 00:38:17 +08:00 |
|
dongpx
|
3dd11b9f37
|
新增字段
|
2026-02-12 08:38:19 +08:00 |
|
dongpx
|
35d708612e
|
ceshi
|
2026-02-11 11:33:57 +08:00 |
|
|
|
dcb15b1aa7
|
是否隐藏列
|
2026-02-11 11:18:38 +08:00 |
|
|
|
2cae542098
|
新增维度隐藏字段
|
2026-02-10 10:42:42 +08:00 |
|
|
|
8b9f4a5013
|
修改代码
|
2026-02-10 00:19:46 +08:00 |
|
|
|
3de7be34b2
|
删除无用文件
|
2026-02-09 23:49:37 +08:00 |
|
|
|
72331c5e1e
|
合并20260204分支
|
2026-02-09 23:34:56 +08:00 |
|
|
|
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 |
|
dongpx
|
246591bb1c
|
Signed-off-by: dongpx <2112323174@qq.com>
|
2026-02-09 20:12:51 +08:00 |
|
|
|
861f082e66
|
·1
|
2026-02-09 00:16:21 +08:00 |
|
dongpx
|
b629c574f1
|
Changes
|
2026-02-08 22:20:56 +08:00 |
|
|
|
81bc9757eb
|
Merge remote-tracking branch 'remotes/origin/20260204'
# Conflicts:
# lidee-core/target/classes/com/lideeyunji/core/framework/service/impl/FrameServiceImpl.class
# lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/codegen/CodegenConvertImpl.java
# lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/config/ConfigConvertImpl.java
# lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/file/FileConfigConvertImpl.java
# lidee-service/lidee-service-infra-biz/target/generated-sources/annotations/com/lideeyunji/service/infra/config/convert/redis/RedisConvertImpl.java
# lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/auth/AuthConvertImpl.java
# lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/logger/OperateLogConvertImpl.java
# lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/mail/MailAccountConvertImpl.java
# lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/oauth2/OAuth2OpenConvertImpl.java
# lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/social/SocialUserConvertImpl.java
# lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/tenant/TenantConvertImpl.java
# lidee-service/lidee-service-system-biz/target/generated-sources/annotations/com/lideeyunji/service/system/config/convert/user/UserConvertImpl.java
|
2026-02-05 13:15:03 +08:00 |
|
|
|
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
|
b7ebd3778d
|
Signed-off-by: dongpx <2112323174@qq.com>
|
2026-02-05 10:37:57 +08:00 |
|
dongpx
|
3c9eb35f2c
|
Signed-off-by: dongpx <2112323174@qq.com>
|
2026-02-04 10:55:43 +08:00 |
|
|
|
e392221045
|
更新董潘祥代码
|
2026-02-03 15:50:37 +08:00 |
|
|
|
1c212fb3b3
|
Signed-off-by: chy <chy@163.com>
|
2026-02-02 23:21:53 +08:00 |
|
