From 6ff777e808e382e0318a9726721d812865b5d569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 20 Apr 2026 13:57:40 +0800 Subject: [PATCH] =?UTF-8?q?refactor(material):=20=E6=9B=BF=E6=8D=A2BomMate?= =?UTF-8?q?rialDTO=E4=B8=BAMaterialMainDTO=E4=BB=A5=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改DeliveryController中相关物料数据获取逻辑，使用MaterialMainDTO替代BomMaterialDTO - 更新MaterialController物料查询相关代码，改用MaterialMainDTO提高一致性 - 调整MaterialControllerService中物料导入校验逻辑，替换为MaterialMainDTO对象处理 - 精简和规范import语句，删除无用导入，优化代码结构 --- .../service/MaterialControllerService.java | 4 ++-- .../shipment/controller/DeliveryController.java | 17 +++++++++-------- .../shipment/controller/MaterialController.java | 4 ++-- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java index 9956aa61..3979dc34 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java @@ -260,7 +260,7 @@ public class MaterialControllerService { MaterialSearchQO qo = new MaterialSearchQO(); qo.setPageSize(Integer.MAX_VALUE); List dbMaterials = materialService.search(qo).getRecords(); - List bomMaterials = bomMaterialService.getList(data.stream().map(MaterialExcelImportDTO::getNo).collect(Collectors.toSet())); + List bomMaterials = bomMaterialService.getList(data.stream().map(MaterialExcelImportDTO::getNo).collect(Collectors.toSet())); List suppliers = userSupplierService.list(); int index = 0; for (MaterialExcelImportDTO dto : data) { @@ -287,7 +287,7 @@ public class MaterialControllerService { if (StrUtil.isBlank(dto.getNo())) { sb.append("SAP料号不能为空;"); } else { - BomMaterialDTO bomMaterial = bomMaterials.stream().filter(m -> StrUtil.equals(dto.getNo(), m.getMaterialNo())).findFirst().orElse(null); + MaterialMainDTO bomMaterial = bomMaterials.stream().filter(m -> StrUtil.equals(dto.getNo(), m.getMaterialNo())).findFirst().orElse(null); if (Objects.isNull(bomMaterial)) { sb.append("SAP料号无效;"); } else { diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/DeliveryController.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/DeliveryController.java index 36e93012..2d903a03 100644 --- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/DeliveryController.java +++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/DeliveryController.java @@ -6,14 +6,18 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.PageData; -import com.nflg.wms.common.pojo.dto.BomMaterialDTO; +import com.nflg.wms.common.pojo.dto.MaterialMainDTO; import com.nflg.wms.common.pojo.qo.*; import com.nflg.wms.common.pojo.vo.ShipmentMaterialCodeItemVO; import com.nflg.wms.common.pojo.vo.ShipmentPackagingCodeVO; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.VUtil; -import com.nflg.wms.repository.entity.*; -import com.nflg.wms.repository.service.*; +import com.nflg.wms.repository.entity.WmsShipmentDelivery; +import com.nflg.wms.repository.entity.WmsShipmentDeliveryItem; +import com.nflg.wms.repository.entity.WmsShipmentPackagingCode; +import com.nflg.wms.repository.service.IWmsShipmentDeliveryItemService; +import com.nflg.wms.repository.service.IWmsShipmentDeliveryService; +import com.nflg.wms.repository.service.IWmsShipmentPackagingCodeService; import com.nflg.wms.shipment.pojo.dto.CrmDeliveryDTO; import com.nflg.wms.shipment.pojo.dto.DeliveryExportDTO; import com.nflg.wms.shipment.pojo.qo.DeliverySearchFromCRMQO; @@ -30,7 +34,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import org.springframework.web.client.RestTemplate; import org.ttzero.excel.entity.ListSheet; import org.ttzero.excel.entity.TemplateSheet; import org.ttzero.excel.entity.Workbook; @@ -39,10 +42,8 @@ import java.io.IOException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.time.LocalDateTime; -import java.util.Collections; import java.util.List; import java.util.Objects; -import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; /** @@ -76,7 +77,7 @@ public class DeliveryController extends BaseController { @PostMapping("searchFromCRM") public ApiResult> searchFromCRM(@RequestBody DeliverySearchFromCRMQO qo) { List datas = crmService.getDeliverys(qo); - List materials = bomMaterialService.getList(datas.stream().map(CrmDeliveryDTO::getProductNumber__c).collect(Collectors.toSet())); + List materials = bomMaterialService.getList(datas.stream().map(CrmDeliveryDTO::getProductNumber__c).collect(Collectors.toSet())); return ApiResult.success( datas.stream().map(d -> new DeliverAddQO() .setSoNo(d.getOrderNumber()) @@ -88,7 +89,7 @@ public class DeliveryController extends BaseController { materials.stream() .filter(m -> StrUtil.equals(m.getMaterialNo(), d.getProductNumber__c())) .findFirst() - .map(BomMaterialDTO::getDrawingNo) + .map(MaterialMainDTO::getDrawingNo) .orElse("") ) ).toList() diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialController.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialController.java index b270a4c0..1c5f448a 100644 --- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialController.java +++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialController.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.PageData; -import com.nflg.wms.common.pojo.dto.BomMaterialDTO; +import com.nflg.wms.common.pojo.dto.MaterialMainDTO; import com.nflg.wms.common.pojo.qo.ShipmentMaterialAddQO; import com.nflg.wms.common.pojo.qo.ShipmentMaterialSearchQO; import com.nflg.wms.common.pojo.qo.ShipmentMaterialSyncSaveQO; @@ -92,7 +92,7 @@ public class MaterialController extends BaseController { .list() .stream() .collect(Collectors.toMap(WmsShipmentMaterial::getNo, WmsShipmentMaterial::getId)); - List dtos = bomMaterialService.getList(materialMaps.keySet()); + List dtos = bomMaterialService.getList(materialMaps.keySet()); if (CollectionUtil.isNotEmpty(dtos)) { shipmentMaterialService.updateBatchById( dtos.stream().map(dto -> {