From 8617e76468cacd9dbef64b418a2d47afbd959eb1 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 13 Jun 2025 13:56:58 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E7=BB=84=E7=9B=98=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GroupController.java | 48 +++++ .../service/IMdPbGroupplateService.java | 19 ++ .../dao/mapper/MdPbGroupplateMapper.java | 11 ++ .../dao/mapper/MdPbGroupplateMapper.xml | 34 ++++ .../impl/MdPbGroupplateServiceImpl.java | 19 ++ .../service/impl/RetrunServiceImpl.java | 2 +- .../src/views/wms/basedata/group/group.js | 27 +++ .../src/views/wms/basedata/group/index.vue | 167 ++++++++++++++++++ .../src/views/wms/sch/task/index.vue | 21 ++- .../src/views/wms/sch/taskconfig/index.vue | 4 +- 10 files changed, 340 insertions(+), 12 deletions(-) create mode 100644 wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java create mode 100644 wms/nladmin-ui/src/views/wms/basedata/group/group.js create mode 100644 wms/nladmin-ui/src/views/wms/basedata/group/index.vue diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java new file mode 100644 index 0000000..927fee4 --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java @@ -0,0 +1,48 @@ +package org.nl.wms.basedata_manage.controller; + + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.base.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.logging.annotation.Log; +import org.nl.wms.warehouse_management.service.IMdPbGroupplateService; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Map; +import java.util.Set; + + +/** + *

+ * 组盘记录 控制层 + *

+ * + * @author Liuxy + * @since 2025-06-03 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/group") +@Slf4j +public class GroupController { + + @Resource + private final IMdPbGroupplateService iMdPbGroupplateService; + + @GetMapping + @Log("分页查询") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(iMdPbGroupplateService.queryAll(whereJson, page)), HttpStatus.OK); + } + + @DeleteMapping + @Log("删除组盘") + public ResponseEntity delete(@RequestBody Set ids) { + iMdPbGroupplateService.delete(ids); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java index 2bc7e14..a0f8291 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java @@ -1,8 +1,14 @@ package org.nl.wms.warehouse_management.service; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.warehouse_management.service.dao.GroupPlate; +import java.util.Map; +import java.util.Set; + /** *

* 组盘记录表 服务类 @@ -13,4 +19,17 @@ import org.nl.wms.warehouse_management.service.dao.GroupPlate; */ public interface IMdPbGroupplateService extends IService { + /** + * 分页查询 + * @param whereJson : {查询参数} + * @param page : 分页对象 + * @return 返回结果 + */ + IPage queryAll(Map whereJson, PageQuery page); + + /** + * 删除组盘 + * @param ids 标识集合 + */ + void delete(Set ids); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.java index 6695959..d16f9ca 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.java @@ -2,10 +2,13 @@ package org.nl.wms.warehouse_management.service.dao.mapper; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.nl.wms.warehouse_management.service.dao.GroupPlate; import java.util.List; +import java.util.Map; /** *

@@ -24,4 +27,12 @@ public interface MdPbGroupplateMapper extends BaseMapper { * } */ List getDtl(@Param("param") JSONObject whereJson); + + /** + * 分页查询 + * @param page 分页条件 + * @param whereJson 查询条件 + * @return IPage + */ + IPage queryAllByPage(Page page, @Param("param") Map whereJson); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml index 569aa0b..c08e16d 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml @@ -18,4 +18,38 @@ + + diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java index 9810bca..feedf28 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java @@ -1,10 +1,18 @@ package org.nl.wms.warehouse_management.service.impl; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.warehouse_management.service.IMdPbGroupplateService; import org.nl.wms.warehouse_management.service.dao.GroupPlate; import org.nl.wms.warehouse_management.service.dao.mapper.MdPbGroupplateMapper; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Map; +import java.util.Set; /** *

@@ -17,4 +25,15 @@ import org.springframework.stereotype.Service; @Service public class MdPbGroupplateServiceImpl extends ServiceImpl implements IMdPbGroupplateService { + @Override + public IPage queryAll(Map whereJson, PageQuery page) { + return this.baseMapper.queryAllByPage(new Page<>(page.getPage() + 1, page.getSize()), + whereJson); + } + + @Override + @Transactional + public void delete(Set ids) { + this.baseMapper.deleteBatchIds(ids); + } } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RetrunServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RetrunServiceImpl.java index f6a1394..61ed7e2 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RetrunServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RetrunServiceImpl.java @@ -187,7 +187,7 @@ public class RetrunServiceImpl extends ServiceImpl i // 更新 this.update( new UpdateWrapper().lambda() - .in(IOStorInv::getIo_type, idList) + .in(IOStorInv::getIostorinv_id, idList) .set(IOStorInv::getIs_upload, IOSConstant.IS_DELETE_YES) .set(IOStorInv::getUpdate_optid, SecurityUtils.getCurrentUserId()) .set(IOStorInv::getUpdate_optname, SecurityUtils.getCurrentNickName()) diff --git a/wms/nladmin-ui/src/views/wms/basedata/group/group.js b/wms/nladmin-ui/src/views/wms/basedata/group/group.js new file mode 100644 index 0000000..e927e8f --- /dev/null +++ b/wms/nladmin-ui/src/views/wms/basedata/group/group.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/group', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/group/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/group', + method: 'put', + data + }) +} + +export default { add, edit, del } diff --git a/wms/nladmin-ui/src/views/wms/basedata/group/index.vue b/wms/nladmin-ui/src/views/wms/basedata/group/index.vue new file mode 100644 index 0000000..77dd506 --- /dev/null +++ b/wms/nladmin-ui/src/views/wms/basedata/group/index.vue @@ -0,0 +1,167 @@ + + + + + diff --git a/wms/nladmin-ui/src/views/wms/sch/task/index.vue b/wms/nladmin-ui/src/views/wms/sch/task/index.vue index 12d5266..c59091d 100644 --- a/wms/nladmin-ui/src/views/wms/sch/task/index.vue +++ b/wms/nladmin-ui/src/views/wms/sch/task/index.vue @@ -174,16 +174,16 @@ - + - +