From 0a2f4136da45c943f36ae676eacb7ef718de1c19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 12 Jun 2026 17:00:05 +0800 Subject: [PATCH] =?UTF-8?q?refactor(transfer):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E8=BD=AC=E5=82=A8=E5=8D=95=E6=97=A0=E6=89=AB=E6=8F=8F=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=9A=84=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84=E5=92=8C?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除未使用的 TransferFactoryNoScanRecord 和 ApiMark 注解导入 - 将 TransferCompanyNoScanRecord 中的 id 字段重命名为 orderId，ItemId 重命名为 itemId - 将 TransferFactoryNoScanRecord 中的 id 字段重命名为 orderId，ItemId 重命名为 itemId - 更新 TransferCompanyNoScanRecordRespository 查询方法名从 getTransferCompanyNoScanRecordBy 到 findByOrderIdAndItemId - 更新 TransferFactoryNoScanRecordRespository 查询方法名从 getTransferFactoryNoScanRecordBy 到 findByOrderIdAndItemId - 在 TransferCompanyTicketVO 和 TransferFactoryTicketVO 中添加 orderId 字段 - 修正控制器中的 NPE 检查逻辑，简化 Objects.isNull 判断 - 更新数据库查询映射，添加 orderId 字段到 VO 查询结果中 - 统一字段引用从 id 到 orderId 的使用一致性 --- .../controller/TransferCompanyController.java | 41 +++++----- .../controller/TransferFactoryController.java | 75 +++++++++---------- ...ransferCompanyNoScanRecordRespository.java | 2 +- ...ransferFactoryNoScanRecordRespository.java | 2 +- .../document/TransferCompanyNoScanRecord.java | 4 +- .../document/TransferFactoryNoScanRecord.java | 4 +- .../pojo/vo/TransferCompanyTicketVO.java | 2 + .../pojo/vo/TransferFactoryTicketVO.java | 2 + .../mapper/WmsTransferCompanyTicketMapper.xml | 2 +- .../mapper/WmsTransferFactoryTicketMapper.xml | 2 +- 10 files changed, 67 insertions(+), 69 deletions(-) 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 e47c8557..475a04e0 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 @@ -31,7 +31,6 @@ 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.*; @@ -41,7 +40,6 @@ import com.nflg.wms.common.util.VUtil; import com.nflg.wms.repository.entity.*; import com.nflg.wms.repository.service.*; import com.nflg.wms.starter.BaseController; -import com.nflg.wms.starter.annotation.ApiMark; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; @@ -123,15 +121,16 @@ public class TransferCompanyController extends BaseController { @Resource private TransferCompanyNoScanRecordRespository transferCompanyNoScanRecordRespository; + /** * 查询SAP订单数据 */ @PostMapping("searchSAP") public ApiResult> searchSAP0(@Valid @RequestBody AllocationOrderQO request) { List datas = sapService.zwm3a15(request); - if (CollectionUtil.isNotEmpty(datas)){ + if (CollectionUtil.isNotEmpty(datas)) { datas.forEach(dto -> { - dto.setLockedNum(transferCompanyItemService.getLockedNum(dto.getEbeln(),dto.getEbelp())); + dto.setLockedNum(transferCompanyItemService.getLockedNum(dto.getEbeln(), dto.getEbelp())); }); } return ApiResult.success(PageUtil.Page(datas, request.getPage(), request.getPageSize())); @@ -635,13 +634,13 @@ public class TransferCompanyController extends BaseController { transferCompanyTicketService.save(ticket); submitSap(order, ticket, records, datas, ticketItems, Collections.emptyList()); - if (!Objects.isNull(request) && CollectionUtil.isNotEmpty(request.getItems())) { + if (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()) + .setOrderId(request.getId()) .setItemId(item.getOrderItemId()) .setNum(data.getNum()) .setBatchNo(data.getBatchNo()) @@ -649,9 +648,9 @@ public class TransferCompanyController extends BaseController { .setBinNo(data.getBinNo()) ); }); - } }); - if(CollectionUtil.isNotEmpty(temRecords)) - { + } + }); + if (CollectionUtil.isNotEmpty(temRecords)) { transferCompanyNoScanRecordRespository.saveAll(temRecords); } @@ -717,24 +716,21 @@ public class TransferCompanyController extends BaseController { */ @GetMapping("pda/getTicketForIn") public ApiResult> getTicketForOut(@Valid @RequestParam @NotBlank String no) { - List vos=transferCompanyTicketService.getVOByOrderNo(no); - if(CollectionUtil.isNotEmpty(vos)) - { + 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 wmsItems = transferCompanyItemService.lambdaQuery() + .eq(WmsTransferCompanyItem::getOrderId, p.getOrderId()) .list(); - if(CollectionUtil.isNotEmpty(wmsItems)) - { + if (CollectionUtil.isNotEmpty(wmsItems)) { wmsItems.forEach(wmsItem -> { - List dataQOS=new ArrayList<>(); - List mongoRecords= - transferCompanyNoScanRecordRespository.getTransferCompanyNoScanRecordBy( - p.getId(), + List dataQOS = new ArrayList<>(); + List mongoRecords = + transferCompanyNoScanRecordRespository.findByOrderIdAndItemId( + p.getOrderId(), wmsItem.getId()); - if(CollectionUtil.isNotEmpty(mongoRecords)) - { + if (CollectionUtil.isNotEmpty(mongoRecords)) { mongoRecords.forEach(mongoRecord -> { dataQOS.add(new NoScanningItemDataQO() .setBinNo(mongoRecord.getBinNo()) @@ -763,7 +759,6 @@ public class TransferCompanyController extends BaseController { } - return ApiResult.success(vos); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java index 082744b2..1702bdc9 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java @@ -118,7 +118,9 @@ public class TransferFactoryController extends BaseController { private NoScanningBaseControllerService noScanningBaseControllerService; @Resource - private TransferFactoryNoScanRecordRespository transferFactoryNoScanRecordRespository;; + private TransferFactoryNoScanRecordRespository transferFactoryNoScanRecordRespository; + ; + /** * 查询SAP领料订单数据 */ @@ -664,13 +666,13 @@ public class TransferFactoryController extends BaseController { .setNum(list.stream().map(OutMaterialScanRecord::getNum).reduce(BigDecimal.ZERO, BigDecimal::add)) ).toList() ); - if (!Objects.isNull(request) && CollectionUtil.isNotEmpty(request.getItems())) { + if (CollectionUtil.isNotEmpty(request.getItems())) { List temRecords = new ArrayList<>(); request.getItems().forEach(item -> { if (CollectionUtil.isNotEmpty(item.getDatas())) { item.getDatas().forEach(data -> { temRecords.add(new TransferFactoryNoScanRecord() - .setId(request.getId()) + .setOrderId(request.getId()) .setItemId(item.getOrderItemId()) .setNum(data.getNum()) .setBatchNo(data.getBatchNo()) @@ -678,9 +680,9 @@ public class TransferFactoryController extends BaseController { .setBinNo(data.getBinNo()) ); }); - } }); - if(CollectionUtil.isNotEmpty(temRecords)) - { + } + }); + if (CollectionUtil.isNotEmpty(temRecords)) { transferFactoryNoScanRecordRespository.saveAll(temRecords); } @@ -785,40 +787,37 @@ public class TransferFactoryController extends BaseController { */ @GetMapping("pda/getTicketForIn") public ApiResult> getTicketForOut(@Valid @RequestParam @NotBlank String no) { - List vos=transferFactoryTicketService.getVOByOrderNo(no); - if(CollectionUtil.isNotEmpty(vos)) - { + List vos = transferFactoryTicketService.getVOByOrderNo(no); + if (CollectionUtil.isNotEmpty(vos)) { vos.forEach(p -> { List items = new ArrayList<>(); - List wmsItems=transferFactoryItemService.lambdaQuery() - .eq(WmsTransferFactoryItem::getOrderId, p.getId()) + List wmsItems = transferFactoryItemService.lambdaQuery() + .eq(WmsTransferFactoryItem::getOrderId, p.getOrderId()) .list(); - if(CollectionUtil.isNotEmpty(wmsItems)) - { - wmsItems.forEach(wmsItem -> { - List dataQOS=new ArrayList<>(); - List mongoRecords= - transferFactoryNoScanRecordRespository.getTransferFactoryNoScanRecordBy( - 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.getUmlgo()) - .setMaterialNo(wmsItem.getMatnr()) - .setDatas(dataQOS) - ); - }); + if (CollectionUtil.isNotEmpty(wmsItems)) { + wmsItems.forEach(wmsItem -> { + List dataQOS = new ArrayList<>(); + List mongoRecords = + transferFactoryNoScanRecordRespository.findByOrderIdAndItemId( + p.getOrderId(), + 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.getUmlgo()) + .setMaterialNo(wmsItem.getMatnr()) + .setDatas(dataQOS) + ); + }); } @@ -826,7 +825,7 @@ public class TransferFactoryController extends BaseController { .setId(p.getId()) .setNo(p.getNo()) .setItems(items); - p.noScannings.add(qo); + p.noScannings.add(qo); }); } return ApiResult.success(vos); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/TransferCompanyNoScanRecordRespository.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/TransferCompanyNoScanRecordRespository.java index feaaa1c8..a5aea6eb 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/TransferCompanyNoScanRecordRespository.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/TransferCompanyNoScanRecordRespository.java @@ -9,5 +9,5 @@ import java.util.List; @Repository public interface TransferCompanyNoScanRecordRespository extends MongoRepository { - List getTransferCompanyNoScanRecordBy(Long id, Long itemId); + List findByOrderIdAndItemId(Long id, Long itemId); } \ No newline at end of file diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/TransferFactoryNoScanRecordRespository.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/TransferFactoryNoScanRecordRespository.java index 69a76912..2a3a2858 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/TransferFactoryNoScanRecordRespository.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/TransferFactoryNoScanRecordRespository.java @@ -9,5 +9,5 @@ import java.util.List; @Repository public interface TransferFactoryNoScanRecordRespository extends MongoRepository { - List getTransferFactoryNoScanRecordBy(Long id, Long itemId); + List findByOrderIdAndItemId(Long id, Long itemId); } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/document/TransferCompanyNoScanRecord.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/document/TransferCompanyNoScanRecord.java index ad405b61..d90652c5 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/document/TransferCompanyNoScanRecord.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/document/TransferCompanyNoScanRecord.java @@ -15,12 +15,12 @@ public class TransferCompanyNoScanRecord { /** * 转储单ID */ - private Long id; + private Long orderId; /** * 转储单项目Id */ - private Long ItemId; + private Long itemId; /** * 数量 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/document/TransferFactoryNoScanRecord.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/document/TransferFactoryNoScanRecord.java index 5eab9e96..6db3f570 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/document/TransferFactoryNoScanRecord.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/document/TransferFactoryNoScanRecord.java @@ -16,12 +16,12 @@ public class TransferFactoryNoScanRecord { /** * 转储单ID */ - private Long id; + private Long orderId; /** * 转储单项目Id */ - private Long ItemId; + private Long itemId; /** * 数量 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 3e85cd4a..a0de609d 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 @@ -13,6 +13,8 @@ public class TransferCompanyTicketVO { private Long id; + private Long orderId; + /** * 转储单单号 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferFactoryTicketVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferFactoryTicketVO.java index 38384a14..e45a248a 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferFactoryTicketVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferFactoryTicketVO.java @@ -13,6 +13,8 @@ public class TransferFactoryTicketVO { private Long id; + private Long orderId; + /** * 调拨单单号 */ diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsTransferCompanyTicketMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsTransferCompanyTicketMapper.xml index 0c6ea669..97e8aa7c 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsTransferCompanyTicketMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsTransferCompanyTicketMapper.xml @@ -56,7 +56,7 @@