Merge remote-tracking branch 'origin/ycawdasrs-2' into ycawdasrs-2

zwl

2025-10-13 03b5b8a480fb201e288486299eb385a00d2aac66

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

@@ -28,7 +28,7 @@
    private WorkMastHandler workMastHandler;

    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute(){
    public void execute(){
        List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData();
        if (wrkMasts.isEmpty()) {
            return;
@@ -48,7 +48,7 @@

    //拣料任务处理
    @Scheduled(cron = "0/3 * * * * ? ")
    private void jl(){
    public void jl(){
        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                .eq("io_type",103)
                .eq("wrk_sts",14L)