Commit Graph

693 Commits

Author SHA1 Message Date
xiaofajia
8bd53b225c 暂提 2024-11-06 15:07:08 +08:00
xiaofajia
20b6bbe763 Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair 2024-11-06 12:04:55 +08:00
xiaofajia
3aa44b5d90 修改预约选择业务 2024-11-06 12:04:41 +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
11c1e759aa try catch 处理 2024-11-01 14:22:57 +08:00
c2eea55b5d Merge remote-tracking branch 'origin/master' 2024-11-01 13:45:11 +08:00
fcf2f05099 Revert "try catch 处理"
This reverts commit e7bd033a78.
2024-11-01 13:43:04 +08:00
Vinjor
ceac1b1e0c 1 2024-10-31 19:23:16 +08:00
Vinjor
f4fe1d3fa3 Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-31 18:50:01 +08:00
Vinjor
b03f5c4663 1 2024-10-31 18:49:54 +08:00
许允枞
f3f37bc908 Merge remote-tracking branch 'origin/dev' into dev 2024-10-31 18:05:36 +08:00
许允枞
6be4a8f089 更新检测功能,新增可以查看app端当前登录用户可以选择的工单 2024-10-31 18:05:02 +08:00
d9dfac5d4c Merge branch 'master' into dev 2024-10-31 17:58:58 +08:00
833824c4a1 try catch 处理 2024-10-31 17:58:08 +08:00
xiaofajia
c4d996a265 解决维修开单新增客户、车辆信息ID不回填 2024-10-31 14:35:05 +08:00
xiaofajia
c939fbe59b 新增员工角色权限非空判断 2024-10-31 10:53:00 +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
c7d0f6e707 Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-30 18:08:09 +08:00
xiaofajia
fd3b9c0aec 打印工单 完成 2024-10-30 18:07:27 +08:00
许允枞
68dd037dcc Merge remote-tracking branch 'origin/dev' into dev 2024-10-30 18:07:13 +08:00
许允枞
6583cb87ed 检测项目新增时增加验证 2024-10-30 18:06:35 +08:00