#

zc

2025-05-05 84168cb0fa1ca6bc2b8d088776d9e04401edb883

#

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

@@ -541,6 +541,7 @@
        if ((locMast.getBay1() >= 3 && locMast.getBay1() <= 6) ) {
            locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("row1", locMast.getBay1())
                    .in("bay1", 3,4,5,6)
                    .eq("crn_no", 7)
                    .eq("loc_type1", locMast.getLocType1())
                    .orderBy("bay1", true));
@@ -1770,31 +1771,51 @@
            LocMast locMast = locMastService.selectById(dto.getLocNo());

            List<LocMast> locMasts = new ArrayList<>();
            if ((locMast.getBay1() >= 1 && locMast.getBay1() <= 2) || (locMast.getBay1() >= 6 && locMast.getBay1() <= 7 && locMast.getRow1() != 36 && locMast.getRow1() != 29) || (locMast.getBay1() >= 11 && locMast.getBay1() <= 12)) {
//            if ((locMast.getBay1() >= 1 && locMast.getBay1() <= 2) || (locMast.getBay1() >= 6 && locMast.getBay1() <= 7 && locMast.getRow1() != 36 && locMast.getRow1() != 29) || (locMast.getBay1() >= 11 && locMast.getBay1() <= 12)) {
//                locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
//                        .eq("gro1", locMast.getGro1())
//                        .eq("crn_no", 7)
//                        .eq("loc_type1", locMast.getLocType1())
//                        .orderBy("bay1", false));
//            } else {
//                locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
//                        .eq("gro1", locMast.getGro1())
//                        .eq("crn_no", 7)
//                        .eq("loc_type1", locMast.getLocType1())
//                        .orderBy("bay1", true));
//            }
//            for (LocMast locMast1 : locMasts) {
//                if (locMast1.getLocNo().equals(dto.getLocNo())) {
//                    break;
//                }
//                if (locMast1.getLocSts().equals("X")) {
//                    throw new CoolException(dto.getLocNo() + "库位前方有锁定库位，禁止出库");
//                }
//                if (locMast1.getLocSts().equals("F")) {
//                    moveLocForDeepLoc(locMast1);
//                }
//            }
            if ((locMast.getBay1() >= 3 && locMast.getBay1() <= 6) ) {
                locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                        .eq("gro1", locMast.getGro1())
                        .eq("crn_no", 7)
                        .eq("loc_type1", locMast.getLocType1())
                        .orderBy("bay1", false));
            } else {
                locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                        .eq("gro1", locMast.getGro1())
                        .eq("row1", locMast.getBay1())
                        .in("bay1", 3,4,5,6)
                        .eq("crn_no", 7)
                        .eq("loc_type1", locMast.getLocType1())
                        .orderBy("bay1", true));
            }
            for (LocMast locMast1 : locMasts) {
                if (locMast1.getLocNo().equals(dto.getLocNo())) {
                    break;
                }
                if (locMast1.getLocSts().equals("X")) {
                    throw new CoolException(dto.getLocNo() + "库位前方有锁定库位，禁止出库");
                }
                if (locMast1.getLocSts().equals("F")) {
                    moveLocForDeepLoc(locMast1);
                for (LocMast locMast1 : locMasts) {
                    if (locMast1.getLocNo().equals(locMast.getLocNo())) {
                        break;
                    }
                    if (locMast1.getLocSts().equals("X")) {
                        throw new CoolException(locMast.getLocNo() + "库位前方有锁定库位，禁止出库");
                    }
                    if (locMast1.getLocSts().equals("F")) {
                        locMast = locMast1;
                    }
                }
            }


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

 src/main/webapp/views/pakStoreSxk/emptyOut.html

@@ -125,7 +125,7 @@
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/js/pakStoreSxk/emptyOut.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/pakStoreSxk/emptyOut.js?v=1" charset="utf-8"></script>

<!--启动出库-->
<div id="outboundDiv">

 src/main/webapp/views/pakStoreSxk/pakStore.html

@@ -121,7 +121,7 @@
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/js/pakStoreSxk/pakStore.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/pakStoreSxk/pakStore.js?v=1" charset="utf-8"></script>

<script type="text/template" id="putSiteSelectTemplate">
    {{#each data}}