#

Administrator

12 小时以前 8543b0accaf45e49362b4ae72799ace85d4673ab

#

 src/main/java/com/zy/asrs/task/WorkMastScheduler.java

@@ -104,11 +104,18 @@
                    continue;
                }
            Integer crnNo = wrkMast.getCrnNo();
            //该堆垛机已经下发任务给wcs后不再下发新的搬运任务
            List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).in("wrk_sts", Arrays.asList(12L)));
            if (!wrkMasts1.isEmpty()) {
                continue;
            }
            //如果任务是移库任务时：该堆垛机已经下发任务给wcs后不再下发新的搬运任务
                if(wrkMast.getIoType()==101&&!Cools.isEmpty(wrkMast.getLocNo())){
                    LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("crn_no", crnNo).eq("loc_no", wrkMast.getLocNo()));
                    if (!Cools.isEmpty(locMast)) {
                        List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).in("wrk_sts", Arrays.asList(12L)));
                        if (!wrkMasts1.isEmpty()) {
                            continue;
                        }
                    }

                }

                //源库位为冻结库位时禁止下发搬运任务给堆垛机
                if (!Cools.isEmpty(wrkMast.getSourceLocNo())) {
                    LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -145,7 +145,7 @@

                            Double v = Math.round((selectOne.getStockQty() - selectOne.getAnfme()) * 10000) / 10000.0;

                            OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), null, null, null, null,
                            OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), "", "", "", "",
                                    null, null, null);

                            if (!Objects.isNull(orderDetlPakout)) {

 src/main/resources/mapper/OrderDetlPakoutMapper.xml

@@ -60,9 +60,9 @@
        <if test="brand != null and brand != ''">
            and brand = #{brand}
        </if>
<!--        <if test="standby1 != null and standby1 != ''">-->
<!--            and standby1 = #{standby1}-->
<!--        </if>-->
        <if test="standby1 != null and standby1 != ''">
            and standby1 = #{standby1}
        </if>
        <if test="standby2 != null and standby2 != ''">
            and standby2 = #{standby2}
        </if>
@@ -84,7 +84,7 @@
    </select>

    <select id="selectItemByOrderNo" resultMap="BaseResultMap">
        select * from man_order_detl_pakout
        select top 1 * from man_order_detl_pakout
        where 1=1
        and order_no = #{orderNo}
        and matnr = #{matnr}