自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
#
DELL
2022-05-06 b43d307ac60607bcc556ca52c54cee0176b66273 
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java


@@ -12,15 +12,19 @@


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


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


import com.zy.asrs.service.*;


import com.zy.asrs.utils.Utils;


import com.zy.asrs.utils.VersionUtils;


import com.zy.common.model.LocDetlDto;


import com.zy.common.model.LocTypeDto;


import com.zy.common.model.OutLocDto;


import com.zy.common.model.StartupDto;


import com.zy.common.properties.SlaveProperties;


import com.zy.common.service.CommonService;


import com.zy.ints.entity.WaitMatchk;


import com.zy.ints.service.IoCompleteService;


import com.zy.ints.service.WaitMatchkLogService;


import com.zy.ints.service.WaitMatchkService;


import lombok.extern.slf4j.Slf4j;


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


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


@@ -33,6 +37,7 @@


/**


 * Created by vincent on 2020/6/11


 */


@Slf4j


@Service


public class WorkServiceImpl implements WorkService {


    static int i =1;


@@ -67,10 +72,15 @@


    @Autowired


    private WaitMatchkService waitMatchkService;


    @Autowired


    private WaitMatchkLogService waitMatchkLogService;


    @Autowired


    private IoCompleteService ioCompleteService;


    @Autowired


    private SlaveProperties slaveProperties;




    @Override


    @Transactional


    //入库


    public String startupFullPutStore(FullStoreParam param, Long userId) {


        // 参数非空判断


        if (Cools.isEmpty(param.getDevpNo(), param.getList())) {


@@ -115,7 +125,7 @@


        // 生成工作档明细


        List<MatCodeCountDto> matDtos = new ArrayList<>();


        param.getList().forEach(elem -> {


            matDtos.add(new MatCodeCountDto(elem.getMatNo(), elem.getCount()));


            matDtos.add(new MatCodeCountDto(elem.getMatNo(), elem.getSupplier(), elem.getCount(),elem.getMemo(),elem.getSource(),elem.getVendor()));


        });


        wrkDetlService.createWorkDetail(workNo, matDtos, param.getBarcode(), userId);


        // 更新源站点信息


@@ -166,6 +176,7 @@




    @Override


    @Transactional


    //出库作业


    public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, Integer ioType, Long userId) {




        // 合并同类项


@@ -183,39 +194,6 @@


                }


            }


            dtos.add(new OutLocDto(locNo, list));


        }




        if(ioType == 107) {


            //获取当前时间戳


            SimpleDateFormat sf = new SimpleDateFormat("yyyyMMddHHmmss");


            String temp = sf.format(new Date());


            //获取3位随机数


            Random rand = new Random();


            Integer r = rand.nextInt(900) + 100;


            String billNo = temp + r;


            //生成盘点通知档


            for (LocDetlDto locDetlDto : locDetlDtos) {


//            String replace = UUID.randomUUID().toString().replace("-", "");


                LocDetl locDetl = locDetlDto.getLocDetl();


                //生成盘点档


                WaitMatchk waitMatchk = new WaitMatchk();


                waitMatchk.setBillNo(billNo);//订单编号


                waitMatchk.setLocNo(locDetl.getLocNo());//库位号


                waitMatchk.setStockQty(locDetl.getQty());


                waitMatchk.setMatNo(locDetl.getMatNo());//产品编号


                waitMatchk.setMatName(locDetl.getMatName());//铲平名称


                waitMatchk.setSeqNo(i);


//                waitMatchk.setIoTime(new Date());


                waitMatchk.setZpallet(locDetl.getZpallet());


                waitMatchk.setAppeUser(userId); // 操作人员数据


                waitMatchk.setAppeTime(new Date());


                waitMatchk.setModiUser(userId);


                waitMatchk.setModiTime(new Date());


                if (!waitMatchkService.insert(waitMatchk)) {


                    throw new CoolException("保存盘点档失败");


                }


                i++;


            }


        }




        // 生成工作档


