Commit Graph

1720 Commits

Author SHA1 Message Date
bonus 49241d48e3 材料站结算班组项目部修改 2025-10-14 22:00:41 +08:00
mashuai e1c5771475 优化 2025-10-14 21:58:10 +08:00
hongchao c1306c49e3 问题修复 2025-10-14 21:55:30 +08:00
hongchao b3c97bce82 Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material 2025-10-14 21:42:22 +08:00
bonus 54b954122f Merge remote-tracking branch 'origin/master' 2025-10-14 21:42:15 +08:00
hongchao bab678f32d 问题修复 2025-10-14 21:42:07 +08:00
hayu f77c901cb0 修改 2025-10-14 21:41:55 +08:00
bonus 3bd67c598b 材料站结算超期费用修改 2025-10-14 21:41:16 +08:00
mashuai 20f399eb35 导出优化 2025-10-14 20:06:23 +08:00
bonus 434a330191 材料站结算修改 2025-10-14 17:38:23 +08:00
hayu 739df5ea33 修改 2025-10-14 17:35:38 +08:00
mashuai 1824735546 优化 2025-10-14 17:34:13 +08:00
syruan 0597901404 Merge remote-tracking branch 'frps/master' into frp-master
# Conflicts:
#	bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml
2025-10-14 17:29:02 +08:00
hongchao 288d52e280 Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material 2025-10-14 17:26:57 +08:00
hongchao 2ea92e78a6 结算修改 2025-10-14 17:26:29 +08:00
bonus a431f69a95 材料站结算修改 2025-10-14 17:26:11 +08:00
mashuai 4f5f2eb0f2 优化 2025-10-13 23:01:30 +08:00
hongchao de2fb68076 Merge remote-tracking branch 'origin/master' 2025-10-13 21:39:13 +08:00
hongchao 37a4600263 结算修改 2025-10-13 21:37:02 +08:00
mashuai 84da3532fc 优化 2025-10-13 21:33:50 +08:00
hayu 39f0b41bbb 直转签名 2025-10-13 21:31:42 +08:00
hayu deb5f9ce89 维修员、材料员、库管员强制维护签名 2025-10-13 18:44:17 +08:00
mashuai 150b01d3cc 优化 2025-10-13 18:31:45 +08:00
mashuai 2dc94f20b8 领用无法发布已结算协议 2025-10-11 17:44:39 +08:00
jjLv 9003c84147 导出功能(维修审核管理) 2025-10-11 17:38:50 +08:00
liux 8a80a7059e 修饰任务审核模块功能修改优化 2025-10-11 17:37:52 +08:00
syruan 02f89296f1 修正 2025-10-11 15:46:07 +08:00
mashuai a763b6d646 材料站优化 2025-10-11 11:25:06 +08:00
liang.chao 00506cc7ca 代码提交 2025-10-11 11:20:49 +08:00
hayu fb20d8517f 退料单查询审核人 2025-10-10 21:50:14 +08:00
liang.chao d1235dcc06 代码提交 2025-10-10 21:39:19 +08:00
syruan 5b686df136 增加结算日志 2025-10-10 21:13:54 +08:00
bonus ea1a3411f1 Merge remote-tracking branch 'origin/master' 2025-10-10 21:07:03 +08:00
bonus 6ca23d9fc9 协议合并修改 2025-10-10 21:06:07 +08:00
syruan 43499b4a45 增加根据协议ID和结算类型修改设备状态为丢失的功能,优化相关数据处理逻辑 2025-10-10 21:05:36 +08:00
hongchao 2e50eb1ad0 Merge remote-tracking branch 'origin/master' 2025-10-10 20:59:43 +08:00
hongchao aa2eccd23c 台账关联班组 2025-10-10 20:59:30 +08:00
jjLv 1f8e477105 导出功能(发料记录汇总、维修任务管理、维修审核管理) 2025-10-10 20:58:21 +08:00
liux 9efa25e31a 材料站点导出及查询优化 2025-10-10 20:57:44 +08:00
liux b75ab65778 材料站点导出及查询优化 2025-10-10 20:56:27 +08:00
mashuai b252062602 Merge remote-tracking branch 'origin/master' 2025-10-10 17:35:17 +08:00
mashuai ebc342a9c1 材料站优化 2025-10-10 17:35:08 +08:00
hayu ccbed741c7 Merge remote-tracking branch 'origin/master' 2025-10-10 17:34:54 +08:00
hayu b0a4f046fd 退料单查询审核人、授权功能修改 2025-10-10 17:34:06 +08:00
hongchao ffeea860d9 Merge remote-tracking branch 'origin/master' 2025-10-10 17:33:54 +08:00
hongchao 0a41ecc202 定时器增量工程添加至工程表 2025-10-10 17:33:10 +08:00
syruan 22bf965675 优化结算申请相关功能,增加费用明细字段,调整数据处理逻辑 2025-10-10 17:32:37 +08:00
hongchao bc8822fc1f Merge remote-tracking branch 'origin/master' 2025-10-10 12:14:35 +08:00
hongchao 5a5b8c609f 配件查询,在修工程 2025-10-10 12:12:49 +08:00
hongchao a94f01e29b Merge branch 'master' of http://36.33.26.201:3000/bonus/Bonus-Cloud-Material 2025-10-10 12:11:25 +08:00