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

Merge remote-tracking branch '惠信/feature/NoScanning' into feature/NoScanning

This commit is contained in:
曹鹏飞 2026-06-04 09:46:53 +08:00
parent d345aefa57 a579d131cc
commit 56db72c074
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -965,7 +965,8 @@ public class TransferCompanyController extends BaseController {
@GetMapping("getListForNoScanIn") @GetMapping("getListForNoScanIn")
public ApiResult<List<NoScanItemVO>> getListForNoScanIn(@RequestParam(required = false) Long orderId public ApiResult<List<NoScanItemVO>> getListForNoScanIn(@RequestParam(required = false) Long orderId
, @RequestParam(required = false) String no) { , @RequestParam(required = false) String no) {
WmsTransferCompanyTicket ticket = getNoScanInTicket(orderId, no); TransferCompanyTicketVO ticket = transferCompanyTicketService.getInfo(orderId, no);
VUtil.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("订单不存在");
List<TransferCompanyItemVO> items = transferCompanyTicketItemService.getList(ticket.getId()); List<TransferCompanyItemVO> items = transferCompanyTicketItemService.getList(ticket.getId());
items.removeIf(item -> item.getNum().compareTo(BigDecimal.ZERO) <= 0 items.removeIf(item -> item.getNum().compareTo(BigDecimal.ZERO) <= 0
|| noScanningBaseControllerService.existsQrCode(item.getMatnr())); || noScanningBaseControllerService.existsQrCode(item.getMatnr()));
@ -977,7 +978,7 @@ public class TransferCompanyController extends BaseController {
.setMaterialNo(item.getMatnr()) .setMaterialNo(item.getMatnr())
.setMaterialDesc(item.getMaktx()) .setMaterialDesc(item.getMaktx())
.setFactoryNo(item.getWerks()) .setFactoryNo(item.getWerks())
.setWarehouseNo(item.getLgpbe1()) .setWarehouseNo(ticket.getLgort())
.setNum(item.getNum()) .setNum(item.getNum())
) )
.toList() .toList()

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

@ -941,7 +941,7 @@ public class TransferFactoryController extends BaseController {
TransferFactoryTicketInfoVO order = transferFactoryTicketService.getInfo(orderId, no); TransferFactoryTicketInfoVO order = transferFactoryTicketService.getInfo(orderId, no);
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在"); VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
List<TransferFactoryItemVO> items = transferFactoryTicketItemService.getList(order.getId()); List<TransferFactoryItemVO> items = transferFactoryTicketItemService.getList(order.getId());
items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0 items.removeIf(item -> item.getNum().compareTo(BigDecimal.ZERO) <= 0
|| noScanningBaseControllerService.existsQrCode(item.getMatnr())); || noScanningBaseControllerService.existsQrCode(item.getMatnr()));
return ApiResult.success( return ApiResult.success(
items.stream() items.stream()
@ -951,8 +951,8 @@ public class TransferFactoryController extends BaseController {
.setMaterialNo(item.getMatnr()) .setMaterialNo(item.getMatnr())
.setMaterialDesc(item.getMaktx()) .setMaterialDesc(item.getMaktx())
.setFactoryNo(order.getWerks()) .setFactoryNo(order.getWerks())
.setWarehouseNo(item.getUmlgo()) .setWarehouseNo(order.getUmlgo())
.setNum(item.getLeft()) .setNum(item.getNum())
) )
.toList() .toList()
); );
@ -1004,7 +1004,7 @@ public class TransferFactoryController extends BaseController {
.setBatchNo(batchNo) .setBatchNo(batchNo)
.setSerialNo(serialNo) .setSerialNo(serialNo)
.setFactoryNo(ticket.getWerks()) .setFactoryNo(ticket.getWerks())
.setWarehouseNo(ticketItem.getUmlgo()) .setWarehouseNo(item.getWarehouseNo())
.setBinNo(binNo) .setBinNo(binNo)
.setUniqNo("NO_SCAN_" + IdUtil.getSnowflakeNextId()) .setUniqNo("NO_SCAN_" + IdUtil.getSnowflakeNextId())
.setRspos(ticketItem.getRspos()) .setRspos(ticketItem.getRspos())