#

LSH

2023-10-18 f40e68e59fef7d029b9aee90ba9afbeacb0e88fd

#

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

@@ -121,7 +121,7 @@
    List<WrkMast> selectWrkStsAndIoType(@Param("sour")Integer sour);
    List<WrkMast> selectWrkStsAndIoType0(@Param("sour")Integer sour);
    List<WrkMast> selectWrkStsAndIoType1(@Param("sour")Integer sour);
    Integer selectWrkStsAndIoType107Count(@Param("sour")Integer sour);
    Integer selectWrkStsAndIoType107Count(@Param("sour")Integer sour,@Param("workNo")Integer workNo);

    WrkMast selectWorkingPakin(@Param("sourceStaNo")Integer sourceStaNo);
    WrkMast selectWorkingPakout(@Param("sourceStaNo")Integer sourceStaNo);

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

@@ -1257,7 +1257,7 @@
    public synchronized boolean locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol){
        Collections.shuffle(slave.getCrnOutStn());
        for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
            // 获取工作状态为11（生成出库ID）的出库工作档
            // 获取工作状态为11,12,13,14,15, 16（生成出库ID）的出库工作档
            WrkMast wrkMast = wrkMastMapper.selectPakOutStep111215(slave.getId(), crnStn.getStaNo());
            if (wrkMast == null) {
                continue;
@@ -1267,8 +1267,8 @@
             * 100、200存在进行中的盘点任务，则不执行盘点任务
             * */
            if (wrkMast.getIoType().equals(107)){
                Integer countPan = wrkMastMapper.selectWrkStsAndIoType107Count(wrkMast.getSourceStaNo());
                if (countPan > 1){
                Integer countPan = wrkMastMapper.selectWrkStsAndIoType107Count(wrkMast.getSourceStaNo(),wrkMast.getWrkNo());
                if (countPan > 0){
                    News.error("MainServiceImpl  locToCrnStn 1271行"+"盘点出库跳过，存在进行中可能堵塞任务数{}个",countPan);
                    continue;
                }

 src/main/resources/mapper/WrkMastMapper.xml

@@ -223,6 +223,7 @@

    <select id="selectWrkStsAndIoType107Count" resultType="java.lang.Integer">
        select count (*) from dbo.asr_wrk_mast where 1=1
        and work_no!=#{workNo}
        and
        (
        <choose>