Commit Graph

1573 Commits

Author SHA1 Message Date
zhoukeda
753e24741b 调整喷码贴标 2023-11-09 16:00:05 +08:00
zhoukeda
fa292dea76 Merge remote-tracking branch 'origin/dev' into dev 2023-11-09 14:39:08 +08:00
zhoukeda
bf47dca08a 保养记录执行了才生成下一条 2023-11-09 14:38:58 +08:00
yang.lee
d757785f0b EnumTaskChainType新增,电梯,输送线 2023-11-09 11:48:45 +08:00
yang.lee
1b3b30662c Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-09 11:03:58 +08:00
yang.lee
49dcc79b6a Agv任务状态返回,出发预任务执行函数 2023-11-09 11:03:52 +08:00
zhoukeda
5a9f31c451 Merge remote-tracking branch 'origin/dev' into dev 2023-11-09 10:58:24 +08:00
zhoukeda
746e7f425d 外包装入库申请 2023-11-09 10:58:15 +08:00
yang.lee
56818634be Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-09 10:42:55 +08:00
yang.lee
79c066ec2d 调整预任务获取条件过滤 2023-11-09 10:42:49 +08:00
fei.pan
36fbb3ab18 Merge branch 'dev' of ssh://git.tuotong-tech.com:9105/tnb/tnb.server into dev 2023-11-09 10:21:40 +08:00
fei.pan
cacf974527 模型通用接口List改为用left join 2023-11-09 10:21:31 +08:00
yang.lee
9afe7d94c1 +1 2023-11-09 10:09:05 +08:00
yang.lee
fc54814fae 1 2023-11-09 10:04:35 +08:00
yang.lee
e9259ce8ad 预任务执行,Agv及电梯任务根据配置执行 2023-11-09 10:03:30 +08:00
yang.lee
68efc42e31 解决未实现指定接口约束问题 2023-11-09 08:59:13 +08:00
yang.lee
449303161e +1 2023-11-08 17:35:57 +08:00
yang.lee
3beb03de18 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-08 17:07:55 +08:00
yang.lee
cb359b4ef9 调整出库申请代码逻辑 2023-11-08 17:07:50 +08:00
qianjiawei
f8cf67150a redis 2023-11-08 16:54:15 +08:00
qianjiawei
7f3c8b1de9 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-08 16:52:26 +08:00
qianjiawei
be8b061de3 质检 2023-11-08 16:51:20 +08:00
zhoukeda
dd9a84bdae Merge remote-tracking branch 'origin/dev' into dev 2023-11-08 16:50:02 +08:00
zhoukeda
ee0663aaaa 外包装入库申请 2023-11-08 16:49:52 +08:00
yang.lee
6bb3db57aa +1 2023-11-08 16:48:15 +08:00
yang.lee
225a00c9e2 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-08 16:48:05 +08:00
yang.lee
e9b33e1bd6 +1 2023-11-08 16:47:58 +08:00
hlb
b6129ee807 修改空载具出库判断 2023-11-08 16:41:33 +08:00
yang.lee
60ff5d69bb +1 2023-11-08 16:38:50 +08:00
yang.lee
e808092ad8 采购收货,销售发货新增对外接口 2023-11-08 16:36:42 +08:00
yang.lee
8f00f2b688 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-08 16:24:52 +08:00
yang.lee
7980e342c0 新增Mes检验结束后,回调通知功能 2023-11-08 16:24:47 +08:00
qianjiawei
2619a011af 质检任务 2023-11-08 16:19:30 +08:00
qianjiawei
5504703f3a 质检任务 2023-11-08 15:58:39 +08:00
qianjiawei
edfce0ce78 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-08 15:55:37 +08:00
yang.lee
b99c045391 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-08 15:54:59 +08:00
qianjiawei
189b31f4a6 质检任务 2023-11-08 15:54:52 +08:00
yang.lee
6521b98cc8 调整出库申请代码逻辑 2023-11-08 15:54:51 +08:00
zhoukeda
bd739b3060 齐套出库 一般出库 物料出库添加状态 2023-11-08 14:06:40 +08:00
zhoukeda
30b40fb28e 领料记录添加状态过滤 2023-11-08 11:01:37 +08:00
zhoukeda
8c5d302daa Merge remote-tracking branch 'origin/dev' into dev 2023-11-08 10:50:25 +08:00
zhoukeda
c9d053a6d8 bug 2023-11-08 10:50:18 +08:00
yang.lee
294f60b51d Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-08 10:38:59 +08:00
yang.lee
7f15f7c59f 采购收货、销售发货,新增审核、反审核功能 2023-11-08 10:38:52 +08:00
zhoukeda
7f6bb604fd bug 2023-11-08 09:59:10 +08:00
zhoukeda
14aa0b2ff4 1 2023-11-08 09:31:18 +08:00
yang.lee
59933a17cd 1 2023-11-07 18:02:19 +08:00
yang.lee
ac01098baa Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-11-07 18:02:08 +08:00
yang.lee
ea44abf6af 采购收货,销售发货业务代码提交 2023-11-07 18:01:59 +08:00
zhoukeda
f16f89e86a 调整注塑满箱到位后入库申请接口 领料记录工位刷选 2023-11-07 17:28:01 +08:00