no message

skyouc

3 天以前 c8559a2186ac04ef3e0760f7d48ab3d74fbcb105

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

@@ -1332,10 +1332,14 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R OutCallAgv(AgvCallParams params, Long userId) {

        BasAreas basAreas = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("whs_type_id", LocAreaType.LOC_AREA_TYPE_IN_CACHE.type));
        if (Objects.isNull(basAreas)) {
            throw new CoolException("库区不存在！！");
        }
        /**获取入库最早的一条数据**/
        List<LocCache> locCaches = locCacheService.selectList(new EntityWrapper<LocCache>()
                .eq("loc_sts", LocStsType.LOC_STS_TYPE_F.type)
                .eq("area_id", basAreas.getId())
                .eq("frozen", 0)
                .orderDesc(Arrays.asList("sort", "first_time")));

@@ -1345,11 +1349,7 @@

        for (LocCache locCache : locCaches) {
            //获取缓存区信息
            BasAreas basAreas = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("whs_type_id", LocAreaType.LOC_AREA_TYPE_IN_CACHE.type));
            if (Objects.isNull(basAreas)) {
                throw new CoolException("库区不存在！！");
            }

//            BasAreas basAreas = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("whs_type_id", LocAreaType.LOC_AREA_TYPE_IN_CACHE.type));
            List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
                    .eq("area_id", basAreas.getId())
                    .eq("loc_no", locCache.getLocNo()));
@@ -1681,7 +1681,7 @@
                throw new CoolException("明细内容不存在！！");
            }

            Double v = stationDetl.getAnfme() - stationDetl.getWorkQty();
            Double v = Math.round((stationDetl.getAnfme() - stationDetl.getWorkQty()) * 10000) / 10000.0;
            if (detlDto.getAnfme().compareTo(v) > 0) {
                throw new CoolException("组托上限为：" + stationDetl.getAnfme() + ", 已组托：" + stationDetl.getWorkQty() + ", 还可组托：" + v);
            }
@@ -1712,7 +1712,7 @@
                throw new CoolException("保存入库通知档失败");
            }

            Double v1 = stationDetl.getWorkQty() + detlDto.getAnfme();
            Double v1 = Math.round((stationDetl.getWorkQty() + detlDto.getAnfme()) * 10000) / 10000.0;
            stationDetl.setWorkQty(v1);

            if (!basStationDetlService.updateById(stationDetl)) {
@@ -1724,7 +1724,6 @@
                    throw new CoolException("原始数据移除失败！");
                }
            }

        }
    }

@@ -1825,11 +1824,13 @@
                Mat mat = matService.selectByMatnr(combMat.getMatnr());
                BeanUtils.copyProperties(mat, basStationDetl);
                basStationDetl
                        .setId(null)
                        .setOrderNo(orderPakin.getOrderNo())
                        .setDevNo(basStation.getDevNo())
                        .setBarcode(params.getTarBarcode())
                        .setZpallet(params.getTarBarcode())
                        .setBatch(combMat.getBatch())
                        .setSuppCode(combMat.getStandby1())
                        .setStandby1(combMat.getStandby1())
                        .setAnfme(combMat.getWorkQty().doubleValue());
                if (!basStationDetlService.insert(basStationDetl)) {
@@ -1842,7 +1843,6 @@
                if (!basStationDetlService.updateById(basStationDetl)) {
                    throw new CoolException("更新明细数据失败");
                }

            }
        }
        if (basStation.getLocSts().equals(LocStsType.LOC_STS_TYPE_D.type)