Merge remote-tracking branch 'origin/jxgtwcs' into jxgtwcs

zjj

2025-06-09 80d97d40c44165674ee0168be5f08c8ca52d3c06

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/TaskServiceImpl.java

@@ -11,6 +11,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Collections;
import java.util.List;

@Service("taskService")
@@ -33,6 +34,11 @@
            case EXECUTE_OUTBOUND:
            case COMPLETE_OUTBOUND:
            case SETTLE_OUTBOUND:
                return Boolean.FALSE;
            case NEW_LADEN_MOVE:
            case ANALYZE_LADEN_MOVE:
            case EXECUTE_LADEN_MOVE:
            case COMPLETE_LADEN_MOVE:
                return Boolean.FALSE;
        }
        return Boolean.TRUE;
@@ -66,6 +72,36 @@
    }

    @Override
    public List<Task> selectChargeByAnalyzeSts() {
        return this.baseMapper.selectChargeByAnalyzeSts();
    }

    @Override
    public List<Task> selectChargeByExecuteSts() {
        return this.baseMapper.selectChargeByExecuteSts();
    }

    @Override
    public List<Task> selectManualByAnalyzeSts() {
        return this.baseMapper.selectManualByAnalyzeSts();
    }

    @Override
    public List<Task> selectManualByExecuteSts() {
        return this.baseMapper.selectManualByExecuteSts();
    }

    @Override
    public List<Task> selectMoveByAnalyzeSts() {
        return this.baseMapper.selectMoveByAnalyzeSts();
    }

    @Override
    public List<Task> selectMoveByExecuteSts() {
        return this.baseMapper.selectMoveByExecuteSts();
    }

    @Override
    public List<Task> selectWaitAnalyzeInBoundTask() {
        return this.baseMapper.selectWaitAnalyzeInBoundTask();
    }
@@ -73,6 +109,11 @@
    @Override
    public List<Task> selectPakOut() {
        return this.baseMapper.selectPakOut();
    }

    @Override
    public List<Task> selectWaitAnalyzeMoveTask() {
        return this.baseMapper.selectWaitAnalyzeMoveTask();
    }

    @Override
@@ -86,12 +127,36 @@
    }

    @Override
    public List<Task> selectWorkingByShuttle(Integer shuttleNo) {
        return this.baseMapper.selectWorkingByShuttle(shuttleNo);
    public Task selectManualWorking(Integer shuttleNo) {
        return this.baseMapper.selectManualWorking(shuttleNo);
    }

    @Override
    public List<Task> selectWorkingByShuttle(Integer shuttleNo, String taskNo) {
        return this.baseMapper.selectWorkingByShuttle(shuttleNo, taskNo);
    }

    @Override
    public List<Task> selectWorkingByLift(Integer liftNo, String taskNo) {
        return this.baseMapper.selectWorkingByLift(liftNo, taskNo);
    }

    @Override
    public Task selectChargeWorking(Integer shuttleNo) {
        return this.baseMapper.selectChargeWorking(shuttleNo);
    }
    @Override
    public List<Task> selectWaitAnalyzeLadenMoveTask() {
        return this.baseMapper.selectWaitAnalyzeLadenMoveTask();
    }

    @Override
    public List<Task> selectLadenMoveByAnalyzeSts() {
        return this.baseMapper.selectLadenMoveByAnalyzeSts();
    }

    @Override
    public List<Task> selectLadenMoveByExecuteSts() {
        return this.baseMapper.selectLadenMoveByExecuteSts();
    }
}