Commit Graph

397 Commits

Author SHA1 Message Date
FanLian
5c21b4fc88 1 2023-06-16 16:16:06 +08:00
FanLian
d8c10fa9a1 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-16 15:46:27 +08:00
FanLian
4229d60271 1 2023-06-16 15:46:23 +08:00
hlb
82856d3bd3 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-16 15:21:18 +08:00
hlb
5f8ab0c9e2 修改类名 2023-06-16 15:21:07 +08:00
FanLian
b9dcd91460 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-16 15:15:25 +08:00
FanLian
90156f4dfd 载具绑定、载具解绑:清理不用的代码 2023-06-16 15:15:19 +08:00
alex
6c57264782 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-16 15:10:16 +08:00
alex
034d5746de wms扫码入库逻辑代码提交 2023-06-16 15:10:11 +08:00
hlb
e7b044d172 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-16 15:09:16 +08:00
FanLian
f967ee2a59 1 2023-06-16 15:08:33 +08:00
FanLian
3f0449a50b Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-16 15:08:22 +08:00
hlb
70de9f117f Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-16 15:08:12 +08:00
FanLian
9129277f96 更新载具解绑,载具绑定 2023-06-16 15:08:11 +08:00
hlb
62e7eec793 异常操作,取消 重新执行, 完成 2023-06-16 15:07:57 +08:00
zhoukeda
3d60c3b912 bug 2023-06-16 14:38:34 +08:00
zhoukeda
11b6ca2eba Merge remote-tracking branch 'origin/dev' into dev 2023-06-16 14:11:42 +08:00
zhoukeda
489987091c 增加签收单号 2023-06-16 14:11:30 +08:00
FanLian
dd3ca9abd2 1 2023-06-16 13:48:54 +08:00
FanLian
78f726d139 载具解绑 2023-06-16 13:48:36 +08:00
FanLian
0dcf9fff9a Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-16 13:26:41 +08:00
FanLian
d8a95aa1e0 1 2023-06-16 13:26:35 +08:00
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