Commit Graph

825 Commits

Author SHA1 Message Date
alex
fe77280ff0 1 2023-07-14 11:07:53 +08:00
alex
cc6010be4e 调整wareHouseService部分代码 2023-07-14 11:07:07 +08:00
alex
1eaae0a983 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-13 17:56:11 +08:00
alex
8cbbbc47de 调整生成任务代码逻辑 2023-07-13 17:56:04 +08:00
qianjiawei
61cd022343 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-13 17:45:14 +08:00
qianjiawei
9f6dbcf268 1 2023-07-13 17:45:07 +08:00
alex
f490a90ef4 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-13 15:40:36 +08:00
alex
237e6f81f6 1 2023-07-13 15:40:33 +08:00
FanLian
1f806bf9fb Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-13 15:30:47 +08:00
FanLian
38f72bd4d0 bug 2023-07-13 15:30:42 +08:00
alex
30c67925e1 1 2023-07-13 15:29:27 +08:00
alex
b7fa16b8e1 1 2023-07-13 15:26:58 +08:00
alex
64cebe8017 删除NonUnify 2023-07-13 15:26:27 +08:00
FanLian
c5e4f223a2 去除绕过框架 2023-07-13 15:25:12 +08:00
alex
b64a4af91e 1 2023-07-13 14:34:51 +08:00
alex
02f748948f 1 2023-07-13 14:34:01 +08:00
alex
99c27ad34d 1 2023-07-13 14:25:34 +08:00
alex
a33adef0c5 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-13 14:19:54 +08:00
alex
fd8026b3b0 1 2023-07-13 14:19:24 +08:00
FanLian
1f3257e139 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-13 14:17:14 +08:00
FanLian
2b4c3a985b 出库申请预任务生成后变更单据状态 2023-07-13 14:17:09 +08:00
alex
f9343d27c4 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-13 14:13:22 +08:00
alex
7cf869b6f2 出库申请代码逻辑调整 2023-07-13 14:13:16 +08:00
FanLian
adbef09153 Input去除问号 2023-07-13 11:07:33 +08:00
FanLian
5dd2857a91 去除问号 2023-07-13 10:54:05 +08:00
FanLian
5aed4189a4 增加报错代码 2023-07-13 10:26:10 +08:00
FanLian
35df665c73 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-13 09:17:32 +08:00
FanLian
f474f40135 更改返回结果变量名results=>data 2023-07-13 09:17:26 +08:00
qianjiawei
9c4b032f0f Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-12 17:27:53 +08:00
qianjiawei
1b5d0ffdf2 质检任务生成计划 2023-07-12 17:27:46 +08:00
alex
3eb8b471b7 出库签收,新增根据carry_code判断 2023-07-12 17:24:50 +08:00
alex
010c7f34a8 1 2023-07-12 16:14:24 +08:00
alex
a3e6ba5bb5 1 2023-07-12 16:11:55 +08:00
alex
fed352fbca 调整出库代码,出库签收代码 2023-07-12 16:03:38 +08:00
alex
afb9784735 mes->wms入库接口代码调整 2023-07-12 14:05:31 +08:00
zhoukeda
911bf43d9a Merge remote-tracking branch 'origin/dev' into dev 2023-07-12 10:19:23 +08:00
zhoukeda
67c481f97c 入库申请同步 2023-07-12 10:19:15 +08:00
FanLian
c9b50818e9 绕过JNPF规范过滤 2023-07-12 09:16:24 +08:00
alex
f07b7235d7 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-12 08:50:08 +08:00
alex
d11304abfa 绕过JNPF规范过滤 2023-07-12 08:50:04 +08:00
zhoukeda
e21dc46a88 bug 2023-07-11 17:37:56 +08:00
alex
1d36768640 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-11 17:09:47 +08:00
alex
6adff88589 1 2023-07-11 17:09:43 +08:00
zhoukeda
1fc73f2307 bug 2023-07-11 16:56:02 +08:00
alex
ace324bc5f 1 2023-07-11 16:51:59 +08:00
alex
ff225db2e1 调整,wms进出库代码逻辑 2023-07-11 16:49:14 +08:00
alex
0c64a6ccda 1 2023-07-11 16:29:53 +08:00
FanLian
d061b63b2e 1 2023-07-11 16:26:31 +08:00
FanLian
1d4f0b555f Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-11 16:26:22 +08:00
FanLian
6d5a9c1d44 更改生产入库\出库输入参数 2023-07-11 16:26:14 +08:00