From 637c219e47f940ccbcac5070cd1ed31616d68c33 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Tue, 16 Jul 2024 13:39:17 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E4=BF=A1=E6=81=AF=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BmCustomerController.java | 2 +- .../controller/BmSupplierController.java | 13 +++- .../supplier/service/dao/BmSupplier.java | 19 +----- .../views/wms/base_manage/customer/index.vue | 22 ++++++- .../views/wms/base_manage/supplier/index.vue | 61 ++++++++++--------- 5 files changed, 66 insertions(+), 51 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/customer/controller/BmCustomerController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/customer/controller/BmCustomerController.java index 42417791..15bf50ee 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/customer/controller/BmCustomerController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/customer/controller/BmCustomerController.java @@ -31,7 +31,7 @@ import java.util.*; **/ @RestController @RequiredArgsConstructor -@RequestMapping("/api/customerbase") +@RequestMapping("/api/bmCustomer") @Slf4j public class BmCustomerController { 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 index f1ab452a..197839d4 100644 --- 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 @@ -2,11 +2,15 @@ package org.nl.wms.base_manage.supplier.controller; +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; 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; @@ -39,6 +43,10 @@ public class BmSupplierController { @PostMapping public ResponseEntity create(@Validated @RequestBody BmSupplier dto) { + dto.setSupp_id(IdUtil.getLongId()); + dto.setCreate_id(SecurityUtils.getCurrentUserId()); + dto.setCreate_name(SecurityUtils.getCurrentNickName()); + dto.setCreate_time(DateUtil.now()); supplierService.save(dto); return new ResponseEntity<>(HttpStatus.OK); } @@ -46,7 +54,10 @@ public class BmSupplierController { @PutMapping public ResponseEntity update(@Validated @RequestBody BmSupplier dto) { - supplierService.update(dto, new LambdaUpdateWrapper().eq(BmSupplier::getSupp_id, dto.getSupp_id())); + dto.setUpdate_id(SecurityUtils.getCurrentUserId()); + dto.setUpdate_name(SecurityUtils.getCurrentNickName()); + dto.setUpdate_time(DateUtil.now()); + supplierService.update(dto,new LambdaQueryWrapper().eq(BmSupplier::getSupp_id,dto.getSupp_id())); return new ResponseEntity<>(HttpStatus.OK); } 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 index 18613838..5f53cf2a 100644 --- 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 @@ -129,10 +129,6 @@ public class BmSupplier implements Serializable { */ private String ext_id; - /** - * 条码打印起始值 - */ - private String barcode_print; /** * 备注 @@ -142,20 +138,7 @@ public class BmSupplier implements Serializable { /** * 分类标识 */ - private Long class_id; + private String class_id; - /** - * 分类编码 - */ - private String class_code; - /** - * 分类名称 - */ - private String class_name; - - /** - * 资金计划履约天数 - */ - private BigDecimal honour_days; } diff --git a/wms_pro/qd/src/views/wms/base_manage/customer/index.vue b/wms_pro/qd/src/views/wms/base_manage/customer/index.vue index e66bdde0..e9df6592 100644 --- a/wms_pro/qd/src/views/wms/base_manage/customer/index.vue +++ b/wms_pro/qd/src/views/wms/base_manage/customer/index.vue @@ -230,7 +230,7 @@ export default { cruds() { return CRUD({ title: '客户基础表', - url: 'api/customerbase', + url: 'api/bmCustomer', optShow: { add: true, reset: true @@ -283,9 +283,25 @@ export default { }, [CRUD.HOOK.afterToCU](crud, form) { if (form.class_id != null) { - this.getSubTypes({'id': form.class_id, 'parent_id': '1704039126057226240'}) + //this.getSubTypes({'id': form.class_id, 'parent_id': '1704039126057226240'}) + const param = { + parent_class_code: '' + } + crudClassstandard.getClassType(param).then(res => { + const data = res.content + this.buildClass(data) + this.classes = data + }) } else { - this.getClass() + // this.getClass() + const param = { + parent_class_code: '' + } + crudClassstandard.getClassType(param).then(res => { + const data = res.content + this.buildClass(data) + this.classes = data + }) } }, getSubTypes(id) { 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 index 34425530..3a261853 100644 --- a/wms_pro/qd/src/views/wms/base_manage/supplier/index.vue +++ b/wms_pro/qd/src/views/wms/base_manage/supplier/index.vue @@ -74,13 +74,19 @@ - - + + - - + + @@ -108,22 +114,7 @@ - - - - - - - - - - + @@ -148,7 +139,7 @@ - +