自动化立体仓库 - WMS系统
skyouc
2 天以前 fea45f7448f209bfb836d1462673ac50c090b1f2
no message
1个文件已修改
39 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/OutController.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/OutController.java
@@ -7,6 +7,7 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.BasDeviceServiceImpl;
import com.zy.asrs.service.impl.LocAroundBindServiceImpl;
@@ -86,23 +87,6 @@
                if (issued <= 0.0D) {
                    continue;
                }
                if (Objects.isNull(orderDetl.getStandby1())) {
                    throw new  CoolException("台机号不能为空!!");
                }
                BasDevice basDevice = basDeviceService.selectOne(new EntityWrapper<BasDevice>().eq("dev_no", orderDetl.getStandby1()));
                if (Objects.isNull(basDevice)) {
                    throw new CoolException("台机信息不存在!!");
                }
                List<LocAroundBind> binds = locAroundBindService.selectList(new EntityWrapper<LocAroundBind>().eq("dev_no", basDevice.getDevNo()));
                if (Objects.isNull(binds) || binds.isEmpty()) {
                    throw new CoolException("台机未绑定工作站台!!");
                }
                List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
                        orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
                for (LocDetl locDetl : locDetls) {
@@ -147,6 +131,27 @@
                if (issued <= 0.0D) {
                    continue;
                }
//                if (!Objects.isNull(orderDetl.getStandby1())) {
//                    BasDevice basDevice = basDeviceService.selectOne(new EntityWrapper<BasDevice>().eq("dev_no", orderDetl.getStandby1()));
//                    if (Objects.isNull(basDevice)) {
//                        throw new CoolException("机台信息不存在!!");
//                    }
//                    List<LocAroundBind> binds = locAroundBindService.selectList(new EntityWrapper<LocAroundBind>().eq("dev_no", basDevice.getDevNo()));
//                    if (Objects.isNull(binds) || binds.isEmpty()) {
//                        throw new CoolException("台机未绑定工作站台!!");
//                    }
//                    Set<String> locs = binds.stream().map(LocAroundBind::getBLocNo).collect(Collectors.toSet());
//
//                    List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
//                            .in("loc_no", locs)
//                            .eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type));
//
//
//                } else {
//
//                }
                List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
                        orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
                for (LocDetl locDetl : locDetls) {