#

luxiaotao1123

2022-10-14 76cf10a7c0e487c246c7fa3d653d105206400944

#

 src/main/java/com/zy/asrs/mapper/BasDevpMapper.java

@@ -15,4 +15,6 @@
    List<Integer> getAvailableInSite(@Param("typeNo") Integer typeNo);

    List<Integer> getAvailableOutSite(@Param("typeNo") Integer typeNo);

    BasDevp selectByWrkNo(Integer wrkNo);
}

 src/main/java/com/zy/asrs/service/BasDevpService.java

@@ -44,4 +44,6 @@
     */
    BasDevp checkSiteStatus(Integer devpNo, boolean put);

    BasDevp selectByWrkNo(Integer wrkNo);

}

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

@@ -64,4 +64,9 @@
        }
        return station;
    }

    @Override
    public BasDevp selectByWrkNo(Integer wrkNo) {
        return this.baseMapper.selectByWrkNo(wrkNo);
    }
}

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

@@ -696,9 +696,17 @@
            }

            // 过滤
            if (null != wrkMastMapper.selectPakout(slave.getId(), null)) {
                log.error("{}入库任务无法作业，因存在出库中任务!", wrkMast.getWrkNo());
                continue;
            WrkMast pakoutWrkMast = wrkMastMapper.selectPakout(slave.getId(), null);
            if (null != pakoutWrkMast) {
                if ((pakoutWrkMast.getIoType() == 103 || pakoutWrkMast.getIoType() == 104 || pakoutWrkMast.getIoType() == 107)
                        && pakoutWrkMast.getWrkSts() == 17
                        && basDevpService.selectByWrkNo(pakoutWrkMast.getWrkNo()) != null
                ) {

                } else {
                    log.error("{}入库任务无法作业，因存在出库中任务!", wrkMast.getWrkNo());
                    continue;
                }
            }

            // 置顶任务

 src/main/java/com/zy/core/MainProcess.java

@@ -32,7 +32,7 @@
                try {

                    // 间隔
                    Thread.sleep(1000);
                    Thread.sleep(500);

                    // 系统运行状态判断
                    if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
@@ -42,10 +42,13 @@
                    // 演示
                    mainService.demo();


                    // 入库  ===>> 入库站到堆垛机站，根据条码扫描生成入库工作档
                    mainService.generateStoreWrkFile(); // 组托
                    mainService.generateStoreWrkFile0(); // WMS入库

                    // 间隔
                    Thread.sleep(500);

                    // 拣料、并板、盘点再入库
                    mainService.stnToCrnStnPick0();
                    mainService.stnToCrnStnPick1();

 src/main/resources/mapper/BasDevpMapper.xml

@@ -66,4 +66,11 @@
        group by abd.dev_no
    </select>

    <select id="selectByWrkNo" resultMap="BaseResultMap">
        select top 1 *
        from asr_bas_devp
        where 1=1
        and wrk_no = #{wrkNo}
    </select>

</mapper>