From a0112a1c3fadfc3f68b7f4232a3d85d9da547b5c Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Fri, 8 Mar 2024 15:15:54 +0800 Subject: [PATCH] =?UTF-8?q?add:=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../10e40d67bd7d0818c5483704f020703d1bef8378 | 2 - .../491288c6a971edd368823e6e6d6a676827d0d7b8 | 3 - .../hd/.idea/sonarlint/issuestore/index.pb | 6 +- .../controller/BmMaterialController.java | 72 +++ .../material/service/IBmMaterialService.java | 31 ++ .../material/service/dao/BmMaterial.java | 150 ++++++ .../service/dao/mapper/BmMaterialMapper.java | 23 + .../dao/mapper/xml/BmMaterialMapper.xml | 39 ++ .../material/service/dto/MaterialQuery.java | 28 ++ .../service/impl/BmMaterialServiceImpl.java | 55 +++ .../api/wms/base_manage/material/material.js | 35 ++ .../wms/base_manage/material/UploadDialog.vue | 124 +++++ .../views/wms/base_manage/material/index.vue | 439 ++++++++++++++++++ 13 files changed, 997 insertions(+), 10 deletions(-) delete mode 100644 wms_pro/hd/.idea/sonarlint/issuestore/1/0/10e40d67bd7d0818c5483704f020703d1bef8378 delete mode 100644 wms_pro/hd/.idea/sonarlint/issuestore/4/9/491288c6a971edd368823e6e6d6a676827d0d7b8 create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/controller/BmMaterialController.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/IBmMaterialService.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/BmMaterial.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/mapper/BmMaterialMapper.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/mapper/xml/BmMaterialMapper.xml create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dto/MaterialQuery.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/impl/BmMaterialServiceImpl.java create mode 100644 wms_pro/qd/src/api/wms/base_manage/material/material.js create mode 100644 wms_pro/qd/src/views/wms/base_manage/material/UploadDialog.vue create mode 100644 wms_pro/qd/src/views/wms/base_manage/material/index.vue diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/1/0/10e40d67bd7d0818c5483704f020703d1bef8378 b/wms_pro/hd/.idea/sonarlint/issuestore/1/0/10e40d67bd7d0818c5483704f020703d1bef8378 deleted file mode 100644 index bffb945f..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/1/0/10e40d67bd7d0818c5483704f020703d1bef8378 +++ /dev/null @@ -1,2 +0,0 @@ - -N java:S106."9Replace this use of System.out or System.err by a logger.( \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/4/9/491288c6a971edd368823e6e6d6a676827d0d7b8 b/wms_pro/hd/.idea/sonarlint/issuestore/4/9/491288c6a971edd368823e6e6d6a676827d0d7b8 deleted file mode 100644 index 719377ba..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/4/9/491288c6a971edd368823e6e6d6a676827d0d7b8 +++ /dev/null @@ -1,3 +0,0 @@ - -k java:S117I"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -k java:S117N"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Ђ \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/index.pb b/wms_pro/hd/.idea/sonarlint/issuestore/index.pb index d3f8f777..0f42689b 100644 --- a/wms_pro/hd/.idea/sonarlint/issuestore/index.pb +++ b/wms_pro/hd/.idea/sonarlint/issuestore/index.pb @@ -3,8 +3,6 @@ q Anladmin-system/src/main/java/org/nl/common/anno/Datazhuazhua.java,3/6/363ec6c9460095b38992146a934751ba30bef9af  Ynladmin-system/src/main/java/org/nl/wms/system_manage/controller/dept/DeptController.java,a/a/aa9ec186e2a7aa1989de50b7632ac6126cea19a9 -_ -/nladmin-system/src/main/java/org/nl/AppRun.java,1/0/10e40d67bd7d0818c5483704f020703d1bef8378  _nladmin-system/src/main/java/org/nl/wms/system_manage/controller/monitor/MonitorController.java,5/b/5bf8a103b07bcc6e53d76381558cf3ce51acec97  @@ -50,6 +48,4 @@ inladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/B  vnladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/mapper/BmExternalFieldMappingMapper.java,3/8/3828de74f3f9d1252984dd2c3524e61bc6632160  -ynladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/mapper/xml/BmExternalFieldMappingMapper.xml,8/5/8579f2942008652ebd59f8eed6fafca608a42516 - -rnladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/controller/BmExternalFieldMappingController.java,4/9/491288c6a971edd368823e6e6d6a676827d0d7b8 \ No newline at end of file +ynladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/mapper/xml/BmExternalFieldMappingMapper.xml,8/5/8579f2942008652ebd59f8eed6fafca608a42516 \ No newline at end of file diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/controller/BmMaterialController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/controller/BmMaterialController.java new file mode 100644 index 00000000..59233577 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/controller/BmMaterialController.java @@ -0,0 +1,72 @@ +package org.nl.wms.base_manage.material.controller; + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.entity.PageQuery; +import org.nl.common.utils.RedissonUtils; +import org.nl.wms.base_manage.material.service.IBmMaterialService; +import org.nl.wms.base_manage.material.service.dao.BmMaterial; +import org.nl.wms.base_manage.material.service.dto.MaterialQuery; +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 org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; + +/** + *

