diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/BinControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/BinControllerService.java index b85c05af..94ee5c79 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/BinControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/BinControllerService.java @@ -51,7 +51,7 @@ import java.util.stream.Collectors; public class BinControllerService { @Resource - private IWmsBinService binService; + private IWmsBinService wmsBinService; @Resource private IWmsWarehouseService wmsWarehouseService; @@ -63,26 +63,26 @@ public class BinControllerService { WmsBin bin = Convert.convert(WmsBin.class, request); bin.setCreateBy(UserUtil.getUserName()); bin.setCreateTime(LocalDateTime.now()); - binService.add(bin); + wmsBinService.add(bin); } public void update(@Valid BinUpdateQO request) { WmsBin bin = Convert.convert(WmsBin.class, request); bin.setUpdateBy(UserUtil.getUserName()); bin.setUpdateTime(LocalDateTime.now()); - binService.update(bin); + wmsBinService.update(bin); } public void delete(@Valid @NotNull Long id) { - binService.delete(id); + wmsBinService.delete(id); } public void enable(@Valid EnableQO request) { - binService.enable(request); + wmsBinService.enable(request); } public IPage search(@Valid BinSearchQO request) { - return binService.search(request); + return wmsBinService.search(request); } @Transactional @@ -121,7 +121,7 @@ public class BinControllerService { if (Objects.isNull(warehouse)){ sb.append("仓库编号无效;"); }else { - bin = binService.lambdaQuery().eq(WmsBin::getNo, dto.getNo()).eq(WmsBin::getWarehouseId, warehouse.getId()).one(); + bin = wmsBinService.lambdaQuery().eq(WmsBin::getNo, dto.getNo()).eq(WmsBin::getWarehouseId, warehouse.getId()).one(); if (Objects.isNull(bin)) { bin = new WmsBin() .setNo(dto.getNo()) @@ -145,14 +145,14 @@ public class BinControllerService { bins.add(bin); } if (data.stream().noneMatch(it -> StrUtil.isNotBlank(it.getError()))) { - binService.saveOrUpdateBatch(bins); + wmsBinService.saveOrUpdateBatch(bins); return true; } return false; } public void exportSelect(HttpServletResponse response, List ids) throws IOException { - List binVOS = CollectionUtil.isNotEmpty(ids) ? binService.getList(ids) : new ArrayList<>(); + List binVOS = CollectionUtil.isNotEmpty(ids) ? wmsBinService.getList(ids) : new ArrayList<>(); List datas = binVOS.stream().map(bin -> Convert.convert(BinExcelExportDTO.class, bin)).collect(Collectors.toList()); response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("储位导出.xlsx", StandardCharsets.UTF_8)); @@ -168,7 +168,7 @@ public class BinControllerService { } public void exportSearch(HttpServletResponse response, @Valid BinSearchQO request) throws IOException { - List binVOS = binService.searchNonPage(request); + List binVOS = wmsBinService.searchNonPage(request); List datas = binVOS.stream().map(bin -> Convert.convert(BinExcelExportDTO.class, bin)).collect(Collectors.toList()); response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("储位导出.xlsx", StandardCharsets.UTF_8)); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/CenterReturnControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/CenterReturnControllerService.java index 313119ad..36a35fd1 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/CenterReturnControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/CenterReturnControllerService.java @@ -2,7 +2,6 @@ package com.nflg.wms.admin.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.IdUtil; -import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.dto.C_MaterialReturnDTO; import com.nflg.wms.common.pojo.dto.C_MaterialReturnQueryDTO; import com.nflg.wms.common.pojo.dto.SAPSyncFromDTO; @@ -84,7 +83,7 @@ public class CenterReturnControllerService { } // 调用SAP服务获取仓库详细信息 - List warehouseList = sapService.zwm3a01(werks, warehouseNos, materialNos, null, null); + List warehouseList = sapService.zwm3A01(werks, warehouseNos, materialNos, null, null); if (CollectionUtil.isNotEmpty(warehouseList)) { allWarehouse.addAll(warehouseList); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StorageControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StorageControllerService.java index b161ce63..3ada6947 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StorageControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StorageControllerService.java @@ -68,7 +68,7 @@ public class StorageControllerService { private BomMaterialService bomMaterialService; @Resource - private IWmsBinService binService; + private IWmsBinService wmsBinService; @Transactional public void add(@Valid StorageAddQO request) { @@ -108,7 +108,7 @@ public class StorageControllerService { { List binNos = StrUtil.split(storageVO.getBinNos(), ","); if (CollectionUtil.isNotEmpty(binNos)) { - storageVO.setBinIds(binService.lambdaQuery().select(WmsBin::getId).in(WmsBin::getNo, binNos).list().stream().map(WmsBin::getId).toList()); + storageVO.setBinIds(wmsBinService.lambdaQuery().select(WmsBin::getId).in(WmsBin::getNo, binNos).list().stream().map(WmsBin::getId).toList()); } }); return page; @@ -168,7 +168,7 @@ public class StorageControllerService { sb.append("储位编号不能为空;"); } else { List binNos = StrUtil.split(dto.getBinNos(), ","); - List bins = binService.lambdaQuery().in(WmsBin::getNo, binNos).list(); + List bins = wmsBinService.lambdaQuery().in(WmsBin::getNo, binNos).list(); List bs = bins.stream().map(WmsBin::getNo).toList(); binNos.removeAll(bs); if (CollectionUtil.isNotEmpty(binNos)) { diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsWarehouseServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsWarehouseServiceImpl.java index 29d256d5..925aacef 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsWarehouseServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsWarehouseServiceImpl.java @@ -37,7 +37,7 @@ public class WmsWarehouseServiceImpl extends ServiceImplSRM订单接收服务 jar - - com.nflg - nflg-wms-common - com.nflg nflg-wms-starter