自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
skyouc
1 天以前 8ed084555bb336cb7366611f4e9f0c95ad003073 
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java


@@ -5,20 +5,19 @@


import com.core.common.BaseRes;


import com.core.common.Cools;


import com.core.common.DateUtils;


import com.core.common.SnowflakeIdWorker;


import com.core.exception.CoolException;


import com.zy.asrs.entity.*;


import com.zy.asrs.entity.param.EmptyPlateOutParam;


import com.zy.asrs.entity.param.FullStoreParam;


import com.zy.asrs.entity.param.LocDetlAdjustParam;


import com.zy.asrs.entity.param.StockOutParam;


import com.zy.asrs.enums.LocAreaType;


import com.zy.asrs.mapper.LocMastMapper;


import com.zy.asrs.entity.result.FindLocNoAttributeVo;


import com.zy.asrs.service.*;


import com.zy.asrs.utils.OrderInAndOutUtil;


import com.zy.asrs.utils.Utils;


import com.zy.common.model.*;


import com.zy.common.model.enumUtils.OrderEnumVo;


import com.zy.common.model.enums.IoWorkType;


import com.zy.common.model.enums.WorkNoType;


import com.zy.common.properties.SlaveProperties;


@@ -99,6 +98,12 @@


    private TaskService taskService;


    @Autowired


    private TaskDetlService taskDetlService;


    @Autowired


    private BasStationService basStationService;


    @Autowired


    private BasStationDetlService basStationDetlService;


    @Autowired


    private BasAreasService basAreasService;




    @Override


    @Transactional


@@ -115,7 +120,7 @@


//        List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());


//        List<String> batchs = param.getList().stream().map(FullStoreParam.MatCodeStore::getBatch).distinct().collect(Collectors.toList());


        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(param.getList().get(0));


        StartupDto dto = commonService.getLocNo(1, param.getDevpNo(), findLocNoAttributeVo, locTypeDto);


        StartupDto dto = commonService.getLocNo(1, param.getDevpNo(), sourceStaNo.getDevNo(), findLocNoAttributeVo, locTypeDto);


        if (Cools.isEmpty(dto)) {


            throw new CoolException("查询库位失败！！==》startupFullPutStore ==》 commonService.getLocNo");


        }


@@ -418,7 +423,7 @@


                            .eq("loc_no", locDto.getLocNo())


                            .eq("matnr", locDto.getMatnr())


                            .eq("batch", locDto.getBatch())


                            .eq("standby1",locDto.getStandby2())


                            .eq("standby1",locDto.getStandby1())


                    ).getDiffQty().compareTo(BigDecimal.ZERO) == 0


            );


            if (!DiffQty){


@@ -459,7 +464,7 @@


            }


//            OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());


            OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.FALSE, locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getBrand()


                    , locDto.getStandby1(), locDto.getStandby2(), locDto.getStandby3(), locDto.getBoxType1(), locDto.getBoxType2(), locDto.getBoxType3());


                    , locDto.getStandby1(), locDto.getStandby2(), locDto.getStandby3(), "1", locDto.getBoxType2(), locDto.getBoxType3());


//            if (orderDetl == null) {


////                orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);


//                orderDetl = OrderInAndOutUtil.selectItem(Boolean.FALSE, locDto.getOrderNo(), locDto.getMatnr(), null);


@@ -487,7 +492,7 @@


//            orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);


            OrderInAndOutUtil.increaseWorkQty(Boolean.FALSE, orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(),


                    orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),


                    orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3()


                    "1", orderDetl.getBoxType2(), orderDetl.getBoxType3()


                    , locDto.getAnfme());


            OrderInAndOutUtil.updateOrder(Boolean.FALSE, orderDetl.getOrderId(), 2L, userId);


        }


@@ -672,7 +677,7 @@


//            orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);


            OrderInAndOutUtil.increaseWorkQty(Boolean.FALSE, orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(),


                    orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),


                    orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3()


                    "1", orderDetl.getBoxType2(), orderDetl.getBoxType3()


                    , locDto.getAnfme());


            OrderInAndOutUtil.updateOrder(Boolean.FALSE, orderDetl.getOrderId(), 2L, userId);


        }


@@ -699,7 +704,7 @@


        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);


        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();




        StartupDto dto = commonService.getLocNo(10, devpNo, findLocNoAttributeVo, locTypeDto);


        StartupDto dto = commonService.getLocNo(10, devpNo, sourceStaNo.getDevNo(), findLocNoAttributeVo, locTypeDto);


        int workNo = dto.getWorkNo();


        Date now = new Date();


        // 生成工作档


@@ -775,15 +780,15 @@


                throw new CoolException("所选库位存在状态不为D的库位，库位号：" + locMast.getLocNo() + " 、当前状态：" + locMast.getLocSts() + "-" + locMast.getLocSts$());


            }


            // 获取源站


            Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()


                    .eq("type_no", 110)


                    .eq("stn_no", param.getOutSite())


                    .eq("crn_no", locMast.getCrnNo());


            StaDesc staDesc = staDescService.selectOne(wrapper);


            Integer sourceStaNo = staDesc.getCrnStn();


            if (Cools.isEmpty(sourceStaNo)) {


                throw new CoolException("检索源站失败");


            }


//            Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()


//                    .eq("type_no", 110)


//                    .eq("stn_no", param.getOutSite())


//                    .eq("crn_no", locMast.getCrnNo());