@@ -237,7 +215,29 @@


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


            }


            // 生成工作号


            int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);


            int rok;


            if(ioType==103||ioType==107){


                rok=2;


            }else{


                rok=1;


            }


            int workNo = commonService.getWorkNo(rok);




            boolean reduce = false;


            if(locMast.getCrnNo().equals(1) && dto.getLocNo().substring(0,2).equals("01")) {//1号货架才判断


                // 当深库位出库时，查找对应的浅库位是否也有出库任务,如果有，就增加其优先级


                if (Utils.isDeepLoc(slaveProperties, dto.getLocNo())) {


                    String shallowLoc = Utils.getShallowLoc(slaveProperties, dto.getLocNo());


                    if (locNos.contains(shallowLoc)) {


                        reduce = true;


                    }


                }




                // 深库位移库


                if (!reduce) {


                    moveLocForDeepLoc(locMast.getCrnNo(), dto.getLocNo());


                }


            }




            // 生成工作档


            WrkMast wrkMast = new WrkMast();


@@ -245,7 +245,7 @@


            wrkMast.setIoTime(new Date());


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


            wrkMast.setIoType(ioType); // 入出库状态


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


            wrkMast.setIoPri(reduce?13D:15D); // 优先级：13


            wrkMast.setCrnNo(locMast.getCrnNo());


            wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站


            wrkMast.setStaNo(staDesc.getStnNo()); // 目标站


@@ -264,6 +264,10 @@


            }


            // 生成工作档明细


            for (LocDetlDto detlDto : dto.getLocDetlDtos()) {


                MatCode matCode = matCodeService.selectById(detlDto.getLocDetl().getMatNo());


                if(Cools.isEmpty(matCode)){


                    throw new CoolException("产品编码在基础数据中不存在，请确认");


                }


                // 出库时，数量为0的直接忽略


                if (detlDto.getCount()==null || detlDto.getCount() <= 0.0D) {continue;}


                WrkDetl wrkDetl = new WrkDetl();


@@ -276,6 +280,17 @@


                wrkDetl.setAppeUser(userId);


                wrkDetl.setModiTime(new Date());


                wrkDetl.setModiUser(userId);


                wrkDetl.setMemo(detlDto.getLocDetl().getMemo());


                wrkDetl.setQtyBox(matCode.getStr6()!=null ? matCode.getStr6() : 0);


                wrkDetl.setWeight(matCode.getWeight()!=null ? matCode.getWeight() : 0);


                wrkDetl.setAllWeight(matCode.getWeight()!=null ? qty*matCode.getWeight()+30 : 0);


                wrkDetl.setAllQty(matCode.getStr6()!=null ? qty*matCode.getStr6() : 0);


                wrkDetl.setVendor(detlDto.getLocDetl().getVendor());


                wrkDetl.setSource(detlDto.getLocDetl().getSource());


                wrkDetl.setSupplier(detlDto.getLocDetl().getSupplier());


                wrkDetl.setStr5(matCode.getStr5());


                wrkDetl.setStr4(matCode.getStr4());


                wrkDetl.setStr3(matCode.getStr3());


                if (!wrkDetlService.insert(wrkDetl)) {


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


                }


@@ -292,11 +307,54 @@


            } else {


                throw new CoolException(dto.getLocNo() + "库位不是在库状态");


            }




            if(ioType == 107) {


                //获取当前时间戳


                SimpleDateFormat sf = new SimpleDateFormat("yyyyMMddHHmmss");


                String temp = sf.format(new Date());


                //获取3位随机数


                Random rand = new Random();


                Integer r = rand.nextInt(900) + 100;


                String billNo = temp + r;


                //生成盘点通知档


                for (LocDetlDto locDetlDto : locDetlDtos) {


//            String replace = UUID.randomUUID().toString().replace("-", "");


                    LocDetl locDetl = locDetlDto.getLocDetl();




                    //////插入盘点档前，将通知档之前相同库位数据转历史档


                    List<WaitMatchk> waitMatchks = waitMatchkService.selectList(new EntityWrapper<WaitMatchk>().eq("loc_no",locDetl.getLocNo()));


                    for(WaitMatchk one : waitMatchks){


                        waitMatchkLogService.save(one.getBillNo(),one.getLocNo(),one.getMatNo());


                        waitMatchkService.delete(new EntityWrapper<WaitMatchk>().eq("bill_no",one.getBillNo()).eq("loc_no",one.getLocNo()).eq("mat_no",one.getMatNo()));


                    }




                    //生成盘点档


                    WaitMatchk waitMatchk = new WaitMatchk();


                    waitMatchk.setBillNo(billNo);//订单编号


                    waitMatchk.setLocNo(locDetl.getLocNo());//库位号


                    waitMatchk.setStockQty(locDetl.getQty());


                    waitMatchk.setMatNo(locDetl.getMatNo());//产品编号


                    waitMatchk.setMatName(locDetl.getMatName());//铲平名称


                    waitMatchk.setSeqNo(i);


//                waitMatchk.setIoTime(new Date());


                    waitMatchk.setZpallet(locDetl.getZpallet());


                    waitMatchk.setAppeUser(userId); // 操作人员数据


                    waitMatchk.setAppeTime(new Date());


                    waitMatchk.setModiUser(userId);


                    waitMatchk.setModiTime(new Date());


                    if (!waitMatchkService.insert(waitMatchk)) {


                        throw new CoolException("保存盘点档失败");


                    }


                    i++;


                }


            }




        }


    }




    @Override


    @Transactional


    //空板入库


    public String emptyPlateIn(Integer devpNo, Long userId) {


        // 源站点状态检测


        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);


