出库不用选站点

pang.jiabao

2 天以前 403f92738e1e17268bc84b1d5daeb75d3ba7af5b

出库不用选站点

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

@@ -162,7 +162,7 @@
    @Transactional
    public void startupFullTakeStore(StockOutParam param, Long userId) {
        // 目标站点状态检测
        BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
//        BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
        // 获取库位明细
        List<LocDetlDto> locDetlDtos = new ArrayList<>();
        for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
@@ -175,7 +175,7 @@
            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
            if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") ){
                // 启动出库开始 101.出库
                stockOut(staNo, locDetlDtos, null, userId);
                stockOut(null, locDetlDtos, null, userId);
            }else {
                throw new CoolException("所选库位存在状态不为F、D的库位，库位号："+locMast.getLocNo()+" 、当前状态："+locMast.getLocSts()+"-"+locMast.getLocSts$());
            }
@@ -218,11 +218,8 @@
            // 获取库位
            LocMast locMast = locMastService.selectById(dto.getLocNo());

            Integer outSta = staNo.getDevNo();
//            //2号堆垛机全板出库站指定为204站，拣料站指定为202
//            if(locMast.getCrnNo()==2){
//                outSta = ioType == 101 ? 204 : 202;
//            }
            // 1号堆垛机全板出库站指定为101站，2号107
            Integer outSta = locMast.getCrnNo() == 1 ? 101 : 107;

            // 获取路径
            StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
@@ -429,9 +426,9 @@
    @Override
    @Transactional
    public void emptyPlateOut(EmptyPlateOutParam param, Long userId) {
        if (Cools.isEmpty(param.getOutSite())) {
            throw new CoolException("站点不存在");
        }
//        if (Cools.isEmpty(param.getOutSite())) {
//            throw new CoolException("站点不存在");
//        }
        for (String locNo : param.getLocNos()) {
            // 获取工作号
            int workNo = commonService.getWorkNo(WorkNoType.PAKOUT.type);
@@ -443,6 +440,8 @@
            if (!locMast.getLocSts().equals("D")){
                throw new CoolException("所选库位存在状态不为D的库位，库位号："+locMast.getLocNo()+" 、当前状态："+locMast.getLocSts()+"-"+locMast.getLocSts$());
            }
            // 1号堆垛机空板出库站指定为101站，2号107
            param.setOutSite(locMast.getCrnNo() == 1 ? 101 : 107);
            // 获取源站
            Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                    .eq("type_no", 110)

 src/main/webapp/static/js/pakStore/emptyOut.js

@@ -103,10 +103,10 @@
        switch (obj.event) {
            case 'outbound':
                var staNo = $("#staNoSelect").val();
                if (staNo === "" || staNo === null){
                    layer.msg("请选择出库口");
                    return;
                }
                // if (staNo === "" || staNo === null){
                //     layer.msg("请选择出库口");
                //     return;
                // }
                var locNos = [];
                data.forEach(function(elem) {
                    locNos.push(elem.locNo);

 src/main/webapp/static/js/pakStore/stockOut.js

@@ -71,10 +71,10 @@
                    layer.msg('请先提取商品库存', {icon: 2});
                } else {
                    var staNo = $("#staNoSelect").val();
                    if (staNo === "" || staNo === null){
                        layer.msg("请选择出库口", {icon: 2});
                        return;
                    }
                    // if (staNo === "" || staNo === null){
                    //     layer.msg("请选择出库口", {icon: 2});
                    //     return;
                    // }
                    let param = {
                        outSite: staNo,
                        locDetls: locDetlData