Commit Graph

1444 Commits

Author SHA1 Message Date
hayu 5f15a736fc 修改 2025-09-02 11:31:47 +08:00
hongchao 5598a935be 直转审核bug 2025-09-02 11:31:11 +08:00
hayu 5df71896fd Merge remote-tracking branch 'origin/master' 2025-09-02 01:59:20 +08:00
hayu caf103e9d1 修改 2025-09-02 01:58:57 +08:00
mashuai 6e32f84495 Merge remote-tracking branch 'origin/master' 2025-09-02 01:58:46 +08:00
mashuai a921294a14 功能优化 2025-09-02 01:58:32 +08:00
syruan 09d69775da 优化未结算报表查询性能
- 添加 totalCount 查询接口,避免全表扫描
- 重构列表查询逻辑,提高查询效率
- 优化数据处理方式,减少冗余操作
-增加参数预处理,提升 SQL 执行效率
2025-09-02 01:57:50 +08:00
hayu 01d5b2bdb4 修改 2025-09-02 01:30:40 +08:00
syruan 6262a382c2 Merge remote-tracking branch 'frps/master' into frp-master 2025-09-01 22:17:31 +08:00
syruan 8d79e7c931 未结算协议查询修正 2025-09-01 22:17:27 +08:00
hayu e37b4bfb7b 修改 2025-09-01 20:53:11 +08:00
hayu 015c852ede 修改 2025-09-01 16:28:30 +08:00
hayu 27f942d77d 修改 2025-09-01 14:15:19 +08:00
mashuai 7a2a10372f Merge remote-tracking branch 'origin/master' 2025-09-01 13:32:04 +08:00
mashuai dab38a5b9c 功能优化 2025-09-01 13:31:50 +08:00
hayu 4598a2d5ea 修改 2025-09-01 13:22:58 +08:00
syruan 40c7c19aa8 增加消耗性物资结算功能
- 新增消耗性物资的租赁费用计算逻辑
- 增加安全工器具的结算相关字段和功能
- 优化已结算和未结算协议的处理流程
-调整数据库查询以支持新的结算类型
2025-09-01 01:39:44 +08:00
mashuai aea731d3b8 Merge remote-tracking branch 'origin/master' 2025-08-31 22:41:19 +08:00
hayu c2343ece82 修改 2025-08-31 22:33:53 +08:00
jiang 17ceb7b0c5 接口对接 2025-08-31 22:12:38 +08:00
mashuai 14d3bc2040 功能优化 2025-08-31 22:05:06 +08:00
hongchao 046b71dec7 直转审核,数据迁移功能修复, 2025-08-31 20:57:51 +08:00
hongchao fbd448a321 直转审核,数据迁移功能修复, 2025-08-31 20:57:01 +08:00
hongchao 451f542982 Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material 2025-08-31 20:56:09 +08:00
hongchao 4ecc905556 直转审核,数据迁移功能修复, 2025-08-31 20:55:53 +08:00
hayu fa5a630656 修改 2025-08-31 20:51:22 +08:00
mashuai c7fc7a0cd2 功能优化 2025-08-31 18:24:23 +08:00
hayu 8257f1c3bd 修改 2025-08-31 18:19:11 +08:00
jiang abcbeff813 接口对接 2025-08-31 13:25:08 +08:00
hayu 59842231f8 修改 2025-08-30 22:44:57 +08:00
mashuai 759f754fcf 功能优化 2025-08-30 22:42:04 +08:00
syruan 7fc22fde25 费用推送审核接口 2025-08-30 22:16:48 +08:00
syruan 5a6aaf5da7 (new)区间费用计算功能开发 2025-08-30 16:53:11 +08:00
mashuai 03b9e4ce8c Merge remote-tracking branch 'origin/master' 2025-08-30 16:37:24 +08:00
mashuai 9454d969aa 优化 2025-08-30 16:37:08 +08:00
bonus 26f59138aa 检验标签查询接口修改 2025-08-30 10:05:13 +08:00
hayu 50ed57eaa6 修改 2025-08-29 18:35:21 +08:00
mashuai ef5e7262fa Merge remote-tracking branch 'origin/master' 2025-08-29 18:34:04 +08:00
mashuai 1eb3a39b1f 优化 2025-08-29 18:33:50 +08:00
bonus b0468de806 电子标签查询修改 2025-08-29 18:32:55 +08:00
hayu 9ebd493f87 修改 2025-08-29 18:18:41 +08:00
hongchao 813266dca2 退料和修试bug修复 2025-08-29 18:07:39 +08:00
hongchao f840f0841c 退料和修试bug修复 2025-08-29 18:05:14 +08:00
syruan c997c888be 丢失、报废、维修费用报表 2025-08-29 17:54:55 +08:00
hayu de498f3e58 修改 2025-08-29 17:52:27 +08:00
hongchao 32eba8af22 Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material 2025-08-29 14:52:54 +08:00
hongchao 02f99835fa 预警短信发送,修试入库数量显示 2025-08-29 14:52:35 +08:00
hongchao e91ff17b80 预警短信发送,修试入库数量显示 2025-08-29 14:51:46 +08:00
mashuai b2d8cb5d37 优化 2025-08-29 13:27:45 +08:00
mashuai f547c8af75 Merge remote-tracking branch 'origin/master' 2025-08-29 11:25:25 +08:00
mashuai 094971b034 优化 2025-08-29 11:25:12 +08:00
bonus 6482651111 新购标准箱接口修改 2025-08-29 11:04:16 +08:00
hayu d0d2904e15 修改 2025-08-28 21:25:23 +08:00
mashuai f840b2820a 优化功能 2025-08-28 19:24:06 +08:00
jiang 6de69becb8 Merge remote-tracking branch 'origin/master' 2025-08-28 19:18:43 +08:00
jiang 4d7644cadb 接口对接 2025-08-28 19:18:31 +08:00
syruan b8905ea4f4 已结算费用统计修改 2025-08-28 18:01:10 +08:00
hongchao 451d8dd923 盘点入库bug修复 2025-08-28 16:38:21 +08:00
hayu b0159a8e18 修改 2025-08-28 15:25:52 +08:00
hayu 9e4bea6e87 修改 2025-08-27 21:57:11 +08:00
mashuai a2a25fe20f 优化功能 2025-08-27 21:55:56 +08:00
jiang bd8bef233a 接口对接 2025-08-27 18:12:27 +08:00
jiang 456e88f4d4 接口对接 2025-08-27 16:05:42 +08:00
liang.chao 3b3cec07bb 代码提交 2025-08-27 14:09:01 +08:00
liang.chao 50e48b3230 代码提交 2025-08-27 12:29:57 +08:00
liang.chao c172a18ca9 Merge remote-tracking branch 'origin/master' 2025-08-27 11:42:25 +08:00
liang.chao 2d6f3939a9 代码提交 2025-08-27 11:42:18 +08:00
bonus 6b1ebf97c5 结算表开发 2025-08-27 11:41:46 +08:00
hayu bc2a08303e 修改 2025-08-27 10:55:20 +08:00
syruan 0c80b00186 领料费用计算小数点精度算法修改 2025-08-27 10:36:20 +08:00
mashuai dfaf94edd2 优化 2025-08-27 10:06:54 +08:00
hayu 8d9b7ccfa3 修改 2025-08-26 22:33:56 +08:00
mashuai 5e6c28baa4 优化 2025-08-26 20:58:26 +08:00
jiang b35d42ff20 Merge remote-tracking branch 'origin/master' 2025-08-26 19:54:47 +08:00
jiang d6e9a6ed59 接口对接 2025-08-26 19:54:22 +08:00
hayu b7ed8f573a 修改 2025-08-26 18:44:00 +08:00
hayu b5c7828252 修改 2025-08-26 16:20:19 +08:00
mashuai b7d861f9b6 优化 2025-08-26 09:25:06 +08:00
syruan 876b06ab01 增加二维码查询外部使用接口 2025-08-25 18:38:22 +08:00
mashuai 8fef6cc97f 优化 2025-08-25 12:37:18 +08:00
hayu b2971abc78 修改 2025-08-25 12:03:42 +08:00
mashuai cc09b903fb 优化 2025-08-24 19:49:51 +08:00
syruan 937a619fd7 结算负数优化 2025-08-24 19:12:07 +08:00
hayu ff05164b8b 修改 2025-08-24 18:59:16 +08:00
mashuai 6bc468201a 优化 2025-08-24 18:15:36 +08:00
liang.chao 877c06a088 代码提交 2025-08-24 18:02:56 +08:00
liang.chao e58a0cebd3 代码提交 2025-08-24 15:59:32 +08:00
mashuai e78a42de1f 优化 2025-08-24 15:03:03 +08:00
liang.chao 58245dd94c 代码提交 2025-08-24 12:25:38 +08:00
liang.chao 1e6400c0de 代码提交 2025-08-24 11:27:05 +08:00
syruan 6183fc5163 修饰审核速度优化 2025-08-23 20:17:42 +08:00
hayu 92c6a2f9e6 修改 2025-08-23 20:04:28 +08:00
liang.chao ad5f3b5e94 代码提交 2025-08-23 19:37:38 +08:00
liang.chao 5cfcf6b3c3 Merge remote-tracking branch 'origin/master' 2025-08-23 19:26:16 +08:00
liang.chao d4f687aa5a 代码提交 2025-08-23 19:26:12 +08:00
liang.chao 77f4998c98 代码提交 2025-08-23 19:24:46 +08:00
mashuai 7c0c13e8dd 优化 2025-08-23 19:22:18 +08:00
liang.chao b5bf04e682 Merge remote-tracking branch 'origin/master' 2025-08-23 19:20:38 +08:00
liang.chao 883ee948e5 代码提交 2025-08-23 19:18:15 +08:00
hongchao cdeeab88bc Merge remote-tracking branch 'origin/master' 2025-08-23 18:57:15 +08:00