From 0afba31001bcc9cc05af2b9061aa32bf7bd83b0b Mon Sep 17 00:00:00 2001 From: yxFwq <1> Date: 星期五, 03 一月 2025 14:28:27 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java | 50 +++++++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java index c56f182..8f532b7 100644 --- a/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java +++ b/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java @@ -117,37 +117,37 @@ // if (wrkMast.getStaNoSign().equals(signBigTurn)){ // continue; // } - if (wrkMast.booleanStaNoSign() && wrkMast.booleanStaNoSign()){ - RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","LineUp"+wrkMast.getStaNo())); - if (Cools.isEmpty(rgvOneSign)){ - continue; - } - int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).eq("wrk_sts",12L)); - if (wrkCount+rgvOneSign.getRgvOneSign()>2){ - continue; - } - int wrkCountGt = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).gt("wrk_sts",11L)); - if (wrkCountGt > 2){ - continue; - } -// int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).gt("sta_no", 309).lt("sta_no", 314).gt("wrk_sts",11L)); -// if (wrkCount>=12){ +// if (wrkMast.booleanStaNoSign() && wrkMast.booleanStaNoSign()){ +// RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","LineUp"+wrkMast.getStaNo())); +// if (Cools.isEmpty(rgvOneSign)){ // continue; // } -// RgvOneSign bigTurn = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","bigTurn")); -// if (Cools.isEmpty(bigTurn)){ +// int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).eq("wrk_sts",12L)); +// if (wrkCount+rgvOneSign.getRgvOneSign()>2){ // continue; // } -// if (bigTurn.getRgvOneSign()>13){ +// int wrkCountGt = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).gt("wrk_sts",11L)); +// if (wrkCountGt > 2){ // continue; // } -// BasDevp basDevp = basDevpService.selectById(wrkMast.getStaNoBying()); -// if (basDevp.getLoading().equals("Y") -// || !basDevp.getAutoing().equals("Y") -// || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()!=0) ){ -// continue; -// } - } +//// int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).gt("sta_no", 309).lt("sta_no", 314).gt("wrk_sts",11L)); +//// if (wrkCount>=12){ +//// continue; +//// } +//// RgvOneSign bigTurn = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","bigTurn")); +//// if (Cools.isEmpty(bigTurn)){ +//// continue; +//// } +//// if (bigTurn.getRgvOneSign()>13){ +//// continue; +//// } +//// BasDevp basDevp = basDevpService.selectById(wrkMast.getStaNoBying()); +//// if (basDevp.getLoading().equals("Y") +//// || !basDevp.getAutoing().equals("Y") +//// || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()!=0) ){ +//// continue; +//// } +// } wrkMastSplitTwinInItHandler.start(wrkMastSplitTwin,wrkMast,2); // signBigTurn++; // if (signBigTurn > 2){ -- Gitblit v1.9.1