 mashuai
|
b7179fae41
|
材料员优化
|
2025-09-24 18:36:06 +08:00 |
 hongchao
|
44fc28a2e3
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-24 17:54:48 +08:00 |
|
hongchao
|
9c1cc5a3cf
|
直转代码提交
|
2025-09-24 17:54:39 +08:00 |
 hayu
|
44c4d568be
|
修改
|
2025-09-24 16:49:39 +08:00 |
|
mashuai
|
9236606439
|
机具优化
|
2025-09-24 16:15:16 +08:00 |
|
hayu
|
9dab95e001
|
修改
|
2025-09-23 20:32:54 +08:00 |
|
mashuai
|
fd650d2f3c
|
Merge remote-tracking branch 'origin/master'
|
2025-09-23 20:12:43 +08:00 |
|
mashuai
|
e83e88e68f
|
材料站优化
|
2025-09-23 20:12:32 +08:00 |
 syruan
|
68d9424b0b
|
优化审核状态过滤逻辑，移除未审核或审核不通过的记录
|
2025-09-23 20:12:30 +08:00 |
 bonus
|
5f4d9a9226
|
工程合并及结算维修单号修改
|
2025-09-23 19:16:54 +08:00 |
|
mashuai
|
b2d7d082f0
|
优化
|
2025-09-23 16:35:13 +08:00 |
|
mashuai
|
2c4aa45c82
|
优化
|
2025-09-23 16:34:12 +08:00 |
|
mashuai
|
eb127b3daf
|
Merge remote-tracking branch 'origin/master'
|
2025-09-23 16:13:25 +08:00 |
|
mashuai
|
92b21519bc
|
优化
|
2025-09-23 16:13:11 +08:00 |
|
hongchao
|
0644ace525
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-23 16:00:26 +08:00 |
|
hongchao
|
1e958de63d
|
材料站直转修复
|
2025-09-23 16:00:01 +08:00 |
|
bonus
|
a878f88d51
|
工程合并接口开发
|
2025-09-23 14:32:12 +08:00 |
|
hayu
|
1c1f973957
|
修改
|
2025-09-23 12:45:44 +08:00 |
|
hayu
|
c0bb92fd75
|
修改
|
2025-09-23 12:21:35 +08:00 |
|
mashuai
|
7597ea905f
|
优化
|
2025-09-22 20:52:01 +08:00 |
|
hongchao
|
69f46d8a1a
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-22 19:28:29 +08:00 |
|
hongchao
|
b40219b870
|
材料站领料修改
|
2025-09-22 19:28:20 +08:00 |
|
bonus
|
664d09dbeb
|
材料站多协议类型树修改
|
2025-09-22 19:01:55 +08:00 |
|
mashuai
|
a73ca331cb
|
优化
|
2025-09-22 16:37:06 +08:00 |
|
bonus
|
471c867c13
|
过滤费用为0的数据不展示
|
2025-09-22 13:56:16 +08:00 |
|
hongchao
|
06b73d765f
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-19 15:44:15 +08:00 |
|
hongchao
|
012d6be506
|
代码去除
|
2025-09-19 15:44:05 +08:00 |
|
mashuai
|
a4d1ebd228
|
Merge remote-tracking branch 'origin/master'
|
2025-09-19 15:43:53 +08:00 |
|
mashuai
|
6b623f2eab
|
优化
|
2025-09-19 15:43:47 +08:00 |
|
hongchao
|
8000e6e4f8
|
sql修复
|
2025-09-19 15:41:34 +08:00 |
|
hongchao
|
130440d3d8
|
sql修复
|
2025-09-19 14:54:54 +08:00 |
|
hayu
|
0ae0d50578
|
修改
|
2025-09-19 14:50:17 +08:00 |
|
hongchao
|
cadfdc6cdc
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-19 14:32:14 +08:00 |
|
mashuai
|
0485bcb690
|
优化
|
2025-09-19 14:32:03 +08:00 |
|
hongchao
|
1466d8686e
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-19 14:29:06 +08:00 |
|
hongchao
|
9260cd9822
|
材料站下拉框
|
2025-09-19 14:29:00 +08:00 |
|
mashuai
|
62f98b1445
|
优化
|
2025-09-19 14:21:31 +08:00 |
|
mashuai
|
0a6f204afc
|
出库优化
|
2025-09-18 19:51:47 +08:00 |
|
mashuai
|
040b69d594
|
材料站优化
|
2025-09-18 19:36:12 +08:00 |
|
hayu
|
bd953a8796
|
增加编码状态更改记录
|
2025-09-18 18:46:59 +08:00 |
|
hongchao
|
5ecbf25188
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-18 17:34:50 +08:00 |
|
hongchao
|
140305f73f
|
大屏预警过滤去除
|
2025-09-18 17:34:38 +08:00 |
|
bonus
|
9f70189db7
|
材料站增加检查报告
|
2025-09-18 17:14:50 +08:00 |
|
hongchao
|
1ffe0cb288
|
退料问题修复
|
2025-09-18 14:55:39 +08:00 |
|
hayu
|
c2b63488af
|
修改
|
2025-09-18 12:25:30 +08:00 |
|
hongchao
|
0c1228234b
|
材料站领料记录添加备注
|
2025-09-18 10:49:31 +08:00 |
|
mashuai
|
7c31ac223b
|
材料站优化
|
2025-09-17 22:02:24 +08:00 |
|
mashuai
|
9b7527b087
|
材料站优化
|
2025-09-17 21:56:10 +08:00 |
|
hayu
|
e962757e41
|
修改
|
2025-09-17 21:44:17 +08:00 |
|
mashuai
|
99b47f9fed
|
材料站优化
|
2025-09-17 20:32:54 +08:00 |
|
hongchao
|
e7cecc89f3
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-17 18:27:01 +08:00 |
|
hongchao
|
70eea4c3f8
|
大屏接口
|
2025-09-17 18:26:44 +08:00 |
|
mashuai
|
6851a6b6c5
|
材料站优化
|
2025-09-17 18:23:02 +08:00 |
|
hongchao
|
336847c054
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-17 12:22:55 +08:00 |
|
hongchao
|
d860758ac0
|
导出领料出库明细
|
2025-09-17 12:22:33 +08:00 |
|
mashuai
|
a9c6fb295d
|
单位新增优化
|
2025-09-17 12:22:27 +08:00 |
|
hayu
|
8b938c25bb
|
修改
|
2025-09-16 21:13:11 +08:00 |
|
mashuai
|
78f82c37c4
|
Merge remote-tracking branch 'origin/master'
|
2025-09-16 21:08:01 +08:00 |
|
mashuai
|
ee5d6414d7
|
功能优化
|
2025-09-16 21:07:49 +08:00 |
|
hongchao
|
0b65c3639f
|
导出领料出库明细
|
2025-09-16 20:42:58 +08:00 |
|
hongchao
|
76490ac8c7
|
工器具检验字段处理
|
2025-09-16 14:04:04 +08:00 |
|
hongchao
|
f5bfd5c199
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-16 12:18:51 +08:00 |
|
mashuai
|
9d801cf860
|
功能优化
|
2025-09-16 12:18:34 +08:00 |
|
hongchao
|
88c9266ce3
|
直转最后完成处理
|
2025-09-16 11:32:20 +08:00 |
|
mashuai
|
b1fe3526c4
|
功能优化
|
2025-09-15 19:55:53 +08:00 |
|
hayu
|
3b5c725f1c
|
修改
|
2025-09-15 19:42:39 +08:00 |
|
hayu
|
bb41e8db9d
|
Merge remote-tracking branch 'origin/master'
|
2025-09-15 19:34:19 +08:00 |
|
hayu
|
e6ad7bd2f3
|
修改
|
2025-09-15 19:34:08 +08:00 |
|
mashuai
|
995268a664
|
功能优化
|
2025-09-15 19:22:41 +08:00 |
|
mashuai
|
3393b7ba6d
|
Merge remote-tracking branch 'origin/master'
|
2025-09-15 19:22:21 +08:00 |
|
mashuai
|
9245aa992d
|
功能优化
|
2025-09-15 19:22:14 +08:00 |
|
hayu
|
d2e2fe1b1a
|
修改
|
2025-09-15 19:21:02 +08:00 |
|
hayu
|
f32ff8cb6b
|
修改
|
2025-09-15 19:19:37 +08:00 |
|
mashuai
|
0279307413
|
功能优化
|
2025-09-15 18:43:18 +08:00 |
|
mashuai
|
f76d14c6c5
|
Merge remote-tracking branch 'origin/master'
|
2025-09-15 18:36:57 +08:00 |
|
mashuai
|
3e0b2ace75
|
功能优化
|
2025-09-15 18:36:46 +08:00 |
|
hongchao
|
fc72658b96
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-15 18:02:51 +08:00 |
|
hongchao
|
7141100081
|
网页版领料工单接入，材料站退料单
|
2025-09-15 18:02:33 +08:00 |
|
bonus
|
855cffa5df
|
结算丢失、审核接口列表展示修改
|
2025-09-15 15:48:15 +08:00 |
|
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 |