Commit Graph

585 Commits

Author SHA1 Message Date
alex
de0d5bcce9 1 2023-06-27 09:48:38 +08:00
alex
fbfd0c54d8 1 2023-06-27 09:47:06 +08:00
alex
534d27e5f0 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-27 09:25:22 +08:00
alex
4b9817b858 出库签收输入参数删除,serviceModule属性 2023-06-27 09:25:16 +08:00
FanLian
2456fd8017 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-27 08:27:32 +08:00
FanLian
16a5042fb0 更改 2023-06-27 08:27:19 +08:00
alex
60e8168355 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-26 18:26:58 +08:00
alex
25bdc6af84 出库签收代码调整 2023-06-26 18:26:54 +08:00
zhoukeda
53ff2d010a bug 2023-06-26 17:30:09 +08:00
zhoukeda
12c2d5391d Merge remote-tracking branch 'origin/dev' into dev 2023-06-26 17:02:11 +08:00
zhoukeda
5a918b25ad bug,设备迁移 2023-06-26 17:02:04 +08:00
alex
65b6bb31ce 根据载具ID获取相关信息 2023-06-26 16:43:25 +08:00
alex
c40dfcd079 1 2023-06-26 16:14:49 +08:00
alex
9b87134b01 1 2023-06-26 16:10:24 +08:00
alex
b25aca740a 调整齐套分拣模块代码 2023-06-26 16:10:10 +08:00
FanLian
a3b6e3f8d0 1 2023-06-26 15:37:22 +08:00
FanLian
cde7d5bb3b 1 2023-06-26 15:31:11 +08:00
FanLian
b88ae777cf ` 2023-06-26 14:19:57 +08:00
FanLian
3acddb8f0e 更改PDAFeeding 2023-06-26 14:19:30 +08:00
FanLian
1e5226c9dd Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-26 13:51:19 +08:00
FanLian
c097fb78d6 更改PDAFeeding 2023-06-26 13:51:15 +08:00
alex
9c464625bb +1 2023-06-26 11:55:01 +08:00
alex
5a631cf414 1 2023-06-26 11:53:13 +08:00
alex
d7c43a8c51 1 2023-06-26 11:48:46 +08:00
alex
9e2b534e96 修改获取的任务状态已完成 2023-06-26 10:07:27 +08:00
alex
ff5430446b 新增,出库签收接口 2023-06-26 09:53:56 +08:00
alex
2e90f164a0 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-25 18:18:38 +08:00
alex
6b48341493 齐套业务代码提交 2023-06-25 18:18:34 +08:00
qianjiawei
d2e7f5a22e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-25 17:36:44 +08:00
qianjiawei
b8f32bd438 1 2023-06-25 17:36:35 +08:00
zhoukeda
265864bbed bug 2023-06-25 17:11:57 +08:00
zhoukeda
eb3cd5d3b2 组织新增修改接口bug 2023-06-25 15:40:23 +08:00
zhoukeda
d2ae9d8751 bug,生产bom工序添加排序和是否最后一道工序字段 2023-06-25 15:19:26 +08:00
zhoukeda
ac094e1d58 Merge remote-tracking branch 'origin/dev' into dev 2023-06-25 15:18:58 +08:00
zhoukeda
ab238d4f3c bug,生产bom工序添加排序和是否最后一道工序字段 2023-06-25 15:18:51 +08:00
FanLian
12744e4e71 注释修改 2023-06-25 14:15:57 +08:00
FanLian
1bdc38adf1 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-25 13:30:37 +08:00
FanLian
f7db1bbde0 1 2023-06-25 13:30:28 +08:00
FanLian
3b076e09f7 更改载具更换和PDA投料 2023-06-25 13:30:00 +08:00
zhoukeda
586d0e1ffc Merge remote-tracking branch 'origin/dev' into dev 2023-06-25 11:41:41 +08:00
zhoukeda
87e478bf8d bug,异常停机添加报修申请 2023-06-25 11:41:32 +08:00
FanLian
ee671f897b Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-25 09:15:31 +08:00
FanLian
7233438855 修改bug 2023-06-25 09:15:26 +08:00
FanLian
3249a7871c 修改PDAfeeding功能 2023-06-25 09:13:53 +08:00
zhoukeda
db52f09c67 Merge remote-tracking branch 'origin/dev' into dev 2023-06-21 17:39:33 +08:00
zhoukeda
0a1a407385 bug 2023-06-21 17:39:04 +08:00
FanLian
05cfde1e8d Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-21 17:35:37 +08:00
alex
fbabad9a5e 1 2023-06-21 17:35:27 +08:00
FanLian
6dcacc38e5 复用载具更换类,修改PDA投料 2023-06-21 17:34:51 +08:00
alex
506daed631 删除注释代码 2023-06-21 17:24:09 +08:00