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-03 17:29:21 +08:00
parent 8ceb832eaf e598e816ba
commit a6b861b69c
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -964,12 +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 order = transferCompanyTicketService.lambdaQuery()
.eq(Objects.nonNull(orderId), WmsTransferCompanyTicket::getId, orderId)
.eq(StrUtil.isNotBlank(no), WmsTransferCompanyTicket::getNo, no)
.one();
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
List<TransferCompanyItemVO> items = transferCompanyTicketItemService.getList(order.getId());
WmsTransferCompanyTicket ticket = getNoScanInTicket(orderId, no);
List<TransferCompanyItemVO> items = transferCompanyTicketItemService.getList(ticket.getId());
items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0
|| noScanningBaseControllerService.existsQrCode(item.getMatnr()));
return ApiResult.success(
@ -993,7 +989,8 @@ public class TransferCompanyController extends BaseController {
@Transactional
@PostMapping("pda/submitForInNoScanning")
public ApiResult<Void> submitForInNoScanning(@Valid @RequestBody NoScanningRequest request) {
TransferCompanyTicketVO ticket = transferCompanyTicketService.getInfo(request.getId(),request.getNo());
WmsTransferCompanyTicket ticketEntity = getNoScanInTicket(request.getId(), request.getNo());
TransferCompanyTicketVO ticket = transferCompanyTicketService.getInfo(ticketEntity.getId());
VUtil.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("出库单不存在");
VUtil.trueThrowBusinessError(!Objects.equals(ticket.getState(), 0)).throwMessage("出库单无效");
@ -1117,6 +1114,23 @@ public class TransferCompanyController extends BaseController {
return ApiResult.success();
}
private WmsTransferCompanyTicket getNoScanInTicket(Long orderId, String no) {
WmsTransferCompany order = transferCompanyService.lambdaQuery()
.eq(Objects.nonNull(orderId), WmsTransferCompany::getId, orderId)
.eq(StrUtil.isNotBlank(no), WmsTransferCompany::getNo, no)
.one();
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
WmsTransferCompanyTicket ticket = transferCompanyTicketService.lambdaQuery()
.eq(WmsTransferCompanyTicket::getOrderId, order.getId())
.eq(WmsTransferCompanyTicket::getFinish, true)
.eq(WmsTransferCompanyTicket::getState, 0)
.orderByDesc(WmsTransferCompanyTicket::getId)
.last("LIMIT 1")
.one();
VUtil.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("出库单不存在");
return ticket;
}
/**
* 搜索转储凭证
*/

2
nflg-wms-repository/src/main/resources/mapper/WmsTransferCompanyTicketMapper.xml
View File

@ -68,6 +68,6 @@
,tct.doc_year,tct.state,tct.finish,tct.audit_state,tc.*
from wms_transfer_company tc
inner join wms_transfer_company_ticket tct on tc.id = tct.order_id
where tct.id=#{id} or tct.no= #{id}
where tct.id=#{id} or tct.no=#{no}
</select>
</mapper>