diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java index cb4c304e..c0db44fc 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java @@ -1183,7 +1183,6 @@ public class NormalPGIController extends BaseController { // pushDto.getContent().getLineVOList().add(srmItem); // } Set qrCodes = new HashSet<>(); - Set batchNos = new HashSet<>(); if (CollectionUtil.isNotEmpty(codes)) { List qrCodeMasters = qrCodeMasterService.lambdaQuery() .in(WmsQrCodeMaster::getMaterialCode, codes.stream() @@ -1193,9 +1192,6 @@ public class NormalPGIController extends BaseController { List qrCodeMasters0 = qrCodeMasters.stream() .filter(q -> q.getPackagingType() == 0) .toList(); - batchNos = qrCodeMasters0.stream() - .map(WmsQrCodeMaster::getBatchNo) - .collect(Collectors.toSet()); qrCodes.addAll( qrCodeMasters0.stream() .map(WmsQrCodeMaster::getMaterialCode) @@ -1208,11 +1204,6 @@ public class NormalPGIController extends BaseController { .toList() ) .list(); - batchNos.addAll( - qrCodeMasters0.stream() - .map(WmsQrCodeMaster::getBatchNo) - .collect(Collectors.toSet()) - ); qrCodes.addAll( qrCodeMasters0.stream() .map(WmsQrCodeMaster::getMaterialCode) @@ -1234,7 +1225,7 @@ public class NormalPGIController extends BaseController { .setInspectionQty(item.getReceiptNum() != null ? item.getReceiptNum().intValue() : 0) .setPurchaseGroup(order.getPurchaseGroup()) .setQrCodes(qrCodes) - .setBatchNo(StrUtil.join(",", batchNos)) + .setBatchNo("") ); }