diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java index 1b51a85c..e12eef1f 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java @@ -434,6 +434,7 @@ public class ComponentOutboundController extends BaseController { .setWarehouseNo(item.getLgort()) .setNum(getNoScanOutQty(item)) .setBatchNo("") + .setBinNo(item.getLgobe()) .setMustScan(noScanningBaseControllerService.cannotOutNoScanning(item.getIdnrk(),order.getFactoryNo(),item.getLgort())) ) .sorted(Comparator.comparing(NoScanItemVO::isMustScan)) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java index 9cb1a2ed..580b7978 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java @@ -232,6 +232,7 @@ public class InCostCenterBackController extends BaseController { .setWarehouseNo(order.getLgort()) .setNum(item.getLeft()) .setBatchNo("") + .setBinNo(item.getLgpbe()) .setMustScan(noScanningBaseControllerService.existsQrCode(item.getMatnr())) ) .sorted(Comparator.comparing(NoScanItemVO::isMustScan)) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java index fa1880fa..29cb569a 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java @@ -240,6 +240,7 @@ public class InProduceBackController extends BaseController { .setWarehouseNo(order.getLgort2()) .setNum(item.getSqsl().subtract(item.getNum())) .setBatchNo("") + .setBinNo(item.getLgpbe()) .setMustScan(noScanningBaseControllerService.existsQrCode(item.getMatnr())) ) .sorted(Comparator.comparing(NoScanItemVO::isMustScan)) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java index 5c9011fa..2baa1bed 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java @@ -442,6 +442,7 @@ public class InProduceOrderController extends BaseController { .setWarehouseNo(item.getWarehouseNo()) .setNum(item.getNum()) .setBatchNo(NoUtil.getBatchNo(item.getBatchNo())) + .setBinNo(item.getBinNos()) .setMustScan(noScanningBaseControllerService.existsQrCode(item.getMaterialNo())) ) .sorted(Comparator.comparing(NoScanItemVO::isMustScan)) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java index e02035a8..fed21977 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java @@ -426,6 +426,7 @@ public class InProduceOrderSurplusController extends BaseController { .setWarehouseNo(order.getLgort2()) .setNum(item.getLeftNum()) .setBatchNo("") + .setBinNo(item.getLgpbe()) .setMustScan(noScanningBaseControllerService.existsQrCode(item.getMatnr())) ) .sorted(Comparator.comparing(NoScanItemVO::isMustScan)) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java index 44e87330..33c3a716 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java @@ -314,6 +314,7 @@ public class OutAssistanceController extends BaseController { .setFactoryNo(order.getWerks()) .setWarehouseNo(order.getLgort1()) .setNum(item.getLeft()) + .setBinNo(item.getLgpbe()) .setMustScan(noScanningBaseControllerService.cannotOutNoScanning(item.getMatnr1(), order.getWerks(), order.getLgort1())) ) .sorted(Comparator.comparing(NoScanItemVO::isMustScan)) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java index 4a48c750..0663b425 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java @@ -315,6 +315,7 @@ public class OutCostCenterController extends BaseController { .setFactoryNo(order.getWerks()) .setWarehouseNo(item.getLgort()) .setNum(item.getLeft()) + .setBinNo(item.getLgpbe()) .setMustScan(noScanningBaseControllerService.cannotOutNoScanning(item.getMatnr(), order.getWerks(), item.getLgort())) ) .sorted(Comparator.comparing(NoScanItemVO::isMustScan)) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java index 2d256a32..80a5e006 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java @@ -451,6 +451,7 @@ public class OutProduceController extends BaseController { .setFactoryNo(order.getDwerk()) .setWarehouseNo(order.getLgort2()) .setNum(item.getSqsl().subtract(item.getNum())) + .setBinNo(item.getLgpbe()) .setMustScan(noScanningBaseControllerService.cannotOutNoScanning(item.getMatnr(), order.getDwerk(), order.getLgort2())) ) .sorted(Comparator.comparing(NoScanItemVO::isMustScan)) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java index 5f6795e1..99fe20d8 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java @@ -167,6 +167,7 @@ public class OutPurchaseController extends BaseController { .setFactoryNo(item.getFactoryCode()) .setWarehouseNo(item.getStorageLocation()) .setNum(item.getLeft()) + .setBinNo("") .setMustScan(noScanningBaseControllerService.cannotOutNoScanning(item.getMaterialCode(),item.getFactoryCode(),item.getStorageLocation())) ) .sorted(Comparator.comparing(NoScanItemVO::isMustScan)) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java index b9924ef3..18743107 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java @@ -511,8 +511,7 @@ public class TransferCompanyController extends BaseController { List items = transferCompanyItemService.lambdaQuery() .eq(WmsTransferCompanyItem::getOrderId, order.getId()) .list(); - items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0 - || noScanningBaseControllerService.cannotOutNoScanning(item.getMatnr(), order.getReswk(), item.getLgpro())); + items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0); return ApiResult.success( items.stream() .map(item -> new NoScanItemVO() @@ -523,6 +522,8 @@ public class TransferCompanyController extends BaseController { .setFactoryNo(order.getReswk()) .setWarehouseNo(item.getLgpro()) .setNum(item.getLeft()) + .setBinNo(item.getLgpbe()) + .setMustScan(noScanningBaseControllerService.cannotOutNoScanning(item.getMatnr(), order.getWerks(), item.getLgpro())) ) .sorted(Comparator.comparing(NoScanItemVO::isMustScan)) .toList() @@ -977,7 +978,6 @@ public class TransferCompanyController extends BaseController { return ApiResult.success(Collections.emptyList()); } List items = transferCompanyTicketItemService.getList(ticket.getId()); - items.removeIf(item -> noScanningBaseControllerService.existsQrCode(item.getMatnr())); return ApiResult.success( items.stream() .map(item -> new NoScanItemVO() @@ -988,6 +988,8 @@ public class TransferCompanyController extends BaseController { .setFactoryNo(item.getWerks()) .setWarehouseNo(ticket.getLgort()) .setNum(item.getNum()) + .setBinNo(item.getLgpbe()) + .setMustScan(noScanningBaseControllerService.existsQrCode(item.getMatnr())) ) .sorted(Comparator.comparing(NoScanItemVO::isMustScan)) .toList() diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java index f033e4e6..c1729b8e 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java @@ -537,8 +537,7 @@ public class TransferFactoryController extends BaseController { List items = transferFactoryItemService.lambdaQuery() .eq(WmsTransferFactoryItem::getOrderId, order.getId()) .list(); - items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0 - || noScanningBaseControllerService.cannotOutNoScanning(item.getMatnr(), order.getWerks(), order.getLgort())); + items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0); return ApiResult.success( items.stream() .map(item -> new NoScanItemVO() @@ -549,6 +548,8 @@ public class TransferFactoryController extends BaseController { .setFactoryNo(order.getWerks()) .setWarehouseNo(order.getLgort()) .setNum(item.getLeft()) + .setBinNo(item.getLgpbe()) + .setMustScan(noScanningBaseControllerService.cannotOutNoScanning(item.getMatnr(), order.getWerks(), order.getLgort())) ) .sorted(Comparator.comparing(NoScanItemVO::isMustScan)) .toList() @@ -961,6 +962,8 @@ public class TransferFactoryController extends BaseController { .setFactoryNo(order.getWerks()) .setWarehouseNo(order.getUmlgo()) .setNum(item.getNum()) + .setBinNo(item.getLgpbe()) + .setMustScan(noScanningBaseControllerService.existsQrCode(item.getMatnr())) ) .sorted(Comparator.comparing(NoScanItemVO::isMustScan)) .toList()