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

Merge remote-tracking branch 'origin/feature/NoScanning' into feature/NoScanning

This commit is contained in:
yf001217 2026-06-04 12:03:20 +08:00
parent d06e28f716 e5296c5f6e
commit eaa6d684cd
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -991,7 +991,7 @@ public class TransferCompanyController extends BaseController {
@Transactional @Transactional
@PostMapping("pda/submitForInNoScanning") @PostMapping("pda/submitForInNoScanning")
public ApiResult<Void> submitForInNoScanning(@Valid @RequestBody NoScanningRequest request) { public ApiResult<Void> submitForInNoScanning(@Valid @RequestBody NoScanningRequest request) {
TransferCompanyTicketVO ticket = transferCompanyTicketService.getInfo(request.getId()); TransferCompanyTicketVO ticket = transferCompanyTicketService.getInfo(request.getId(),request.getNo());
VUtil.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("出库单不存在"); VUtil.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("出库单不存在");
VUtil.trueThrowBusinessError(!Objects.equals(ticket.getState(), 0)).throwMessage("出库单无效"); VUtil.trueThrowBusinessError(!Objects.equals(ticket.getState(), 0)).throwMessage("出库单无效");

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

@ -530,7 +530,7 @@ public class TransferFactoryController extends BaseController {
.one(); .one();
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在"); VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
List<WmsTransferFactoryItem> items = transferFactoryItemService.lambdaQuery() List<WmsTransferFactoryItem> items = transferFactoryItemService.lambdaQuery()
.eq(WmsTransferFactoryItem::getOrderId, orderId) .eq(WmsTransferFactoryItem::getOrderId, order.getId())
.list(); .list();
items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0 items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0
|| noScanningBaseControllerService.cannotOutNoScanning(item.getMatnr(),order.getWerks(),order.getLgort())); || noScanningBaseControllerService.cannotOutNoScanning(item.getMatnr(),order.getWerks(),order.getLgort()));
@ -964,7 +964,7 @@ public class TransferFactoryController extends BaseController {
@Transactional @Transactional
@PostMapping("pda/submitForInNoScanning") @PostMapping("pda/submitForInNoScanning")
public ApiResult<Void> submitForInNoScanning(@Valid @RequestBody @NotNull NoScanningRequest request) { public ApiResult<Void> submitForInNoScanning(@Valid @RequestBody @NotNull NoScanningRequest request) {
TransferFactoryTicketInfoVO ticket = transferFactoryTicketService.getInfo(request.getId()); TransferFactoryTicketInfoVO ticket = transferFactoryTicketService.getInfo(request.getId(),request.getNo());
VUtil.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("出库单不存在"); VUtil.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("出库单不存在");
VUtil.trueThrowBusinessError(!Objects.equals(ticket.getState(), 0)).throwMessage("出库单无效"); VUtil.trueThrowBusinessError(!Objects.equals(ticket.getState(), 0)).throwMessage("出库单无效");
List<TransferFactoryItemVO> ticketItems = transferFactoryTicketItemService.getList(ticket.getId()); List<TransferFactoryItemVO> ticketItems = transferFactoryTicketItemService.getList(ticket.getId());

6
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryServiceImpl.java
View File

@ -74,7 +74,7 @@ public class WmsInventoryServiceImpl extends ServiceImpl<WmsInventoryMapper, Wms
BigDecimal sub = NumberUtil.min(info.getNum(), left); BigDecimal sub = NumberUtil.min(info.getNum(), left);
left = left.subtract(sub); left = left.subtract(sub);
info.setNum(info.getNum().subtract(sub)); info.setNum(info.getNum().subtract(sub));
info.setUpdateBy(UserUtil.getUserName()); // info.setUpdateBy(UserUtil.getUserName());
info.setUpdateTime(LocalDateTime.now()); info.setUpdateTime(LocalDateTime.now());
if (left.compareTo(BigDecimal.ZERO) <= 0) { if (left.compareTo(BigDecimal.ZERO) <= 0) {
break; break;
@ -135,13 +135,13 @@ public class WmsInventoryServiceImpl extends ServiceImpl<WmsInventoryMapper, Wms
.setBinLocation(item.getBinLocation()) .setBinLocation(item.getBinLocation())
.setNum(inventory.stream().map(InventoryInDTO::getNum).reduce(BigDecimal.ZERO, BigDecimal::add)) .setNum(inventory.stream().map(InventoryInDTO::getNum).reduce(BigDecimal.ZERO, BigDecimal::add))
.setSort(item.getOrder()) .setSort(item.getOrder())
.setCreateBy(UserUtil.getUserName()) // .setCreateBy(UserUtil.getUserName())
.setCreateTime(LocalDateTime.now()); .setCreateTime(LocalDateTime.now());
forAdd.add(info); forAdd.add(info);
} else { } else {
info.setNum(info.getNum().add(inventory.stream().map(InventoryInDTO::getNum).reduce(BigDecimal.ZERO, BigDecimal::add))); info.setNum(info.getNum().add(inventory.stream().map(InventoryInDTO::getNum).reduce(BigDecimal.ZERO, BigDecimal::add)));
info.setSort(item.getOrder()); info.setSort(item.getOrder());
info.setUpdateBy(UserUtil.getUserName()); // info.setUpdateBy(UserUtil.getUserName());
info.setUpdateTime(LocalDateTime.now()); info.setUpdateTime(LocalDateTime.now());
forUpdate.add(info); forUpdate.add(info);
} }