Merge remote-tracking branch '惠信/feature/NoScanning' into feature/NoScanning
This commit is contained in:
commit
0f32cf9251
|
|
@ -966,7 +966,7 @@ public class TransferCompanyController extends BaseController {
|
||||||
, @RequestParam(required = false) String no) {
|
, @RequestParam(required = false) String no) {
|
||||||
WmsTransferCompanyTicket ticket = getNoScanInTicket(orderId, no);
|
WmsTransferCompanyTicket ticket = getNoScanInTicket(orderId, no);
|
||||||
List<TransferCompanyItemVO> items = transferCompanyTicketItemService.getList(ticket.getId());
|
List<TransferCompanyItemVO> items = transferCompanyTicketItemService.getList(ticket.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()
|
||||||
|
|
@ -977,7 +977,7 @@ public class TransferCompanyController extends BaseController {
|
||||||
.setMaterialDesc(item.getMaktx())
|
.setMaterialDesc(item.getMaktx())
|
||||||
.setFactoryNo(item.getWerks())
|
.setFactoryNo(item.getWerks())
|
||||||
.setWarehouseNo(item.getLgpbe1())
|
.setWarehouseNo(item.getLgpbe1())
|
||||||
.setNum(item.getLeft())
|
.setNum(item.getNum())
|
||||||
)
|
)
|
||||||
.toList()
|
.toList()
|
||||||
);
|
);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue