Commit Graph

135 Commits

Author SHA1 Message Date
chy
f8dc751b86 Merge remote-tracking branch 'origin/master' 2026-03-13 12:08:54 +08:00
chy
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
chy
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
e882dd280e Merge remote-tracking branch 'origin/master' 2026-03-11 09:13:38 +08:00
king
7fc21dcc9b SQL调整 金额已万为单位 2026-03-11 09:07:54 +08:00
chy
eca53d5424 添加单点登录接口和退出接口 2026-03-11 00:23:07 +08:00
chy
f9d4b08495 Merge remote-tracking branch 'origin/master' 2026-03-11 00:01:49 +08:00
chy
32627270d1 添加单点登录接口和退出接口 2026-03-11 00:01:32 +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
chy
56cb31c616 根据tokne获取用户信息 2026-03-10 14:23:28 +08:00
king
1c9d3b831c 实现前置增强逻辑,再实现“综合销售情况表” 动态分组逻辑 2026-03-10 14:13:57 +08:00
chy
de1774b2d3 修改配置文件 2026-03-10 11:13:56 +08:00
chy
43e66ea9c6 根据ticket获取用户信息 2026-03-10 11:09:46 +08:00
f494611789 Merge pull request '销售明细表定时任务' (#24) from liug into master
Reviewed-on: #24
2026-03-06 23:01:12 +08:00
hardy.liu
8bae1cbd35 销售明细表定时任务 2026-03-06 15:00:08 +08:00
chy
ee7510f41e 修改统一身份认证 2026-03-02 15:15:41 +08:00
chy
44279d9637 修改统一身份认证 2026-03-02 10:34:45 +08:00
860afb9812 Merge pull request '新增字段' (#23) from dpx20260211 into master
Reviewed-on: #23
2026-02-28 08:44:07 +08:00
dongpx
0ef88ce81d 新增字段 2026-02-28 08:24:32 +08:00
1b81782767 Merge pull request '应用查询按字典排序值排序' (#21) from main_hhl0209 into master
Reviewed-on: #21
2026-02-25 14:01:54 +08:00
432feb11d2 Merge pull request 'dpx20260211' (#22) from dpx20260211 into master
Reviewed-on: #22
2026-02-25 14:01:28 +08:00
c4ea4650bf Merge branch 'master' into main_hhl0209 2026-02-25 14:00:25 +08:00
dongpx
1173de364c 新增字段 2026-02-25 10:06:15 +08:00
chy
79cb1297db 修改认证 2026-02-22 21:40:47 +08:00
dongpx
7fb9543604 新增字段 2026-02-14 00:38:17 +08:00
dongpx
bac75778ad 修改字段长度 2026-02-12 11:45:36 +08:00
dongpx
3dd11b9f37 新增字段 2026-02-12 08:38:19 +08:00
chy
f940b2a911 新增文档 2026-02-11 14:58:26 +08:00
huhanlin
0cc088c51b 应用查询按字典排序值排序 2026-02-11 14:42:09 +08:00
869ef2cd8b Merge pull request 'ceshi' (#20) from dpx20260211 into master
Reviewed-on: #20
2026-02-11 11:35:01 +08:00
dongpx
35d708612e ceshi 2026-02-11 11:33:57 +08:00