From 3140e8c1976a3e8acb90e43b448eaf140f83c9c5 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期五, 13 九月 2024 17:29:37 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/web/WcsController.java | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java index e49a7ad..787a882 100644 --- a/src/main/java/com/zy/common/web/WcsController.java +++ b/src/main/java/com/zy/common/web/WcsController.java @@ -73,7 +73,7 @@ if (wrkMast != null && wrkMast.getIoType() == 103) { return R.parse(CodeRes.PICK_600); } - return R.parse(CodeRes.NO_COMB_700); + return R.error(param.getBarcode() + "姝ゆ潯鐮佹湭缁勬墭锛岃鍏堢粍鎵橈紒"); } int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode())); int countWrk = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode",param.getBarcode()) @@ -99,7 +99,7 @@ dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins); break; case 10://绌烘墭鐩樺叆搴� - dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode()); + dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode(),param.isFull()); break; default: break; @@ -166,12 +166,12 @@ // 妫�绱㈠簱浣� List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList()); int rowCount = rowLastnoService.selectCount(null); - Integer integer = 1; + Integer integer = 2; for (int i = 1; i <= rowCount; i++) { integer = rowLastnoService.selectNextWhsType(); BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>() - .eq("crn_no", i)); - if (crn_no.getInEnable().equals("Y")){ + .eq("crn_no", integer)); + if (crn_no.getInEnable().equals("Y") && crn_no.getCrnSts() == 3){ break; } } @@ -247,11 +247,22 @@ } @Transactional - public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode) { + public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode,boolean isFull) { // 婧愮珯鐐圭姸鎬佹娴� BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true); + int rowCount = rowLastnoService.selectCount(null); + Integer integer = 2; + for (int i = 1; i <= rowCount; i++) { + integer = rowLastnoService.selectNextWhsType(); + BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>() + .eq("crn_no", integer)); + if (crn_no.getInEnable().equals("Y") + && crn_no.getCrnSts() == 3){ + break; + } + } // 妫�绱㈠簱浣� - StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto,0); + StartupDto dto = commonService.getLocNo(integer, 10, devpNo, null, locTypeDto,0); int workNo = dto.getWorkNo(); // 鐢熸垚宸ヤ綔妗� WrkMast wrkMast = new WrkMast(); @@ -264,7 +275,8 @@ wrkMast.setSourceStaNo(dto.getSourceStaNo()); wrkMast.setStaNo(dto.getStaNo()); wrkMast.setLocNo(dto.getLocNo()); - wrkMast.setFullPlt("N"); // 婊℃澘 + wrkMast.setFullPlt(isFull?"Y":"N"); // 婊℃澘 +//// wrkMast.setFullPlt("N"); // 婊℃澘 wrkMast.setPicking("N"); // 鎷f枡 wrkMast.setExitMk("N"); // 閫�鍑� wrkMast.setEmptyMk("Y"); // 绌烘澘 -- Gitblit v1.9.1