Commit Graph

707 Commits

Author SHA1 Message Date
许允枞
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
f3e4ba39d1 Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-25 18:51:37 +08:00
Vinjor
637a1124bb 1 2024-10-25 18:51:32 +08:00
a5e1f068c3 Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-25 18:19:59 +08:00
2f6341d823 救援司机端客户信息同步 2024-10-25 18:19:55 +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
3990949c6e Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-25 15:51:14 +08:00
xiaofajia
f1e722d302 配件申请单审核时,合并维修工单中已存在的配件 2024-10-25 15:51:03 +08:00
许允枞
3319ac9b6f Merge remote-tracking branch 'origin/dev' into dev 2024-10-25 13:34:23 +08:00
许允枞
e74cfe2c54 救援大屏接口 2024-10-25 13:33:49 +08:00
xiaofajia
b947a96ca8 服务顾问设置哪些维修图片可以给客户看 2024-10-25 12:05:10 +08:00
许允枞
7567d59c59 Merge remote-tracking branch 'origin/dev' into dev 2024-10-25 09:09:35 +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
许允枞
ec5b1a29c1 Merge remote-tracking branch 'origin/dev' into dev 2024-10-24 18:06:22 +08:00
许允枞
95a94f0637 救援大屏接口 2024-10-24 18:05:58 +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
9f05b0b6ba Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-24 13:13:46 +08:00
92ba31ac12 检测客户信息同步 2024-10-24 13:13:41 +08:00
7ec5a905c5 首页业务处理 2024-10-23 23:25:04 +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