Commit Graph

136 Commits

Author SHA1 Message Date
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