Commit Graph

493 Commits

Author SHA1 Message Date
alex
46e280bf4c 1 2023-07-20 10:37:45 +08:00
alex
7cc193c978 调整Mes->Wms 出库申请接口,carry_id为空的bug 2023-07-20 09:53:20 +08:00
alex
b2354f31bb 1 2023-07-19 17:29:22 +08:00
alex
659464f04a 调整Mes->Wms生产出库返回值 2023-07-19 17:28:45 +08:00
alex
4cf4551d6f Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-19 16:05:47 +08:00
alex
9f7c61b0b0 消除部分warning 2023-07-19 16:05:44 +08:00
FanLian
3fac1f47d0 空载具出库最小值判断 2023-07-19 11:07:49 +08:00
alex
addc9c19e2 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-18 14:13:00 +08:00
alex
97c0e96b86 判断最终目标库位是否可放置当前载具,公共函数代码优化 2023-07-18 14:12:56 +08:00
FanLian
f981f4952d Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-18 14:10:02 +08:00
alex
bc5a67338a 1 2023-07-18 14:03:58 +08:00
FanLian
a5f7ded7d3 补漏,调整 2023-07-18 11:35:56 +08:00
alex
8559f08b65 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-18 11:22:01 +08:00
alex
480c2a6d11 1 2023-07-18 11:21:57 +08:00
FanLian
0daf7fe663 入库业务增加库位与载具规格关联的限制 2023-07-18 11:17:51 +08:00
FanLian
43f73b16a7 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-18 10:39:03 +08:00
alex
e3a5934738 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-18 10:38:49 +08:00
alex
81f7672980 新增,判断目标库位是否可以放置当前载具 2023-07-18 10:38:44 +08:00
FanLian
bfc948a718 重命名变量 2023-07-18 09:15:50 +08:00
FanLian
ecca272e76 1 2023-07-18 09:11:22 +08:00
FanLian
919af3542c 注释和报错 2023-07-18 09:10:57 +08:00
taomin0419
c92dbc3397 解决一次同时处理多个update/progress冲突 2023-07-17 17:39:02 +08:00
FanLian
340bd17324 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-17 17:07:11 +08:00
FanLian
193da3ac1b 1 2023-07-17 17:07:06 +08:00
FanLian
2509eb739d 增加存储库位判断,限制条件 2023-07-17 17:06:57 +08:00
alex
d6d2baa7ac Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-17 17:06:45 +08:00
alex
8c06c4c622 重写预任务申请,任务执行删除功能 2023-07-17 17:06:40 +08:00
FanLian
0a1d4db247 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-07-17 15:18:46 +08:00
FanLian
9ca32bbcd6 优化 2023-07-17 15:18:39 +08:00
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