*

L

13 小时以前 03c29682dd413657ac2c5ec5a585eac166ae617c

*

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

@@ -39,6 +39,7 @@
    TaskWrk selectCrnStaWorkingDemo(@Param("crnNo") Integer crnNo, @Param("targetPoint") String targetPoint);

    TaskWrk selectCrnNoInWorking(@Param("crnNo") Integer crnNo,@Param("workNo") Integer workNo);
    TaskWrk selectCrnNoInWorkingBuDing(@Param("crnNo") Integer crnNo,@Param("workNo") Integer workNo);
    TaskWrk selectCrnNoInWorkingDemo(@Param("crnNo") Integer crnNo,@Param("workNo") Integer workNo);

//    TaskWrk selectWalkSta(@Param("crnNo") Integer crnNo,@Param("workNo") Integer workNo);

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

@@ -1382,8 +1382,12 @@
                    //获取入库待确认工作档
                    TaskWrk taskWrk = taskWrkMapper.selectCrnNoInWorking(crnProtocol.getLaneNo(), crnProtocol.getTaskNo().intValue());
                    if (Cools.isEmpty(taskWrk) && crnProtocol.getTaskNo() != 999) {
                        log.error("堆垛机处于等待确认且任务完成状态，但未找到符合状态的工作档，准备查询准备状态工作档。堆垛机号={}，巷道号={}，工作号={}", crn.getId(), crnProtocol.getLaneNo(), crnProtocol.getTaskNo());
                        taskWrk = taskWrkMapper.selectCrnNoInWorkingBuDing(crnProtocol.getLaneNo(), crnProtocol.getTaskNo().intValue());
                        if (Cools.isEmpty(taskWrk) && crnProtocol.getTaskNo() != 999) {
                        log.error("堆垛机处于等待确认且任务完成状态，但未找到工作档。堆垛机号={}，巷道号={}，工作号={}", crn.getId(), crnProtocol.getLaneNo(), crnProtocol.getTaskNo());
                        continue;
                        }
                    }
//                Thread.sleep(300);
                    //确认完成信号
@@ -1396,7 +1400,7 @@
                    crnThread.setResetFlag(true);

                    if (!Cools.isEmpty(taskWrk)) {
                        if (taskWrk.getIoType() == 1 && taskWrk.getWrkSts() == 3) {
                        if (taskWrk.getIoType() == 1 && (taskWrk.getWrkSts() == 3 || taskWrk.getWrkSts() == 2)) {
                            taskWrk.setWrkSts(4);//入库完成
                            taskWrk.setStatus(TaskStatusType.OVER.id);//完结
                            //更新库位状态
@@ -1406,7 +1410,7 @@
                            locMast.setModiTime(now);
                            locMast.setModiUser(9999L);
                            locMastService.updateById(locMast);
                        } else if (taskWrk.getIoType() == 2 && taskWrk.getWrkSts() == 12) {
                        } else if (taskWrk.getIoType() == 2 && (taskWrk.getWrkSts() == 12 || taskWrk.getWrkSts() == 11)) {
                            taskWrk.setWrkSts(13);//出库完成
                            taskWrk.setStatus(TaskStatusType.OVER.id);//完结
                            //更新库位状态
@@ -1416,7 +1420,7 @@
                            locMast.setModiTime(now);
                            locMast.setModiUser(9999L);
                            locMastService.updateById(locMast);
                        } else if (taskWrk.getIoType() == 3 && taskWrk.getWrkSts() == 12) {
                        } else if (taskWrk.getIoType() == 3 && (taskWrk.getWrkSts() == 12 || taskWrk.getWrkSts() == 11)) {
                            taskWrk.setWrkSts(4);//入库完成
                            taskWrk.setStatus(TaskStatusType.OVER.id);//完结
                            //更新库位状态

 src/main/resources/mapper/TaskWrkMapper.xml

@@ -155,6 +155,15 @@
        order by "IO_PRI" desc,"CREATE_TIME","WRK_NO" ASC
    </select>

    <select id="selectCrnNoInWorkingBuDing" resultMap="BaseResultMap">
        select top 1 * from "SOURCE"."wcs_task_wrk"
        where 1=1
          and ("WRK_STS"=2 or "WRK_STS"=11)
          and "CRN_NO"=#{crnNo}
          and "WRK_NO"=#{workNo}
        order by "IO_PRI" desc,"CREATE_TIME","WRK_NO" ASC
    </select>

    <select id="selectCrnNoInWorkingDemo" resultMap="BaseResultMap">
        select top 1 * from "SOURCE"."wcs_task_wrk"
        where 1=1