From 69f4e2dadf3d1f9a5444e31f286ee45fd0e69686 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Thu, 15 Aug 2024 15:29:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BA=9F=E7=AE=94=E6=90=AC=E8=BF=90?= =?UTF-8?q?=E4=B8=9A=E5=8A=A12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WastefoilrecordController.java | 59 ++++++++++++ .../service/IWastefoilrecordService.java | 43 +++++++++ .../service/dao/Wastefoilrecord.java | 42 +++++++++ .../dao/mapper/WastefoilrecordMapper.java | 12 +++ .../dao/mapper/WastefoilrecordMapper.xml | 5 + .../service/dto/WastefoilrecordDto.java | 30 ++++++ .../service/dto/WastefoilrecordQuery.java | 12 +++ .../impl/WastefoilrecordServiceImpl.java | 65 +++++++++++++ lms2/nladmin-ui/src/views/wms/md/index.vue | 93 +++++++++++++++++++ .../src/views/wms/md/wastefoilrecord.js | 27 ++++++ 10 files changed, 388 insertions(+) create mode 100644 lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/controller/WastefoilrecordController.java create mode 100644 lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/IWastefoilrecordService.java create mode 100644 lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/dao/Wastefoilrecord.java create mode 100644 lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/dao/mapper/WastefoilrecordMapper.java create mode 100644 lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/dao/mapper/WastefoilrecordMapper.xml create mode 100644 lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/dto/WastefoilrecordDto.java create mode 100644 lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/dto/WastefoilrecordQuery.java create mode 100644 lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/impl/WastefoilrecordServiceImpl.java create mode 100644 lms2/nladmin-ui/src/views/wms/md/index.vue create mode 100644 lms2/nladmin-ui/src/views/wms/md/wastefoilrecord.js diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/controller/WastefoilrecordController.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/controller/WastefoilrecordController.java new file mode 100644 index 000000000..f3bdc69c0 --- /dev/null +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/controller/WastefoilrecordController.java @@ -0,0 +1,59 @@ +package org.nl.wms.md.wastefoilrecord.controller; + +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.md.wastefoilrecord.service.IWastefoilrecordService; +import org.nl.wms.md.wastefoilrecord.service.dao.Wastefoilrecord; +import org.springframework.beans.factory.annotation.Autowired; +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; +/** +* @author lyd +* @date 2024-08-15 +**/ +@Slf4j +@RestController +@RequestMapping("/api/wastefoilrecord") +public class WastefoilrecordController { + + @Autowired + private IWastefoilrecordService wastefoilrecordService; + + @GetMapping + @Log("查询废箔记录") + //@SaCheckPermission("wastefoilrecord:list") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ + return new ResponseEntity<>(TableDataInfo.build(wastefoilrecordService.queryAll(whereJson,page)),HttpStatus.OK); + } + + @PostMapping + @Log("新增废箔记录") + //@SaCheckPermission("wastefoilrecord:add") + public ResponseEntity create(@Validated @RequestBody Wastefoilrecord entity){ + wastefoilrecordService.create(entity); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改废箔记录") + //@SaCheckPermission("wastefoilrecord:edit") + public ResponseEntity update(@Validated @RequestBody Wastefoilrecord entity){ + wastefoilrecordService.update(entity); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除废箔记录") + //@SaCheckPermission("wastefoilrecord:del") + @DeleteMapping + public ResponseEntity delete(@RequestBody Set ids) { + wastefoilrecordService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/IWastefoilrecordService.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/IWastefoilrecordService.java new file mode 100644 index 000000000..444bd4c9a --- /dev/null +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/IWastefoilrecordService.java @@ -0,0 +1,43 @@ +package org.nl.wms.md.wastefoilrecord.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.nl.common.domain.query.PageQuery; +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.md.wastefoilrecord.service.dao.Wastefoilrecord; + +import java.util.Map; +import java.util.Set; + +/** +* @description 服务接口 +* @author lyd +* @date 2024-08-15 +**/ +public interface IWastefoilrecordService extends IService { + + /** + * 查询数据分页 + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ + IPage queryAll(Map whereJson, PageQuery pageable); + + /** + * 创建 + * @param entity / + */ + void create(Wastefoilrecord entity); + + /** + * 编辑 + * @param entity / + */ + void update(Wastefoilrecord entity); + + /** + * 多选删除 + * @param ids / + */ + void deleteAll(Set ids); +} diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/dao/Wastefoilrecord.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/dao/Wastefoilrecord.java new file mode 100644 index 000000000..970afce96 --- /dev/null +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/dao/Wastefoilrecord.java @@ -0,0 +1,42 @@ +package org.nl.wms.md.wastefoilrecord.service.dao; + + import com.baomidou.mybatisplus.annotation.IdType; + import com.baomidou.mybatisplus.annotation.TableId; + import com.baomidou.mybatisplus.annotation.TableName; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** +* @description / +* @author lyd +* @date 2024-08-15 +**/ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("md_me_wastefoilrecord") +public class Wastefoilrecord implements Serializable { + +private static final long serialVersionUID = 1L; + + @TableId(value = "record_id", type = IdType.NONE) + /** 记录id */ + private String record_id; + + /** 站点号 */ + private String point_code; + + /** 名称 */ + private String point_name; + + /** 重量 */ + private String weight; + + /** 记录时间 */ + private String create_id; + private String create_name; + private String create_time; + +} diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/dao/mapper/WastefoilrecordMapper.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/dao/mapper/WastefoilrecordMapper.java new file mode 100644 index 000000000..eb04d6ecd --- /dev/null +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/dao/mapper/WastefoilrecordMapper.java @@ -0,0 +1,12 @@ +package org.nl.wms.md.wastefoilrecord.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.md.wastefoilrecord.service.dao.Wastefoilrecord; + +/** +* @author lyd +* @date 2024-08-15 +**/ +public interface WastefoilrecordMapper extends BaseMapper { + +} diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/dao/mapper/WastefoilrecordMapper.xml b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/dao/mapper/WastefoilrecordMapper.xml new file mode 100644 index 000000000..41911b7eb --- /dev/null +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/dao/mapper/WastefoilrecordMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/dto/WastefoilrecordDto.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/dto/WastefoilrecordDto.java new file mode 100644 index 000000000..ecc9a0046 --- /dev/null +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/dto/WastefoilrecordDto.java @@ -0,0 +1,30 @@ +package org.nl.wms.md.wastefoilrecord.service.dto; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import java.io.Serializable; + +/** +* @description / +* @author lyd +* @date 2024-08-15 +**/ +@Data +public class WastefoilrecordDto implements Serializable { + + /** 记录id */ + private String record_id; + + /** 站点号 */ + private String point_code; + + /** 名称 */ + private String point_name; + + /** 重量 */ + private String weight; + + /** 记录时间 */ + private String record_time; +} diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/dto/WastefoilrecordQuery.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/dto/WastefoilrecordQuery.java new file mode 100644 index 000000000..302b20086 --- /dev/null +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/dto/WastefoilrecordQuery.java @@ -0,0 +1,12 @@ +package org.nl.wms.md.wastefoilrecord.service.dto; + +import org.nl.common.domain.query.BaseQuery; +import org.nl.wms.md.wastefoilrecord.service.dao.Wastefoilrecord; + +/** +* @author lyd +* @date 2024-08-15 +**/ +public class WastefoilrecordQuery extends BaseQuery { + +} diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/impl/WastefoilrecordServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/impl/WastefoilrecordServiceImpl.java new file mode 100644 index 000000000..35476af0d --- /dev/null +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/md/wastefoilrecord/service/impl/WastefoilrecordServiceImpl.java @@ -0,0 +1,65 @@ +package org.nl.wms.md.wastefoilrecord.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.config.language.LangProcess; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.exception.BadRequestException; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.md.wastefoilrecord.service.IWastefoilrecordService; +import org.nl.wms.md.wastefoilrecord.service.dao.mapper.WastefoilrecordMapper; +import org.nl.wms.md.wastefoilrecord.service.dao.Wastefoilrecord; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Map; +import java.util.Set; + +/** +* @description 服务实现 +* @author lyd +* @date 2024-08-15 +**/ +@Slf4j +@Service +public class WastefoilrecordServiceImpl extends ServiceImpl implements IWastefoilrecordService { + + @Autowired + private WastefoilrecordMapper wastefoilrecordMapper; + + @Override + public IPage queryAll(Map whereJson, PageQuery page){ + LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + wastefoilrecordMapper.selectPage(pages, lam); + return pages; + } + + @Override + public void create(Wastefoilrecord entity) { + entity.setRecord_id(IdUtil.getSnowflake(1, 1).nextIdStr()); + wastefoilrecordMapper.insert(entity); + } + + @Override + public void update(Wastefoilrecord entity) { + Wastefoilrecord dto = wastefoilrecordMapper.selectById(entity.getRecord_id()); + if (dto == null) { + throw new BadRequestException(LangProcess.msg("error_SystemAuthError")); + } + wastefoilrecordMapper.updateById(entity); + } + + @Override + public void deleteAll(Set ids) { + // 真删除 + wastefoilrecordMapper.deleteBatchIds(ids); + } + +} diff --git a/lms2/nladmin-ui/src/views/wms/md/index.vue b/lms2/nladmin-ui/src/views/wms/md/index.vue new file mode 100644 index 000000000..1458adc1f --- /dev/null +++ b/lms2/nladmin-ui/src/views/wms/md/index.vue @@ -0,0 +1,93 @@ + + + + + diff --git a/lms2/nladmin-ui/src/views/wms/md/wastefoilrecord.js b/lms2/nladmin-ui/src/views/wms/md/wastefoilrecord.js new file mode 100644 index 000000000..3e6fa7292 --- /dev/null +++ b/lms2/nladmin-ui/src/views/wms/md/wastefoilrecord.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/wastefoilrecord', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/wastefoilrecord/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/wastefoilrecord', + method: 'put', + data + }) +} + +export default { add, edit, del }