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 new file mode 100644 index 000000000..a04a6d31a --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/controller/MdpbBoxtypeController.java @@ -0,0 +1,48 @@ +package org.nl.b_lms.storage_manage.database.controller; + + +import lombok.extern.slf4j.Slf4j; +import org.nl.b_lms.storage_manage.database.service.IMdpbBoxtypeService; +import org.nl.b_lms.storage_manage.database.service.dao.MdpbBoxtype; +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; + +/** + *

+ * 木箱规格信息前端控制器 + *

+ * + * @author author + * @since 2024-06-28 + */ +@RestController +@RequestMapping("/api/boxtype") +@Slf4j +public class MdpbBoxtypeController { + + @Autowired + private IMdpbBoxtypeService iMdpbBoxtypeService; + + @GetMapping + @Log("查询木箱类型") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(iMdpbBoxtypeService.queryAll(whereJson, page)), HttpStatus.OK); + } + + @PostMapping + @Log("新增木箱类型") + public ResponseEntity query(@Validated @RequestBody MdpbBoxtype dao) { + iMdpbBoxtypeService.create(dao); + 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 new file mode 100644 index 000000000..2e4d32875 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/IMdpbBoxtypeService.java @@ -0,0 +1,33 @@ +package org.nl.b_lms.storage_manage.database.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.b_lms.storage_manage.database.service.dao.MdpbBoxtype; +import org.nl.common.domain.query.PageQuery; + +import java.util.Map; + +/** + *

+ * 木箱规格信息服务类 + *

+ * + * @author author + * @since 2024-06-28 + */ +public interface IMdpbBoxtypeService extends IService { + + /** + * 分页查询 + * @param whereJson : {查询参数} + * @param pageable : 分页对象 + * @return 返回结果 + */ + IPage queryAll(Map whereJson, PageQuery pageable); + + /** + * 新增 + * @param dao : {实体对象} + */ + void create(MdpbBoxtype dao); +} 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 new file mode 100644 index 000000000..e49e33cc3 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/MdpbBoxtype.java @@ -0,0 +1,70 @@ +package org.nl.b_lms.storage_manage.database.service.dao; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + *

+ * 木箱规格信息表 + *

+ * + * @author author + * @since 2024-06-28 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("mdpb_boxtype") +@Builder +public class MdpbBoxtype implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 木箱类型 + */ + @TableId(value = "box_type") + private String box_type; + + /** + * 木箱描述 + */ + private String box_name; + + /** + * 捆扎模版 + */ + private String lash_num; + + /** + * 一次捆扎次数 + */ + private String lash_num_one; + + /** + * 二次捆扎次数 + */ + private String lash_num_tow; + + /** + * 是否一次捆扎 + */ + private String need_lash_one; + + /** + * 是否二次捆扎 + */ + private String need_lash_two; + + /** + * 叉车取货宽度 + */ + private String expend_width; + + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/MdpbBoxtypeMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/MdpbBoxtypeMapper.java new file mode 100644 index 000000000..6b0c6d897 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/MdpbBoxtypeMapper.java @@ -0,0 +1,16 @@ +package org.nl.b_lms.storage_manage.database.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.b_lms.storage_manage.database.service.dao.MdpbBoxtype; + +/** + *

+ * 木箱规格信息表Mapper 接口 + *

+ * + * @author author + * @since 2024-06-28 + */ +public interface MdpbBoxtypeMapper extends BaseMapper { + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/MdpbBoxtypeMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/MdpbBoxtypeMapper.xml new file mode 100644 index 000000000..46f06c7d7 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/MdpbBoxtypeMapper.xml @@ -0,0 +1,5 @@ + + + + + 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 new file mode 100644 index 000000000..9f36e7c2e --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/MdpbBoxtypeServiceImpl.java @@ -0,0 +1,46 @@ +package org.nl.b_lms.storage_manage.database.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.b_lms.storage_manage.database.service.IMdpbBoxtypeService; +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; + +/** + *

+ * 木箱规格信息服务实现类 + *

+ * + * @author author + * @since 2024-06-28 + */ +@Service +public class MdpbBoxtypeServiceImpl extends ServiceImpl implements IMdpbBoxtypeService { + + @Override + public IPage queryAll(Map whereJson, PageQuery page) { + return this.baseMapper.selectPage(new Page<>(page.getPage() + 1, page.getSize()), new QueryWrapper() + .lambda()); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void create(MdpbBoxtype dao) { + // 判断当前木箱类型是否存在 + MdpbBoxtype mdpbBoxtype = this.baseMapper.selectById(dao.getBox_type()); + if (ObjectUtil.isNotEmpty(mdpbBoxtype)) { + throw new BadRequestException("当前木箱类型已存在:"+mdpbBoxtype.getBox_type()); + } + this.baseMapper.insert(dao); + } +} diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/boxType/boxtype.js b/lms/nladmin-ui/src/views/wms/basedata/st/boxType/boxtype.js new file mode 100644 index 000000000..b855611e7 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/basedata/st/boxType/boxtype.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/boxtype', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/boxtype/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/boxtype', + method: 'put', + data + }) +} + +export default { add, edit, del } 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 new file mode 100644 index 000000000..71f79e4be --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/basedata/st/boxType/index.vue @@ -0,0 +1,202 @@ + + + + +