rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(controller): 添加库存移动操作中的库位号设置功能 

- 在ComponentOutboundController中为出库项目设置库位号
- 在InCostCenterBackController中为成本中心退料设置库位号
- 在InProduceBackController中为生产退料设置库位号
- 在InProduceOrderController中为生产订单入库设置库位号
- 在InProduceOrderSurplusController中为生产订单溢余设置库位号
- 在OutAssistanceController中为辅助出库设置库位号
- 在OutCostCenterController中为成本中心出库设置库位号
- 在OutProduceController中为生产出库设置库位号
- 在OutPurchaseController中为采购出库设置空库位号
- 在TransferCompanyController中调整公司间调拨的过滤条件并添加库位号和扫描设置
- 在TransferFactoryController中调整工厂间调拨的过滤条件并添加库位号和扫描设置
This commit is contained in:
曹鹏飞 2026-06-12 14:33:10 +08:00
parent b65ef39eb7
commit 714ff62b91
11 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java
View File

@ -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))

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java
View File

@ -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))

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java
View File

@ -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))

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java
View File

@ -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))

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java
View File

@ -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))

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java
View File

@ -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))

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java
View File

@ -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))

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java
View File

@ -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))

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java
View File

@ -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))

8
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java
View File

@ -511,8 +511,7 @@ public class TransferCompanyController extends BaseController {
List<WmsTransferCompanyItem> 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<TransferCompanyItemVO> 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()

7
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java
View File

@ -537,8 +537,7 @@ public class TransferFactoryController extends BaseController {
List<WmsTransferFactoryItem> 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()