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

厂间/厂内调拨无码入库查询修改

This commit is contained in:
yf001217 2026-06-04 08:47:46 +08:00
parent e28fa5740f
commit 383b5e004e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -964,7 +964,8 @@ public class TransferCompanyController extends BaseController {
@GetMapping("getListForNoScanIn")
public ApiResult<List<NoScanItemVO>> getListForNoScanIn(@RequestParam(required = false) Long orderId
, @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());
items.removeIf(item -> item.getNum().compareTo(BigDecimal.ZERO) <= 0
|| noScanningBaseControllerService.existsQrCode(item.getMatnr()));

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

@ -940,7 +940,7 @@ public class TransferFactoryController extends BaseController {
TransferFactoryTicketInfoVO order = transferFactoryTicketService.getInfo(orderId, no);
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
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()));
return ApiResult.success(
items.stream()
@ -950,8 +950,8 @@ public class TransferFactoryController extends BaseController {
.setMaterialNo(item.getMatnr())
.setMaterialDesc(item.getMaktx())
.setFactoryNo(order.getWerks())
.setWarehouseNo(item.getUmlgo())
.setNum(item.getLeft())
.setWarehouseNo(order.getUmlgo())
.setNum(item.getNum())
)
.toList()
);
@ -1003,7 +1003,7 @@ public class TransferFactoryController extends BaseController {
.setBatchNo(batchNo)
.setSerialNo(serialNo)
.setFactoryNo(ticket.getWerks())
.setWarehouseNo(ticketItem.getUmlgo())
.setWarehouseNo(item.getWarehouseNo())
.setBinNo(binNo)
.setUniqNo("NO_SCAN_" + IdUtil.getSnowflakeNextId())
.setRspos(ticketItem.getRspos())