From 60f1d6d21436bb617f64131a908e680cc16f8109 Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期五, 28 二月 2025 10:59:27 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/entity/param/FullStoreParam.java | 1 + src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java | 4 ++-- src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 4 ++-- src/main/java/com/zy/common/web/WcsController.java | 7 ++++--- src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java | 44 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 53 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java index 756b465..673903f 100644 --- a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java +++ b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java @@ -27,6 +27,7 @@ // 搴忓垪鐮� private String batch; + private String specs = ""; private String brand = ""; private String standby1 = ""; private String standby2 = ""; diff --git a/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java b/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java index 4e91dd1..a0b3a9e 100644 --- a/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java +++ b/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java @@ -1,7 +1,9 @@ package com.zy.asrs.entity.result; import com.zy.asrs.entity.LocDetl; +import com.zy.asrs.entity.WaitPakin; import com.zy.asrs.entity.WrkDetl; +import com.zy.asrs.entity.param.FullStoreParam; public class FindLocNoAttributeVo { private String matnr = ""; @@ -67,6 +69,48 @@ this.standby3 = standby3; } + public FindLocNoAttributeVo(WaitPakin waitPakin) { + this.matnr = waitPakin.getMatnr(); + this.specs = waitPakin.getSpecs(); + this.batch = waitPakin.getBatch(); +// this.grade = waitPakin.g; + this.brand = waitPakin.getBrand(); + this.standby1 = waitPakin.getStandby1(); + this.standby2 = waitPakin.getStandby2(); + this.standby3 = waitPakin.getStandby3(); + this.boxType1 = waitPakin.getBoxType1(); + this.boxType2 = waitPakin.getBoxType2(); + this.boxType3 = waitPakin.getBoxType3(); + } + + public FindLocNoAttributeVo(FullStoreParam.MatCodeStore matCodeStore) { + this.matnr = matCodeStore.getMatnr(); + this.specs = matCodeStore.getSpecs(); + this.batch = matCodeStore.getBatch(); +// this.grade = waitPakin.g; + this.brand = matCodeStore.getBrand(); + this.standby1 = matCodeStore.getStandby1(); + this.standby2 = matCodeStore.getStandby2(); + this.standby3 = matCodeStore.getStandby3(); + this.boxType1 = matCodeStore.getBoxType1(); + this.boxType2 = matCodeStore.getBoxType2(); + this.boxType3 = matCodeStore.getBoxType3(); + } + + public FindLocNoAttributeVo(LocDetl locDetl) { + this.matnr = locDetl.getMatnr(); + this.specs = locDetl.getSpecs(); + this.batch = locDetl.getBatch(); +// this.grade = waitPakin.g; + this.brand = locDetl.getBrand(); + this.standby1 = locDetl.getStandby1(); + this.standby2 = locDetl.getStandby2(); + this.standby3 = locDetl.getStandby3(); + this.boxType1 = locDetl.getBoxType1(); + this.boxType2 = locDetl.getBoxType2(); + this.boxType3 = locDetl.getBoxType3(); + } + public String getBoxType1() { return boxType1; } 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 7d91a2d..e0ea69d 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -106,9 +106,9 @@ BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getDevpNo(), true); // 妫�绱㈠簱浣� LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo); - List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList()); +// List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList()); // List<String> batchs = param.getList().stream().map(FullStoreParam.MatCodeStore::getBatch).distinct().collect(Collectors.toList()); - FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(matnrs.get(0)); + FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(param.getList().get(0)); StartupDto dto = commonService.getLocNo(1, param.getDevpNo(), findLocNoAttributeVo,locTypeDto); if (Cools.isEmpty(dto)){ throw new CoolException("鏌ヨ搴撲綅澶辫触锛侊紒==銆媠tartupFullPutStore ==銆� commonService.getLocNo"); diff --git a/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java index 97124d1..d1f7212 100644 --- a/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java @@ -49,7 +49,7 @@ for (LocMast locMast:locMasts){ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo())); // StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 6 : 5, ioType, crnNo == 1 ? 917 : 918, locDetl.getMatnr(), locDetl.getBatch(),locDetl.getBrand(), null); - FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(locDetl.getMatnr(),locDetl.getBatch(),locDetl.getBrand()); + FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(locDetl); StartupDto startupDto = commonService.getLocNo( ioType, crnNo == 1 ? 917 : 918, findLocNoAttributeVo, null); workService.locMove(locMast.getLocNo(), startupDto.getLocNo(),9527L); @@ -72,7 +72,7 @@ List<LocDetl> locDetlList = locDetlService.selectLocDetlUnilateralMoveShuttle(matnr, batch, grade, crnNo); for (LocDetl locDetl : locDetlList) { // StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 4 : 3, ioType, crnNo == 1 ? 901 : 932, locDetl.getMatnr(), locDetl.getBatch(), locDetl.getBrand(), null); - FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(locDetl.getMatnr(),locDetl.getBatch(),locDetl.getBrand()); + FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(locDetl); StartupDto startupDto = commonService.getLocNo( ioType, crnNo == 1 ? 901 : 932, findLocNoAttributeVo, null); workService.locMove(locDetl.getLocNo(), startupDto.getLocNo(), 9527L); diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java index 37a43f4..fd48d94 100644 --- a/src/main/java/com/zy/common/web/WcsController.java +++ b/src/main/java/com/zy/common/web/WcsController.java @@ -163,9 +163,10 @@ // 婧愮珯鐐圭姸鎬佹娴� BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true); // 妫�绱㈠簱浣� - List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList()); - List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList()); - FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(matnrs.get(0), batchs.get(0)); +// List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList()); +// List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList()); +// FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(matnrs.get(0), batchs.get(0)); + FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(waitPakins.get(0)); StartupDto dto = commonService.getLocNo( 1, devpNo,findLocNoAttributeVo, locTypeDto); int workNo = dto.getWorkNo(); Date now = new Date(); -- Gitblit v1.9.1