From e666ab89158593e0ab2e44d6e61a2a3a4f8210b2 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期五, 02 六月 2023 14:47:22 +0800 Subject: [PATCH] 随机可用堆垛机号 --- src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 397 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 363 insertions(+), 34 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 f48fe8b..45a92f5 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -91,7 +91,7 @@ // 妫�绱㈠簱浣� LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo); List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList()); - StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs, locTypeDto, 0); + StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs, locTypeDto); // 鐢熸垚宸ヤ綔鍙� int workNo = dto.getWorkNo(); // 鐢熸垚宸ヤ綔妗� @@ -159,22 +159,210 @@ @Override @Transactional public void startupFullTakeStore(StockOutParam param, Long userId) { + ArrayList<String> locNos = new ArrayList<>(); + for (StockOutParam.LocDetl locDetl:param.getLocDetls()){ + if (!locNos.contains(locDetl.getLocNo())){ + locNos.add(locDetl.getLocNo()); + } + } + List<StockOutParam.LocDetl> locDetls = param.getLocDetls(); +// ArrayList<String> locNos = new ArrayList<>(); +// List<StockOutParam.LocDetl> locDetls = new ArrayList<>(); +// ArrayList<String> matnrs = new ArrayList<>();//鐩殑鍋氭暟鎹幓閲� +// for (StockOutParam.LocDetl locDetl : param.getLocDetls()) { +// if (!matnrs.contains(locDetl.getMatnr())) { +// matnrs.add(locDetl.getMatnr()); +// +// //1.鏍规嵁鐗╂枡鍙峰厛鎼滅储楂橀鍖哄煙鏄惁鏈夊簱瀛� +// List<StockOutParam.LocDetl> locNoStep1 = this.findLocNoStep1(locDetl); +// if (locNoStep1 != null) { +// locDetls.addAll(locNoStep1); +// continue; +// } +// +// //楂橀娣锋斁鍖哄煙娌℃湁婊¤冻鐨勫簱浣嶏紝鍦ㄥ崟鍝佸尯鍩熻繘琛屾悳绱� +// List<StockOutParam.LocDetl> locNoStep2 = this.findLocNoStep2(locDetl); +// if (locNoStep2 != null) { +// locDetls.addAll(locNoStep2); +// continue; +// } +// +// //浣庨娣锋斁鍖哄煙杩涜鎼滅储 +// List<StockOutParam.LocDetl> locNoStep3 = this.findLocNoStep3(locDetl); +// if (locNoStep3 != null) { +// locDetls.addAll(locNoStep3); +// continue; +// } +// +// } +// } +// +// for (StockOutParam.LocDetl locDetl : locDetls) { +// if (!locNos.contains(locDetl.getLocNo())) { +// locNos.add(locDetl.getLocNo()); +// } +// } + +// //妫�娴嬫彁浜ょ殑鍑哄簱搴撲綅鏄惁鍚堟硶(娴呭簱浣嶆湁闈炵┖搴撲綅) +// Utils.checkStockOutLocNo(locNos); + // 鐩爣绔欑偣鐘舵�佹娴� BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite()); // 鑾峰彇搴撲綅鏄庣粏 List<LocDetlDto> locDetlDtos = new ArrayList<>(); - for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) { + for (StockOutParam.LocDetl paramLocDetl : locDetls) { if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) { LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch()); if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount())); } } if (!locDetlDtos.isEmpty()) { - // 鍚姩鍑哄簱寮�濮� 101.鍑哄簱 - stockOut(staNo, locDetlDtos, null, userId); + LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo())); + if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") ){ + // 鍚姩鍑哄簱寮�濮� 101.鍑哄簱 + stockOut(staNo, locDetlDtos, null, userId); + }else { + throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篎銆丏鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$()); + } } else { throw new CoolException("搴撳瓨涓嶅瓨鍦�"); } + } + + //1.鏍规嵁鐗╂枡鍙峰厛鎼滅储楂橀鍖哄煙鏄惁鏈夊簱瀛� + private List<StockOutParam.LocDetl> findLocNoStep1(StockOutParam.LocDetl locDetl) { + List<StockOutParam.LocDetl> locDetlList = new ArrayList<>(); + //1.鏍规嵁鐗╂枡鍙峰厛鎼滅储楂橀鍖哄煙鏄惁鏈夊簱瀛� + List<LocDetl> locDetls = locDetlService.findHighAreaByMatnr(locDetl.getMatnr()); + if (locDetls.size() > 0) { + for (LocDetl locDetl0 : locDetls) { + if (locDetl0.getAnfme() >= locDetl.getCount()) { + //鎵惧埌鐨勫簱瀛� >= 鎵�闇�搴撳瓨锛屾弧瓒虫潯浠� + locDetlList.add(new StockOutParam.LocDetl(locDetl0.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), locDetl.getCount())); + return locDetlList; + } else { + //涓嶆弧瓒冲簱瀛樻潯浠� + //鍒ゆ柇鏈�澶栦晶搴撲綅鐨勬繁澶勬槸鍚︽湁鐩稿悓鐗╂枡 + Double useCount = locDetl0.getAnfme();//宸蹭娇鐢ㄧ殑鏁伴噺 + List<StockOutParam.LocDetl> tmpLocDetlList = new ArrayList<>();//璁板綍缁忚繃鐨勫簱浣� + tmpLocDetlList.add(new StockOutParam.LocDetl(locDetl0.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), locDetl0.getAnfme())); + + List<String> insideLoc = Utils.getGroupInsideLoc(locDetl0.getLocNo()); + List<LocDetl> locDetls1 = locDetlService.selectByLocNosAndMatnr(insideLoc, locDetl.getMatnr()); + if (locDetls1.size() == 0) {//鍐呬晶搴撲綅娌℃湁鐩稿悓鐨勭墿鏂欙紝璺宠繃 + continue; + } + int locRow = Utils.getRow(locDetl0.getLocNo()); + switch (locRow) { + case 3: + case 11: + case 18: + Collections.reverse(locDetls1); + break; + } + for (LocDetl detl : locDetls1) { + double lastCount = locDetl.getCount() - useCount;//鍓╀綑鎵�闇�鏁伴噺 + double realCount = 0;//瀹為檯鎻愪緵鏁伴噺 + if (detl.getAnfme() >= lastCount) {//瀹為檯鏁伴噺澶т簬鎵�闇�鏁伴噺锛屾寜鎵�闇�鏁伴噺鎻愪緵 + realCount = lastCount; + }else { + //瀹為檯灏忎簬鎵�闇�鏁伴噺锛屾寜瀹為檯鏁伴噺鎻愪緵 + realCount = detl.getAnfme(); + } + useCount += realCount; + tmpLocDetlList.add(new StockOutParam.LocDetl(detl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), realCount)); + if (useCount >= locDetl.getCount()) { + //鎵惧埌鐨勫簱瀛� >= 鎵�闇�搴撳瓨锛屾弧瓒虫潯浠� + locDetlList.addAll(tmpLocDetlList); + return locDetlList; + } + } + + } + } + + //鏈�澶栦晶鍖呮嫭鍐呬晶閮芥棤婊¤冻搴撲綅锛屽垯鍒ゆ柇鎼滅储鍑烘潵鐨勫叏閮ㄦ渶澶栦晶搴撲綅鍔犺捣鏉ユ槸鍚︽弧瓒冲嚭搴撴暟閲忚姹� + Double useCount = 0D; + for (LocDetl locDetl0 : locDetls) { + double lastCount = locDetl.getCount() - useCount;//鍓╀綑鎵�闇�鏁伴噺 + double realCount = 0;//瀹為檯鎻愪緵鏁伴噺 + if (locDetl0.getAnfme() >= lastCount) {//瀹為檯鏁伴噺澶т簬鎵�闇�鏁伴噺锛屾寜鎵�闇�鏁伴噺鎻愪緵 + realCount = lastCount; + }else { + //瀹為檯灏忎簬鎵�闇�鏁伴噺锛屾寜瀹為檯鏁伴噺鎻愪緵 + realCount = locDetl0.getAnfme(); + } + useCount += realCount;//宸蹭娇鐢ㄧ殑鏁伴噺 + locDetlList.add(new StockOutParam.LocDetl(locDetl0.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), realCount)); + if (useCount >= locDetl.getCount()) { + //鎵惧埌鐨勫簱瀛� >= 鎵�闇�搴撳瓨锛屾弧瓒虫潯浠� + return locDetlList; + } + } + } + + return null; + } + + //楂橀娣锋斁鍖哄煙娌℃湁婊¤冻鐨勫簱浣嶏紝鍦ㄥ崟鍝佸尯鍩熻繘琛屾悳绱� + private List<StockOutParam.LocDetl> findLocNoStep2(StockOutParam.LocDetl locDetl) { + List<StockOutParam.LocDetl> locDetlList = new ArrayList<>(); + //鍦ㄥ崟鍝佸尯鍩熻繘琛屾悳绱� + List<LocDetl> locDetls = locDetlService.findSingleAreaByMatnr(locDetl.getMatnr()); + if (locDetls.size() > 0) { + Double useCount = 0D; + for (LocDetl locDetl0 : locDetls) { + double lastCount = locDetl.getCount() - useCount;//鍓╀綑鎵�闇�鏁伴噺 + double realCount = 0;//瀹為檯鎻愪緵鏁伴噺 + if (locDetl0.getAnfme() >= lastCount) {//瀹為檯鏁伴噺澶т簬鎵�闇�鏁伴噺锛屾寜鎵�闇�鏁伴噺鎻愪緵 + realCount = lastCount; + } else { + //瀹為檯灏忎簬鎵�闇�鏁伴噺锛屾寜瀹為檯鏁伴噺鎻愪緵 + realCount = locDetl0.getAnfme(); + } + useCount += realCount;//宸蹭娇鐢ㄧ殑鏁伴噺 + + locDetlList.add(new StockOutParam.LocDetl(locDetl0.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), realCount)); + if (useCount >= locDetl.getCount()) { + //鎵惧埌鐨勫簱瀛� >= 鎵�闇�搴撳瓨锛屾弧瓒虫潯浠� + return locDetlList; + } + } + + //搴撳瓨鏁伴噺涓嶆弧瓒� + throw new CoolException("鍗曞搧鍖哄煙鍙湁" + useCount + "涓揣鐗�"); + } + + return null; + } + + //浣庨娣锋斁鍖哄煙杩涜鎼滅储 + private List<StockOutParam.LocDetl> findLocNoStep3(StockOutParam.LocDetl locDetl) { + List<StockOutParam.LocDetl> locDetlList = new ArrayList<>(); + //鍦ㄥ崟鍝佸尯鍩熻繘琛屾悳绱� + List<LocDetl> locDetls = locDetlService.findLowAreaByMatnr(locDetl.getMatnr()); + if (locDetls.size() > 0) { + Double useCount = 0D; + for (LocDetl locDetl0 : locDetls) { + double lastCount = locDetl.getCount() - useCount;//鍓╀綑鎵�闇�鏁伴噺 + double realCount = 0;//瀹為檯鎻愪緵鏁伴噺 + if (locDetl0.getAnfme() >= lastCount) {//瀹為檯鏁伴噺澶т簬鎵�闇�鏁伴噺锛屾寜鎵�闇�鏁伴噺鎻愪緵 + realCount = lastCount; + }else { + //瀹為檯灏忎簬鎵�闇�鏁伴噺锛屾寜瀹為檯鏁伴噺鎻愪緵 + realCount = locDetl0.getAnfme(); + } + useCount += realCount;//宸蹭娇鐢ㄧ殑鏁伴噺 + + locDetlList.add(new StockOutParam.LocDetl(locDetl0.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), realCount)); + if (useCount >= locDetl.getCount()) { + //鎵惧埌鐨勫簱瀛� >= 鎵�闇�搴撳瓨锛屾弧瓒虫潯浠� + return locDetlList; + } + } + } + + return null; } @Override @@ -210,6 +398,108 @@ } } + //-----------------2023.5.31涓婃灦鍖哄煙鐗堟湰鍏煎浠g爜----------------------- + //鍒ゆ柇褰撳墠搴撲綅缁勬槸鍚﹀潎涓哄悓涓�绉嶇墿鏂欙紝濡備笉鏄紝鍒欒瀹氶渶瑕佹墽琛屽吋瀹逛唬鐮� + //闇�瑕佸皢寰呭嚭搴撳簱浣嶅墠渚у簱浣�(涓嶅寘鍚渶澶栦晶楂橀搴撲綅)鎵ц101鍏ㄦ澘鍑哄簱 + String locNo = dto.getLocNo(); + String matnr = null; + for (LocDetlDto locDetlDto : dto.getLocDetlDtos()) { + LocDetl locDetl = locDetlDto.getLocDetl(); + if (locDetl.getLocNo().equals(locNo)) { + matnr = locDetl.getMatnr(); + } + } + + List<String> outerLocs = Utils.getGroupOuterSingleLoc(locNo); + Double wrkPri = 15D; + for (String outerLoc : outerLocs) { + LocMast locMast = locMastService.selectById(outerLoc); + if (locMast == null) { + continue; + } + + if (!locMast.getLocSts().equals("F")) { + continue; + } + + boolean flag = false; + for (LocDetl locDetl : locDetlService.selectByLocNo(locMast.getLocNo())) { + if (!locDetl.getMatnr().equals(matnr)) { + flag = true; + break; + } + } + + if (flag) { + //褰撳墠宸烽亾瀛樺湪涓嶅悓瑙勬牸鐨勭墿鏂欙紝闇�瑕佽繘琛�101鍏ㄦ澘鍑哄簱 + // 鑾峰彇璺緞 + StaDesc staDesc = staDescService.queryCrnStn(101, locMast.getCrnNo(), staNo.getDevNo(), locMast.getRow1()); + if(staDesc == null){ + throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�"); + } + + // 鐢熸垚宸ヤ綔鍙� + int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(101)); + // 鐢熸垚宸ヤ綔妗� + WrkMast wrkMast = new WrkMast(); + wrkMast.setWrkNo(workNo); + wrkMast.setIoTime(now); + wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID + wrkMast.setIoType(101); // 鍏ュ嚭搴撶姸鎬�101鍏ㄦ澘鍑哄簱 + wrkPri += 2D; + wrkMast.setIoPri(wrkPri); // 浼樺厛绾� + wrkMast.setOutMost(0); + wrkMast.setCrnNo(locMast.getCrnNo()); + wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯 + wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔� + wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣� + wrkMast.setFullPlt("Y"); // 婊℃澘锛歒 + wrkMast.setPicking("N"); // 鎷f枡 + wrkMast.setExitMk("N"); // 閫�鍑� + wrkMast.setEmptyMk("N"); // 绌烘澘 + wrkMast.setLinkMis("N"); + wrkMast.setBarcode(locMast.getBarcode()); + wrkMast.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁 + wrkMast.setAppeTime(now); + wrkMast.setModiUser(userId); + wrkMast.setModiTime(now); + if (!wrkMastService.insert(wrkMast)) { + throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + dto.getLocNo()); + } + // 鐢熸垚宸ヤ綔妗f槑缁� + for (LocDetl locDetl : locDetlService.selectByLocNo(locMast.getLocNo())) { + WrkDetl wrkDetl = new WrkDetl(); + wrkDetl.sync(locDetl); + wrkDetl.setOrderNo(""); // 鎵嬪姩鍑哄簱涓嶉渶瑕佸甫鍑哄簱瀛樹腑鐨勫崟鎹紪鍙� + wrkDetl.setWrkNo(workNo); + wrkDetl.setIoTime(now); + wrkDetl.setAnfme(locDetl.getAnfme()); // 鏁伴噺 + wrkDetl.setAppeTime(now); + wrkDetl.setAppeUser(userId); + wrkDetl.setModiTime(now); + wrkDetl.setModiUser(userId); + wrkDetl.setSpecs(locDetl.getSpecs()); + wrkDetl.setMatType(locDetl.getMatType()); + if (!wrkDetlService.insert(wrkDetl)) { + throw new CoolException("淇濆瓨宸ヤ綔妗f槑缁嗗け璐�"); + } + } + // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害 + if (locMast.getLocSts().equals("F")) { + locMast.setLocSts("R"); + locMast.setModiUser(userId); + locMast.setModiTime(now); + if (!locMastService.updateById(locMast)) { + throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細" + dto.getLocNo()); + } + } else { + throw new CoolException(dto.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��"); + } + } + + } + //-----------------2023.5.31涓婃灦鍖哄煙鐗堟湰鍏煎浠g爜end----------------------- + // 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷f枡鍑哄簱 if (ioWorkType == null) { ioType = dto.isAll() ? 101 : 103; @@ -222,8 +512,21 @@ assert ioType != null; // 鑾峰彇搴撲綅 LocMast locMast = locMastService.selectById(dto.getLocNo()); + + //-----------------2023.6.2鍑哄簱鍏煎浠g爜----------------------- + List<LocDetl> locDetls = locDetlService.selectByLocNo(locMast.getLocNo()); + if (locMast.getLocType2() == 1 && locDetls.size() > 1) { + //鍗曞搧鍖哄煙鍑哄簱鐗╂枡澶т簬1绉嶏紝寮哄埗鍙樻垚101鍏ㄦ澘鍑哄簱 + ioType = 101; + } + //-----------------2023.6.2鍑哄簱鍏煎浠g爜end----------------------- + // 鑾峰彇璺緞 - StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), staNo.getDevNo()); + StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), staNo.getDevNo(), locMast.getRow1()); + if(staDesc == null){ + throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�"); + } + // 鐢熸垚宸ヤ綔鍙� int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType)); // 鐢熸垚宸ヤ綔妗� @@ -233,7 +536,7 @@ wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬� Double ioPri = wrkMastService.getIoPri(ioType, dto.getLocNo()); - wrkMast.setIoPri(13D); // 浼樺厛绾э細13 + wrkMast.setIoPri(15D); // 浼樺厛绾э細13 wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), false) ? 1 : 0); wrkMast.setCrnNo(locMast.getCrnNo()); wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯 @@ -269,6 +572,7 @@ wrkDetl.setModiTime(now); wrkDetl.setModiUser(userId); wrkDetl.setSpecs(detlDto.getLocDetl().getSpecs()); + wrkDetl.setMatType(detlDto.getLocDetl().getMatType()); if (!wrkDetlService.insert(wrkDetl)) { throw new CoolException("淇濆瓨宸ヤ綔妗f槑缁嗗け璐�"); } @@ -355,11 +659,12 @@ wrkDetl.setAppeUser(userId); wrkDetl.setModiTime(now); wrkDetl.setModiUser(userId); + wrkDetl.setMatType(locDetl.getMatType()); if (!wrkDetlService.insert(wrkDetl)) { throw new CoolException("淇濆瓨宸ヤ綔妗f槑缁嗗け璐�"); } // 淇敼璁㈠崟鏄庣粏 - if (BaseController.isJSON(locDto.getOrderNo())) { + if (!BaseController.isJSON(locDto.getOrderNo())) { String[] orderNos = GetOrderNo(locDto.getOrderNo()); if (!Cools.isEmpty(orderNos)){ Double anfme = locDto.getAnfme(); @@ -393,6 +698,7 @@ } else { // 璁㈠崟鍚堝苟鍑哄簱 List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class); + for (OrderDto orderDto : orderDtoList) { OrderDetl orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch()); if (orderDetl == null) { @@ -462,7 +768,7 @@ BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true); // 妫�绱㈠簱浣� LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo); - StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null, locTypeDto, 0); + StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null, locTypeDto); int workNo = dto.getWorkNo(); // 鐢熸垚宸ヤ綔妗� WrkMast wrkMast = new WrkMast(); @@ -535,6 +841,9 @@ if (Cools.isEmpty(locMast)) { throw new CoolException(locNo + "搴撲綅涓嶅瓨鍦�"); } + if (!locMast.getLocSts().equals("D")){ + throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篋鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$()); + } // 鑾峰彇婧愮珯 Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>() .eq("type_no", 110) @@ -603,8 +912,14 @@ } } if (!locDetlDtos.isEmpty()) { - // 鍚姩鍑哄簱寮�濮� 107.鐩樼偣鍑哄簱 - stockOut(staNo, locDetlDtos, IoWorkType.CHECK_OUT, userId); + LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo())); + if (locMast.getLocSts().equals("F")){ + // 鍚姩鍑哄簱寮�濮� 107.鐩樼偣鍑哄簱 + stockOut(staNo, locDetlDtos, IoWorkType.CHECK_OUT, userId); + }else { + throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篎鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$()); + } + } else { throw new CoolException("搴撲綅鐗╂枡涓嶅瓨鍦�"); } @@ -621,6 +936,9 @@ LocMast loc = locMastService.selectById(locNo); if (Cools.isEmpty(loc)) { throw new CoolException("鏈壘鍒板簱浣�"); + } + if (!loc.getLocSts().equals("O")||(!sourceLoc.getLocSts().equals("F") && !sourceLoc.getLocSts().equals("D"))){ + throw new CoolException("搴撲綅鐘舵�佸凡鏀瑰彉"); } if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) { // throw new CoolException("绉昏浆搴撲綅灞炰簬涓嶅悓鍫嗗灈鏈�"); todo:luxiaotao @@ -664,6 +982,7 @@ wrkDetl.setAppeUser(userId); wrkDetl.setModiTime(now); wrkDetl.setModiUser(userId); + wrkDetl.setMatType(locDetl.getMatType()); if (!wrkDetlService.insert(wrkDetl)) { throw new CoolException("淇濆瓨宸ヤ綔妗f槑缁嗗け璐�"); } @@ -707,6 +1026,7 @@ wrkMast.setWrkSts(9L); // 鍑哄簱 } else if (wrkMast.getWrkSts() > 10) { + wrkMast.setSteNo(0); wrkMast.setWrkSts(17L); } Date now = new Date(); @@ -750,25 +1070,26 @@ continue; } if (locDetl.getMatnr().equals(adjust.getMatnr()) && Cools.eq(locDetl.getBatch(), adjust.getBatch())) { - if (!locDetl.getAnfme().equals(adjust.getCount())) { - // todo 鐩樼偣璁板綍 - // 淇敼搴撳瓨 - if (!locDetlService.updateAnfme(adjust.getCount(), locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch())) { - throw new CoolException(locDetl.getLocNo() + "搴撲綅锛�" + locDetl.getMatnr() + "鍟嗗搧锛�" + locDetl.getBatch() + "搴忓垪鐮佷慨鏀规暟閲忓け璐�"); - } - // 淇濆瓨璋冩暣璁板綍 - AdjDetl adjDetl = new AdjDetl(); - adjDetl.setLocNo(locDetl.getLocNo()); - adjDetl.setMatnr(locDetl.getMatnr()); - adjDetl.setBatch(locDetl.getBatch()); - adjDetl.setOriQty(locDetl.getAnfme()); - adjDetl.setAdjQty(adjust.getCount()); - adjDetl.setModiTime(now); - adjDetl.setModiUser(userId); - adjDetl.setAppeTime(now); - adjDetl.setAppeUser(userId); - adjDetlService.save(adjDetl, userId); + // todo 鐩樼偣璁板綍 + // 淇敼搴撳瓨 + if (!locDetlService.updateAnfme(adjust.getCount(), locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), adjust.getManu(), adjust.getMemo())) { + throw new CoolException(locDetl.getLocNo() + "搴撲綅锛�" + locDetl.getMatnr() + "鍟嗗搧锛�" + locDetl.getBatch() + "搴忓垪鐮佷慨鏀规暟閲忓け璐�"); } + // 淇濆瓨璋冩暣璁板綍 + AdjDetl adjDetl = new AdjDetl(); + adjDetl.setLocNo(locDetl.getLocNo()); + adjDetl.setMatnr(locDetl.getMatnr()); + adjDetl.setBatch(locDetl.getBatch()); + adjDetl.setOriQty(locDetl.getAnfme()); + adjDetl.setAdjQty(adjust.getCount()); + adjDetl.setMemo(adjust.getMemo()); + adjDetl.setManu(adjust.getManu()); + adjDetl.setModiTime(now); + adjDetl.setModiUser(userId); + adjDetl.setAppeTime(now); + adjDetl.setAppeUser(userId); + adjDetlService.save(adjDetl, userId); + iterator.remove(); iterator1.remove(); } @@ -806,6 +1127,8 @@ locDetl.setBatch(adjust.getBatch()); locDetl.setLocNo(locMast.getLocNo()); locDetl.setAnfme(adjust.getCount()); // 鏁伴噺 + locDetl.setMemo(adjust.getMemo()); + locDetl.setManu(adjust.getManu()); locDetl.setModiUser(userId); // 鎿嶄綔浜哄憳淇℃伅 locDetl.setModiTime(now); locDetl.setAppeUser(userId); @@ -818,6 +1141,8 @@ adjDetl.setLocNo(locMast.getLocNo()); adjDetl.setMatnr(adjust.getMatnr()); adjDetl.setBatch(adjust.getBatch()); + adjDetl.setMemo(adjust.getMemo()); + adjDetl.setManu(adjust.getManu()); adjDetl.setOriQty(0.0D); adjDetl.setAdjQty(adjust.getCount()); adjDetl.setModiTime(now); @@ -861,7 +1186,7 @@ locSts = "O"; // 搴撲綅杞Щ - if (wrkMast.getIoType() == 11) { + if (wrkMast.getIoType() == 11 || wrkMast.getIoType() == 111) { // 搴撲綅杞Щ锛氭簮搴撲綅 LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo()); if (Cools.isEmpty(locMast)) { @@ -883,6 +1208,9 @@ locSts = "D"; // 搴撲綅杞Щ ===>> D.绌烘《/绌烘爤鏉� } else if (wrkMast.getIoType() == 11) { + if (wrkMast.getWrkSts() > 11){ + throw new CoolException("绉诲簱浠诲姟宸插湪鎵ц涓紝涓嶈兘鍙栨秷"); + } locSts = wrkMast.getFullPlt().equalsIgnoreCase("N") ? "D" : "F"; // 搴撲綅杞Щ锛氱洰鏍囧簱浣� LocMast locMast = locMastService.selectById(wrkMast.getLocNo()); @@ -909,7 +1237,7 @@ if (!Cools.isEmpty(orderNo)) { Double anfme = Integer.parseInt(anfmes[i]) + 0.0; i++; - if (BaseController.isJSON(wrkDetl.getOrderNo())) { + if (!BaseController.isJSON(wrkDetl.getOrderNo())) { if (!orderDetlService.decrease(orderNo, wrkDetl.getMatnr(), wrkDetl.getBatch(), anfme)) { throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触"); } @@ -925,7 +1253,7 @@ } } }else { - if (BaseController.isJSON(wrkDetl.getOrderNo())) { + if (!BaseController.isJSON(wrkDetl.getOrderNo())) { if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) { throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触"); } @@ -1059,9 +1387,9 @@ if (Cools.isEmpty(locNos)) { return; } - if (true && !Cools.isEmpty(locNos)) { - throw new CoolException("鏆備笉鏀寔绉诲簱浠诲姟"); // todo:luxiaotao 绉诲簱寮�鍏� - } +// if (true && !Cools.isEmpty(locNos)) { +// throw new CoolException("鏆備笉鏀寔绉诲簱浠诲姟"); // todo:luxiaotao 绉诲簱寮�鍏� +// } LocMast one = locMastService.selectById(locNos.get(0)); List<Integer> rows = Utils.getGroupLoc(Integer.parseInt(locNos.get(0).substring(0, 2))); List<LocMast> locMasts = locMastService.queryFreeLocMast(rows, rows.size(), one.getLocType1()); @@ -1144,6 +1472,7 @@ wrkDetl.setAppeUser(9527L); wrkDetl.setModiTime(now); wrkDetl.setModiUser(9527L); + wrkDetl.setMatType(locDetl.getMatType()); if (!wrkDetlService.insert(wrkDetl)) { throw new CoolException("淇濆瓨宸ヤ綔妗f槑缁嗗け璐�"); } -- Gitblit v1.9.1