Commit Graph

729 Commits

Author SHA1 Message Date
alex
fca6b414eb 1 2023-07-04 17:34:14 +08:00
FanLian
6310748276 修改use相关的 2023-07-04 11:31:19 +08:00
FanLian
6bb96832f0 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-04 11:03:33 +08:00
FanLian
ff66b1fa04 更改location的is_use字段为string 2023-07-04 11:03:28 +08:00
alex
4e42d12e21 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-04 09:45:27 +08:00
alex
418133e475 wms 服务消除warning 2023-07-04 09:45:22 +08:00
FanLian
a4298ca2d9 1 2023-07-04 09:35:13 +08:00
FanLian
df89a9a526 1 2023-07-04 09:26:37 +08:00
alex
5e36ac1a15 1 2023-07-04 09:22:42 +08:00
alex
1a01692551 wms 消除warning 2023-07-04 09:22:13 +08:00
alex
e78f63acfb Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-03 17:37:12 +08:00
zhoukeda
0a981b65e4 Merge remote-tracking branch 'origin/dev' into dev 2023-07-03 17:36:57 +08:00
zhoukeda
85e96cd402 系统导入下拉框多选存json 2023-07-03 17:28:24 +08:00
FanLian
842152a5c5 1 2023-07-03 17:11:50 +08:00
alex
b68970b5b1 删除为引用的函数及变量成员 2023-07-03 16:52:34 +08:00
alex
01e337cac8 1 2023-07-03 14:08:15 +08:00
alex
c901340266 路段管理,起重点验证失效bug处理 2023-07-03 11:58:10 +08:00
hlb
3790fcb70a Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-03 11:56:34 +08:00
hlb
1f4210087e 修改MES入库参数 2023-07-03 11:56:25 +08:00
zhoukeda
9c59b778af Merge remote-tracking branch 'origin/dev' into dev 2023-07-03 10:44:45 +08:00
zhoukeda
b013765bb3 bug 2023-07-03 10:44:37 +08:00
alex
a8c894aac8 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-03 09:24:27 +08:00
alex
06d8a4df5e 齐套出库业务代码,新增操作是否成功判断逻辑 2023-07-03 09:24:22 +08:00
hlb
5b8b2ce262 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-03 09:00:40 +08:00
hlb
947a6cd066 增加MES入库接口 2023-07-03 09:00:29 +08:00
alex
0d13eb93aa 齐套出库、分拣业务代码调整 2023-06-30 19:13:24 +08:00
hlb
280abeac1d Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-30 17:11:15 +08:00
hlb
f2829ecfd1 任务完成时,更新条码的库位和仓库信息 2023-06-30 17:11:05 +08:00
alex
7bbc41d0af 出库申请消除catch块变量 2023-06-30 16:33:45 +08:00
hlb
a90c18f89c Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-30 15:55:52 +08:00
hlb
afd98cd359 更新回更操作 2023-06-30 15:55:44 +08:00
FanLian
a1828ae9e9 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-30 15:55:19 +08:00
FanLian
d2afae3a60 1 2023-06-30 15:55:13 +08:00
FanLian
cca23e3615 出库签收后载具库位清空 2023-06-30 15:54:57 +08:00
alex
5fb9b97795 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-30 15:53:30 +08:00
alex
8d1e343c5a 机器人回调代码调整 2023-06-30 15:53:27 +08:00
hlb
814c1e213c Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-30 15:50:50 +08:00
hlb
edefbe4c63 PDA齐套入库业务逻辑新增 2023-06-30 15:50:42 +08:00
alex
b56b53a234 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-30 15:35:51 +08:00
alex
74fa55af9d 机器人回调出库功能 2023-06-30 15:35:46 +08:00
hlb
ddf5966178 PC端增加齐套入库业务逻辑 2023-06-30 15:34:10 +08:00
hlb
7f58fe6c50 类型错误修改 2023-06-30 14:06:09 +08:00
zhoukeda
48f1b0e0dd Merge remote-tracking branch 'origin/dev' into dev 2023-06-30 13:51:31 +08:00
zhoukeda
9931b433f8 bug 2023-06-30 13:51:23 +08:00
alex
e4a596a71f 消除部分warning 2023-06-30 11:11:54 +08:00
PhilPan
f86e10c845 修复更新时没有删除子表的错误 2023-06-30 11:02:44 +08:00
hlb
43f8c50c7e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-30 10:03:59 +08:00
hlb
0dc3e55e42 模块标识错误 2023-06-30 10:03:47 +08:00
alex
777f683b9c Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-30 09:55:03 +08:00
alex
a60fd76ff3 齐套出库,齐套分拣,更新明细条码表,再更新明细,最后更新主表 2023-06-30 09:54:57 +08:00