@@ -356,18 +414,37 @@




    @Override


    @Transactional


    //空板出库


    public void emptyPlateOut(EmptyPlateOutParam param, Long userId) {


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


            throw new CoolException("站点不存在");


        }


        for (String locNo : param.getLocNos()) {


            // 获取工作号


            int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);


            int workNo = commonService.getWorkNo(1);




            // 获取库位


            LocMast locMast = locMastService.selectById(locNo);


            if (Cools.isEmpty(locMast)) {


                throw new CoolException(locNo+"库位不存在");


            }




            boolean reduce = false;


            if(locMast.getCrnNo().equals(1) && locNo.substring(0,2).equals("01")) {//1号货架才判断


                // 当深库位出库时，查找对应的浅库位是否也有出库任务,如果有，就增加其优先级


                if (Utils.isDeepLoc(slaveProperties, locNo)) {


                    String shallowLoc = Utils.getShallowLoc(slaveProperties, locNo);


                    if (param.getLocNos().contains(shallowLoc)) {


                        reduce = true;


                    }


                }




                // 深库位移库


                if (!reduce) {


                    moveLocForDeepLoc(locMast.getCrnNo(), locNo);


                }


            }




            // 获取源站


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


                    .eq("type_no", 110)


@@ -384,7 +461,7 @@


            wrkMast.setIoTime(new Date());


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


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


            wrkMast.setIoPri(10D);


            wrkMast.setIoPri(reduce?13D:15D);


            wrkMast.setSourceStaNo(sourceStaNo); // 源站


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


            wrkMast.setCrnNo(locMast.getCrnNo());


@@ -417,6 +494,7 @@




    @Override


    @Transactional


    //盘点出库


    public void locCheckOut(StockOutParam param, Long userId) {


        // 目标站点状态检测


        BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());


@@ -427,6 +505,7 @@


                LocDetl sqlParam = new LocDetl();


                sqlParam.setLocNo(paramLocDetl.getLocNo());


                sqlParam.setMatNo(paramLocDetl.getMatNo());


                sqlParam.setSupplier(paramLocDetl.getSupplier());


                LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));


                if (null != one) locDetlDtos.add(new LocDetlDto(one, one.getQty()));


            }


@@ -441,6 +520,7 @@




    @Override


    @Transactional


    //移库


    public void locMove(String sourceLocNo, String locNo, Long userId) {


        LocMast sourceLoc = locMastService.selectById(sourceLocNo);


        if (Cools.isEmpty(sourceLoc)){


@@ -455,6 +535,18 @@


        }


        // 获取工作号


        int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);




        if(loc.getCrnNo().equals(1) && sourceLocNo.substring(0,2).equals("01")) {//1号货架才判断


            // 当深库位出库时，查找对应的浅库位是否也有出库任务,如果有，就增加其优先级


            if (Utils.isDeepLoc(slaveProperties, sourceLocNo)) {


                String shallowLoc = Utils.getShallowLoc(slaveProperties, sourceLocNo);


                LocMast locShallow = locMastService.selectById(shallowLoc);


                if(!Cools.isEmpty(locShallow) && (locShallow.getLocSts().equals("F") || locShallow.getLocSts().equals("D"))){


                    moveLocForDeepLoc(loc.getCrnNo(), sourceLocNo);


                }


            }


        }




        // 保存工作档


        WrkMast wrkMast = new WrkMast();


        wrkMast.setWrkNo(workNo);


