#

whycq

2025-01-02 5317c6f53f6997e42e5bb9b72da4d8bbd6df9715

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

@@ -89,8 +89,13 @@
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getDevpNo(), true);
        // 检索库位
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);

        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("source_sta_no", param.getDevpNo()));
        if (!wrkMasts.isEmpty()) {
            throw new CoolException("已有任务");
        }
        List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs, locTypeDto, 0);
        StartupDto dto = commonService.getLocNo(2, 1, param.getDevpNo(), null,null,null,0, locTypeDto,0);
        // 生成工作号
        int workNo = dto.getWorkNo();
        // 生成工作档
@@ -374,7 +379,7 @@
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null, locTypeDto, 0);
        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null,null,null,0, locTypeDto,0);
        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档
@@ -490,9 +495,6 @@
    @Transactional
    public WrkMast emptyPlateOut(EmptyPlateOutParam param) {
        WrkMast wrkMast = new WrkMast();
        if (Cools.isEmpty(param.getOutSite())) {
            throw new CoolException("站点不存在");
        }
        for (String locNo : param.getLocNos()) {
            // 获取工作号
            int workNo = commonService.getWorkNo(0);
@@ -504,8 +506,8 @@
            // 获取源站
            Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                    .eq("type_no", 110)
                    .eq("stn_no", param.getOutSite())
                    .eq("crn_no", locMast.getCrnNo());
                    .eq("crn_no", locMast.getCrnNo())
                    .eq("stn_no",param.getOutSite());
            StaDesc staDesc = staDescService.selectOne(wrapper);
            Integer sourceStaNo = staDesc.getCrnStn();
            if (Cools.isEmpty(sourceStaNo)) {
@@ -520,7 +522,7 @@
            wrkMast.setIoType(110); // 入出库状态： 110.空板出库
            wrkMast.setIoPri(10D);
            wrkMast.setSourceStaNo(sourceStaNo); // 源站
            wrkMast.setStaNo(param.getOutSite()); // 目标站
            wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
            wrkMast.setCrnNo(locMast.getCrnNo());
            wrkMast.setSourceLocNo(locNo); // 源库位
            wrkMast.setFullPlt("N"); // 满板：Y
@@ -624,6 +626,8 @@
            wrkDetl.setAppeUser(userId);
            wrkDetl.setModiTime(now);
            wrkDetl.setModiUser(userId);
            wrkDetl.setOwner(locDetl.getOwner());
            wrkDetl.setPayment(locDetl.getPayment());
            if (!wrkDetlService.insert(wrkDetl)) {
                throw new CoolException("保存工作档明细失败");
            }
@@ -809,6 +813,12 @@
        WrkMast wrkMast = wrkMastService.selectById(workNo);
        if (Cools.isEmpty(wrkMast)){
            throw new CoolException(workNo+"工作档不存在");
        }
        if (wrkMast.getIoType() == 1 && (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 5)){
            throw new CoolException(workNo+"不可取消");
        }
        if (wrkMast.getIoType() == 101 && (wrkMast.getWrkSts() == 14 || wrkMast.getWrkSts() == 15)){
            throw new CoolException(workNo+"不可取消");
        }
        String locNo = ""; // 待修改目标库位
        String locSts = ""; // 待修改目标库位状态
@@ -1043,14 +1053,14 @@
                Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
                targetLoc = locMastService.queryFreeLocMast(deepRow, locMast.getLocType1());
                // 因库位移转、需预留空库位
                if (!locMastService.checkEmptyCount(targetLoc)) {
                if (!locMastService.checkEmptyCount(targetLoc,10)) {
                    continue;
                }
            }
            if (Cools.isEmpty(targetLoc)) {
                targetLoc = locMastService.queryFreeLocMast(curRow, locMast.getLocType1());
                // 因库位移转、需预留空库位
                if (!locMastService.checkEmptyCount(targetLoc)) {
                if (!locMastService.checkEmptyCount(targetLoc,10)) {
                    continue;
                }
                // 目标库位 ===>> 浅库位， 则校验其深库位是否为 F D X
@@ -1129,9 +1139,9 @@
            String[][] locNos2 =new String[param.getLocDetls().size()][2];
            int i=0;
            for (EmptyPlateOutParam.LocDetl locDetl : param.getLocDetls()){
                if (!locNos.contains(locDetl.getLocNo())){
                    locNos.add(locDetl.getLocNo());
                    locNos2[i][0]=locDetl.getLocNo();
                if (!locNos.contains(locDetl.getLoc_no())){
                    locNos.add(locDetl.getLoc_no());
                    locNos2[i][0]=locDetl.getLoc_no();
                    locNos2[i][1]=locDetl.getManu();
                    i++;
                }
@@ -1186,6 +1196,10 @@
    @Override
    @Transactional
    public void turnOverOutPayment(EmptyPlateOutParam param, Long userId) {
        if (Cools.isEmpty(param.getPayment())){
            throw new CoolException("请选择目标货物形态");
        }
        log.info("更新货物形态：目标货物形态："+param.getPayment$(param.getPayment())+";更改货物信息："+param.getLocDetls());
        try {
            if (param.getLocDetls().size()<=0){
                throw new CoolException("请提取明细");
@@ -1194,15 +1208,10 @@
            String[][] locNos2 =new String[param.getLocDetls().size()][2];
            int i=0;
            for (EmptyPlateOutParam.LocDetl locDetl : param.getLocDetls()){
                if (!locNos.contains(locDetl.getLocNo())){
                    locNos.add(locDetl.getLocNo());
                    locNos2[i][0]=locDetl.getLocNo();
                    if (locDetl.getLocNo().substring(0,2) == "DT"){
                        locNos2[i][1]= "平库";
                    }else {
                        locNos2[i][1]= "立库";
                    }

                if (!locNos.contains(locDetl.getLoc_no())){
                    locNos.add(locDetl.getLoc_no());
                    locNos2[i][0]=locDetl.getLoc_no();
                    locNos2[i][1]=locDetl.getManu();
                    i++;
                }
            }
@@ -1211,7 +1220,7 @@
                if (locNo1[1].equals("平库")){
                    List<ManLocDetl> manLocDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("loc_no", locNo));
                    for (ManLocDetl manLocDetl:manLocDetls){
                        manLocDetl.setPayment(1);
                        manLocDetl.setPayment(param.getPayment());
                        try{
                            manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("matnr",manLocDetl.getMatnr()));
                        }catch (Exception e){
@@ -1221,7 +1230,7 @@
                }else if (locNo1[1].equals("立库")){
                    List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
                    for (LocDetl locDetl:locDetls){
                        locDetl.setPayment(1);
                        locDetl.setPayment(param.getPayment());
                        try{
                            locDetlService.update(locDetl,new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("matnr",locDetl.getMatnr()));
                        }catch (Exception e){