Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

zyx

2023-12-22 9b3eeec64465760a4f351f63335f6693c30dda73

Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -284,6 +284,7 @@
            }
        }

        ArrayList<String> outerLocs = new ArrayList<>();
        //检测是否为浅库位
        boolean sign=false;
        String th = "";
@@ -301,17 +302,32 @@
                    LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", outerLoc));
                    if (locMast != null) {
                        if (!locMast.getLocSts().equals("O") && !locMast.getLocSts().equals("R")) {
                            sign = true;
                            th = "库位号：" + locNo + " 浅库位有非空库位！";
                            break;
//                            sign = true;
//                            th = "库位号：" + locNo + " 浅库位有非空库位！";
//                            break;

                            OutLocDto outLocDto = new OutLocDto();
                            outLocDto.setLocNo(locMast.getLocNo());
                            List<LocDetlDto> locDetlDtos1 = new ArrayList<>();
                            for (LocDetl locDetl : locDetlService.selectByLocNo(locMast.getLocNo())) {
                                LocDetlDto locDetlDto = new LocDetlDto();
                                locDetlDto.setLocDetl(locDetl);
                                locDetlDto.setCount(locDetl.getAnfme());
                                locDetlDtos1.add(locDetlDto);
                            }
                            outLocDto.setLocDetlDtos(locDetlDtos1);
                            if (!outerLocs.contains(locMast.getLocNo())) {
                                dtos.add(outLocDto);
                                outerLocs.add(locMast.getLocNo());
                        }
                    }
                }
            }
        }
        if (sign){
            throw new CoolException("出库失败；"+th);
        }
//        if (sign){
//            throw new CoolException("出库失败；"+th);
//        }

        //**************325、331、333、339站点额外逻辑代码**************
        HashMap<String, Object> tmpMap = new HashMap<>();

 src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java

@@ -46,31 +46,21 @@
        if (Cools.isEmpty(ioType, locNo)) {
            return 100.0D;
        }
        if (ioType != 11) {
            // 入库
            if (ioType < 100) {
                List<String> groupInnerLoc = Utils.getGroupInnerLoc(locNo);
                if (!Cools.isEmpty(groupInnerLoc)) {
                    for (String innerLoc : groupInnerLoc) {
                        WrkMast wrkMast = this.baseMapper.selectByLocNoOfPakin(innerLoc);
                        if (wrkMast != null) {
                            defaultIoPri = wrkMast.getIoPri() - 2;
        int row = Utils.getRow(locNo);
        if (row == 6) {
            return 101D;
                        }

        if (row == 13) {
            return 103D;
                    }
        if (row == 14) {
            return 102D;
                }
            // 出库
            } else {
                List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo);
                if (!Cools.isEmpty(groupOuterLoc)) {
                    for (String outerLoc : groupOuterLoc) {
                        WrkMast wrkMast = this.baseMapper.selectBySourceLocNoOfPakout(outerLoc);
                        if (wrkMast != null) {
                            defaultIoPri = wrkMast.getIoPri() - 2;
        if (row == 15) {
            return 101D;
                        }
                    }
                }
            }
        }

        return defaultIoPri == null ? 100.0D : defaultIoPri;
    }


 src/main/java/com/zy/common/web/WcsController.java

@@ -5,6 +5,7 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.CodeRes;
@@ -56,6 +57,10 @@
    private AgvBasDevpService agvBasDevpService;
    @Autowired
    private AgvWrkMastService agvWrkMastService;
    @Autowired
    private WrkMastMapper wrkMastMapper;
    @Autowired
    private WrkMastLogService wrkMastLogService;
//    @Autowired
//    private ErpService erpService;

@@ -423,6 +428,11 @@
            throw new CoolException(dto.getLocNo() + "目标库位已被占用");
        }

        // 保存工作主档历史档
        if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
            throw new CoolException(wrkMast.getWrkNo() + "保存工作主档历史档失败");
        }

        //获取回库提升机目标站
        Integer staNo = liftNo * 100 + locMast.getLev1();
        // 更新工作档数据状态
@@ -434,7 +444,7 @@
        wrkMast.setShuttleNo(null); // 穿梭车清空
        wrkMast.setLiftNo(null);// 提升机清空
        wrkMast.setModiTime(new Date());
        if (wrkMastService.updateById(wrkMast)) {
        if (!wrkMastService.updateById(wrkMast)) {
            throw new CoolException(wrkMast.getWrkNo() + "更新工作档数据状态失败");
        }

@@ -495,6 +505,11 @@
            throw new CoolException("源库位状态异常");
        }

        // 保存工作主档历史档
        if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
            throw new CoolException(wrkMast.getWrkNo() + "保存工作主档历史档失败");
        }

        //获取回库提升机目标站
        Integer staNo = liftNo * 100 + locMast1.getLev1();

@@ -507,7 +522,7 @@
        wrkMast.setShuttleNo(null); // 穿梭车清空
        wrkMast.setLiftNo(null);// 提升机清空
        wrkMast.setModiTime(new Date());
        if (wrkMastService.updateById(wrkMast)) {
        if (!wrkMastService.updateById(wrkMast)) {
            throw new CoolException(wrkMast.getWrkNo() + "更新工作档数据状态失败");
        }