自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
pjb
6 天以前 b5ca846c41affe2c41d719be38be326a1931b3de 
 src/main/java/com/zy/common/web/WcsController.java


@@ -8,7 +8,9 @@


import com.core.exception.CoolException;


import com.zy.asrs.entity.*;


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


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


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


import com.zy.asrs.mapper.BasCrnpMapper;


import com.zy.asrs.mapper.LocMastMapper;


import com.zy.asrs.mapper.WrkMastMapper;


import com.zy.asrs.service.*;


@@ -27,6 +29,7 @@




import javax.annotation.Resource;


import java.util.*;


import java.util.stream.Collectors;




/**


 * Created by vincent on 2020/10/30


@@ -67,6 +70,18 @@


    @Resource


    private WrkMastMapper wrkMastMapper;




    @Resource


    private BasCrnpMapper basCrnpMapper;




    public static final Map<Integer,ArrayList<Integer>> crnOutSite;




    static {


        crnOutSite = new HashMap<>();


        crnOutSite.put(1,new ArrayList<Integer>(){{add(1091);add(1092);add(1093);}});


        crnOutSite.put(2,new ArrayList<Integer>(){{add(1097);add(1098);add(1099);}});


        crnOutSite.put(3,new ArrayList<Integer>(){{add(1105);add(1106);add(1107);}});


    }




    @PostMapping("/pakin/loc/v1")


    @ResponseBody


    @Transactional


@@ -102,7 +117,7 @@


        if(param.getIoType() == 1) {


            List<SearchLocParam.WantBucket> wantBucketFlag = param.getWantBucketFlag();


            for(SearchLocParam.WantBucket wantBucket: wantBucketFlag) {


                if(wantBucket.getBucketType() != 0 && wantBucket.getBucketType() == param.getBucketType()) { // 罐装线有要桶信号并且当前桶是罐装线要的桶


                if(wantBucket.getBucketType() != 0 && wantBucket.getBucketType() == param.getBucketType() && wantBucket.getWantBucketCount() >= 1) { // 罐装线有要桶信号并且当前桶是罐装线要的桶


                    if(waitPakin == null) {


                        return R.error("入库通知档为空");


                    } else {


@@ -247,51 +262,52 @@


        StartupDto dto;




        // 判断贴标异常，复检重量异常的，不分配库位，去往异常口1090


//        if ( !param.isTbFlag() || !param.isReinspection()) {


//


//            // 生成工作档 ------------------------------------------------------


//            WrkMast wrkMast = new WrkMast();


//            wrkMast.setWrkNo(commonService.getWorkNo(0));


//            wrkMast.setIoTime(now);


//            wrkMast.setIoType(3); // 入出库类型3.站到站


//            wrkMast.setWrkSts(2L);


//            wrkMast.setIoPri(13D); // 优先级


////            wrkMast.setCrnNo(dto.getCrnNo());


//            wrkMast.setSourceStaNo(param.getSourceStaNo());


//            wrkMast.setStaNo(1090);


////            wrkMast.setLocNo(dto.getLocNo());


//            wrkMast.setBarcode(wrkMast1.getBarcode()); // 托盘码


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


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


////            wrkMast.setExitMk("N"); // 退出


////            wrkMast.setEmptyMk("N"); // 空板


////            wrkMast.setLinkMis("Y");


////            wrkMast.setCtnType(wrkMast1.getCtnType()); // 尾托标识


//            wrkMast.setPdcType(wrkMast1.getPdcType()); // 空桶类型


//            wrkMast.setAppeTime(now);


//            wrkMastService.insert(wrkMast);


//


//            // 生成工作档明细----------------------------------------------------


//            WrkDetl wrkDetl = new WrkDetl();


//            wrkDetl.sync(mat);


//            wrkDetl.setWrkNo(wrkMast.getWrkNo());


//            wrkDetl.setAnfme(wrkDetl1.getAnfme());


//            wrkDetl.setZpallet(wrkMast1.getBarcode());


//            wrkDetl.setBatch(param.getBatch());


//            wrkDetl.setManuDate(param.getManuDate());


//            wrkDetl.setWeight(param.getWeight());


//            wrkDetl.setManLength(param.getGrossWeight());


//            wrkDetl.setInspect(param.isTbFlag()?1:0); // 贴标成功


//            wrkDetl.setIoTime(now);


//            wrkDetl.setAppeTime(now);


//            wrkDetl.setModel(wrkDetl1.getMaktx()); // 保存空桶名称


//            wrkDetlService.insert(wrkDetl);


//


//            dto = new StartupDto();


//            dto.setWorkNo(wrkMast.getWrkNo());


//            dto.setSourceStaNo(wrkMast.getSourceStaNo());


//            dto.setStaNo(wrkMast.getStaNo());


//        } else


        if ( !param.isTbFlag() || !param.isReinspection()) {




            // 生成工作档 ------------------------------------------------------


            WrkMast wrkMast = new WrkMast();


            wrkMast.setWrkNo(commonService.getWorkNo(0));


            wrkMast.setIoTime(now);


            wrkMast.setIoType(3); // 入出库类型3.站到站


            wrkMast.setWrkSts(2L);


            wrkMast.setIoPri(13D); // 优先级


//            wrkMast.setCrnNo(dto.getCrnNo());


            wrkMast.setSourceStaNo(param.getSourceStaNo());


            wrkMast.setStaNo(1090);


            wrkMast.setLocNo(!param.isTbFlag() ? "贴标失败" : "复检重量异常");


            wrkMast.setBarcode(wrkMast1.getBarcode()); // 托盘码


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


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


//            wrkMast.setExitMk("N"); // 退出


//            wrkMast.setEmptyMk("N"); // 空板


//            wrkMast.setLinkMis("Y");


//            wrkMast.setCtnType(wrkMast1.getCtnType()); // 尾托标识


            wrkMast.setPdcType(wrkMast1.getPdcType()); // 空桶类型


            wrkMast.setAppeTime(now);


            wrkMastService.insert(wrkMast);




            // 生成工作档明细----------------------------------------------------


            WrkDetl wrkDetl = new WrkDetl();


            wrkDetl.sync(mat);


            wrkDetl.setWrkNo(wrkMast.getWrkNo());


            wrkDetl.setAnfme(wrkDetl1.getAnfme());


            wrkDetl.setZpallet(wrkMast1.getBarcode());


            wrkDetl.setBatch(param.getBatch());


            wrkDetl.setManuDate(param.getManuDate());


            wrkDetl.setWeight(param.getWeight());


            wrkDetl.setManLength(param.getGrossWeight());


            wrkDetl.setVolume(param.getCannedVolume()); // 罐装量


            wrkDetl.setInspect(param.isTbFlag()?1:0); // 贴标成功


            wrkDetl.setIoTime(now);


            wrkDetl.setAppeTime(now);


            wrkDetl.setModel(wrkDetl1.getMaktx()); // 保存空桶名称


            wrkDetlService.insert(wrkDetl);




            dto = new StartupDto();


            dto.setWorkNo(wrkMast.getWrkNo());


            dto.setSourceStaNo(wrkMast.getSourceStaNo());


            dto.setStaNo(wrkMast.getStaNo());


        } else


        if(fhFlag) { // 直接发货


            // 生成工作档 ------------------------------------------------------


            WrkMast wrkMast = new WrkMast();


@@ -325,6 +341,7 @@


            wrkDetl.setManuDate(param.getManuDate());


            wrkDetl.setWeight(param.getWeight());


            wrkDetl.setManLength(param.getGrossWeight());


            wrkDetl.setVolume(param.getCannedVolume()); // 罐装量


            wrkDetl.setInspect(1);


            wrkDetl.setIoTime(now);


            wrkDetl.setAppeTime(now);


@@ -378,6 +395,7 @@


                wrkDetl.setManuDate(param.getManuDate());


                wrkDetl.setWeight(param.getWeight());


                wrkDetl.setManLength(param.getGrossWeight());


                wrkDetl.setVolume(param.getCannedVolume());


                wrkDetl.setInspect(1); // 贴标成功


                wrkDetl.setIoTime(now);


                wrkDetl.setAppeTime(now);


@@ -446,14 +464,20 @@


        WrkMast wrkMast = wrkMastService.selectById(wrkNo);


        if (wrkMast == null) {


            throw new CoolException("异常口入库任务号无任务：" + wrkNo);


        } else if (wrkMast.getLocNo() != null) {


        } else if (wrkMast.getLocNo() != null && wrkMast.getLocNo().length() == 7) {


            throw new CoolException("异常口入库库位已分配：" + wrkMast.getLocNo());


        }




        if(!param.isTbFlag()) { //下线出库


            Config config = configService.selectConfigByCode("gzxfh" + wrkMast.getSourceStaNo());


            wrkMast.setSourceStaNo(1090);


            wrkMast.setStaNo(1024); // 异常下线默认入库站点为1016


            wrkMast.setStaNo(1024); // 异常下线默认入库站点为1024


            // 获取系统配置，看成品罐装完成是否直接出到发货口


            if (config != null && config.getStatus() == 1 && !Cools.isEmpty(config.getValue())) {


                wrkMast.setStaNo(Integer.parseInt(config.getValue()));


            }


            wrkMastService.updateById(wrkMast);


            log.info("WCS异常口入库接口返参:{},目标站点:{}", "下线出库", wrkMast.getStaNo());


            return R.ok();


        }




@@ -671,6 +695,15 @@


        return wrkMastService.insert(wrkMast) ? R.ok("自动空托入库成功,工作号:"+wrkMast.getWrkNo()) : R.error("生成自动空托入库失败");


    }




    // 自动出空桶


    @PostMapping("/autoOutEmptyBucket")


    @ResponseBody


    public R autoOutEmptyBucket(@RequestBody StockOutParam param){


        log.info("收到WCS自动出空桶接口请求====>>入参:{}", param);


        workService.startupFullTakeStore(param, 29L);


        return R.ok("出库启动成功");


    }




    @PostMapping("auto/emptyOut/v1")


    @ResponseBody


    public R autoEmptyOut(@RequestBody Map<String,String> emptyPalletSite){


@@ -679,18 +712,47 @@


        // 出库站点


        Integer site = Integer.valueOf(emptyPalletSite.get("site"));




        LocMast locMast;


        LocMast locMast = null;




        // 先找浅库位


        locMast = locMastMapper.queryLocMasterByLocStsAndRow(Arrays.asList(2, 3), type);


        List<BasCrnp> basCrnps = basCrnpMapper.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts", 3).eq("crn_err", 0).in("crn_no",1,2,3)


                .eq("out_enable","Y"));


        if (basCrnps.size() == 0) {


            log.error("空拖出库请求库位失败，没有联机堆垛机或堆垛机异常");


            throw new CoolException("空拖出库请求库位失败，没有联机堆垛机或堆垛机异常");


        }




        // 浅库位没有则查询所有


        if (locMast == null) {


            locMast = locMastMapper.queryLocMasterByLocStsAndRow(null, type);


        List<BasCrnp> basCrnpList = new ArrayList<>();


        for(BasCrnp basCrnp: basCrnps) {


            List<BasDevp> devps = basDevpService.selectList(new EntityWrapper<BasDevp>().in("dev_no", crnOutSite.get(basCrnp.getCrnNo())).ne("wrk_no", 0));


            long count = devps.stream().map(BasDevp::getWrkNo).distinct().count();


            basCrnp.setWrkNo(count + basCrnp.getWrkNo() >= 5001 && basCrnp.getWrkNo() <= 9000 ? 1 : 0);


            basCrnpList.add(basCrnp);


        }




        basCrnpList = basCrnpList.stream().sorted(Comparator.comparing(BasCrnp::getWrkNo).thenComparing(BasCrnp::getCrnNo,Comparator.reverseOrder())).collect(Collectors.toList());




        for(BasCrnp basCrnp:basCrnpList) {


            Integer crnNo = basCrnp.getCrnNo();


            Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>().eq("loc_sts", type)


                    .eq("crn_no", crnNo).orderBy("lev1").orderBy("bay1").orderBy("row1");


            if (crnNo == 1) {


                wrapper.in("row1", 1, 4);


            }


            locMast = locMastService.selectOne(wrapper);


            if (locMast != null) {


                break;


            }


            // 深库位没有了则获取一个浅库位


            if (crnNo == 1) {


                locMast = locMastService.selectOne(wrapper.in("row1", 2, 3));


                if (locMast != null) {


                    break;


                }


            }


        }




        if (locMast == null) {


            return R.error("库存没有"+type+"类型空托盘");


            return R.error("库存没有"+type+"类型空托盘或无可用堆垛机");


        }




        String locNo = locMast.getLocNo();


@@ -871,7 +933,7 @@


        wrkMast.setIoTime(new Date());


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


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


        wrkMast.setIoPri(13D); // 优先级


        wrkMast.setIoPri(14D); // 优先级


        wrkMast.setCrnNo(dto.getCrnNo());


        wrkMast.setSourceStaNo(dto.getSourceStaNo());


        wrkMast.setStaNo(dto.getStaNo());