Commit Graph

375 Commits

Author SHA1 Message Date
zhoukeda
1a0df13ec4 物料签收 2023-06-16 11:42:54 +08:00
FanLian
f527a02d75 1 2023-06-16 11:28:30 +08:00
FanLian
74e2726f8f Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-16 11:25:41 +08:00
FanLian
3e24b1bf80 1 2023-06-16 11:25:24 +08:00
FanLian
17ab663e10 更新载具绑定,修改载具更换 2023-06-16 11:24:52 +08:00
alex
c0c3996690 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-16 11:12:45 +08:00
alex
3087c45a48 生成与任务,新增条码集合参数 2023-06-16 11:12:40 +08:00
FanLian
539ed048f0 载具更换:增加载具规格相同采用更换条件 2023-06-16 11:09:08 +08:00
FanLian
8c2209d4e3 载具更换 2023-06-16 10:49:10 +08:00
hlb
1fe1eb41df clear error 2023-06-16 09:55:52 +08:00
alex
19e49ab740 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-16 09:43:58 +08:00
alex
4b5cc3e0c0 1 2023-06-16 09:43:54 +08:00
FanLian
6d7447b7e9 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-16 09:20:49 +08:00
FanLian
cc8b545555 1 2023-06-16 09:20:46 +08:00
alex
0a54b60412 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-16 09:20:44 +08:00
alex
8667b63d0b 1 2023-06-16 09:20:39 +08:00
hlb
77ff8d92a1 修改pretaskid 2023-06-16 09:18:05 +08:00
hlb
42b7956c08 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-16 09:15:37 +08:00
hlb
e2d35901cf 增加操作单插入 2023-06-16 09:15:29 +08:00
alex
7ef4f0475a 1 2023-06-16 09:01:11 +08:00
alex
c5ed02772d Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-16 08:58:21 +08:00
alex
489f01cf7f 载具入库将PreTaskId改为RequireId 2023-06-16 08:58:16 +08:00
hlb
1a79a76d2b Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-16 08:57:13 +08:00
hlb
bb0b3819f6 1 2023-06-16 08:57:02 +08:00
FanLian
37e0177229 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-16 08:55:22 +08:00
FanLian
22f80ca26e 1 2023-06-16 08:55:16 +08:00
alex
0aceef8697 1 2023-06-15 19:55:09 +08:00
hlb
04f2d5c551 1 2023-06-15 19:52:22 +08:00
alex
1a2f3aa8ea 1 2023-06-15 19:37:43 +08:00
alex
b96e4dbb04 1 2023-06-15 19:37:40 +08:00
alex
50dc30f76a 1 2023-06-15 19:36:41 +08:00
FanLian
6bebc0393e 空载具出库 2023-06-15 19:27:07 +08:00
FanLian
36cb3ec766 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-15 18:54:59 +08:00
FanLian
2632d471db 1 2023-06-15 18:54:53 +08:00
hlb
4b3eb55252 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-15 18:52:58 +08:00
hlb
99f1674a9b 更新PDA异常取消功能 2023-06-15 18:52:50 +08:00
alex
0d1910f459 1 2023-06-15 18:45:25 +08:00
alex
64c32eaff8 1 2023-06-15 18:45:22 +08:00
alex
e7f2337eeb wms调整插入操作记录逻辑代码 2023-06-15 18:44:45 +08:00
hlb
14bc12cba8 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-15 17:35:22 +08:00
hlb
c14cd8e6af 异常取消 2023-06-15 17:35:13 +08:00
FanLian
78ad2bb3d0 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-15 17:21:58 +08:00
FanLian
76cf64ebe3 1 2023-06-15 17:21:53 +08:00
hlb
ff052580fd Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-15 16:52:35 +08:00
hlb
3000b395d2 增加任务已取消状态 2023-06-15 16:52:27 +08:00
FanLian
f66aa1ff49 线程名更改 2023-06-15 16:41:05 +08:00
FanLian
26993e0f9a Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-15 16:28:24 +08:00
FanLian
c8a49842f5 空载具入库,载具移出,载具移入PDA端 2023-06-15 16:28:18 +08:00
hlb
d849a23b89 修改库内转移和配送的模块名 2023-06-15 16:27:23 +08:00
hlb
7d8974a61d Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-15 16:26:41 +08:00