@@ -559,7 +651,7 @@


            throw new CoolException("库位不存在");


        }


        //查询库位状态


        if (locMast.getLocSts().equals("O")){


        if (locMast.getLocSts().equals("O") || locMast.getLocSts().equals("D")){


            //更新库位状态


            locMast.setLocSts("F");


//            boolean b = locMastService.updateById(locMast);


@@ -575,6 +667,7 @@


            LocDetl sqlParam = new LocDetl();


            sqlParam.setLocNo(locMast.getLocNo());


            sqlParam.setMatNo(adjust.getMatNo());


            sqlParam.setSupplier(adjust.getSupplier());


            LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));


            // 保存新库存明细


            if (Cools.isEmpty(one)) {


@@ -586,11 +679,29 @@


                locDetl.setLocNo(locMast.getLocNo());


                locDetl.setQty(adjust.getCount()); // 数量


                VersionUtils.setLocDetl(locDetl, matCode); // 版本控制




                if (Cools.isEmpty(adjust.getSupplier())){


                    SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");


                    locDetl.setSupplier(sdf.format(new Date()));


                }else {


                    locDetl.setSupplier(adjust.getSupplier());


                }






                locDetl.setModiUser(userId); // 操作人员信息


                locDetl.setModiTime(new Date());


                locDetl.setAppeUser(userId);


                locDetl.setAppeTime(new Date());


                locDetl.setZpallet(param.getZpallet());//托盘号


                locDetl.setVendor(adjust.getVendor());


                locDetl.setSource(adjust.getSource());


                locDetl.setSupplier(adjust.getSupplier());


                locDetl.setQtyBox(matCode.getStr6());


                locDetl.setAllQty(matCode.getStr6()*adjust.getCount());


                locDetl.setAllWeight(matCode.getWeight()*adjust.getCount()+30);


                locDetl.setStr3(matCode.getStr3());


                locDetl.setStr4(matCode.getStr4());


                locDetl.setStr5(matCode.getStr5());


                if (!locDetlService.insert(locDetl)) {


                    throw new CoolException("保存库存明细失败");


                }


@@ -611,13 +722,25 @@


                            throw new CoolException("清除库存明细失败");


                        }


                    } else {


                        MatCode matCode = matCodeService.selectById(adjust.getMatNo());


                        LocDetl sqlParam1 = new LocDetl();


                        sqlParam1.setQty(adjust.getCount());


                        sqlParam1.setSupplier(adjust.getSupplier());


                        sqlParam1.setModiTime(new Date());


                        sqlParam1.setModiUser(userId);


                        sqlParam1.setVendor(adjust.getVendor());


                        sqlParam1.setSource(adjust.getSource());


                        sqlParam1.setSupplier(adjust.getSupplier());


                        sqlParam1.setQtyBox(matCode.getStr6());


                        sqlParam1.setAllQty(matCode.getStr6()*adjust.getCount());


                        sqlParam1.setAllWeight(matCode.getWeight()*adjust.getCount()+30);


                        sqlParam1.setStr5(matCode.getStr5());


                        sqlParam1.setStr4(matCode.getStr4());


                        sqlParam1.setStr3(matCode.getStr3());


                        if (!locDetlService.update(sqlParam1, new EntityWrapper<LocDetl>()


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


                                .eq("mat_no", adjust.getMatNo()))) {


                                .eq("mat_no", adjust.getMatNo())


                                .eq("supplier",adjust.getSupplier()))) {


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


                        }


                    }


