From c4c55decf9fea70ce225e608c32508925a676f58 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期四, 01 十二月 2022 13:21:21 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 13 +++++++++++++ src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 15 +++++++++------ src/main/java/com/zy/asrs/service/LocMastService.java | 3 +++ 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java index 792729f..63a8824 100644 --- a/src/main/java/com/zy/asrs/service/LocMastService.java +++ b/src/main/java/com/zy/asrs/service/LocMastService.java @@ -50,4 +50,7 @@ // 瀵瑰悓缁勮揣鐗╄繘琛岀Щ搴撴搷浣� void breakUp(String locNo, List<String> excludeLocNos); + // 鑾峰彇瀵瑰簲鍑哄簱鍫嗗灈鏈哄彿鐮� + Integer getOutCrnNo(LocMast locMast); + } diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java index c139b03..4d0af43 100644 --- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java @@ -119,4 +119,17 @@ workService.shuttleTransfer(groupLoc); } + @Override + public Integer getOutCrnNo(LocMast locMast) { + int row = Utils.getRow(locMast.getLocNo()); + if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) { + return 1; + } + if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) { + return 3; + } else { + return locMast.getCrnNo(); + } + } + } 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 df4d621..0f13c88 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -220,7 +220,8 @@ // 鑾峰彇搴撲綅 LocMast locMast = locMastService.selectById(dto.getLocNo()); // 鑾峰彇璺緞 - StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), staNo.getDevNo()); + Integer outCrnNo = locMastService.getOutCrnNo(locMast); + StaDesc staDesc = staDescService.queryCrnStn(ioType, outCrnNo, staNo.getDevNo()); // 鐢熸垚宸ヤ綔鍙� int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType)); // 鐢熸垚宸ヤ綔妗� @@ -232,7 +233,7 @@ Double ioPri = wrkMastService.getIoPri(ioType, dto.getLocNo()); wrkMast.setIoPri(ioPri); // 浼樺厛绾э細13 wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), false)?1:0);; - wrkMast.setCrnNo(locMast.getCrnNo()); + wrkMast.setCrnNo(outCrnNo); wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯 wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔� wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣� @@ -297,7 +298,8 @@ LocMast locMast = locMastService.selectById(taskDto.getLocNo()); // 鑾峰彇璺緞 int ioType = taskDto.isAll() ? 101 : 103; - StaDesc staDesc = staDescService.queryCrnStnAuto(ioType, locMast.getCrnNo(), staNo.getDevNo()); + Integer outCrnNo = locMastService.getOutCrnNo(locMast); + StaDesc staDesc = staDescService.queryCrnStnAuto(ioType, outCrnNo, staNo.getDevNo()); // 鐢熸垚宸ヤ綔鍙� int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType)); // 鐢熸垚宸ヤ綔妗� @@ -309,7 +311,7 @@ Double ioPri = wrkMastService.getIoPri(ioType, taskDto.getLocNo()); wrkMast.setIoPri(ioPri); // 浼樺厛绾э細13 wrkMast.setOutMost(locMastService.isOutMost(taskDto.getLocNo(), false)?1:0);; - wrkMast.setCrnNo(locMast.getCrnNo()); + wrkMast.setCrnNo(outCrnNo); wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯 wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔� wrkMast.setSourceLocNo(taskDto.getLocNo()); // 婧愬簱浣� @@ -469,11 +471,12 @@ if (Cools.isEmpty(locMast)) { throw new CoolException(locNo+"搴撲綅涓嶅瓨鍦�"); } + Integer outCrnNo = locMastService.getOutCrnNo(locMast); // 鑾峰彇婧愮珯 Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>() .eq("type_no", 110) .eq("stn_no", param.getOutSite()) - .eq("crn_no", locMast.getCrnNo()); + .eq("crn_no", outCrnNo); StaDesc staDesc = staDescService.selectOne(wrapper); if (Cools.isEmpty(staDesc)) { throw new CoolException("闈炴硶璺緞锛�"); @@ -493,7 +496,7 @@ wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯 wrkMast.setStaNo(param.getOutSite()); // 鐩爣绔� wrkMast.setOutMost(locMastService.isOutMost(locNo, false)?1:0);; - wrkMast.setCrnNo(locMast.getCrnNo()); + wrkMast.setCrnNo(outCrnNo); wrkMast.setSourceLocNo(locNo); // 婧愬簱浣� wrkMast.setFullPlt("N"); // 婊℃澘锛歒 wrkMast.setPicking("N"); // 鎷f枡 -- Gitblit v1.9.1