From 9f3f31e66b2ffb217155b9bcd294da4ec12b6e34 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期一, 16 十月 2023 15:38:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs --- src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 33 +++++++++++++++++++++++++++------ 1 files changed, 27 insertions(+), 6 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 656b917..4a76d35 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -191,13 +191,13 @@ } } - List<String> groupInnerLoc = Utils.getGroupInnerLoc(locNo); - if (!Cools.isEmpty(groupInnerLoc)) { - for (String insideLoc : groupInnerLoc) { - if (locNos.contains(insideLoc)){ + List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo); + if (!Cools.isEmpty(groupOuterLoc)) { + for (String outerLoc : groupOuterLoc) { + if (locNos.contains(outerLoc)){ continue; } - LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", insideLoc)); + LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", outerLoc)); if (locMast != null) { if (!locMast.getLocSts().equals("O") && !locMast.getLocSts().equals("R")){ sign=true; @@ -312,6 +312,13 @@ sourceStaNo = staDesc.getStnNo(); } + int lev = Utils.getLev(dto.getLocNo()); + if (lev == 1 || lev == 2) { + if (!(stnNo == 100 || stnNo == 103 || stnNo == 105)) { + throw new CoolException("1銆�2灞傝揣鐗╀粎鍏佽鍦ㄤ竴妤艰繘琛屽嚭搴�"); + } + } + // 鐢熸垚宸ヤ綔妗� WrkMast wrkMast = new WrkMast(); wrkMast.setWrkNo(workNo); @@ -396,6 +403,13 @@ if (stnNo == 325 || stnNo == 331 || stnNo == 333 || stnNo == 339) { stnNo = staDesc.getCrnStn(); sourceStaNo = staDesc.getStnNo(); + } + + int lev = Utils.getLev(taskDto.getLocNo()); + if (lev == 1 || lev == 2) { + if (!(stnNo == 100 || stnNo == 103 || stnNo == 105)) { + throw new CoolException("1銆�2灞傝揣鐗╀粎鍏佽鍦ㄤ竴妤艰繘琛屽嚭搴�"); + } } // 鐢熸垚宸ヤ綔妗� @@ -774,6 +788,13 @@ if (Cools.isEmpty(wrkMast)){ throw new CoolException(workNo+"宸ヤ綔妗d笉瀛樺湪"); } + + if (wrkMast.getIoType() == 200) { + //灏忚溅绉诲簱浠诲姟锛岀洿鎺ュ垹闄ゅ伐浣滄。 + wrkMastService.deleteById(wrkMast); + return; + } + if (wrkMast.getWrkSts() == 9 || wrkMast.getWrkSts() == 29) { throw new CoolException("褰撳墠宸ヤ綔妗e凡瀹屾垚"); } @@ -940,7 +961,7 @@ throw new CoolException(workNo+"宸ヤ綔妗d笉瀛樺湪"); } - if (wrkMast.getWrkSts() == 200) { + if (wrkMast.getIoType() == 200) { //灏忚溅绉诲簱浠诲姟锛岀洿鎺ュ垹闄ゅ伐浣滄。 wrkMastService.deleteById(wrkMast); return; -- Gitblit v1.9.1