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 |
|
xiaofajia
|
b458fc1b7b
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
|
2024-10-28 23:09:12 +08:00 |
|
xiaofajia
|
4165f0912f
|
打印工单1/2
|
2024-10-28 23:09:02 +08:00 |
|
许允枞
|
5625589976
|
修改查询配件接口，增加仓管可以查看待审核
|
2024-10-28 18:03:32 +08:00 |
|
许允枞
|
cac8ac030f
|
增加创建工单时上传用户签名
|
2024-10-28 16:46:15 +08:00 |
|
许允枞
|
814ad0fde4
|
入库单查询sql修改
|
2024-10-28 11:38:00 +08:00 |
|
Vinjor
|
6a03253d26
|
1
|
2024-10-27 16:12:09 +08:00 |
|
xiaofajia
|
32015dd9db
|
补正入库方法，跑通流程
|
2024-10-26 21:31:57 +08:00 |
|
xiaofajia
|
8f548f45be
|
维修工单新增客户处更新
|
2024-10-26 20:55:02 +08:00 |
|
xiaofajia
|
e8b1e7a655
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
|
2024-10-26 17:52:48 +08:00 |
|
xiaofajia
|
dc6a6e1bc4
|
超时自动总检
|
2024-10-26 17:52:36 +08:00 |
|
Vinjor
|
65410b9f38
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
|
2024-10-26 16:56:23 +08:00 |
|
Vinjor
|
0f54e30320
|
1
|
2024-10-26 16:56:17 +08:00 |
|
许允枞
|
36fb6992f9
|
修改采购单入库的bug
|
2024-10-26 16:32:08 +08:00 |
|
许允枞
|
60bb0a296a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-26 16:13:43 +08:00 |
|
许允枞
|
b5c40faf0a
|
修改采购单入库的bug
|
2024-10-26 16:13:21 +08:00 |
|
Vinjor
|
24ab2d1b5d
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
|
2024-10-26 16:07:40 +08:00 |
|
Vinjor
|
fecc3fc5a1
|
1
|
2024-10-26 16:07:35 +08:00 |
|
许允枞
|
99c1df8df9
|
修改采购单入库的bug
|
2024-10-26 15:54:21 +08:00 |
|
PQZ
|
76cc2cc0b3
|
1
|
2024-10-26 15:06:10 +08:00 |
|
xiaofajia
|
d42b25596a
|
更新代码
|
2024-10-26 11:42:33 +08:00 |
|
xiaofajia
|
83a341e541
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
# Conflicts:
# dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java
|
2024-10-26 11:21:21 +08:00 |
|
xiaofajia
|
f4dda63143
|
补正同步申请表数据到工单
|
2024-10-26 11:20:07 +08:00 |
|
PQZ
|
a40a6f8900
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
# Conflicts:
# dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java
|
2024-10-26 11:12:31 +08:00 |
|
PQZ
|
aba04b4c91
|
调整
|
2024-10-26 11:03:28 +08:00 |
|
xiaofajia
|
76226e7f67
|
补正同步申请表数据到工单
|
2024-10-26 10:05:53 +08:00 |
|
xiaofajia
|
35e61c5321
|
细节补正
|
2024-10-25 22:14:21 +08:00 |
|
xiaofajia
|
950f014f0f
|
维修工单车辆、施工人员、销售人员非空判断
|
2024-10-25 22:13:14 +08:00 |
|
xiaofajia
|
13273992ed
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
|
2024-10-25 22:04:31 +08:00 |
|
xiaofajia
|
a4257f3bd3
|
修改领料、退料逻辑
|
2024-10-25 22:04:18 +08:00 |
|
Vinjor
|
637a1124bb
|
1
|
2024-10-25 18:51:32 +08:00 |
|
Vinjor
|
47f55f5ce1
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
|
2024-10-25 18:12:22 +08:00 |
|
Vinjor
|
2372219243
|
1
|
2024-10-25 18:12:17 +08:00 |
|
PQZ
|
e3607bed22
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
|
2024-10-25 17:53:31 +08:00 |
|
PQZ
|
3564d6d99a
|
1
|
2024-10-25 17:53:28 +08:00 |
|
xiaofajia
|
eb5f52e67d
|
总检时，更新配件申请表中领料数量小于申请数量的配件到维修工单子表
|
2024-10-25 17:13:05 +08:00 |
|
xiaofajia
|
d9af2bee73
|
配件申请单审核时，合并维修工单中已存在的配件 补上驳回通知维修工
|
2024-10-25 16:01:09 +08:00 |
|
