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


@@ -29,6 +29,9 @@


import com.zy.common.properties.SlaveProperties;


import com.zy.common.service.CommonService;


import com.zy.common.utils.HttpHandler;


import com.zy.system.entity.Config;


import com.zy.system.service.ConfigService;


import com.zy.system.service.impl.ConfigServiceImpl;


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


@@ -133,6 +136,8 @@


    private BasStationDetlService basStationDetlService;


    @Autowired


    private WorkService workService;


    @Autowired


    private ConfigService configService;




    @Override


    @Transactional


@@ -173,7 +178,9 @@


        wrkMastService.insert(wrkMast);




        for (OrderDetl orderDetl : param.getCombMats()) {


            Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", orderDetl.getMatnr()));


            Mat mat = matService.selectOne(new EntityWrapper<Mat>()


                    .eq("supp_code", orderDetl.getStandby1())


                    .eq("matnr", orderDetl.getMatnr()));


            if (mat == null) {


                throw new CoolException("保存工作档失败，物料信息不存在：" + orderDetl.getMatnr());


            }


@@ -372,6 +379,7 @@


        for (CombParam.CombMat combMat : combParam.getCombMats()) {


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


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


                    .eq(!Cools.isEmpty(combMat.getStandby1()), "supp_code", combMat.getStandby1())


                    .eq("matnr", combMat.getMatnr()));


            if (locDetlList.isEmpty()) {


                return R.error("未查询到库存数据");


@@ -446,7 +454,9 @@


                wrkMast.setModiUser(userId);


                wrkMastService.insert(wrkMast);




                Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", combMat.getMatnr()));


                Mat mat = matService.selectOne(new EntityWrapper<Mat>()


                        .eq(!Cools.isEmpty(combMat.getStandby1()), "supp_code", combMat.getStandby1())


                        .eq("matnr", combMat.getMatnr()));


                if (mat == null) {


                    throw new CoolException("保存工作档失败，物料信息不存在：" + combMat.getMatnr());


                }


@@ -627,7 +637,7 @@


        // 无单组托


        if (Cools.isEmpty(param.getOrderNo())) {


            //空板组托


            if (param.getPakinType().equals("3")) {


            if (!Cools.isEmpty(param.getPakinType()) && param.getPakinType().equals("3")) {


                WaitPakin waitPakin = new WaitPakin();


                waitPakin.setZpallet(param.getBarcode());


                waitPakin.setIoStatus("N");


@@ -708,6 +718,7 @@


                // elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3());


                OrderDetlPakin detls = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>()


                        .eq("order_id", order.getId())


                        .eq("supp_code", elem.getStandby1())


                        .eq("matnr", elem.getMatnr()));


                if (Objects.isNull(elem.getBoxType1())) {


                    throw new CoolException("格层编码不能为空！！");


@@ -738,9 +749,16 @@


                }


            });




            Set<String> matnrs = detlDtos.stream().map(DetlDto::getMatnr).collect(Collectors.toSet());


            List<Mat> mats = matService.selectList(new EntityWrapper<Mat>().in("matnr", matnrs));


            Set<Long> tagIds = mats.stream().map(Mat::getTagId).collect(Collectors.toSet());


            List<Mat> tempMats = new ArrayList<>();


            for (DetlDto detlDto : detlDtos) {


                Mat mat = matService.selectOne(new EntityWrapper<Mat>()


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


                        .eq("supp_code", detlDto.getStandby1()));


                tempMats.add(mat);


            }




//            Set<String> matnrs = tempMats.stream().map(Mat::getMatnr).collect(Collectors.toSet());


            Set<Long> tagIds = tempMats.stream().map(Mat::getTagId).collect(Collectors.toSet());


            if (tagIds.size() > 1) {


                throw new CoolException("组托物料类型不一致，只有相同的物料分类才可以组托！！");


            }


@@ -1186,6 +1204,7 @@


                orderDetl.setUpdateBy(userId);


                orderDetl.setUpdateTime(now);


                Wrapper wrapper = new EntityWrapper<OrderDetl>().eq("order_no", orderNo)


                        .eq(!Cools.isEmpty(orderDetl.getStandby1()), "supp_code", orderDetl.getStandby1())


                        .eq("matnr", orderDetl.getMatnr());


                if (!Cools.isEmpty(orderDetl.getBatch())) {


                    wrapper.eq("batch", orderDetl.getBatch());


@@ -1303,7 +1322,6 @@


                .eq("area_id", basAreas.getId())


                .eq("frozen", 0)


                .eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type)


                // .eq("loc_no", params.getTarSite())


                .orderAsc(Arrays.asList("loc_no"))


                .last("OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY"));


        if (Objects.isNull(locCache)) {


@@ -1330,18 +1348,12 @@


        if (Objects.isNull(params)) {


            throw new CoolException("参数不能为空！！");


        }


        if (Objects.isNull(params.getOrderNo())) {


            throw new CoolException("单号不能为空！！");


        }


        OrderPakin orderPakin = orderPakinService


                .selectOne(new EntityWrapper<OrderPakin>().eq("order_no", params.getOrderNo()));


        if (Objects.isNull(orderPakin)) {


            throw new CoolException("数据错误：单据不存在！！");


        }




        List<OrderDetlPakin> detlPakins = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>()


                .eq(!Cools.isEmpty(params.getThreeCode()), "three_code", params.getThreeCode())


                .eq(!Cools.isEmpty(params.getMatnr()), "matnr", params.getMatnr())


                .eq("order_id", orderPakin.getId()));


                        .eq(!Cools.isEmpty(params.getThreeCode()), "three_code", params.getThreeCode())


//                .eq(!Cools.isEmpty(params.getMatnr()), "matnr", params.getMatnr())


//                .eq(!Cools.isEmpty(params.getOrderNo()), "order_no", params.getOrderNo())


        );


        if (Objects.isNull(detlPakins) || detlPakins.isEmpty()) {


            throw new CoolException("数据错误： 单据明细不存在！！");


        }


