From 886a48cc97ffd5813951a36d3686e074be5bc9fb Mon Sep 17 00:00:00 2001 From: lsh <lsh123456> Date: 星期四, 10 十月 2024 19:49:14 +0800 Subject: [PATCH] #gz --- src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java | 2 +- src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 2 +- src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java index fe9aaf9..2a1c0d2 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -663,6 +663,8 @@ public void locCheckOut(StockOutParam param, Long userId) { // 鐩爣绔欑偣鐘舵�佹娴� BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite()); + BasDevp staNo122 = basDevpService.checkSiteStatus(122); + BasDevp staNo171 = basDevpService.checkSiteStatus(171); // 鑾峰彇搴撲綅鏄庣粏 List<LocDetlDto> locDetlDtos = new ArrayList<>(); for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) { @@ -673,6 +675,11 @@ } if (!locDetlDtos.isEmpty()) { LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo())); + if (locMast.getCrnNo()>3){ + staNo = staNo171; + } else { + staNo = staNo122; + } if (locMast.getLocSts().equals("F")){ // 鍚姩鍑哄簱寮�濮� 107.鐩樼偣鍑哄簱 stockOut(staNo, locDetlDtos, IoWorkType.CHECK_OUT, userId); diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java index 18521d3..cdf0dd9 100644 --- a/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java +++ b/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java @@ -60,7 +60,7 @@ }}; public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{ - add(120);add(121);add(122);add(123); + add(120);add(121);add(122);add(123);add(171); }}; diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java index d4bfc20..5e07df2 100644 --- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java +++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java @@ -59,7 +59,7 @@ }}; public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{ - add(118);add(120);add(121);add(122);add(123); + add(118);add(120);add(121);add(122);add(123);add(171); }}; -- Gitblit v1.9.1