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 |
|
Vinjor
|
764d7eee0d
|
1
|
2024-10-18 16:52:30 +08:00 |
|
PQZ
|
deb05cb0b3
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
|
2024-10-18 16:50:41 +08:00 |
|
PQZ
|
88e5379ea2
|
111
|
2024-10-18 16:50:38 +08:00 |
|
Vinjor
|
b0df9941d9
|
1
|
2024-10-18 16:37:31 +08:00 |
|
xiaofajia
|
b83b615d93
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
|
2024-10-18 16:36:17 +08:00 |
|
xiaofajia
|
bbcd90f9d5
|
更新代码
|
2024-10-18 16:36:09 +08:00 |
|
Vinjor
|
328c865bb6
|
后端对应 RecordTypeEnum 枚举）
|
2024-10-18 16:33:23 +08:00 |
|
Vinjor
|
a789c59169
|
操作类型枚举
|
2024-10-18 16:33:09 +08:00 |
|
Vinjor
|
88dab0293f
|
1
|
2024-10-18 16:10:53 +08:00 |
|
xiaofajia
|
b8b73d9e1c
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
|
2024-10-18 15:32:12 +08:00 |
|
xiaofajia
|
f2c0fbf010
|
更新代码
|
2024-10-18 15:32:05 +08:00 |
|
Vinjor
|
c146d42c8c
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
|
2024-10-18 14:41:21 +08:00 |
|
Vinjor
|
6386be7e7d
|
维修工单状态枚举
|
2024-10-18 14:41:15 +08:00 |
|
xiaofajia
|
99cd47d28e
|
退料
|
2024-10-17 23:40:19 +08:00 |
|
xiaofajia
|
fd4e95a52c
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
|
2024-10-17 17:36:15 +08:00 |
|
Vinjor
|
99846979fd
|
1
|
2024-10-17 17:35:29 +08:00 |
|
xiaofajia
|
1f4a63a296
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
|
2024-10-17 17:28:53 +08:00 |
|
xiaofajia
|
95f953dcb9
|
暂提
|
2024-10-17 17:28:43 +08:00 |
|
Vinjor
|
d3783b1de9
|
优化维修判断逻辑
|
2024-10-17 16:18:55 +08:00 |
|
Vinjor
|
d10a19a252
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
|
2024-10-17 15:22:54 +08:00 |
|
Vinjor
|
de9eec4689
|
消息语音提醒
|
2024-10-17 15:22:49 +08:00 |
|
xiaofajia
|
10ce965e65
|
领料同步扣除库存
|
2024-10-17 12:11:24 +08:00 |
|
xiaofajia
|
f4b57db744
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
|
2024-10-16 22:39:12 +08:00 |
|
xiaofajia
|
51fad285f6
|
仓库处理申请、员工确认领料
|
2024-10-16 22:39:03 +08:00 |
|
Vinjor
|
fc918ff41c
|
app回显个人信息
|
2024-10-16 18:35:34 +08:00 |
|
xiaofajia
|
b6b9395031
|
审批申请
|
2024-10-16 15:39:51 +08:00 |
|
xiaofajia
|
2c7868b96a
|
申请审核 1%
|
2024-10-15 22:31:30 +08:00 |
|
xiaofajia
|
70995ffe73
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
|
2024-10-15 18:01:21 +08:00 |
|
xiaofajia
|
50e59d4e4b
|
维修工填写配件申请单、配件是否可见
|
2024-10-15 18:01:11 +08:00 |
|
Vinjor
|
42997d7095
|
订单列表加分页，操作指南对接扣
|
2024-10-15 15:24:16 +08:00 |
|
xiaofajia
|
21e12b339c
|
维修工接单/维修班组长重新指派
|
2024-10-14 17:24:34 +08:00 |
|
xiaofajia
|
316e7cae5a
|
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/DlRepairTicketsService.java
# dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
|
2024-10-12 20:01:51 +08:00 |
|
xiaofajia
|
4e50de5bfe
|
维修工接单/维修班组长重新指派，维修工填写配件申请单 1/2
|
2024-10-12 19:59:20 +08:00 |
|
PQZ
|
dae440e12f
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
|
2024-10-12 17:43:49 +08:00 |
|
PQZ
|
22418e657d
|
1
|
2024-10-12 17:43:46 +08:00 |
|
Vinjor
|
533097151f
|
微信邀请注册
|
2024-10-12 16:13:06 +08:00 |
|
|
|
b1eb9cfbc4
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
|
2024-10-12 12:41:10 +08:00 |
|
|
|
b8fa5ad88c
|
打印导出工单
|
2024-10-12 12:41:06 +08:00 |
|
xiaofajia
|
96088fcd74
|
工单指派多选
|
2024-10-12 12:30:54 +08:00 |
|
PQZ
|
ed211f91ff
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
|
2024-10-11 20:45:25 +08:00 |
|
PQZ
|
e0de2462fd
|
1
|
2024-10-11 20:45:22 +08:00 |
|
Lihx
|
5de07b49e6
|
更改IPage分页
|
2024-10-11 18:53:33 +08:00 |
|
xiaofajia
|
1aa11cce44
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
|
2024-10-11 17:15:36 +08:00 |
|
xiaofajia
|
24b48a181f
|
优化部分代码与采购、领料关联配件库
|
2024-10-11 17:15:27 +08:00 |
|
PQZ
|
ce7393652a
|
Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev
|
2024-10-11 16:55:08 +08:00 |
|
PQZ
|
fb27a36be1
|
1
|
2024-10-11 16:55:06 +08:00 |
|
Vinjor
|
d8a2f4b3cb
|
客户自动注册并登录通用方法
|
2024-10-11 14:06:17 +08:00 |
|
