Commit Graph

1491 Commits

Author SHA1 Message Date
zhoukeda
d77b6c1a5b Merge remote-tracking branch 'origin/dev' into dev 2023-11-03 14:29:30 +08:00
zhoukeda
c7add3bfe5 齐套出库接口 2023-11-03 14:29:22 +08:00
FanLian
a35aea7f13 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-03 11:38:04 +08:00
FanLian
7a1dbf4e97 删除齐套出库接口的seq字段 2023-11-03 11:37:58 +08:00
zhoukeda
2959d925cf Merge remote-tracking branch 'origin/dev' into dev 2023-11-03 10:28:05 +08:00
zhoukeda
f56c1d1120 添加x2server设备关联的字段 2023-11-03 10:27:58 +08:00
qianjiawei
821358621c Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-03 09:54:04 +08:00
qianjiawei
0bfc23ac4c redis获取数采数据 2023-11-03 09:53:58 +08:00
fei.pan
5dbbe60682 模型查询接口增加按子表字段查询 2023-11-02 17:42:12 +08:00
zhoukeda
29eb552d3b Merge remote-tracking branch 'origin/dev' into dev 2023-11-02 17:34:05 +08:00
zhoukeda
46772647e7 注塑满箱入库申请接口 2023-11-02 17:33:58 +08:00
yang.lee
669c4228e8 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-02 15:58:33 +08:00
yang.lee
b13574530d 将依赖事件总线的发布订阅模式,改为直接调用的形式 2023-11-02 15:58:15 +08:00
zhoukeda
910d96c921 Merge remote-tracking branch 'origin/dev' into dev 2023-11-02 11:45:52 +08:00
zhoukeda
95ecfd1814 1 2023-11-02 11:45:44 +08:00
qianjiawei
a01786aef8 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-02 10:14:13 +08:00
qianjiawei
b1984e5548 模具保养 2023-11-02 10:14:06 +08:00
zhoukeda
8c31205e70 bug 2023-11-01 00:01:24 +08:00
zhoukeda
4cfefb9150 Merge remote-tracking branch 'origin/dev' into dev 2023-10-31 18:20:28 +08:00
zhoukeda
615957e66d 点巡检 保养没子项目不生成 2023-10-31 18:20:17 +08:00
yang.lee
02e4dbb45a 放货确认,电梯关门逻辑代码调整 2023-10-31 17:49:28 +08:00
yang.lee
77a07b5a3a Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-10-31 17:38:02 +08:00
yang.lee
74118cccf4 1、删除无用类
2、调整定时逻辑,将定时改为框架的事件总线
3、电梯业务逻辑代码调整
2023-10-31 17:37:54 +08:00
qianjiawei
b00eea39dd bug 2023-10-31 17:32:57 +08:00
qianjiawei
2c37098bc2 质检 2023-10-31 14:53:58 +08:00
zhoukeda
ab1635cbe5 bug 2023-10-30 17:30:59 +08:00
zhoukeda
38c7644dde BUG 2023-10-30 15:08:21 +08:00
zhoukeda
ad9974b1af 重写报修接口 bug 2023-10-30 14:58:43 +08:00
zhoukeda
2291c4f096 bug 2023-10-30 11:26:50 +08:00
zhoukeda
bd7f854f31 bug 2023-10-30 10:22:29 +08:00
qianjiawei
f94bd6f809 质检 2023-10-30 09:48:50 +08:00
qianjiawei
138697015a 质检 2023-10-30 09:31:45 +08:00
yang.lee
eddb6edf45 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-10-27 17:16:31 +08:00
yang.lee
40d0878aa6 新增日志归类,将日志写入到指定的文件中 2023-10-27 17:08:03 +08:00
zhoukeda
bf64b2f068 bug 2023-10-27 16:37:24 +08:00
zhoukeda
bef9b53b4d bug 2023-10-27 16:24:44 +08:00
zhoukeda
d54ebf3cba bug 2023-10-27 15:41:22 +08:00
zhoukeda
79045a61de 点检保养报修添加时间过滤 自定义排序 2023-10-27 15:23:36 +08:00
zhoukeda
85d2a68e98 sqlsugar的PostgreSQL数据库 时间格式化分钟mm改为mi 2023-10-27 14:41:33 +08:00
zhoukeda
8e59b885c6 添加上次保养时间 报修列表创建时间倒叙 2023-10-27 11:11:47 +08:00
zhoukeda
82017178dd 重写设备保养执行列表接口+bug 2023-10-26 15:56:38 +08:00
zhoukeda
a0a59c0ae7 设备点检创建时间倒叙 2023-10-26 14:59:13 +08:00
zhoukeda
06349a3468 维修添加状态判断 2023-10-25 11:16:38 +08:00
zhoukeda
6268f63b0e bug 2023-10-24 11:42:37 +08:00
zhoukeda
1aa2614d26 字符串格式的时间也能正确映射 2023-10-24 11:33:57 +08:00
zhoukeda
339672d2bd bug 2023-10-24 10:04:06 +08:00
zhoukeda
c934c86756 bug 2023-10-24 09:56:47 +08:00
qianjiawei
35257534bb Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-10-23 17:35:15 +08:00
qianjiawei
846ff28c47 质检模块修改 2023-10-23 17:35:09 +08:00
zhoukeda
65dd14d46e 生产 开始中断完成暂停添加状态判断 2023-10-23 17:05:54 +08:00