Commit Graph

464 Commits

Author SHA1 Message Date
alex
af91dc8cb3 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-17 14:40:10 +08:00
alex
5bb09d4952 1 2023-07-17 14:40:06 +08:00
FanLian
e2a03ded93 优化 2023-07-17 14:29:00 +08:00
FanLian
92a8389efa 优化 2023-07-17 14:28:46 +08:00
taomin0419
d3c2e433d1 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-17 13:53:59 +08:00
taomin0419
1408bf0f97 齐套出库增加载具为料架时,取料箱条码 2023-07-17 13:53:53 +08:00
alex
b8b040981b 1 2023-07-17 13:36:20 +08:00
alex
f2a3da3634 1 2023-07-17 11:46:56 +08:00
alex
f1c8ad986e 优化WmsFeedingService 代码 2023-07-17 11:43:45 +08:00
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
alex
713247236c 消除部分warning 2023-07-17 10:09:20 +08:00
alex
0afdf90a19 消除部分warning 2023-07-17 09:43:23 +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
b7f15702a2 调整BaseWareHouseService 2023-07-14 15:47:52 +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
8cbbbc47de 调整生成任务代码逻辑 2023-07-13 17:56:04 +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