@@ -788,4 +911,111 @@


        }


    }




    /**


     * 因双深库位阻塞，对浅库位进行移转


     */


    public void moveLocForDeepLoc(Integer crnNo, String locNo){


        // 双深库位且浅库位有货，则需先对浅库位进行库位移转


        if (Utils.isDeepLoc(slaveProperties, locNo)) {


            String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);


            LocMast shallowLoc = locMastService.selectById(shallowLocNo);


            // O.空库位、Q.拣料/盘点/并板再入库、S.入库预约、X.禁用 直接搬！


            if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) {


                WrkMast waitWrkMast = wrkMastService.selectByLocNo(shallowLocNo);


                if (null == waitWrkMast) {


                    log.error("{}库位异常，未检索到相应工作档！", shallowLocNo);


                    throw new CoolException(shallowLocNo + "库位异常，未检索到相应工作档！");


                } else {


                    waitWrkMast.setIoPri(15D);


                    waitWrkMast.setModiTime(new Date());


                    if (!wrkMastService.updateById(waitWrkMast)) {


                        log.error("调整工作档优先级失败！工作号={}", waitWrkMast.getWrkNo());


                        throw new CoolException("调整工作档优先级失败！工作号=" + waitWrkMast.getWrkNo());


                    }


                }


            } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {


                // 生成工作档、改变浅库位的源库/目标库 库位状态、下发堆垛机命令（立马执行)


                List<Integer> rows = locMastService.queryDistinctRow(crnNo);


                LocMast loc = null;


                for (Integer row : rows) {


                    if (Utils.isDeepLoc(slaveProperties, row)) {


                        loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1(),shallowLoc.getLocType2(),shallowLoc.getLocType3());


                        if (null != loc) { break; }


                    }


                }


                if (null == loc) {


                    for (Integer row : rows) {


                        if (Utils.isShallowLoc(slaveProperties, row)) {


                            loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1(),shallowLoc.getLocType2(),shallowLoc.getLocType3());


                            if (null != loc) { break; }


                        }


                    }


                }


                if (null == loc) {


                    throw new CoolException("双深库位 --- 浅库位阻塞异常！ 待移转浅库位：" + shallowLoc.getLocNo());


                }




                // 获取工作号


                int workNo = commonService.getWorkNo(0);


                // 保存工作档


                WrkMast wrkMast = new WrkMast();


                wrkMast.setWrkNo(workNo);


                wrkMast.setIoTime(new Date());


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


                wrkMast.setIoType(11); // 入出库状态： 11.库格移载


                wrkMast.setIoPri(13D);


                wrkMast.setCrnNo(crnNo);


                wrkMast.setSourceLocNo(shallowLoc.getLocNo()); // 源库位


                wrkMast.setLocNo(loc.getLocNo()); // 目标库位


                wrkMast.setFullPlt(shallowLoc.getFullPlt()); // 满板


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


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


                wrkMast.setEmptyMk(shallowLoc.getLocSts().equals("D")?"Y":"N"); // 空板


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


                wrkMast.setLinkMis("N");


                wrkMast.setAppeTime(new Date());


                wrkMast.setModiTime(new Date());


                if (!wrkMastService.insert(wrkMast)) {


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


                }


                // 工作档明细保存


                if (shallowLoc.getLocSts().equals("F")) {


                    List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", shallowLoc.getLocNo()));


                    for (LocDetl locDetl : locDetls) {


                        WrkDetl wrkDetl = new WrkDetl();


                        wrkDetl.setWrkNo(workNo);


                        wrkDetl.setIoTime(new Date());


                        wrkDetl.setQty(locDetl.getQty());


                        VersionUtils.setWrkDetl(wrkDetl, locDetl); // 版本控制


                        wrkDetl.setAppeTime(new Date());


                        wrkDetl.setModiTime(new Date());


                        if (!wrkDetlService.insert(wrkDetl)) {


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


                        }


                    }


                }


                // 修改源库位状态


                if (shallowLoc.getLocSts().equals("D") || shallowLoc.getLocSts().equals("F")) {


                    shallowLoc.setLocSts("R"); // R.出库预约


                    shallowLoc.setModiTime(new Date());


                    if (!locMastService.updateById(shallowLoc)){


                        throw new CoolException("更新源库位状态失败");


                    }


                } else {


                    throw new CoolException("源库位出库失败");


                }


                // 修改目标库位状态


                if (loc.getLocSts().equals("O")) {


                    loc.setLocSts("S"); // S.入库预约


                    loc.setModiTime(new Date());


                    if (!locMastService.updateById(loc)) {


                        throw new CoolException("更新目标库位状态失败");


                    }


                } else {


                    throw new CoolException("移转失败");


                }


            }


        }


    }




}