Commit Graph

687 Commits

Author SHA1 Message Date
alex
e09251ef76 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-15 13:53:11 +08:00
alex
28b7800baf 将定时任务改为,发布、订阅模式的消息队列执行任务 2023-08-15 13:53:04 +08:00
FanLian
69930e06a2 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-14 12:07:22 +08:00
FanLian
9055911b74 增加新业务转运签收 2023-08-14 12:07:14 +08:00
alex
4c1e3c8c40 1 2023-08-14 09:15:24 +08:00
alex
962ab7cab9 1 2023-08-14 09:14:07 +08:00
alex
b208bb8af5 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-14 09:12:15 +08:00
alex
ca3d04cb83 任务完成接口,代码调整将原库位更新代码调整为批量更新 2023-08-14 09:12:10 +08:00
FanLian
dece731c8c Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-14 09:08:05 +08:00
FanLian
767bfe2d49 创建任务链增加载具编号字段 2023-08-14 09:07:59 +08:00
alex
8894ca77e6 任务完成,代码调整将更新载具、载具条码改为批量更新 2023-08-11 17:47:45 +08:00
alex
2b06a277f7 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-11 16:24:53 +08:00
alex
ae41d3e056 消除部分warning 2023-08-11 16:24:45 +08:00
FanLian
a42be24180 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-10 11:14:13 +08:00
FanLian
8db0c10e59 修改导入功能 2023-08-10 11:13:55 +08:00
alex
6e482e02de Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-10 10:51:49 +08:00
alex
dd0d37d7d9 齐套分拣,新增异常处理 2023-08-10 10:51:45 +08:00
FanLian
12bd8e6de6 齐套出库增加定时异常日志 2023-08-10 10:29:34 +08:00
alex
309cc17eca Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-10 10:24:31 +08:00
alex
e88604b748 1 2023-08-10 10:24:27 +08:00
FanLian
233dea93f9 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-10 10:21:21 +08:00
FanLian
f21291380e 修改报错消息,增加注释 2023-08-10 10:21:13 +08:00
alex
7aea535351 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-10 10:20:20 +08:00
alex
47ab94b3ef 定时任务,出现异常是将数据推送到系统异常日志以供查看 2023-08-10 10:20:14 +08:00
FanLian
831a469617 重写点位业务的导入模块,修改重写在线开发接口的bug 2023-08-10 10:00:59 +08:00
FanLian
943cd5a0b2 bug 2023-08-10 09:29:02 +08:00
FanLian
8fdbebb127 修改数据有误条件 2023-08-10 09:28:22 +08:00
FanLian
1bbb30f135 1.去掉编译条件
2.重写业务导入功能
2023-08-09 17:49:27 +08:00
FanLian
7913642d3d Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-09 14:28:53 +08:00
FanLian
e7419e1971 对空任务链编号输入做处理 2023-08-09 14:28:48 +08:00
alex
d853d49d3c 1 2023-08-09 14:21:05 +08:00
alex
273bce8987 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-09 14:20:57 +08:00
alex
e4cbbe4bfb 新增 ,定时器自定义异常类 2023-08-09 14:20:50 +08:00
FanLian
76e9a9a4bb 修改库内转移业务不回更的bug 2023-08-09 11:42:27 +08:00
alex
3d66e60477 创建任务链类型改为CTU 2023-08-09 10:58:13 +08:00
alex
7a98d8a72f 新增,任务链类型枚举 2023-08-09 10:49:47 +08:00
alex
e2d41a1f54 设备第三方提供接口改为匿名方式调用 2023-08-09 08:53:35 +08:00
alex
3e889495f3 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-08 15:15:59 +08:00
alex
446c4e45c8 调整调用Agv创建任务链代码逻辑 2023-08-08 15:15:53 +08:00
FanLian
dfd2b7ddb5 1 2023-08-08 15:13:01 +08:00
FanLian
6c37fcdb0a 修改联核接口Taskcode 2023-08-08 15:12:30 +08:00
alex
7b02f83a67 1 2023-08-08 10:27:12 +08:00
alex
75f9b45e5c 修改联合接口地址的请求IP端口 2023-08-08 10:26:42 +08:00
FanLian
ea0f71ac19 重写库位定义导入功能 2023-08-08 10:19:34 +08:00
alex
abb9663485 将Excel数据导入提取到单独的类中 2023-08-08 09:26:22 +08:00
alex
bd2af7dccf Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-08 09:15:57 +08:00
alex
57e837c2de 1 2023-08-08 09:15:54 +08:00
FanLian
fabf6a2f4e 增加载具导入功能 2023-08-08 09:15:17 +08:00
FanLian
744d053801 1 2023-08-07 17:53:34 +08:00
FanLian
1ebf011961 1 2023-08-07 17:50:55 +08:00