Commit Graph

625 Commits

Author SHA1 Message Date
zhoukeda
68b975c498 bug 2023-06-28 15:31:02 +08:00
zhoukeda
e478a4c2ca Merge remote-tracking branch 'origin/dev' into dev 2023-06-28 14:38:40 +08:00
zhoukeda
8c0a23215f bug 2023-06-28 14:38:32 +08:00
alex
49578c27c2 +1 2023-06-28 14:36:20 +08:00
alex
41fcd7ad59 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-28 14:36:12 +08:00
alex
dcbf6fbc95 出库签收业务回更,分拣出库 2023-06-28 14:36:07 +08:00
zhoukeda
35b7d3ea97 bug 2023-06-28 14:09:51 +08:00
zhoukeda
3394740eb7 Merge remote-tracking branch 'origin/dev' into dev 2023-06-28 14:02:27 +08:00
zhoukeda
83e0b1294b bug 2023-06-28 14:02:20 +08:00
alex
6db872c17d 出库签收,新增输入参数 2023-06-28 11:25:46 +08:00
taomin0419
4e8c1e372a Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-28 10:37:56 +08:00
taomin0419
c665a59fd9 出库申请业务回更代码提交 2023-06-28 10:37:49 +08:00
alex
8db0152336 出库申请,未找到载具时提示,“库存不足” 2023-06-28 09:23:53 +08:00
alex
465790efcb Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-27 17:54:39 +08:00
alex
038a234d9a 改bug 2023-06-27 17:54:34 +08:00
qianjiawei
d1053d09bd Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-27 17:29:46 +08:00
qianjiawei
8ee61dff20 工作日历 2023-06-27 17:29:40 +08:00
taomin0419
73f0232f0b Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-27 17:02:15 +08:00
taomin0419
83273a6d49 入库申请,抛出异常 2023-06-27 17:02:11 +08:00
alex
f03951fea1 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-27 16:45:27 +08:00
alex
e6d8f2d2e2 出库签收业务回更全部出 2023-06-27 16:45:24 +08:00
taomin0419
d23b8b125a 解决入库申请bug 2023-06-27 16:43:16 +08:00
qianjiawei
379901c7b4 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-27 14:28:05 +08:00
qianjiawei
97def64135 1 2023-06-27 14:27:59 +08:00
alex
6062b886e6 回更齐套分拣业务主表 2023-06-27 14:18:59 +08:00
alex
9990ba1147 将BaseLocation,is_use属性类型改为int 2023-06-27 14:11:27 +08:00
alex
7ba5fc5f83 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-27 11:47:40 +08:00
alex
824731ada9 1 2023-06-27 11:47:35 +08:00
zhoukeda
593311567e Merge remote-tracking branch 'origin/dev' into dev 2023-06-27 10:58:59 +08:00
zhoukeda
143837b615 设备维修拒绝添加原因 2023-06-27 10:58:51 +08:00
qianjiawei
35275f723c 1 2023-06-27 10:55:35 +08:00
qianjiawei
af455a64ee 组装包装任务管理 2023-06-27 10:47:34 +08:00
FanLian
4dd5ef47d0 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-27 10:45:15 +08:00
FanLian
666ca6bb94 1 2023-06-27 10:45:11 +08:00
alex
559b218df2 +1 2023-06-27 10:34:44 +08:00
alex
72d7c61663 1 2023-06-27 10:28:04 +08:00
alex
e253f56f80 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-27 10:27:30 +08:00
alex
8c4a0799a2 修改载具状态与数据库字段类型映射 2023-06-27 10:27:25 +08:00
FanLian
5406e7bdd8 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-27 10:23:03 +08:00
FanLian
614424b55f PDA投料修改 2023-06-27 10:22:46 +08:00
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