//            StaDesc staDesc = staDescService.selectOne(wrapper);


//            Integer sourceStaNo = staDesc.getCrnStn();


//            if (Cools.isEmpty(sourceStaNo)) {


//                throw new CoolException("检索源站失败");


//            }


            Date now = new Date();


            // 保存工作档


            WrkMast wrkMast = new WrkMast();


@@ -792,9 +797,10 @@


            wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID


            wrkMast.setIoType(110); // 入出库状态： 110.空板出库


            wrkMast.setIoPri(10D);


            wrkMast.setSourceStaNo(sourceStaNo + ""); // 源站


//            wrkMast.setSourceStaNo(sourceStaNo + ""); // 源站


            wrkMast.setStaNo(param.getOutSite() + ""); // 目标站


            wrkMast.setCrnNo(locMast.getCrnNo());


            wrkMast.setBarcode(locMast.getBarcode());


            wrkMast.setSourceLocNo(locNo); // 源库位


            wrkMast.setFullPlt("N"); // 满板：Y


            wrkMast.setPicking("N"); // 拣料


@@ -1457,6 +1463,10 @@


        if (Cools.isEmpty(wrkMast)) {


            throw new CoolException(workNo + "工作档不存在");


        }


        BasAreas basAreas = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("whs_type_id", LocAreaType.LOC_AREA_TYPE_CRN.type));


        if (Objects.isNull(basAreas)) {


            throw new CoolException("数据错误，库区不存在！！");


        }


        // 入出库类型判断


        if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107) {


            throw new CoolException("当前入出库类型无法进行操作");


@@ -1465,6 +1475,7 @@


        if (wrkMast.getWrkSts() < 11 || wrkMast.getWrkSts() == 15) {


            throw new CoolException("当前工作状态无法进行操作");


        }




        // 保存工作明细档历史档


//        if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {


//            throw new CoolException("保存工作明细档历史档失败");


@@ -1474,22 +1485,22 @@


            throw new CoolException("保存工作主档历史档失败");


        }


        // 获取目标站


        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()


                .eq("type_no", wrkMast.getIoType() - 50)


                .eq("stn_no", wrkMast.getStaNo()) // 作业站点 = 拣料出库的目标站


                .eq("crn_no", wrkMast.getCrnNo()); // 堆垛机号


        StaDesc staDesc = staDescService.selectOne(wrapper);


        if (Cools.isEmpty(staDesc)) {


            throw new CoolException("入库路径不存在");


        }


//        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()


//                .eq("type_no", wrkMast.getIoType() - 50)


//                .eq("stn_no", wrkMast.getStaNo()) // 作业站点 = 拣料出库的目标站


//                .eq("crn_no", wrkMast.getCrnNo()); // 堆垛机号


//        StaDesc staDesc = staDescService.selectOne(wrapper);


//        if (Cools.isEmpty(staDesc)) {


//            throw new CoolException("入库路径不存在");


//        }


        Date now = new Date();


        // 堆垛机站点(目标站)


        Integer staNo = staDesc.getCrnStn();


//        Integer staNo = staDesc.getCrnStn();


        // 更新工作档数据状态


        wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57


        wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走


        wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 源站


        wrkMast.setStaNo(staNo + ""); // 目标站


//        wrkMast.setStaNo(staNo + ""); // 目标站


        wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 目标库位 = 出库时的源库位


        wrkMast.setSourceLocNo(""); // 源库位清空


        wrkMast.setModiTime(now);


@@ -1498,13 +1509,48 @@


            throw new CoolException("更新工作档数据状态失败");


        }


        // 修改库位状态 Q.拣料/盘点/并板再入库


        LocMast locMast = locMastService.selectById(wrkMast.getLocNo());


        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));


        if (Cools.isEmpty(locMast)) {


            throw new CoolException("库位不存在:" + wrkMast.getLocNo());


        }


        locMast.setLocSts("Q");


        locMast.setAreaId(basAreas.getId());


        locMast.setAreaName(basAreas.getName());


        locMast.setBarcode(locMast.getBarcode());


        locMast.setModiTime(now);


        locMast.setModiUser(userId);


        if (!locMastService.updateById(locMast)) {


            throw new CoolException("修改库位状态失败");


        }




        // .修改并托入库明细托码


        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()


                        .eq("area_id", locMast.getAreaId())


                .eq("loc_no", locMast.getLocNo()));


        if (!Objects.isNull(locDetls) && !locDetls.isEmpty()) {


            locDetls.forEach(locDetl -> {


                locDetl.setZpallet(locMast.getBarcode());


                locDetl.setBarcode(locMast.getBarcode());


                if (!locDetlService.updateById(locDetl)) {


                    throw new CoolException("库存明细修改失败！！");


                }


            });


        }




        // .修改任务档明细托盘码


        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));


        if (!Objects.isNull(wrkDetls) && !wrkDetls.isEmpty()) {


            for (WrkDetl wrkDetl : wrkDetls) {


                wrkDetl.setZpallet(wrkMast.getBarcode());


                wrkDetl.setBarcode(wrkMast.getBarcode());


                if (!wrkDetlService.update(wrkDetl, new EntityWrapper<WrkDetl>()


                                .eq("matnr", wrkDetl.getMatnr())


                                .eq("standby1", wrkDetl.getStandby1())


                        .eq("wrk_no", wrkMast.getWrkNo()))) {


                    throw new CoolException("任务档明细修改失败！！");


                }


            }


        }


    }




    @Override