From 7c755361f0512f9f96c66fae51cc1d0a538dbe4d Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Tue, 4 Nov 2025 13:38:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=8C=BA=E7=AE=A1=E7=90=86-=E9=98=B2?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9=20?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BasWarehouseController.java | 12 ++- .../bas/warehouse/domain/BasWarehouse.java | 88 ++++++++++++------- .../service/impl/BasWarehouseServiceImpl.java | 14 +++ .../bas/warehouse/BasWarehouseMapper.xml | 3 + ruoyi-ui/src/views/bas/warehouse/index.vue | 14 +-- 5 files changed, 91 insertions(+), 40 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/controller/BasWarehouseController.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/controller/BasWarehouseController.java index 6028027..a0560bc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/controller/BasWarehouseController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/controller/BasWarehouseController.java @@ -72,7 +72,11 @@ public class BasWarehouseController extends BaseController public AjaxResult add(@RequestBody BasWarehouse basWarehouse) { // basWarehouse.setWarehouseId("A01"); - return toAjax(basWarehouseService.insertBasWarehouse(basWarehouse)); + if (basWarehouseService.insertBasWarehouse(basWarehouse) > 0){ + return AjaxResult.success(); + }else { + return AjaxResult.error("仓库编码已存在"); + } } /** @@ -83,7 +87,11 @@ public class BasWarehouseController extends BaseController @PutMapping public AjaxResult edit(@RequestBody BasWarehouse basWarehouse) { - return toAjax(basWarehouseService.updateBasWarehouse(basWarehouse)); + if (basWarehouseService.updateBasWarehouse(basWarehouse) > 0){ + return AjaxResult.success(); + }else { + return AjaxResult.error("仓库编码已存在"); + } } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/domain/BasWarehouse.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/domain/BasWarehouse.java index 40fe5d2..fb4732b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/domain/BasWarehouse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/domain/BasWarehouse.java @@ -18,151 +18,177 @@ public class BasWarehouse extends BaseEntity private static final long serialVersionUID = 1L; /** id（主键不允许为空）主键 */ - @Excel(name = "${bas.Warehouse.warehouseId}") + @Excel(name = "id") private String warehouseId; /** 仓库id（不允许为空） */ - @Excel(name = "${bas.Warehouse.warehouseNo}") private String warehouseNo; /** 项目编号 */ - @Excel(name = "${bas.Warehouse.projectNo}") private String projectNo; /** 仓库名称（不允许为空） */ - @Excel(name = "${bas.Warehouse.warehouseName}") + @Excel(name = "仓库名称") private String warehouseName; /** 仓库地址（允许为空） */ - @Excel(name = "${bas.Warehouse.address}") + @Excel(name = "仓库地址") private String address; /** 仓库描述（允许为空） */ - @Excel(name = "${bas.Warehouse.cDesc}") private String cDesc; /** 仓库级别（允许为空）1、2 */ - @Excel(name = "${bas.Warehouse.warehouseKind}") private String warehouseKind; /** 仓库类型 */ - @Excel(name = "${bas.Warehouse.warehouseType}",dictType = "warehouse_type") + @Excel(name = "仓库类型",dictType = "warehouse_type") private String warehouseType; /** 是否可用（不允许为空）Y、N */ - @Excel(name = "${bas.Warehouse.isCurrent}",dictType = "sys_yes_no") + @Excel(name = "是否可用",dictType = "sys_yes_no") private String isCurrent; + @Excel(name = "备注") + private String remark; + /*仓库数据权限*/ private List dataScope; private List typeData; - public void setWarehouseId(String warehouseId) + private String updateId; + + public String getUpdateId() { + return updateId; + } + public void setUpdateId(String updateId) { + this.updateId = updateId; + } + + public String getcDesc() { + return cDesc; + } + + public void setcDesc(String cDesc) { + this.cDesc = cDesc; + } + + @Override + public String getRemark() { + return remark; + } + + @Override + public void setRemark(String remark) { + this.remark = remark; + } + + public void setWarehouseId(String warehouseId) { this.warehouseId = warehouseId; } - public String getWarehouseId() + public String getWarehouseId() { return warehouseId; } - public void setWarehouseNo(String warehouseNo) + public void setWarehouseNo(String warehouseNo) { this.warehouseNo = warehouseNo; } - public String getWarehouseNo() + public String getWarehouseNo() { return warehouseNo; } - public void setProjectNo(String projectNo) + public void setProjectNo(String projectNo) { this.projectNo = projectNo; } - public String getProjectNo() + public String getProjectNo() { return projectNo; } - public void setWarehouseName(String warehouseName) + public void setWarehouseName(String warehouseName) { this.warehouseName = warehouseName; } - public String getWarehouseName() + public String getWarehouseName() { return warehouseName; } - public void setAddress(String address) + public void setAddress(String address) { this.address = address; } - public String getAddress() + public String getAddress() { return address; } - public void setCDesc(String cDesc) + public void setCDesc(String cDesc) { this.cDesc = cDesc; } - public String getCDesc() + public String getCDesc() { return cDesc; } - public void setWarehouseKind(String warehouseKind) + public void setWarehouseKind(String warehouseKind) { this.warehouseKind = warehouseKind; } - public String getWarehouseKind() + public String getWarehouseKind() { return warehouseKind; } - public void setWarehouseType(String warehouseType) + public void setWarehouseType(String warehouseType) { this.warehouseType = warehouseType; } - public String getWarehouseType() + public String getWarehouseType() { return warehouseType; } - public void setIsCurrent(String isCurrent) + public void setIsCurrent(String isCurrent) { this.isCurrent = isCurrent; } - public String getIsCurrent() + public String getIsCurrent() { return isCurrent; } - public void setDataScope(List dataScope) + public void setDataScope(List dataScope) { this.dataScope = dataScope; } - public List getDataScope() + public List getDataScope() { return dataScope; } - public void setTypeData(List typeData) + public void setTypeData(List typeData) { this.typeData = typeData; } - public List getTypeData() + public List getTypeData() { return typeData; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/service/impl/BasWarehouseServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/service/impl/BasWarehouseServiceImpl.java index cac8588..e4d836f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/service/impl/BasWarehouseServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/service/impl/BasWarehouseServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.bas.warehouse.service.impl; +import cn.hutool.core.collection.CollUtil; import com.ruoyi.bas.warehouse.domain.BasWarehouse; import com.ruoyi.bas.warehouse.mapper.BasWarehouseMapper; import com.ruoyi.bas.warehouse.service.IBasWarehouseService; @@ -58,6 +59,12 @@ public class BasWarehouseServiceImpl implements IBasWarehouseService @Override public int insertBasWarehouse(BasWarehouse basWarehouse) { + BasWarehouse basWarehouseParam = new BasWarehouse(); + basWarehouseParam.setWarehouseId(basWarehouse.getWarehouseId()); + List basWarehouses = basWarehouseMapper.selectBasWarehouseList(basWarehouseParam); + if (CollUtil.isNotEmpty(basWarehouses)){ + return -1; + } return basWarehouseMapper.insertBasWarehouse(basWarehouse); } @@ -70,6 +77,13 @@ public class BasWarehouseServiceImpl implements IBasWarehouseService @Override public int updateBasWarehouse(BasWarehouse basWarehouse) { + BasWarehouse basWarehouseParam = new BasWarehouse(); + basWarehouseParam.setWarehouseId(basWarehouse.getWarehouseId()); + basWarehouseParam.setUpdateId(basWarehouse.getWarehouseId()); + List basWarehouses = basWarehouseMapper.selectBasWarehouseList(basWarehouseParam); + if (CollUtil.isNotEmpty(basWarehouses)){ + return -1; + } return basWarehouseMapper.updateBasWarehouse(basWarehouse); } diff --git a/ruoyi-admin/src/main/resources/mapper/bas/warehouse/BasWarehouseMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/warehouse/BasWarehouseMapper.xml index 44029d8..cbec2eb 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/warehouse/BasWarehouseMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/warehouse/BasWarehouseMapper.xml @@ -49,6 +49,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${params.warehouseDataScope} + + and warehouse_id != #{updateId} + diff --git a/ruoyi-ui/src/views/bas/warehouse/index.vue b/ruoyi-ui/src/views/bas/warehouse/index.vue index 26fc0b3..84b5804 100644 --- a/ruoyi-ui/src/views/bas/warehouse/index.vue +++ b/ruoyi-ui/src/views/bas/warehouse/index.vue @@ -3,10 +3,10 @@
- + @@ -144,7 +144,7 @@ - + @@ -206,9 +206,9 @@ - - - + + +