+ * 物料基本信息表 前端控制器 + *

+ * + * @author generator + * @since 2023-04-26 + */ +@RestController +@RequestMapping("/api/bmMaterial") +public class BmMaterialController { + + @Autowired + private IBmMaterialService materialService; + + @GetMapping + public ResponseEntity getAll(MaterialQuery query, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(materialService.page(page.build(), query.build())), HttpStatus.OK); + } + + @PostMapping + public ResponseEntity create(@Validated @RequestBody BmMaterial dto) { + materialService.save(dto); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + + @PutMapping + public ResponseEntity update(@Validated @RequestBody BmMaterial dto) { + materialService.update(dto, new LambdaUpdateWrapper().eq(BmMaterial::getMaterial_id, dto.getMaterial_id())); + return new ResponseEntity<>(HttpStatus.OK); + } + + + @DeleteMapping + public ResponseEntity delete(@RequestBody Long[] ids) { + if (ids.length > 0) { + materialService.removeByIds(Arrays.asList(ids)); + } + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/excelImport") + public ResponseEntity excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request, HttpServletResponse response) { + RedissonUtils.lock(() -> + { + materialService.excelImport(file, request, response); + }, "物料基础信息导入", null); + return new ResponseEntity<>(HttpStatus.OK); + } +} + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/IBmMaterialService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/IBmMaterialService.java new file mode 100644 index 00000000..bb374a76 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/IBmMaterialService.java @@ -0,0 +1,31 @@ +package org.nl.wms.base_manage.material.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.base_manage.material.service.dao.BmMaterial; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; + +/** + *

+ * 物料基本信息表 服务类 + *

+ * + * @author generator + * @since 2023-04-26 + */ +public interface IBmMaterialService extends IService{ + /** + * 物料基础信息导入 + */ + void excelImport(MultipartFile file, HttpServletRequest request, HttpServletResponse response) + throws IOException; + + List pageQuery(Map whereJson); + + void create(BmMaterial entity); +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/BmMaterial.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/BmMaterial.java new file mode 100644 index 00000000..c8843f05 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/BmMaterial.java @@ -0,0 +1,150 @@ +package org.nl.wms.base_manage.material.service.dao; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *

+ * 物料基本信息表 + *

+ * + * @author generator + * @since 2023-04-26 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("bm_material") +public class BmMaterial implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 车间 + */ + private String product_area; + /** + * 物料标识 + */ + @TableId + private String material_id; + /** + * 物料编码 + */ + private String material_code; + /** + * 物料名称 + */ + private String material_name; + /** + * 规格 + */ + private String material_spec; + /** + * 型号 + */ + private String material_model; + /** + * 外文名称 + */ + private String english_name; + /** + * 基本计量单位 + */ + private String base_unit_id; + /** + * 辅助计量单位 + */ + private String assist_unit_id; + /** + * 批准文号 + */ + private String approve_fileno; + /** + * 工程图号 + */ + private String print_no; + /** + * 物料分类标识 + */ + private String material_type_id; + /** + * 长度单位 + */ + private String len_unit_id; + /** + * 物料长度 + */ + private BigDecimal length; + /** + * 物料宽度 + */ + private BigDecimal width; + /** + * 物料高度 + */ + private BigDecimal height; + /** + * 重量单位 + */ + private String weight_unit_id; + /** + * 物料毛重 + */ + private BigDecimal gross_weight; + /** + * 物料净重 + */ + private BigDecimal net_weight; + /** + * 体积单位 + */ + private String cubage_unit_id; + /** + * 物料体积 + */ + private BigDecimal cubage; + /** + * 创建人 + */ + private String create_id; + /** + * 创建人姓名 + */ + private String create_name; + /** + * 创建时间 + */ + private String create_time; + /** + * 修改人 + */ + private String update_id; + /** + * 修改人姓名 + */ + private String update_name; + /** + * 修改时间 + */ + private String update_time; + /** + * 启用时间 + */ + private String is_used_time; + /** + * 是否启用 + */ + private Boolean is_used; + /** + * 是否删除 + */ + private Boolean is_delete; + /** + * 外部标识 + */ + private String ext_id; + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/mapper/BmMaterialMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/mapper/BmMaterialMapper.java new file mode 100644 index 00000000..67be1c11 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/mapper/BmMaterialMapper.java @@ -0,0 +1,23 @@ +package org.nl.wms.base_manage.material.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.nl.common.domain.entity.PageQuery; +import org.nl.wms.base_manage.material.service.dao.BmMaterial; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 物料基本信息表 Mapper 接口 + *

+ * + * @author generator + * @since 2023-04-26 + */ +public interface BmMaterialMapper extends BaseMapper { + + + List queryAll(Map whereJson); +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/mapper/xml/BmMaterialMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/mapper/xml/BmMaterialMapper.xml new file mode 100644 index 00000000..cb4b79c6 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/mapper/xml/BmMaterialMapper.xml @@ -0,0 +1,39 @@ + + + + + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dto/MaterialQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dto/MaterialQuery.java new file mode 100644 index 00000000..1245f869 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dto/MaterialQuery.java @@ -0,0 +1,28 @@ +package org.nl.wms.base_manage.material.service.dto; + +import lombok.Data; +import org.nl.common.domain.entity.BaseQuery; +import org.nl.common.domain.entity.QParam; +import org.nl.common.enums.QueryTEnum; +import org.nl.wms.base_manage.field_mapping.service.dao.BmExternalFieldMapping; +import org.nl.wms.base_manage.material.service.dao.BmMaterial; + +/* + * @author ZZQ + * @Date 2023/5/4 19:49 + */ +@Data +public class MaterialQuery extends BaseQuery { + + + private String local_table_name; + private String search; + + @Override + public void paramMapping() { + super.doP.put("local_table_name", QParam.builder().k(new String[]{"local_table_name"}).type(QueryTEnum.EQ).build()); + super.doP.put("search", QParam.builder().k(new String[]{"local_field_name", "external_field_name"}).type(QueryTEnum.EQ).build()); + } + + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/impl/BmMaterialServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/impl/BmMaterialServiceImpl.java new file mode 100644 index 00000000..6a6956ab --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/impl/BmMaterialServiceImpl.java @@ -0,0 +1,55 @@ +package org.nl.wms.base_manage.material.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.poi.excel.ExcelReader; +import cn.hutool.poi.excel.ExcelUtil; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.common.domain.exception.BadRequestException; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.base_manage.material.service.IBmMaterialService; +import org.nl.wms.base_manage.material.service.dao.BmMaterial; +import org.nl.wms.base_manage.material.service.dao.mapper.BmMaterialMapper; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + *

+ * 物料基本信息表 服务实现类 + *

+ * + * @author generator + * @since 2023-04-26 + */ +@Service +public class BmMaterialServiceImpl extends ServiceImpl implements IBmMaterialService { + + @Override + public List pageQuery(Map whereJson) { + return this.baseMapper.queryAll(whereJson); + } + + @Override + public void create(BmMaterial entity) { + this.baseMapper.insert(entity); + } + + + @Override + public void excelImport(MultipartFile file, HttpServletRequest request, HttpServletResponse response) { + + } +} diff --git a/wms_pro/qd/src/api/wms/base_manage/material/material.js b/wms_pro/qd/src/api/wms/base_manage/material/material.js new file mode 100644 index 00000000..49773f2c --- /dev/null +++ b/wms_pro/qd/src/api/wms/base_manage/material/material.js @@ -0,0 +1,35 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/bmMaterial', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/bmMaterial', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/bmMaterial', + method: 'put', + data + }) +} + +export function excelImport(data) { + return request({ + url: 'api/mdMeMaterialbase/excelImport', + method: 'post', + data + }) +} + +export default { add, edit, del, excelImport } diff --git a/wms_pro/qd/src/views/wms/base_manage/material/UploadDialog.vue b/wms_pro/qd/src/views/wms/base_manage/material/UploadDialog.vue new file mode 100644 index 00000000..26bcafa1 --- /dev/null +++ b/wms_pro/qd/src/views/wms/base_manage/material/UploadDialog.vue @@ -0,0 +1,124 @@ + + + + diff --git a/wms_pro/qd/src/views/wms/base_manage/material/index.vue b/wms_pro/qd/src/views/wms/base_manage/material/index.vue new file mode 100644 index 00000000..ef18b98c --- /dev/null +++ b/wms_pro/qd/src/views/wms/base_manage/material/index.vue @@ -0,0 +1,439 @@ + + + + + +