alex
|
c7a14fccfc
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-17 11:34:22 +08:00 |
|
alex
|
37341183e1
|
1
|
2023-07-17 11:34:18 +08:00 |
|
FanLian
|
711460377f
|
1
|
2023-07-17 11:33:30 +08:00 |
|
FanLian
|
b869fec283
|
齐套出库修改，PDA出库签收接口修改
|
2023-07-17 11:32:19 +08:00 |
|
zhoukeda
|
4d6a192605
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-07-17 11:29:08 +08:00 |
|
zhoukeda
|
25c81366b6
|
载具签收，生产入库
|
2023-07-17 11:29:01 +08:00 |
|
alex
|
713247236c
|
消除部分warning
|
2023-07-17 10:09:20 +08:00 |
|
alex
|
ee0b13bf7e
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-17 09:43:27 +08:00 |
|
alex
|
0afdf90a19
|
消除部分warning
|
2023-07-17 09:43:23 +08:00 |
|
qianjiawei
|
c254739b2e
|
1
|
2023-07-17 09:42:58 +08:00 |
|
qianjiawei
|
f24975c296
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-17 09:42:21 +08:00 |
|
qianjiawei
|
6887ca9ded
|
1
|
2023-07-17 09:42:15 +08:00 |
|
FanLian
|
22cbcd83cd
|
齐套分拣和齐套入库的bug，注释了质检定时相关部分
|
2023-07-14 18:14:03 +08:00 |
|
alex
|
9031b1235a
|
1
|
2023-07-14 15:59:32 +08:00 |
|
alex
|
20285c28a4
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-14 15:59:19 +08:00 |
|
alex
|
6c351f0906
|
消除warning
|
2023-07-14 15:59:14 +08:00 |
|
FanLian
|
696d5fce88
|
1
|
2023-07-14 15:48:18 +08:00 |
|
FanLian
|
f7462d7168
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-14 15:48:00 +08:00 |
|
FanLian
|
b7f15702a2
|
调整BaseWareHouseService
|
2023-07-14 15:47:52 +08:00 |
|
qianjiawei
|
4d7a8b80e7
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-14 15:27:39 +08:00 |
|
qianjiawei
|
f91317c065
|
质检任务优化
|
2023-07-14 15:27:32 +08:00 |
|
zhoukeda
|
4fbcbfb056
|
入库申请同步，提报增加字段
|
2023-07-14 15:05:30 +08:00 |
|
zhoukeda
|
280f1184f3
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-07-14 14:33:02 +08:00 |
|
zhoukeda
|
0203cec1ca
|
物料签收新接口
|
2023-07-14 14:32:47 +08:00 |
|
FanLian
|
4bada98d09
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-14 14:19:25 +08:00 |
|
FanLian
|
2fab4e9000
|
任务执行生成任务执行条码表时，赋值逻辑出错
|
2023-07-14 14:19:19 +08:00 |
|
alex
|
eda4a0231d
|
1
|
2023-07-14 14:18:45 +08:00 |
|
alex
|
14e1e58a3c
|
消除warning
|
2023-07-14 14:07:44 +08:00 |
|
alex
|
b26ec5a297
|
1
|
2023-07-14 11:17:48 +08:00 |
|
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 |
|