From fcdfbff0b969b8a5934cbaf1e8a46218dd903dd7 Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期五, 03 一月 2025 07:58:29 +0800 Subject: [PATCH] 优化自动出库 --- src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java b/src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java index 2f6e818..81bb8f3 100644 --- a/src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java +++ b/src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java @@ -48,7 +48,7 @@ /** * 鑷姩鍑烘弧鎵� */ - @Scheduled(cron = "0/3 * * * * ? ") + @Scheduled(cron = "0/5 * * * * ? ") private void execute(){ Config config = configService.selectConfigByCode("AutomaticOutboundShipment"); if(config.getStatus()==0){ @@ -58,7 +58,16 @@ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 200)); if (Cools.isEmpty(basDevp.getLoading())||basDevp.getLoading().equals("N")) { //鎵惧埌鍏ュ簱鏈�鏃╃殑 - LocMast locMastIoTime=locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").orderBy("io_time")); + List<LocDetl> locDetlss = locDetlService.selectList(new EntityWrapper<LocDetl>().orderBy("appe_time")); + LocMast locMastIoTime=new LocMast(); + for (LocDetl locDetl : locDetlss) { + LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo())); + if(!Cools.isEmpty(locMast)&&locMast.getLocSts().equals("F")){ + locMastIoTime=locMast; + break; + } + } +// LocMast locMastIoTime=locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").orderBy("io_time")); //鏈�鏃╁叆搴撶殑鍙兘涓嶆槸鏈�闈犺繎鍑哄簱鍙g殑锛屾墍浠ラ渶瑕佸啀鍘绘壘杩欏眰鏈�闈犺繎鍑哄簱鍙g殑璐� LocMast locMast =locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").eq("lev1",locMastIoTime.getLev1()).orderBy("bay1",false)); -- Gitblit v1.9.1