第三版

zwl

1 天以前 757f103f37d83dfb55bb49b3df0b805cb520d4f7

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

@@ -217,13 +217,6 @@
            }

            Integer outSta = staNo.getDevNo();
            //2号堆垛机全板出库站指定为103
            if(locMast.getCrnNo()==2){
                outSta = 103;
                //出库站点为205，
            }else if(staNo.getDevNo()==205){

            }

            // 获取路径
            StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
@@ -238,7 +231,7 @@
            wrkMast.setIoPri(13D); // 优先级：13
            wrkMast.setCrnNo(locMast.getCrnNo());
            wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
            wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
            wrkMast.setStaNo(104); // 目标站
            wrkMast.setSourceLocNo(dto.getLocNo()); // 源库位
            wrkMast.setFullPlt("Y"); // 满板：Y
            wrkMast.setPicking("N"); // 拣料
@@ -250,6 +243,7 @@
            wrkMast.setAppeTime(now);
            wrkMast.setModiUser(userId);
            wrkMast.setModiTime(now);
            wrkMast.setMemo(outSta+"");
            if (!wrkMastService.insert(wrkMast)) {
                throw new CoolException("保存工作档失败，出库库位号："+dto.getLocNo());
            }
@@ -429,7 +423,7 @@

    @Override
    @Transactional
    public void emptyPlateOut(EmptyPlateOutParam param, Long userId) {
    public void emptyPlateOut(String agvSourceSite,EmptyPlateOutParam param, Long userId) {
        if (Cools.isEmpty(param.getOutSite())) {
            throw new CoolException("站点不存在");
        }
@@ -460,7 +454,7 @@
            wrkMast.setIoType(110); // 入出库状态： 110.空板出库
            wrkMast.setIoPri(10D);
            wrkMast.setSourceStaNo(sourceStaNo); // 源站
            wrkMast.setStaNo(param.getOutSite()); // 目标站
            wrkMast.setStaNo(102); // 目标站
            wrkMast.setCrnNo(locMast.getCrnNo());
            wrkMast.setSourceLocNo(locNo); // 源库位
            wrkMast.setFullPlt("N"); // 满板：Y
@@ -472,6 +466,7 @@
            wrkMast.setAppeTime(now);
            wrkMast.setModiUser(userId);
            wrkMast.setModiTime(now);
            wrkMast.setMemo(Cools.isEmpty(agvSourceSite) ? "" : agvSourceSite);
            boolean res = wrkMastService.insert(wrkMast);
            if (!res) {
                throw new CoolException("保存工作档失败");
@@ -809,6 +804,7 @@
                if (!Cools.isEmpty(waitPakin)) {
                    waitPakin.setIoStatus("N");
                    waitPakin.setLocNo("");
                    waitPakin.setZpallet("");
                    boolean  result = waitPakinService.update(waitPakin, new EntityWrapper<WaitPakin>()
                            .eq("zpallet", wrkMast.getBarcode()));
                }