From dee8259e818a8fdf2175282901fc8288f3f6b66f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 11 Oct 2025 17:36:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=80=E4=BA=9B=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/InventoryController.java | 6 ++-- .../admin/controller/WarehouseController.java | 3 +- .../service/WarehouseControllerService.java | 3 +- .../pojo/vo/InventoryCheckTaskItemVO.java | 16 +++++----- .../wms/common/pojo/vo/WarehouseSimpleVO.java | 29 +++++++++++++++++++ .../nflg/wms/common/pojo/vo/WarehouseVO.java | 24 +-------------- .../wms/common/pojo/vo/ZWM3A05ItemVO.java | 5 ++++ .../repository/mapper/WmsWarehouseMapper.java | 3 +- .../service/IWmsWarehouseService.java | 3 +- .../service/impl/WmsWarehouseServiceImpl.java | 3 +- .../resources/mapper/WmsWarehouseMapper.xml | 2 +- 11 files changed, 57 insertions(+), 40 deletions(-) create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/WarehouseSimpleVO.java diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InventoryController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InventoryController.java index 6b25b646..37a1c350 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InventoryController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InventoryController.java @@ -93,7 +93,7 @@ public class InventoryController extends BaseController { @GetMapping("check/getTaskItems") public ApiResult> getTaskItems(@Valid @RequestParam(required = false) Long id) { List taskItems = Objects.isNull(id) ? Collections.emptyList() : inventoryCheckTaskItemService.lambdaQuery().eq(WmsInventoryCheckTaskItem::getTaskId, id).list(); - List warehouseVOS = warehouseService.getEnableList(null); + List warehouseVOS = warehouseService.getEnableList(null); List vos = new ArrayList<>(); warehouseVOS.forEach(warehouseVO -> { WmsInventoryCheckTaskItem item = taskItems.stream().filter(taskItem -> Objects.equals(taskItem.getWarehouseId(), warehouseVO.getId())).findFirst().orElse(null); @@ -107,8 +107,8 @@ public class InventoryController extends BaseController { .setChargeUserId(Objects.isNull(item) ? null : item.getChargeUserId()) .setChargeUserName(Objects.isNull(item) ? "" : item.getChargeUserName()) .setAddress(warehouseVO.getAddress()) - .setUserName(warehouseVO.getUserName()) - .setPhone(warehouseVO.getPhone()) +// .setUserName(warehouseVO.getUserName()) +// .setPhone(warehouseVO.getPhone()) ); }); return ApiResult.success(vos); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/WarehouseController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/WarehouseController.java index 6c514947..7b222cf5 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/WarehouseController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/WarehouseController.java @@ -7,6 +7,7 @@ import com.nflg.wms.common.pojo.qo.EnableQO; import com.nflg.wms.common.pojo.qo.WarehouseAddQO; import com.nflg.wms.common.pojo.qo.WarehouseSearchQO; import com.nflg.wms.common.pojo.qo.WarehouseUpdateQO; +import com.nflg.wms.common.pojo.vo.WarehouseSimpleVO; import com.nflg.wms.common.pojo.vo.WarehouseVO; import com.nflg.wms.repository.entity.DictionaryItem; import com.nflg.wms.starter.BaseController; @@ -118,7 +119,7 @@ public class WarehouseController extends BaseController { * @param factoryNo 工厂编号 */ @GetMapping("getEnableList") - public ApiResult> getEnableList(@Valid @RequestParam(required = false) String factoryNo) { + public ApiResult> getEnableList(@Valid @RequestParam(required = false) String factoryNo) { return ApiResult.success(warehouseControllerService.getEnableList(factoryNo)); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/WarehouseControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/WarehouseControllerService.java index de4a6a79..045de30e 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/WarehouseControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/WarehouseControllerService.java @@ -16,6 +16,7 @@ import com.nflg.wms.common.pojo.qo.EnableQO; import com.nflg.wms.common.pojo.qo.WarehouseAddQO; import com.nflg.wms.common.pojo.qo.WarehouseSearchQO; import com.nflg.wms.common.pojo.qo.WarehouseUpdateQO; +import com.nflg.wms.common.pojo.vo.WarehouseSimpleVO; import com.nflg.wms.common.pojo.vo.WarehouseVO; import com.nflg.wms.common.util.DateTimeUtil; import com.nflg.wms.common.util.EecExcelUtil; @@ -217,7 +218,7 @@ public class WarehouseControllerService { .writeTo(response.getOutputStream()); } - public List getEnableList(String factoryNo) { + public List getEnableList(String factoryNo) { return warehouseService.getEnableList(factoryNo); } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemVO.java index d4d4015d..d1e7524a 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemVO.java @@ -74,13 +74,13 @@ public class InventoryCheckTaskItemVO { */ private String address; - /** - * 责任人 - */ - private String userName; +// /** +// * 责任人 +// */ +// private String userName; - /** - * 联系电话 - */ - private String phone; +// /** +// * 联系电话 +// */ +// private String phone; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/WarehouseSimpleVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/WarehouseSimpleVO.java new file mode 100644 index 00000000..a14b02c7 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/WarehouseSimpleVO.java @@ -0,0 +1,29 @@ +package com.nflg.wms.common.pojo.vo; + +import lombok.Data; + +@Data +public class WarehouseSimpleVO { + + private Long id; + + /** + * 仓库编码 + */ + private String no; + + /** + * 仓库名称 + */ + private String name; + + /** + * 所属工厂名称 + */ + private String factoryName; + + /** + * 所在地点 + */ + private String address; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/WarehouseVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/WarehouseVO.java index e374edd0..962b08bc 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/WarehouseVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/WarehouseVO.java @@ -5,19 +5,7 @@ import lombok.Data; import java.time.LocalDateTime; @Data -public class WarehouseVO { - - private Long id; - - /** - * 仓库编码 - */ - private String no; - - /** - * 仓库名称 - */ - private String name; +public class WarehouseVO extends WarehouseSimpleVO { /** * 责任人 @@ -34,11 +22,6 @@ public class WarehouseVO { */ private String phone; - /** - * 所在地点 - */ - private String address; - /** * 是否启用 */ @@ -83,9 +66,4 @@ public class WarehouseVO { * 所属工厂 */ private Long factoryId; - - /** - * 所属工厂名称 - */ - private String factoryName; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ZWM3A05ItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ZWM3A05ItemVO.java index 4f3ccea3..c3a1ac14 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ZWM3A05ItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ZWM3A05ItemVO.java @@ -1,5 +1,6 @@ package com.nflg.wms.common.pojo.vo; +import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -18,6 +19,10 @@ public class ZWM3A05ItemVO { */ private String ebelp; + public String getEbelp() { + return StrUtil.removeAllPrefix(ebelp, "0"); + } + /** * 退货项目 */ diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsWarehouseMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsWarehouseMapper.java index fc477df8..3efa820a 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsWarehouseMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsWarehouseMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.wms.common.pojo.qo.WarehouseSearchQO; +import com.nflg.wms.common.pojo.vo.WarehouseSimpleVO; import com.nflg.wms.common.pojo.vo.WarehouseVO; import com.nflg.wms.repository.entity.WmsWarehouse; import org.apache.ibatis.annotations.Param; @@ -26,7 +27,7 @@ public interface WmsWarehouseMapper extends BaseMapper { List searchNonPage(@Param("request") WarehouseSearchQO request); - List getEnableList(String factoryNo); + List getEnableList(String factoryNo); List getListByIds(List list); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsWarehouseService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsWarehouseService.java index 99bb3742..1b80bd67 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsWarehouseService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsWarehouseService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.nflg.wms.common.pojo.qo.EnableQO; import com.nflg.wms.common.pojo.qo.WarehouseSearchQO; +import com.nflg.wms.common.pojo.vo.WarehouseSimpleVO; import com.nflg.wms.common.pojo.vo.WarehouseVO; import com.nflg.wms.repository.entity.WmsWarehouse; import jakarta.validation.Valid; @@ -37,7 +38,7 @@ public interface IWmsWarehouseService extends IService { List searchNonPage(@Valid WarehouseSearchQO request); - List getEnableList(String factoryNo); + List getEnableList(String factoryNo); List getListByIds(List list); } 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 c55bb4d8..310aed94 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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nflg.wms.common.pojo.qo.EnableQO; import com.nflg.wms.common.pojo.qo.WarehouseSearchQO; +import com.nflg.wms.common.pojo.vo.WarehouseSimpleVO; import com.nflg.wms.common.pojo.vo.WarehouseVO; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.VUtil; @@ -106,7 +107,7 @@ public class WmsWarehouseServiceImpl extends ServiceImpl getEnableList(String factoryNo) { + public List getEnableList(String factoryNo) { return baseMapper.getEnableList(factoryNo); } diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsWarehouseMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsWarehouseMapper.xml index 1846e4b5..4ffbb75a 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsWarehouseMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsWarehouseMapper.xml @@ -49,7 +49,7 @@ order by w.id desc - select w.*, di.name as factory_name from wms_warehouse w left join dictionary_item di on w.factory_id = di.id