From 73b7d0408f6a88552dbc5ccccf2e9c0fa0a0acf1 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Fri, 8 Mar 2024 16:06:27 +0800 Subject: [PATCH] =?UTF-8?q?add:=E4=BE=9B=E5=BA=94=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0c6792b66c9573faf6f7f102bb584f282187174b | 11 - .../3828de74f3f9d1252984dd2c3524e61bc6632160 | 0 .../6380d92563f750329b625bda0586fc4ba3b71943 | 2 - .../9019fde59766868f22fd17bff1ddac61f4908ef3 | 5 - .../hd/.idea/sonarlint/issuestore/index.pb | 8 - .../controller/BmSupplierController.java | 61 +++ .../supplier/service/IBmSupplierService.java | 14 + .../supplier/service/dao/BmSupplier.java | 161 ++++++++ .../service/dao/mapper/BmSupplierMapper.java | 21 ++ .../dao/mapper/xml/BmSupplierMapper.xml | 5 + .../supplier/service/dto/SupplierQuery.java | 27 ++ .../service/impl/BmSupplierServiceImpl.java | 25 ++ .../api/wms/base_manage/material/material.js | 2 +- .../api/wms/base_manage/supplier/supplier.js | 27 ++ .../views/wms/base_manage/supplier/index.vue | 354 ++++++++++++++++++ 15 files changed, 696 insertions(+), 27 deletions(-) delete mode 100644 wms_pro/hd/.idea/sonarlint/issuestore/0/c/0c6792b66c9573faf6f7f102bb584f282187174b delete mode 100644 wms_pro/hd/.idea/sonarlint/issuestore/3/8/3828de74f3f9d1252984dd2c3524e61bc6632160 delete mode 100644 wms_pro/hd/.idea/sonarlint/issuestore/6/3/6380d92563f750329b625bda0586fc4ba3b71943 delete mode 100644 wms_pro/hd/.idea/sonarlint/issuestore/9/0/9019fde59766868f22fd17bff1ddac61f4908ef3 create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/controller/BmSupplierController.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/IBmSupplierService.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/dao/BmSupplier.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/dao/mapper/BmSupplierMapper.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/dao/mapper/xml/BmSupplierMapper.xml create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/dto/SupplierQuery.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/impl/BmSupplierServiceImpl.java create mode 100644 wms_pro/qd/src/api/wms/base_manage/supplier/supplier.js create mode 100644 wms_pro/qd/src/views/wms/base_manage/supplier/index.vue diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/0/c/0c6792b66c9573faf6f7f102bb584f282187174b b/wms_pro/hd/.idea/sonarlint/issuestore/0/c/0c6792b66c9573faf6f7f102bb584f282187174b deleted file mode 100644 index 0f45d7f8..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/0/c/0c6792b66c9573faf6f7f102bb584f282187174b +++ /dev/null @@ -1,11 +0,0 @@ - -u java:S116%"[Rename this field "local_table_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ֵ -p java:S116*"VRename this field "api_address" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ԛ -n java:S116/"TRename this field "sync_type" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -t java:S1164"ZRename this field "external_system" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Ĥ -q java:S1169"WRename this field "mapping_json" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Ύ -s java:S116>"YRename this field "last_update_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -p java:S116C"[Rename this field "last_update_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Ȯ -u java:S116H"[Rename this field "last_update_time" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Λ -B -java:S1948N"&Make "dtos" transient or serializable.(d81 \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/3/8/3828de74f3f9d1252984dd2c3524e61bc6632160 b/wms_pro/hd/.idea/sonarlint/issuestore/3/8/3828de74f3f9d1252984dd2c3524e61bc6632160 deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/6/3/6380d92563f750329b625bda0586fc4ba3b71943 b/wms_pro/hd/.idea/sonarlint/issuestore/6/3/6380d92563f750329b625bda0586fc4ba3b71943 deleted file mode 100644 index 3f8b72a5..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/6/3/6380d92563f750329b625bda0586fc4ba3b71943 +++ /dev/null @@ -1,2 +0,0 @@ - -r java:S117A"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(̘81 \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/9/0/9019fde59766868f22fd17bff1ddac61f4908ef3 b/wms_pro/hd/.idea/sonarlint/issuestore/9/0/9019fde59766868f22fd17bff1ddac61f4908ef3 deleted file mode 100644 index ef8a8000..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/9/0/9019fde59766868f22fd17bff1ddac61f4908ef3 +++ /dev/null @@ -1,5 +0,0 @@ - -k java:S117]"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -f java:S117a"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(쁵 -d -java:S3252b"OUse static access with "cn.hutool.core.text.CharSequenceUtil" for "isNotBlank".(q \ 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 0f42689b..7c852ae0 100644 --- a/wms_pro/hd/.idea/sonarlint/issuestore/index.pb +++ b/wms_pro/hd/.idea/sonarlint/issuestore/index.pb @@ -33,19 +33,11 @@ m =nladmin-system/src/main/java/org/nl/common/TableDataInfo.java,a/8/a85494925056ae5a2edbd2ec7eee55976b36080f w Gnladmin-system/src/main/java/org/nl/common/domain/entity/PageQuery.java,4/c/4c2e7c33185348f635f5a9dbcc6943e1266cd690 - -mnladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/IBmExternalFieldMappingService.java,6/3/6380d92563f750329b625bda0586fc4ba3b71943 - -unladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/impl/BmExternalFieldMappingServiceImpl.java,9/0/9019fde59766868f22fd17bff1ddac61f4908ef3  fnladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dto/RequestMappingParam.java,b/9/b9d6f798f97296813c3841cfa2a60c772c87530a  _nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dto/MappingQuery.java,8/6/866203b5eb8727cc6dfd1175f534632b5b301cf2  ]nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dto/MappingDto.java,e/4/e4d40d63f40ac834a65cd47f2b9ab2436efb39d1 - -inladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/BmExternalFieldMapping.java,0/c/0c6792b66c9573faf6f7f102bb584f282187174b - -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 \ No newline at end of file diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/controller/BmSupplierController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/controller/BmSupplierController.java new file mode 100644 index 00000000..10f39d0a --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/controller/BmSupplierController.java @@ -0,0 +1,61 @@ + +package org.nl.wms.base_manage.supplier.controller; + + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.entity.PageQuery; +import org.nl.wms.base_manage.supplier.service.IBmSupplierService; +import org.nl.wms.base_manage.supplier.service.dao.BmSupplier; +import org.nl.wms.base_manage.supplier.service.dto.SupplierQuery; +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.Arrays; + + +/** + * @author zhouz + * @date 2021-12-06 + **/ +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/bmSupplier") +@Slf4j +public class BmSupplierController { + + @Autowired + private IBmSupplierService supplierService; + + @GetMapping + public ResponseEntity getAll(SupplierQuery query, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(supplierService.page(page.build(), query.build())), HttpStatus.OK); + } + + @PostMapping + public ResponseEntity create(@Validated @RequestBody BmSupplier dto) { + supplierService.save(dto); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + + @PutMapping + public ResponseEntity update(@Validated @RequestBody BmSupplier dto) { + supplierService.update(dto, new LambdaUpdateWrapper().eq(BmSupplier::getSupp_id, dto.getSupp_id())); + return new ResponseEntity<>(HttpStatus.OK); + } + + + @DeleteMapping + public ResponseEntity delete(@RequestBody Long[] ids) { + if (ids.length > 0) { + supplierService.removeByIds(Arrays.asList(ids)); + } + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/IBmSupplierService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/IBmSupplierService.java new file mode 100644 index 00000000..1c264ffc --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/IBmSupplierService.java @@ -0,0 +1,14 @@ + +package org.nl.wms.base_manage.supplier.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.base_manage.supplier.service.dao.BmSupplier; + +/** +* @description 服务接口 +* @author zhouz +* @date 2021-12-06 +**/ +public interface IBmSupplierService extends IService { + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/dao/BmSupplier.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/dao/BmSupplier.java new file mode 100644 index 00000000..18613838 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/dao/BmSupplier.java @@ -0,0 +1,161 @@ +package org.nl.wms.base_manage.supplier.service.dao; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @author zhouz + * @description / + * @date 2021-12-06 + **/ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("bm_supplier") +public class BmSupplier implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 供应商标识 + */ + private Long supp_id; + + /** + * 供应商编码 + */ + private String supp_code; + + /** + * 供应商名称 + */ + private String supp_name; + + /** + * 法人代表 + */ + private String jurid_name; + + /** + * 税务登记号 + */ + private String tax_no; + + /** + * 工商注册号 + */ + private String register_no; + + /** + * 经营许可证号 + */ + private String manage_lice_no; + + /** + * 营业执照 + */ + private String busi_char_name; + + /** + * 行政区划 + */ + private Long area_id; + + /** + * 邮政编码 + */ + private String zip_code; + + /** + * 公司电话 + */ + private String corp_tele_no; + + /** + * 公司地址 + */ + private String corp_address; + + /** + * 创建人 + */ + 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 String is_used; + + /** + * 是否删除 + */ + private String is_delete; + + /** + * 外部标识 + */ + private String ext_id; + + /** + * 条码打印起始值 + */ + private String barcode_print; + + /** + * 备注 + */ + private String remark; + + /** + * 分类标识 + */ + private Long class_id; + + /** + * 分类编码 + */ + private String class_code; + + /** + * 分类名称 + */ + private String class_name; + + /** + * 资金计划履约天数 + */ + private BigDecimal honour_days; +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/dao/mapper/BmSupplierMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/dao/mapper/BmSupplierMapper.java new file mode 100644 index 00000000..6433ee0f --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/dao/mapper/BmSupplierMapper.java @@ -0,0 +1,21 @@ +package org.nl.wms.base_manage.supplier.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.nl.wms.base_manage.field_mapping.service.dao.BmExternalFieldMapping; +import org.nl.wms.base_manage.supplier.service.dao.BmSupplier; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 同步字段映射表 Mapper 接口 + *

+ * + * @author generator + * @since 2024-03-06 + */ +public interface BmSupplierMapper extends BaseMapper { + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/dao/mapper/xml/BmSupplierMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/dao/mapper/xml/BmSupplierMapper.xml new file mode 100644 index 00000000..95b9dfa6 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/dao/mapper/xml/BmSupplierMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/dto/SupplierQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/dto/SupplierQuery.java new file mode 100644 index 00000000..ad6fe522 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/dto/SupplierQuery.java @@ -0,0 +1,27 @@ +package org.nl.wms.base_manage.supplier.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.supplier.service.dao.BmSupplier; + +/* + * @author ZZQ + * @Date 2023/5/4 19:49 + */ +@Data +public class SupplierQuery 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/supplier/service/impl/BmSupplierServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/impl/BmSupplierServiceImpl.java new file mode 100644 index 00000000..9694a93a --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/impl/BmSupplierServiceImpl.java @@ -0,0 +1,25 @@ + +package org.nl.wms.base_manage.supplier.service.impl; + + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.wms.base_manage.supplier.service.IBmSupplierService; +import org.nl.wms.base_manage.supplier.service.dao.BmSupplier; +import org.nl.wms.base_manage.supplier.service.dao.mapper.BmSupplierMapper; +import org.springframework.stereotype.Service; + + +/** + * @author zhouz + * @description 服务实现 + * @date 2021-12-06 + **/ +@Service +@RequiredArgsConstructor +@Slf4j +public class BmSupplierServiceImpl extends ServiceImpl implements IBmSupplierService { + +} 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 index 49773f2c..a5973358 100644 --- a/wms_pro/qd/src/api/wms/base_manage/material/material.js +++ b/wms_pro/qd/src/api/wms/base_manage/material/material.js @@ -26,7 +26,7 @@ export function edit(data) { export function excelImport(data) { return request({ - url: 'api/mdMeMaterialbase/excelImport', + url: 'api/bmMaterial/excelImport', method: 'post', data }) diff --git a/wms_pro/qd/src/api/wms/base_manage/supplier/supplier.js b/wms_pro/qd/src/api/wms/base_manage/supplier/supplier.js new file mode 100644 index 00000000..c0e91d1c --- /dev/null +++ b/wms_pro/qd/src/api/wms/base_manage/supplier/supplier.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/bmSupplier', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/bmSupplier', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/bmSupplier', + method: 'put', + data + }) +} + +export default { add, edit, del } diff --git a/wms_pro/qd/src/views/wms/base_manage/supplier/index.vue b/wms_pro/qd/src/views/wms/base_manage/supplier/index.vue new file mode 100644 index 00000000..41d16c9a --- /dev/null +++ b/wms_pro/qd/src/views/wms/base_manage/supplier/index.vue @@ -0,0 +1,354 @@ + + + + +