Commit Graph

798 Commits

Author SHA1 Message Date
qianjiawei
9f6dbcf268 1 2023-07-13 17:45:07 +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
alex
b6cc0be219 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-11 16:15:01 +08:00
alex
3a27e4cc15 1 2023-07-11 16:14:56 +08:00
zhoukeda
252ae13496 bug 2023-07-11 15:36:23 +08:00
zhoukeda
95599c8fbf Merge remote-tracking branch 'origin/dev' into dev 2023-07-11 14:39:41 +08:00
zhoukeda
dd049ceeed 备件领用 2023-07-11 14:39:34 +08:00
alex
0b99644eea 消除warning 2023-07-11 11:35:02 +08:00
alex
3b1dc1f026 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-10 14:58:55 +08:00
alex
ee4bbf62fe 修改判空条件代码逻辑 2023-07-10 14:58:52 +08:00
FanLian
6543735610 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-10 13:57:44 +08:00
FanLian
0213fb907a bug 2023-07-10 13:57:39 +08:00
alex
ba03f549bc 1 2023-07-10 13:41:19 +08:00
alex
0e058a0f65 消除warning 2023-07-10 13:37:04 +08:00
alex
217d4a02e0 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-10 13:35:01 +08:00
alex
8f9924e918 调整Entity目录结构 2023-07-10 13:34:54 +08:00
FanLian
d662984b38 增加接口输入限制 2023-07-10 10:20:30 +08:00
alex
3f351cf23f MES齐套搭配方案查询接口,忽略中间变量 2023-07-07 17:15:05 +08:00
FanLian
284b36a043 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-07 16:49:47 +08:00
FanLian
630678ff23 增加MES-WMS接口 2023-07-07 16:49:39 +08:00
zhoukeda
844b76b823 消除warning 2023-07-07 15:54:43 +08:00
zhoukeda
c112472256 Merge remote-tracking branch 'origin/dev' into dev 2023-07-07 14:49:43 +08:00
zhoukeda
dace6212de 模具领用归还 2023-07-07 14:49:35 +08:00
alex
70634df84d 出库签收代码调整 2023-07-07 09:03:40 +08:00
alex
9488c6b6ca WmsOutStockService 删除测试代码 2023-07-06 17:00:36 +08:00
FanLian
fbae50c42d Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-06 16:44:47 +08:00
FanLian
5671bbce2f 1 2023-07-06 16:44:40 +08:00
FanLian
7b3cba1099 增加生产出库接口 2023-07-06 16:44:32 +08:00
alex
e89676da3f 1 2023-07-06 16:40:15 +08:00