dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
693 Commits 3 Branches 0 Tags 20 MiB
8bd53b225c
Commit Graph

268 Commits

Author SHA1 Message Date
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
xiaofajia
f1e722d302 配件申请单审核时，合并维修工单中已存在的配件 2024-10-25 15:51:03 +08:00
xiaofajia
b947a96ca8 服务顾问设置哪些维修图片可以给客户看 2024-10-25 12:05:10 +08:00
xiaofajia
dab34eeb2a 结算工单时同步更新订单的支付类型 2024-10-24 22:38:10 +08:00
xiaofajia
3134888852 合并冲突代码 2024-10-24 20:35:55 +08:00
xiaofajia
935da0bafc 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/tickets/service/impl/DlRepairTicketsServiceImpl.java
 2024-10-24 20:29:17 +08:00
xiaofajia
9ae8344f10 服务顾问通知取车前的完成前的编辑工单 2024-10-24 20:27:15 +08:00
Vinjor
3f7e14445a 1 2024-10-24 18:17:26 +08:00
Vinjor
300067ae1f 1 2024-10-24 16:45:04 +08:00
PQZ
8ed75b1daf Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-24 16:31:15 +08:00
PQZ
fa45344904 1 2024-10-24 16:31:10 +08:00
Vinjor
6fe4bd85f8 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/tickets/controller/admin/DlRepairTicketsController.java
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
 2024-10-24 15:06:06 +08:00
Vinjor
f53debdba2 1 2024-10-24 15:04:34 +08:00
xiaofajia
8201a54327 Merge remote-tracking branch 'origin/dev' into dev 2024-10-23 23:21:25 +08:00
xiaofajia
d3db4f19ff 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/tickets/service/impl/DlRepairTicketsServiceImpl.java
 2024-10-23 23:19:27 +08:00
PQZ
43a059c63c Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-23 23:19:06 +08:00
PQZ
1ad9d2e8d0 1 2024-10-23 23:19:03 +08:00
xiaofajia
20ebfde19c 通知客户取车1/2 2024-10-23 23:17:46 +08:00
Vinjor
da5e1474da 1 2024-10-23 22:15:51 +08:00
Vinjor
d799589097 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/tickets/service/impl/DlRepairTicketsServiceImpl.java
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlTicketWaresServiceImpl.java
 2024-10-23 22:01:06 +08:00
Vinjor
5142afa7fe 1 2024-10-23 21:25:26 +08:00
xiaofajia
82cbaaa890 Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-23 21:21:13 +08:00
xiaofajia
5c8d940ea5 更新代码暂提 2024-10-23 21:20:58 +08:00
PQZ
f28590ed0f Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-23 17:59:27 +08:00
PQZ
a9889e5985 1 2024-10-23 17:59:24 +08:00
Vinjor
d5beed0206 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-23 14:33:27 +08:00
Vinjor
77036c32f5 1 2024-10-23 14:32:38 +08:00
xiaofajia
acb3262ca2 更新代码暂提 2024-10-23 14:29:12 +08:00
xiaofajia
524ebe7f2d 维修工单及项目生命周期记录完善 2024-10-23 11:20:49 +08:00
xiaofajia
a46846134d 维修工单及项目生命周期记录完善 2024-10-22 23:54:29 +08:00
xiaofajia
9c5c3343d4 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/tickets/service/impl/DlTicketWaresServiceImpl.java
 2024-10-22 23:46:16 +08:00
xiaofajia
4b6734ec2d 维修工单及项目生命周期记录完善 2024-10-22 23:44:20 +08:00
Vinjor
bc3c0497f4 1 2024-10-22 18:29:46 +08:00
Vinjor
e6cb2ba276 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/tickets/entity/DlTicketWares.java
 2024-10-22 16:37:37 +08:00
Vinjor
cb43c66d43 配件 2024-10-22 16:37:05 +08:00
许允枞
1afa95fb46 Merge remote-tracking branch 'origin/dev' into dev 2024-10-22 16:16:56 +08:00
许允枞
44b7a93403 维修app创建工单时的bug修复 2024-10-22 16:16:41 +08:00
xiaofajia
7fab245097 Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-22 15:58:03 +08:00
xiaofajia
44feda7273 配件领退修改最后完善 2024-10-22 15:57:53 +08:00
PQZ
18ead24a73 Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-22 15:20:43 +08:00
PQZ
658c78b15f 1 2024-10-22 15:20:39 +08:00
xiaofajia
a7dcde4c65 Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-22 10:29:32 +08:00
xiaofajia
16a8bc8952 配件领退优化 2024-10-21 21:37:22 +08:00
许允枞
b910772e5b Merge remote-tracking branch 'origin/dev' into dev 2024-10-21 18:13:22 +08:00
许允枞
5be75a5c81 维修app创建工单时的bug修复 2024-10-21 18:12:49 +08:00
Vinjor
a1fd86ac6e Merge branch 'master' into dev 
# Conflicts:
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionFileController.java
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionPartnerMapper.java
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionFileServiceImpl.java
#	dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/controller/PartnerCustomerInfoController.java
#	yudao-dependencies/pom.xml
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
 2024-10-21 18:03:53 +08:00
PQZ
3bd5ad50a2 Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-21 17:03:37 +08:00
PQZ
2c253b024f 维修数据大屏统计 2024-10-21 17:03:33 +08:00
许允枞
8859ec6706 维修app创建工单后指定施工人员和销售 2024-10-21 13:09:45 +08:00
xiaofajia
374a82a78d Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-19 22:56:16 +08:00
xiaofajia
a268b43f14 配件领退优化1/2 2024-10-19 22:56:01 +08:00
Vinjor
78147d7382 1 2024-10-19 18:09:16 +08:00
PQZ
a76a198161 1111 2024-10-19 16:07:17 +08:00
xiaofajia
4ad6d6835b 开始施工-施工中-施工完成 100% 2024-10-19 11:06:45 +08:00
xiaofajia
d1c037907b Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-19 09:29:14 +08:00
xiaofajia
87de5297d9 更新代码 2024-10-19 09:29:00 +08:00
PQZ
345aaa77af Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-18 23:48:07 +08:00
PQZ
8fcdb5ef18 111 2024-10-18 23:48:04 +08:00
Vinjor
2114d2a0cf Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-18 23:47:27 +08:00
Vinjor
2f566cfeb0 1 2024-10-18 23:47:21 +08:00
xiaofajia
7f1ff44d0c 配件是否可见 2024-10-18 22:03:16 +08:00
Vinjor
18dc48a103 Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-18 20:05:09 +08:00
Vinjor
7c0085496b 接单 2024-10-18 20:05:04 +08:00
PQZ
e29a5ec1ef 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/tickets/vo/DlRepairTicketsRespVO.java
 2024-10-18 19:56:32 +08:00
PQZ
fe9b6be1b5 1 2024-10-18 19:55:18 +08:00
xiaofajia
6f8f2b7a3a Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 
# Conflicts:
#	dl-module-base/src/main/java/cn/iocoder/yudao/common/BaseConstants.java
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
 2024-10-18 18:11:06 +08:00
xiaofajia
d8ca30eb67 开始施工、施工过程记录 2024-10-18 18:09:04 +08:00
Vinjor
457c896ce8 1 2024-10-18 17:50:45 +08:00
Vinjor
524a66e6f1 1 2024-10-18 17:48:29 +08:00
许允枞
c6e571e56c app新建工单流程走通 2024-10-18 17:11:58 +08:00
Vinjor
e4d6de291b 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/tickets/service/impl/DlRepairTicketsServiceImpl.java
 2024-10-18 17:00:50 +08:00