Commit Graph

374 Commits

Author SHA1 Message Date
xiaofajia
0bb3fe2a16 Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-19 15:32:12 +08:00
Vinjor
63e8bb4156 1 2024-11-19 15:30:13 +08:00
xiaofajia
6f7b1d0b86 Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-19 15:25:02 +08:00
xiaofajia
0ed23adb88 采购单,每个商品可以录入 进货价、收价、分类、计量单位,非必填,显示时按分类进行分组展示,可以按分类进行展开收起 2024-11-19 15:24:52 +08:00
Vinjor
0adeb3b6c6 订单详情页优化 2024-11-19 15:11:08 +08:00
Vinjor
9f9320f7a0 1 2024-11-18 20:02:59 +08:00
xiaofajia
7975ac9f46 Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-18 19:33:30 +08:00
xiaofajia
a00cc57f96 选择配件生成采购单展示的数据、展示修改为折叠框 2024-11-18 19:33:18 +08:00
Vinjor
17cd3db1ea 管理员统计功能 2024-11-18 18:04:46 +08:00
Vinjor
7dc148e5b2 1 2024-11-18 17:51:23 +08:00
xiaofajia
1d190df750 Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-18 16:15:52 +08:00
xiaofajia
d3af983873 配件申请单子项可以搜索、可以设置给不给保险公司看 2024-11-18 16:15:44 +08:00
Vinjor
1dd088a320 Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-18 14:28:51 +08:00
Vinjor
de264c529a 1 2024-11-18 14:28:44 +08:00
xiaofajia
9bb6c0b201 修改工单完成位置 2024-11-16 15:56:23 +08:00
xiaofajia
5da4a45e7d 服务顾问通知客户取车前,判断项目价格、配件价格是否已填写 2024-11-16 15:37:58 +08:00
xiaofajia
01f5aa9017 Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-15 16:22:40 +08:00
xiaofajia
f61004114d 一些BUG的修改 2024-11-15 16:22:26 +08:00
Vinjor
0147ee5b7c 仓管修改配件价格 2024-11-15 14:46:31 +08:00
xiaofajia
c4da06e591 新增单个配件申请表查看 2024-11-14 18:30:15 +08:00
xiaofajia
6c396bfbbd 服务顾问不做数据权限控制 2024-11-14 10:44:24 +08:00
xiaofajia
bc79d9df53 更新代码 2024-11-14 09:26:26 +08:00
xiaofajia
32f55301df Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-13 20:00:03 +08:00
xiaofajia
eaf06a2d77 配件申请单加上图片和一些其他修改 2024-11-13 19:58:46 +08:00
PQZ
fecc6bb4da Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-13 17:48:00 +08:00
PQZ
1b6a1dab5b 2 2024-11-13 17:47:57 +08:00
Vinjor
4920ad7b25 1 2024-11-13 17:12:28 +08:00
PQZ
11ea2f5ed5 Merge branch 'repair' 2024-11-13 13:44:38 +08:00
Vinjor
bb70fcb97f 服务顾问不做数据权限控制,他们之间的工单能够互相查看并操作 2024-11-13 09:49:33 +08:00
Vinjor
c179d59cc2 1 2024-11-12 19:14:11 +08:00
Vinjor
5f5f55712a Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-12 17:51:19 +08:00
Vinjor
9562c149d3 1 2024-11-12 17:51:12 +08:00
xiaofajia
287c4feab4 Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-12 17:44:25 +08:00
xiaofajia
3c3c173ff6 改配件申请100% 2024-11-12 17:44:06 +08:00
Vinjor
ac25a0cac8 1 2024-11-12 17:36:04 +08:00
Vinjor
26cc95e827 优化查看工单详情速度 2024-11-12 11:24:12 +08:00
xiaofajia
ed6140bbd9 Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-12 09:48:34 +08:00
xiaofajia
9221a7c503 改配件申请 2024-11-12 09:48:14 +08:00
a0675bb828 Merge branch 'dev'
# Conflicts:
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionWorkNodeMapper.java
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/UserRoleMapper.java
#	yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml
2024-11-11 18:19:46 +08:00
PQZ
8adf0e01f3 Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-07 15:15:52 +08:00
PQZ
cccf884a2c 1 2024-11-07 15:15:49 +08:00
Vinjor
142daa0baa Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-07 14:18:49 +08:00
Vinjor
79ad252cb5 1 2024-11-07 14:18:42 +08:00
xiaofajia
fae6ae4882 预约了服务顾问,消息带上 2024-11-07 11:53:08 +08:00
xiaofajia
1e0df9f82b 加上维修工单子项状态 2024-11-07 11:07:10 +08:00
xiaofajia
83fd022dfc 修改默认的维修类别为维修 2024-11-07 10:53:08 +08:00
xiaofajia
cf4cf9e246 修改默认的维修类别为维修保养 2024-11-07 10:49:52 +08:00
xiaofajia
6cf53afc9c 补正结算逻辑 2024-11-07 10:41:30 +08:00
xiaofajia
ce90f714e2 修改所有用到工单号to车牌号 2024-11-06 18:54:54 +08:00
xiaofajia
6de3b73fc2 Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-06 18:42:46 +08:00
xiaofajia
5de31ac2c4 工单每一步给客户发消息 2024-11-06 18:42:30 +08:00
Vinjor
a9f2a8f967 1 2024-11-06 18:23:52 +08:00
xiaofajia
ffbf0130d6 预约时通知服务顾问 2024-11-06 16:01:49 +08:00
xiaofajia
8bd53b225c 暂提 2024-11-06 15:07:08 +08:00
PQZ
0b6a2f57ae 1 2024-11-06 11:54:41 +08:00
Vinjor
cf196bd497 Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-05 18:27:36 +08:00
Vinjor
1112dfd883 1 2024-11-05 18:27:30 +08:00
xiaofajia
e51d404fe9 修改结算完成工单逻辑 2024-11-05 17:25:17 +08:00
PQZ
97edaf4046 1 2024-11-05 14:12:20 +08:00
Vinjor
e02e370fbb 1 2024-11-05 11:43:19 +08:00
Vinjor
6148f263af Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair
# Conflicts:
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
2024-11-05 10:54:57 +08:00
Vinjor
b2e1a3ed22 1 2024-11-05 10:52:49 +08:00
xiaofajia
e87cafee78 修改重新派工逻辑 2024-11-05 10:44:40 +08:00
xiaofajia
56f84995cc Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair
# Conflicts:
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsReqVO.java
2024-11-05 10:38:42 +08:00
xiaofajia
3f45d05344 修改重新派工逻辑 2024-11-05 10:37:01 +08:00
PQZ
f8544d6569 Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-04 18:44:22 +08:00
PQZ
d1715c2c2b 1 2024-11-04 18:44:19 +08:00
Vinjor
2dde810dec 1 2024-11-04 18:43:25 +08:00
Vinjor
36e140f7f1 Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-04 18:11:01 +08:00
Vinjor
b7163b6aea 1 2024-11-04 18:10:46 +08:00
xiaofajia
38395104a8 员工确认领料、退料时,记录名称和数量 2024-11-04 17:19:40 +08:00
xiaofajia
ab35fd68c2 修改工单完成状态的更新位置 2024-11-04 16:16:41 +08:00
xiaofajia
6a761fb4b3 修改员工确认领料、退料 2024-11-04 15:21:54 +08:00
xiaofajia
4436bb236f Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-04 14:54:51 +08:00
PQZ
3c56602e18 1 2024-11-04 14:53:43 +08:00
xiaofajia
adba8c0dce 作废工单修改2 2024-11-04 14:18:29 +08:00
xiaofajia
e4279f87c5 修改删除工单 2024-11-04 11:03:01 +08:00
xiaofajia
fa5076bcab 修改作废工单 2024-11-04 11:00:59 +08:00
xiaofajia
d17b1129a0 bug修复
(cherry picked from commit 05696bff5e)
2024-11-02 18:10:35 +08:00
xiaofajia
b463144cac 编辑工单和删除工单
(cherry picked from commit 4a90687814)
2024-11-02 18:09:25 +08:00
xiaofajia
bb93d842ec bug修复
(cherry picked from commit 6b4ec9c046)
2024-11-02 18:06:11 +08:00
xiaofajia
05696bff5e bug修复 2024-11-02 16:52:31 +08:00
xiaofajia
6b4ec9c046 bug修复 2024-11-02 16:41:02 +08:00
xiaofajia
4a90687814 编辑工单和删除工单 2024-11-01 20:21:58 +08:00
Vinjor
b03f5c4663 1 2024-10-31 18:49:54 +08:00
xiaofajia
c4d996a265 解决维修开单新增客户、车辆信息ID不回填 2024-10-31 14:35:05 +08:00
xiaofajia
3c1b2355db Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-30 20:38:09 +08:00
xiaofajia
907f86ba52 新增服务顾问修改配件售价 2024-10-30 20:37:57 +08:00
PQZ
9a2913f77b Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-30 20:04:54 +08:00
PQZ
e590c3921c 1 2024-10-30 20:04:51 +08:00
xiaofajia
fd3b9c0aec 打印工单 完成 2024-10-30 18:07:27 +08:00
xiaofajia
c1cf26a98c 打印工单 2024-10-30 17:48:27 +08:00
xiaofajia
85c0f41442 打印工单 2024-10-30 17:41:42 +08:00
xiaofajia
a93e59e5c6 打印工单 2024-10-30 17:30:37 +08:00
xiaofajia
d419653666 Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-30 16:14:05 +08:00
xiaofajia
0f51329be6 打印工单 2024-10-30 16:13:55 +08:00
Vinjor
c891ef584c 1 2024-10-30 15:37:40 +08:00
xiaofajia
db87951161 打印工单 2024-10-30 11:26:27 +08:00
xiaofajia
138c709c9a 打印工单 2024-10-29 21:30:39 +08:00
xiaofajia
4c35c69ad7 打印工单 2024-10-29 16:21:21 +08:00