From 830a523d564354215cd72661bb4de26db6270403 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 28 Jun 2024 16:31:32 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=9C=A8=E7=AE=B1=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MdpbBoxtypeController.java | 18 +++++++++-- .../database/service/IMdpbBoxtypeService.java | 13 ++++++++ .../database/service/dao/MdpbBoxtype.java | 1 - .../service/impl/MdpbBoxtypeServiceImpl.java | 32 +++++++++++++++++-- .../views/wms/basedata/st/boxType/index.vue | 16 +++++++--- 5 files changed, 69 insertions(+), 11 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/controller/MdpbBoxtypeController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/controller/MdpbBoxtypeController.java index a04a6d31a..966dbdf24 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/controller/MdpbBoxtypeController.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/controller/MdpbBoxtypeController.java @@ -8,13 +8,13 @@ import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.modules.logging.annotation.Log; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.Map; +import java.util.Set; /** *

@@ -40,9 +40,23 @@ public class MdpbBoxtypeController { @PostMapping @Log("新增木箱类型") - public ResponseEntity query(@Validated @RequestBody MdpbBoxtype dao) { + public ResponseEntity create(@Validated @RequestBody MdpbBoxtype dao) { iMdpbBoxtypeService.create(dao); return new ResponseEntity<>(HttpStatus.OK); } + @PutMapping + @Log("修改木箱类型") + public ResponseEntity update(@Validated @RequestBody MdpbBoxtype dao) { + iMdpbBoxtypeService.update(dao); + return new ResponseEntity<>(HttpStatus.OK); + } + + @DeleteMapping + @Log("删除木箱类型") + public ResponseEntity delete(@RequestBody Set ids) { + iMdpbBoxtypeService.delete(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/IMdpbBoxtypeService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/IMdpbBoxtypeService.java index 2e4d32875..8a9a206a8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/IMdpbBoxtypeService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/IMdpbBoxtypeService.java @@ -6,6 +6,7 @@ import org.nl.b_lms.storage_manage.database.service.dao.MdpbBoxtype; import org.nl.common.domain.query.PageQuery; import java.util.Map; +import java.util.Set; /** *

@@ -30,4 +31,16 @@ public interface IMdpbBoxtypeService extends IService { * @param dao : {实体对象} */ void create(MdpbBoxtype dao); + + /** + * 修改 + * @param dao: {实体对象} + */ + void update(MdpbBoxtype dao); + + /** + * 删除 + * @param ids ： {集合} + */ + void delete(Set ids); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/MdpbBoxtype.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/MdpbBoxtype.java index e49e33cc3..40c04a156 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/MdpbBoxtype.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/MdpbBoxtype.java @@ -20,7 +20,6 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @TableName("mdpb_boxtype") -@Builder public class MdpbBoxtype implements Serializable { private static final long serialVersionUID = 1L; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/MdpbBoxtypeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/MdpbBoxtypeServiceImpl.java index 9f36e7c2e..48b3ae669 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/MdpbBoxtypeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/MdpbBoxtypeServiceImpl.java @@ -1,6 +1,8 @@ package org.nl.b_lms.storage_manage.database.service.impl; +import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,11 +12,11 @@ import org.nl.b_lms.storage_manage.database.service.dao.MdpbBoxtype; import org.nl.b_lms.storage_manage.database.service.dao.mapper.MdpbBoxtypeMapper; import org.nl.common.domain.query.PageQuery; import org.nl.modules.common.exception.BadRequestException; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Map; +import java.util.Set; /** *

@@ -29,8 +31,21 @@ public class MdpbBoxtypeServiceImpl extends ServiceImpl queryAll(Map whereJson, PageQuery page) { - return this.baseMapper.selectPage(new Page<>(page.getPage() + 1, page.getSize()), new QueryWrapper() - .lambda()); + // 查询条件 + LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda(); + String box_type = MapUtil.getStr(whereJson, "box_type"); + String box_name = MapUtil.getStr(whereJson, "box_name"); + + if (ObjectUtil.isNotEmpty(box_type)) { + queryWrapper.likeRight(MdpbBoxtype::getBox_type, box_type); + } + if (ObjectUtil.isNotEmpty(box_name)) { + queryWrapper.likeRight(MdpbBoxtype::getBox_name, box_name); + } + + return this.baseMapper.selectPage(new Page<>(page.getPage() + 1, page.getSize()), + queryWrapper + ); } @Override @@ -43,4 +58,15 @@ public class MdpbBoxtypeServiceImpl extends ServiceImpl ids) { + this.baseMapper.deleteBatchIds(ids); + } } diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/boxType/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/boxType/index.vue index 71f79e4be..789530795 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/boxType/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/st/boxType/index.vue @@ -46,12 +46,12 @@ - + - + @@ -113,8 +113,8 @@ - - + +