From a12a36f479b47687161a32568531893aaea28df3 Mon Sep 17 00:00:00 2001 From: zhangke Date: Fri, 12 Jun 2026 16:23:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8E=82=E9=97=B4=E8=B0=83=E6=8B=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TransferCompanyController.java | 77 ++++++++++++++++++- .../pojo/vo/TransferCompanyTicketVO.java | 6 ++ 2 files changed, 82 insertions(+), 1 deletion(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java index 18743107..e47c8557 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java @@ -17,6 +17,7 @@ import com.nflg.wms.admin.pojo.request.UpdateItemNumRequest; import com.nflg.wms.admin.repository.InMaterialScanRecordRespository; import com.nflg.wms.admin.repository.InventoryForOutRepository; import com.nflg.wms.admin.repository.OutMaterialScanRecordRespository; +import com.nflg.wms.admin.repository.TransferCompanyNoScanRecordRespository; import com.nflg.wms.admin.service.BasdeSerialNumberControllerService; import com.nflg.wms.admin.service.NoScanningBaseControllerService; import com.nflg.wms.admin.service.SapService; @@ -29,6 +30,8 @@ import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.document.InMaterialScanRecord; import com.nflg.wms.common.pojo.document.OutMaterialScanRecord; +import com.nflg.wms.common.pojo.document.TransferCompanyNoScanRecord; +import com.nflg.wms.common.pojo.document.TransferFactoryNoScanRecord; import com.nflg.wms.common.pojo.dto.*; import com.nflg.wms.common.pojo.qo.*; import com.nflg.wms.common.pojo.vo.*; @@ -117,6 +120,9 @@ public class TransferCompanyController extends BaseController { @Resource private NoScanningBaseControllerService noScanningBaseControllerService; + + @Resource + private TransferCompanyNoScanRecordRespository transferCompanyNoScanRecordRespository; /** * 查询SAP订单数据 */ @@ -628,6 +634,28 @@ public class TransferCompanyController extends BaseController { transferCompanyTicketItemService.saveBatch(ticketItems); transferCompanyTicketService.save(ticket); submitSap(order, ticket, records, datas, ticketItems, Collections.emptyList()); + + if (!Objects.isNull(request) && CollectionUtil.isNotEmpty(request.getItems())) { + List temRecords = new ArrayList<>(); + request.getItems().forEach(item -> { + if (CollectionUtil.isNotEmpty(item.getDatas())) { + item.getDatas().forEach(data -> { + temRecords.add(new TransferCompanyNoScanRecord() + .setId(request.getId()) + .setItemId(item.getOrderItemId()) + .setNum(data.getNum()) + .setBatchNo(data.getBatchNo()) + .setSerialNo(data.getSerialNo()) + .setBinNo(data.getBinNo()) + ); + }); + } }); + if(CollectionUtil.isNotEmpty(temRecords)) + { + transferCompanyNoScanRecordRespository.saveAll(temRecords); + } + + } return ApiResult.success(); } @@ -689,7 +717,54 @@ public class TransferCompanyController extends BaseController { */ @GetMapping("pda/getTicketForIn") public ApiResult> getTicketForOut(@Valid @RequestParam @NotBlank String no) { - return ApiResult.success(transferCompanyTicketService.getVOByOrderNo(no)); + List vos=transferCompanyTicketService.getVOByOrderNo(no); + if(CollectionUtil.isNotEmpty(vos)) + { + vos.forEach(p -> { + List items = new ArrayList<>(); + List wmsItems=transferCompanyItemService.lambdaQuery() + .eq(WmsTransferCompanyItem::getOrderId, p.getId()) + .list(); + if(CollectionUtil.isNotEmpty(wmsItems)) + { + wmsItems.forEach(wmsItem -> { + List dataQOS=new ArrayList<>(); + List mongoRecords= + transferCompanyNoScanRecordRespository.getTransferCompanyNoScanRecordBy( + p.getId(), + wmsItem.getId()); + if(CollectionUtil.isNotEmpty(mongoRecords)) + { + mongoRecords.forEach(mongoRecord -> { + dataQOS.add(new NoScanningItemDataQO() + .setBinNo(mongoRecord.getBinNo()) + .setNum(mongoRecord.getNum()) + .setSerialNo(mongoRecord.getSerialNo()) + .setBatchNo(mongoRecord.getBatchNo()) + ); + }); + } + items.add(new NoScanningItemQO() + .setOrderItemId(wmsItem.getId()) + .setWarehouseNo(p.getLgort()) + .setMaterialNo(wmsItem.getMatnr()) + .setDatas(dataQOS) + ); + }); + } + + + NoScanningQO qo = new NoScanningQO() + .setId(p.getId()) + .setNo(p.getNo()) + .setItems(items); + p.noScannings.add(qo); + }); + } + + + + return ApiResult.success(vos); } /** diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferCompanyTicketVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferCompanyTicketVO.java index 12535c0f..3e85cd4a 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferCompanyTicketVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferCompanyTicketVO.java @@ -1,6 +1,7 @@ package com.nflg.wms.common.pojo.vo; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.nflg.wms.common.pojo.qo.NoScanningQO; import lombok.Data; import java.time.LocalDateTime; @@ -125,4 +126,9 @@ public class TransferCompanyTicketVO { } private List items; + + /** + * 未扫描的物料凭证 + */ + public List noScannings; }