From 1ef5306b1fa675e7650c049e16ba59743e3e8cc5 Mon Sep 17 00:00:00 2001 From: lsh <lsh> Date: 星期日, 14 七月 2024 08:42:36 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java | 18 +++++++++ src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 6 +- src/main/java/com/zy/asrs/utils/CodeDetectionUtil.java | 83 +++++++++++++++++++++++++++++++++-------- 3 files changed, 87 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java index a0bc890..54a3146 100644 --- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java +++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java @@ -118,11 +118,11 @@ @Scheduled(cron = "0/3 * * * * ? ") private void execute2(){//鑷姩璋冪┖鏉垮嚭搴� 鐓滄槦涓�妤� if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){ - Integer devNo = 448; + Integer devNo = 445; Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard448")); if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){ - int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 421).le("dev_no", devNo).eq("loading", "Y")); - int count = 25; + int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 422).le("dev_no", devNo).eq("loading", "Y")); + int count = 20; if (loadIngCount<count){ bareBoardHandler.startYx(devNo,count); } diff --git a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java index 9561966..a131caf 100644 --- a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java @@ -12,6 +12,7 @@ import com.zy.asrs.service.*; import com.zy.asrs.task.AbstractHandler; import com.zy.asrs.task.core.ReturnT; +import com.zy.asrs.utils.CodeDetectionUtil; import com.zy.asrs.utils.Utils; import com.zy.common.model.enums.WorkNoType; import com.zy.common.service.CommonService; @@ -160,6 +161,8 @@ return null; } ArrayList<Integer> crns =new ArrayList<>(); + ArrayList<Integer> crnList =new ArrayList<>(); + int[] crnCount = new int[7]; crns.add(1); crns.add(2); crns.add(3); @@ -169,6 +172,21 @@ crns.add(7); boolean sign = true; for (Integer crnNo : crns){ + int crnCountD = locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_sts", "D").eq("crn_no", crnNo)); + crnCount[crnNo-1] = crnCountD; + } + crnList.add(CodeDetectionUtil.crnCodeDetectionMax(new int[]{crnCount[0],crnCount[1]})[0]+1); + crnList.add(CodeDetectionUtil.crnCodeDetectionMax(new int[]{crnCount[2],crnCount[3],crnCount[4]})[0]+3); + crnList.add(CodeDetectionUtil.crnCodeDetectionMaxT(new int[]{crnCount[2],crnCount[3],crnCount[4]},crnList.get(1))[0]+3); + crnList.add(CodeDetectionUtil.crnCodeDetectionMax(new int[]{crnCount[5],crnCount[6]})[0]+6); + crnList.add(1); + crnList.add(2); + crnList.add(3); + crnList.add(4); + crnList.add(5); + crnList.add(6); + crnList.add(7); + for (Integer crnNo : crnList){ // 妫�娴嬭矾寰� Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>() .eq("type_no", 110) diff --git a/src/main/java/com/zy/asrs/utils/CodeDetectionUtil.java b/src/main/java/com/zy/asrs/utils/CodeDetectionUtil.java index 22afa1f..fd32bb9 100644 --- a/src/main/java/com/zy/asrs/utils/CodeDetectionUtil.java +++ b/src/main/java/com/zy/asrs/utils/CodeDetectionUtil.java @@ -7,32 +7,81 @@ /** * 妫�娴嬭揣鏋剁爜 */ - public static boolean barcodeDetection(String barcode,int code){ - Pattern pattern = Pattern.compile("\\d{"+code+"}");//浣嶆暟瀛� + public static boolean barcodeDetection(String barcode, int code) { + Pattern pattern = Pattern.compile("\\d{" + code + "}");//浣嶆暟瀛� return pattern.matcher(barcode).matches(); } /** * 妫�娴嬪皬杞﹀湴鐮� */ - public static boolean carCodeDetection(String carCode){ + public static boolean carCodeDetection(String carCode) { return carCode.contains("_"); } - public static void main(String[] args) { - System.out.println("barcodeDetection:"+"22222222===>"+barcodeDetection("22222222",7)); - System.out.println("barcodeDetection:"+"222222===>"+barcodeDetection("222222",7)); - System.out.println("barcodeDetection:"+"111===>"+barcodeDetection("111",7)); - System.out.println("barcodeDetection:"+"DB_123ss===>"+barcodeDetection("DB_123ss",7)); - System.out.println("barcodeDetection:"+"12_1231===>"+barcodeDetection("12_1231",7)); - System.out.println("barcodeDetection:"+"DB_123456===>"+barcodeDetection("DB_123456",7)); - - System.out.println("carCodeDetection:"+"22222222===>"+carCodeDetection("22222222")); - System.out.println("carCodeDetection:"+"222222===>"+carCodeDetection("222222")); - System.out.println("carCodeDetection:"+"111===>"+carCodeDetection("111")); - System.out.println("carCodeDetection:"+"DB_123ss===>"+carCodeDetection("DB_123ss")); - System.out.println("carCodeDetection:"+"12_1231===>"+carCodeDetection("12_1231")); - System.out.println("carCodeDetection:"+"DB_123456===>"+carCodeDetection("DB_123456")); + /** + * 妫�娴嬫暟缁勬渶澶у�煎強鍏剁储寮� + */ + public static int[] crnCodeDetectionMax(int[] arr) { + int max = arr[0]; + int index = 0; + for (int i = 0; i < arr.length; i++) { + if (arr[i] > max) { + max = arr[i]; + index = i; + } + } + return new int[]{index, max}; } + /** + * 妫�娴嬫暟缁勬渶澶у�煎強鍏剁储寮� + */ + public static int[] crnCodeDetectionMaxT(int[] arr,Integer crnNo) { + int max = arr[0]; + int index = 0; + for (int i = 0; i < arr.length; i++) { + if (crnNo == i+1){ + continue; + } + if (arr[i] > max) { + max = arr[i]; + index = i; + } + } + return new int[]{index, max}; + } + + /** + * 妫�娴嬫暟缁勬渶灏忓�煎強鍏剁储寮� + */ + public static int[] crnCodeDetectionMin(int[] arr) { + int min = arr[0]; + int index = 0; + for (int i = 0; i < arr.length; i++) { + if (arr[i] < min) { + min = arr[i]; + index = i; + } + } + return new int[]{index, min}; + } + + +// public static void main(String[] args) { +// System.out.println("barcodeDetection:" + "22222222===>" + barcodeDetection("22222222", 7)); +// System.out.println("barcodeDetection:" + "222222===>" + barcodeDetection("222222", 7)); +// System.out.println("barcodeDetection:" + "111===>" + barcodeDetection("111", 7)); +// System.out.println("barcodeDetection:" + "DB_123ss===>" + barcodeDetection("DB_123ss", 7)); +// System.out.println("barcodeDetection:" + "12_1231===>" + barcodeDetection("12_1231", 7)); +// System.out.println("barcodeDetection:" + "DB_123456===>" + barcodeDetection("DB_123456", 7)); +// +// System.out.println("carCodeDetection:" + "22222222===>" + carCodeDetection("22222222")); +// System.out.println("carCodeDetection:" + "222222===>" + carCodeDetection("222222")); +// System.out.println("carCodeDetection:" + "111===>" + carCodeDetection("111")); +// System.out.println("carCodeDetection:" + "DB_123ss===>" + carCodeDetection("DB_123ss")); +// System.out.println("carCodeDetection:" + "12_1231===>" + carCodeDetection("12_1231")); +// System.out.println("carCodeDetection:" + "DB_123456===>" + carCodeDetection("DB_123456")); +// } + } -- Gitblit v1.9.1