Commit Graph

1205 Commits

Author SHA1 Message Date
alex
26dd70efb3 1 2023-08-15 15:19:14 +08:00
alex
a6a4a1ebc2 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-15 14:58:55 +08:00
alex
fd4806ae1c 1 2023-08-15 14:58:51 +08:00
FanLian
34916b7d9d Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-15 14:56:43 +08:00
FanLian
d1ac20a9db 业务增加消息发布 2023-08-15 14:56:36 +08:00
alex
6efbf6f066 1 2023-08-15 14:53:19 +08:00
alex
386dd57782 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-15 14:27:14 +08:00
alex
2f3cf868d7 1 2023-08-15 14:27:10 +08:00
FanLian
6fc24c9456 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-15 14:26:32 +08:00
FanLian
4bec038890 增加最小库存判断处理 2023-08-15 14:26:12 +08:00
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
PhilPan
45e59b175f 添加Tnb.Vengine 2023-08-15 11:41:49 +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
zhoukeda
c39ea62886 Merge remote-tracking branch 'origin/dev' into dev 2023-08-14 10:48:13 +08:00
zhoukeda
a9461977ee 提报报废数量反写到工单 2023-08-14 10:48:05 +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
1a27422a0e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-11 17:47:50 +08:00
alex
8894ca77e6 任务完成,代码调整将更新载具、载具条码改为批量更新 2023-08-11 17:47:45 +08:00
zhoukeda
06fdf932b3 Merge remote-tracking branch 'origin/dev' into dev 2023-08-11 17:04:12 +08:00
zhoukeda
53db402c7a 提报记录添加工序 2023-08-11 17:04:05 +08:00
qianjiawei
85193b8440 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-08-11 16:32:17 +08:00
qianjiawei
2afaa0cb24 1 2023-08-11 16:32:11 +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
zhoukeda
b25ab2c526 bug 2023-08-11 09:59:39 +08:00
zhoukeda
db6929fc35 Merge remote-tracking branch 'origin/dev' into dev 2023-08-10 11:58:49 +08:00
zhoukeda
4a81df87b0 任务单调整 更换设备模具产线 任务单操作记录 2023-08-10 11:58:41 +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