@@ -1681,9 +1693,13 @@


        if (container.getMixMax() < detlDtos.size()) {


            throw new CoolException("超出容器最大混装数量，当前容器最大数量为：" + container.getMixMax() + "!!");


        }


        Set<String> matnrs = detlDtos.stream().map(DetlDto::getMatnr).collect(Collectors.toSet());


        List<Mat> mats = matService.selectList(new EntityWrapper<Mat>().in("matnr", matnrs));


        Set<Long> tagIds = mats.stream().map(Mat::getTagId).collect(Collectors.toSet());


        List<Mat> tempMats = new ArrayList<>();


        for (DetlDto detlDto : detlDtos) {


            Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", detlDto.getMatnr())


                    .eq("supp_code", detlDto.getStandby1()));


            tempMats.add(mat);


        }


        Set<Long> tagIds = tempMats.stream().map(Mat::getTagId).collect(Collectors.toSet());


        if (tagIds.size() > 1) {


            throw new CoolException("组托物料类型不一致，只有相同的物料分类才可以组托！！");


        }


@@ -1895,7 +1911,7 @@


                    .eq("dev_no", basStation.getDevNo())


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


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


                    .eq("standby1", combMat.getStandby1()));


                    .eq(!Cools.isEmpty(combMat.getStandby1()), "standby1", combMat.getStandby1()));


            if (Cools.isEmpty(basStationDetl)) {


                basStationDetl = new BasStationDetl();


                Mat mat = matService.selectByMatnr(combMat.getMatnr());


@@ -1936,8 +1952,8 @@


        OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>()


                .eq("order_id", orderPakin.getId())


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


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


                .eq("standby1", combMat.getStandby1()));


                .eq(!Cools.isEmpty(combMat.getBatch()),"batch", combMat.getBatch())


                .eq(!Cools.isEmpty(combMat.getStandby1()), "supp_code", combMat.getStandby1()));


        if (Cools.isEmpty(orderDetlPakin)) {


            throw new CoolException("检索单据明细数据失败");


        }


@@ -2119,6 +2135,7 @@


        // 更新入库通知档 ioStatus ===>> Y


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


                .eq("zpallet", pakin.getZpallet());




        WaitPakin setParam = new WaitPakin();


        setParam.setLocNo(locNo);


        setParam.setIoStatus("Y");


