 hongchao
|
c9f1e51d3f
|
领料审核驳回
|
2025-09-15 14:37:22 +08:00 |
 mashuai
|
3315b69a88
|
功能优化
|
2025-09-15 12:25:17 +08:00 |
|
hongchao
|
51250a0b3a
|
撤回功能
|
2025-09-15 00:10:55 +08:00 |
|
hongchao
|
a403ec5405
|
撤回功能
|
2025-09-14 23:44:32 +08:00 |
 hayu
|
89f4f166c1
|
修改
|
2025-09-14 23:39:53 +08:00 |
|
mashuai
|
989f1efc3d
|
功能优化
|
2025-09-14 23:24:15 +08:00 |
 bonus
|
9c1a1379f2
|
领料确认接口优化
|
2025-09-14 23:20:19 +08:00 |
 syruan
|
5362cfd2ee
|
优化维修费用记录逻辑，根据任务是否定损
- 注释掉部分冗余代码，包括设置维修数量和新增维修费用记录的操作
- 修改 getCostCount 查询条件，使用 task_id 替代 repair_id，并添加 is_ds = 1 的条件
- 优化判断逻辑，将 count <= 0 改为 count == 0
|
2025-09-14 23:04:27 +08:00 |
|
hongchao
|
76e36697f4
|
Merge remote-tracking branch 'origin/master'
|
2025-09-14 21:04:38 +08:00 |
|
hongchao
|
bf77815eb7
|
扫描二维码
|
2025-09-14 21:04:26 +08:00 |
|
syruan
|
9cdfee2f1c
|
添加报废费用记录功能
- 在 RepairTaskDetails 中添加 buyPrice 字段，用于获取采购原值
- 在 RepairServiceImpl 中实现报废费用记录的新增逻辑
- 修改 Mapper XML，增加获取采购原值的 SQL 查询
|
2025-09-14 21:04:04 +08:00 |
|
hayu
|
547af18752
|
材料站退料预约
|
2025-09-14 20:36:51 +08:00 |
|
hongchao
|
cdb1ef32ce
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-14 19:15:45 +08:00 |
|
hongchao
|
c2970de1b8
|
盘点入库修正
|
2025-09-14 19:15:38 +08:00 |
|
mashuai
|
e3c670c46d
|
功能优化
|
2025-09-14 17:10:37 +08:00 |
|
hongchao
|
591b7fcbde
|
盘点入库修正
|
2025-09-14 16:35:15 +08:00 |
|
hayu
|
ce86089d29
|
修改
|
2025-09-14 12:34:31 +08:00 |
|
hongchao
|
8a86d64282
|
材料站领料单详情接口
|
2025-09-14 11:24:02 +08:00 |
|
hongchao
|
dae408efad
|
合并代码恢复自身代码
|
2025-09-13 20:09:29 +08:00 |
|
hongchao
|
1dd6d9be47
|
材料站，直转
|
2025-09-13 19:11:11 +08:00 |
|
hongchao
|
167e214bc8
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
# Conflicts:
# bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml
# bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
|
2025-09-13 17:57:09 +08:00 |
|
hongchao
|
95bb8ca367
|
材料站，直转
|
2025-09-13 17:53:54 +08:00 |
|
bonus
|
2457422046
|
领料出库、材料站类型树查询优化
|
2025-09-13 17:26:46 +08:00 |
|
hayu
|
513d96dca7
|
修改
|
2025-09-13 15:29:31 +08:00 |
|
mashuai
|
4bc97b87ac
|
材料站功能优化
|
2025-09-13 01:28:58 +08:00 |
|
mashuai
|
16573aedc9
|
材料站功能优化
|
2025-09-13 01:02:36 +08:00 |
|
mashuai
|
4e1becb6a5
|
功能优化
|
2025-09-12 12:10:24 +08:00 |
|
hayu
|
7aa2b00248
|
修改
|
2025-09-12 11:12:53 +08:00 |
|
hayu
|
38afac0898
|
修改
|
2025-09-12 10:49:54 +08:00 |
|
mashuai
|
fac0a798c2
|
功能优化
|
2025-09-12 09:30:37 +08:00 |
|
mashuai
|
0127ff089c
|
Merge remote-tracking branch 'origin/master'
|
2025-09-12 09:08:49 +08:00 |
|
mashuai
|
b27830f800
|
功能优化
|
2025-09-12 09:08:42 +08:00 |
|
hongchao
|
6b92e8821b
|
大屏详情接口补充
|
2025-09-12 09:00:58 +08:00 |
|
mashuai
|
023ad15fe4
|
功能优化
|
2025-09-11 20:02:26 +08:00 |
|
hongchao
|
419605f4c2
|
退料问题修复
|
2025-09-11 18:25:26 +08:00 |
|
hongchao
|
2b6a959a20
|
大屏总数详情接口修正
|
2025-09-11 18:16:28 +08:00 |
|
hongchao
|
3f78b98261
|
结算问题修复
|
2025-09-11 15:08:08 +08:00 |
|
hongchao
|
0284f8fc0f
|
结算问题修复
|
2025-09-11 11:37:12 +08:00 |
|
mashuai
|
53f5e35bbf
|
功能优化
|
2025-09-10 18:53:49 +08:00 |
|
hongchao
|
88f3da9eb7
|
问题修复
|
2025-09-10 18:03:35 +08:00 |
|
mashuai
|
af3b8b420a
|
功能优化
|
2025-09-10 17:33:45 +08:00 |
|
hongchao
|
6510eda512
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-10 15:55:39 +08:00 |
|
hongchao
|
550589f839
|
维修同步更改检修信息
|
2025-09-10 15:55:17 +08:00 |
|
syruan
|
243056af2f
|
优化已结算协议的租赁费用计算逻辑
- 新增查询已结算协议明细的 SQL 查询方法
- 修改区间费用计算逻辑，区分已结算和未结算协议
- 优化租赁天数计算逻辑，针对已结算协议进行特殊处理
-修复跨区间租赁的费用计算问题
|
2025-09-10 15:12:11 +08:00 |
|
hongchao
|
1743a4e54e
|
问题修复
|
2025-09-10 11:33:52 +08:00 |
|
hongchao
|
1a354c7b97
|
结算限制
|
2025-09-10 09:28:20 +08:00 |
|
mashuai
|
4118bc1358
|
功能优化
|
2025-09-09 20:42:02 +08:00 |
|
mashuai
|
ac76c04f80
|
Merge remote-tracking branch 'origin/master'
|
2025-09-09 20:30:09 +08:00 |
|
mashuai
|
d29122b150
|
功能优化
|
2025-09-09 20:29:52 +08:00 |
|
hongchao
|
cf8b5f8204
|
退料问题，竣工问题，盘点问题修复
|
2025-09-09 20:10:01 +08:00 |