zhoukeda
|
861be92ec4
|
andon相关接口
|
2023-10-07 17:28:47 +08:00 |
|
zhoukeda
|
bd86072173
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-07 10:51:20 +08:00 |
|
zhoukeda
|
f038e55c7a
|
BUG
|
2023-10-07 10:51:12 +08:00 |
|
alex
|
327ec33c2e
|
调整，申请电梯开关门逻辑
|
2023-10-07 10:37:24 +08:00 |
|
alex
|
8993fa12cb
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-28 17:44:08 +08:00 |
|
alex
|
db451b6c09
|
调整，取货、放货 确认接口
|
2023-09-28 17:44:02 +08:00 |
|
zhoukeda
|
b17e4b6deb
|
pad端andon相关接口
|
2023-09-28 17:35:34 +08:00 |
|
alex
|
73d773c03f
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-27 17:58:19 +08:00 |
|
alex
|
471d614cf2
|
1、任务执行新增，更具目标库位判断是否为电梯库位进行呼梯操作
2、放货确认接口新增代码逻辑
|
2023-09-27 17:58:13 +08:00 |
|
PhilPan
|
b340064db4
|
Merge branch 'dev' of ssh://git.tuotong-tech.com:9105/tnb/tnb.server into dev
|
2023-09-26 17:55:31 +08:00 |
|
PhilPan
|
ccebc3dea1
|
修复钻取一对多子表时条件使用了字段的错误
|
2023-09-26 17:55:26 +08:00 |
|
alex
|
c34762b0b3
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-26 14:39:13 +08:00 |
|
alex
|
aca969b55e
|
天益Wms新增，电梯调度相关操作
|
2023-09-26 14:39:04 +08:00 |
|
PhilPan
|
bc8401c8e9
|
修复DObject转对象的错误，不能使用Adapt，改成使用json反序列化
|
2023-09-25 11:45:45 +08:00 |
|
alex
|
821737473e
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-24 13:58:25 +08:00 |
|
alex
|
8cb934c3b0
|
将定时任务操作者改为，当前系统管理员
|
2023-09-24 13:58:17 +08:00 |
|
zhoukeda
|
cde4358fee
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-09-22 16:58:49 +08:00 |
|
zhoukeda
|
11c2262fe6
|
优化
|
2023-09-22 16:58:41 +08:00 |
|
PhilPan
|
712501c0e8
|
获取vmodel详情时钻取导航属性的模型
|
2023-09-22 16:53:06 +08:00 |
|
PhilPan
|
6f2d70725f
|
查询模型详情时，钻取导航属性的模型
|
2023-09-22 16:36:45 +08:00 |
|
zhoukeda
|
0afd486af2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-09-21 17:31:58 +08:00 |
|
zhoukeda
|
9ac8d01626
|
pad注塑挤出组装包装任务单列表合二为一
|
2023-09-21 17:31:43 +08:00 |
|
qianjiawei
|
5b56135f62
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-21 17:31:31 +08:00 |
|
qianjiawei
|
b921a38762
|
11
|
2023-09-21 17:31:24 +08:00 |
|
zhoukeda
|
1d9e74b45f
|
工单完成情况汇总
|
2023-09-21 15:45:03 +08:00 |
|
qianjiawei
|
df1b6d941f
|
1
|
2023-09-21 10:16:59 +08:00 |
|
qianjiawei
|
84d65644c7
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-20 23:08:12 +08:00 |
|
qianjiawei
|
0f57d7d396
|
1
|
2023-09-20 23:08:04 +08:00 |
|
alex
|
9d07e7c068
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-20 18:20:21 +08:00 |
|
alex
|
8ce7bb540e
|
继续调整，手动开启定时任务相关逻辑代码，并处理相关bug
|
2023-09-20 18:20:15 +08:00 |
|
zhoukeda
|
9f21a1986e
|
bug
|
2023-09-20 17:13:24 +08:00 |
|
zhoukeda
|
f636b12517
|
上模校验
|
2023-09-20 11:32:00 +08:00 |
|
zhoukeda
|
3592d78fb5
|
pad注塑挤出接口
|
2023-09-19 18:17:13 +08:00 |
|
zhoukeda
|
1a06f2299a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-09-19 16:51:06 +08:00 |
|
zhoukeda
|
6f6a5ecb50
|
pad 组装包装相关接口
|
2023-09-19 16:50:57 +08:00 |
|
alex
|
4220ca4b8b
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-19 15:57:56 +08:00 |
|
alex
|
f05ece37e5
|
手动启动，定时任务反射调用放到本地缓存，优化性能
|
2023-09-19 15:57:51 +08:00 |
|
PhilPan
|
af8391b22c
|
修复vengine Release下找不到代码生成路径的错误
|
2023-09-19 15:49:09 +08:00 |
|
PhilPan
|
0bf34fa215
|
修复清理vengine
|
2023-09-19 10:55:14 +08:00 |
|
zhoukeda
|
b9e9636d72
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-09-19 09:21:59 +08:00 |
|
zhoukeda
|
a80a6fb0bf
|
1
|
2023-09-19 09:21:51 +08:00 |
|
alex
|
767076a513
|
1
|
2023-09-19 09:14:41 +08:00 |
|
alex
|
18b72a8bad
|
继续调整，原逻辑有问题
|
2023-09-18 15:48:02 +08:00 |
|
alex
|
6cc0529d60
|
手动启动，定时新增字典缓存，避免多次反射影响性能
|
2023-09-18 15:07:04 +08:00 |
|
alex
|
0ac46b6e65
|
1
|
2023-09-18 14:40:21 +08:00 |
|
alex
|
64b6a5485c
|
1
|
2023-09-18 14:06:43 +08:00 |
|
alex
|
1cefb51aa9
|
1
|
2023-09-18 11:01:18 +08:00 |
|
alex
|
9754199772
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-18 10:12:43 +08:00 |
|
alex
|
79731d6c67
|
定时服务启动方式调整，并调整相关业务代码
|
2023-09-18 10:12:37 +08:00 |
|
zhoukeda
|
105b5316df
|
优化
|
2023-09-15 15:54:15 +08:00 |
|