@@ -2227,7 +2244,9 @@


                        if (container.getMixMax() > sets.size()) {


                            //余下可混放种类


                            long suplus = Math.round((container.getMixMax() - sets.size()) * 10000) / 10000;


                            Mat mats = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", matnr));


                            Mat mats = matService.selectOne(new EntityWrapper<Mat>()


                                    .eq("supp_code", supId)


                                    .eq("matnr", matnr));


                            if (Objects.isNull(mats)) {


                                throw new CoolException("物料不存在！！");


                            }


@@ -2247,11 +2266,9 @@


            });


        });




        // 判断根据分拣出库后,还需要出多少托盘或料箱;如果余料大于0, 出新托盘或料箱


        if (totalOut.get().compareTo(0.0) > 0) {


            generateTask(locMasts, TaskIOType.MERGE_OUT.type, basDevp, userId, station);


            //TODO 细化区分，当前出库托盘是满足拣货数量


        } else {


        /**是否优先空板出库*/


        Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "OutStockOrderByEmpty"));


        if (!Objects.isNull(config) && Boolean.parseBoolean(config.getValue())) {


            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()


                    // todo 根据物料种类,区分库区类型


                    .eq("loc_sts", LocStsType.LOC_STS_TYPE_D.type)


@@ -2261,12 +2278,32 @@


            if (Objects.isNull(locMast)) {


                throw new CoolException("未查询到可用的空板信息！！");


            }




            CrnTaskDetlDTO crnTaskDetlDTO = new CrnTaskDetlDTO().setLocNo(locMast.getLocNo()).setLocDetlList(locDetls);


            locMasts.add(crnTaskDetlDTO);




            // 空板出库


            generateTask(locMasts, TaskIOType.MERGE_OUT.type, basDevp, userId, station);


        } else {


            // 判断根据分拣出库后,还需要出多少托盘或料箱;如果余料大于0, 出新托盘或料箱


            if (totalOut.get().compareTo(0.0) > 0) {


                generateTask(locMasts, TaskIOType.MERGE_OUT.type, basDevp, userId, station);


                //TODO 细化区分，当前出库托盘是满足拣货数量


            } else {


                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()


                        // todo 根据物料种类,区分库区类型


                        .eq("loc_sts", LocStsType.LOC_STS_TYPE_D.type)


                        .orderAsc(Arrays.asList("row1", "bay1", "lev1"))


                        .last("OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY"));




                if (Objects.isNull(locMast)) {


                    throw new CoolException("未查询到可用的空板信息！！");


                }


                CrnTaskDetlDTO crnTaskDetlDTO = new CrnTaskDetlDTO().setLocNo(locMast.getLocNo()).setLocDetlList(locDetls);


                locMasts.add(crnTaskDetlDTO);




                // 空板出库


                generateTask(locMasts, TaskIOType.MERGE_OUT.type, basDevp, userId, station);


            }


        }


    }




@@ -2503,7 +2540,6 @@


                if (!taskDetlService.insert(wrkDetl)) {


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


                }




            }




            for (WaitPakin pakin : pakins) {


@@ -2648,7 +2684,7 @@


    @Override


    @Transactional(rollbackFor = Exception.class)


    public R taskMove(CompleteParam combParam, long userId) {


        if (Objects.isNull(combParam.getWorkNo())) {


        if (Objects.isNull(combParam.getTaskNo())) {


            return R.error("任务号不能为空");


        }


        if (Objects.isNull(combParam.getSourceLocNo())) {


@@ -2657,26 +2693,33 @@


        if (Objects.isNull(combParam.getLocNo())) {


            return R.error("目标库位不能为空！");


        }


        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", combParam.getWorkNo()));


        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", combParam.getTaskNo()));


        if (Objects.isNull(wrkMast)) {


            return R.error("任务档不存在！！");


        }






        String body = JSON.toJSONString(combParam);


        boolean success = false;


        String response = "";


        try {


            response = new HttpHandler.Builder()


                    .setUri(HIKApiConstant.AGV_IP)


                    .setUri(MesConstant.WCS_URL)


                    .setPath(MesConstant.MOVE_LOC_TASK)


                    .setJson(body)


                    .build()


                    .doPost();


            JSONObject jsonObject = JSON.parseObject(response);


            if (jsonObject.getInteger("code").equals(200)) {


                wrkMast.setWrkSts(12L);


                wrkMast.setWrkSts(2L);


                if (!wrkMastService.updateById(wrkMast)) {


                    throw new CoolException("任务状态更新失败！！");


                }


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


                if (!Objects.isNull(locMast)) {


                    locMast.setMoveStatus(1);


                    locMastService.updateById(locMast);


                }


                success = true;


            } else {


                log.error("发送agv任务失败！！！url：{}；request：{}；response：{}", MesConstant.WCS_URL + MesConstant.MOVE_LOC_TASK, body, response);