Commit Graph

1911 Commits

Author SHA1 Message Date
mashuai 2294540e06 优化 2025-10-17 10:07:47 +08:00
mashuai 2b71b89aa0 优化 2025-10-16 18:47:21 +08:00
hongchao 271fcfc103 Merge remote-tracking branch 'origin/master' 2025-10-16 18:09:46 +08:00
hongchao 75d7e59e14 标准箱出库,新购验收单 2025-10-16 18:09:11 +08:00
mashuai 852b710033 优化 2025-10-16 12:20:11 +08:00
mashuai 3450cad3b4 优化 2025-10-16 09:14:02 +08:00
hongchao b1fe3d440b 租赁费用下拉问题修正 2025-10-15 17:48:15 +08:00
hongchao e4b2439bb7 Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material 2025-10-15 17:12:07 +08:00
hongchao e4b9634357 退料,领料,结算问题修复 2025-10-15 17:11:45 +08:00
bonus ca47adb504 修改超期日期 2025-10-15 01:32:56 +08:00
hongchao fffbf0dcb5 Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material 2025-10-15 01:24:54 +08:00
bonus 808208472e 增加超期日期 2025-10-15 01:24:39 +08:00
hongchao 77fa7563d6 Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material 2025-10-15 00:52:48 +08:00
hongchao f63a56ee22 结算工程加字段 2025-10-15 00:52:40 +08:00
bonus d2c103ca1a 增加超期日期 2025-10-15 00:52:06 +08:00
mashuai 2a8dca2a2b 优化 2025-10-15 00:50:19 +08:00
bonus 4ca6bc49d2 增加超期日期 2025-10-15 00:48:48 +08:00
bonus cfc9e975e3 增加超期日期 2025-10-15 00:42:30 +08:00
hayu 86f12a5413 修改 2025-10-15 00:13:52 +08:00
bonus ec6f1a5ea4 班组库存分包查询修改 2025-10-14 23:31:57 +08:00
hongchao 25df39b6e0 结算工程限制 2025-10-14 22:52:50 +08:00
hongchao 4a3d1617ea Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material 2025-10-14 22:41:50 +08:00
hongchao 532666b0b2 问题修复 2025-10-14 22:41:37 +08:00
bonus bab5c3ef1d 材料站丢失费用逻辑修改 2025-10-14 22:34:11 +08:00
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