From 73a3d5ce6db3acf0fea2290009cfa097d69ae966 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Sat, 16 Sep 2023 12:36:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E5=BA=93=E5=8C=BA=E8=B4=A7=E4=BD=8D+bom+=E8=AE=BE?= =?UTF-8?q?=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/technology/domain/BomComponent.java | 26 +++++++++++++++ .../controller/BaseLocationController.java | 10 +++++- .../controller/BaseWarehouseController.java | 8 ++++- .../com/op/wms/mapper/BaseLocationMapper.java | 3 ++ .../op/wms/mapper/BaseWarehouseMapper.java | 4 +++ .../op/wms/service/IBaseLocationService.java | 3 ++ .../op/wms/service/IBaseWarehouseService.java | 3 ++ .../service/impl/BaseLocationServiceImpl.java | 33 +++++++++++++++++++ .../impl/BaseWarehouseServiceImpl.java | 33 +++++++++++++++++++ .../mapper/wms/BaseEquipmentMapper.xml | 4 +-- .../mapper/wms/BaseLocationMapper.xml | 13 ++++++-- .../mapper/wms/BaseWarehouseMapper.xml | 16 +++++++-- 12 files changed, 147 insertions(+), 9 deletions(-) diff --git a/op-modules/op-technology/src/main/java/com/op/technology/domain/BomComponent.java b/op-modules/op-technology/src/main/java/com/op/technology/domain/BomComponent.java index 06de88ffc..f4c1a48de 100644 --- a/op-modules/op-technology/src/main/java/com/op/technology/domain/BomComponent.java +++ b/op-modules/op-technology/src/main/java/com/op/technology/domain/BomComponent.java @@ -93,6 +93,14 @@ public class BomComponent extends BaseEntity { @Excel(name = "预留字段3") private String attr3; + //虚拟字段 + @Excel(name = "组件上层物料名称") + private String componentName; + + /** 产品描述 */ + @Excel(name = "产品描述") + private String productDescZh; + // private List children; // // public List getChildren() { @@ -140,6 +148,15 @@ public class BomComponent extends BaseEntity { public String getProductCode() { return productCode; } + + public void setProductDescZh(String productDescZh) { + this.productDescZh = productDescZh; + } + + public String getProductDescZh() { + return productDescZh; + } + public void setCumc(String cumc) { this.cumc = cumc; } @@ -151,6 +168,13 @@ public class BomComponent extends BaseEntity { this.component = component; } + public String getComponentName() { + return componentName; + } + public void setComponentName(String componentName) { + this.componentName = componentName; + } + public String getComponent() { return component; } @@ -254,7 +278,9 @@ public class BomComponent extends BaseEntity { .append("bomName", getBomName()) .append("site", getSite()) .append("productCode", getProductCode()) + .append("productDescZh", getProductDescZh()) .append("cumc", getCumc()) + .append("componentName", getComponentName()) .append("component", getComponent()) .append("bomHierarchy", getBomHierarchy()) .append("projectNo", getProjectNo()) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseLocationController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseLocationController.java index f89ae4964..adf0aa1db 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseLocationController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseLocationController.java @@ -72,7 +72,15 @@ public class BaseLocationController extends BaseController { @Log(title = "货位管理", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody BaseLocation baseLocation) { - return toAjax(baseLocationService.insertBaseLocation(baseLocation)); + if (baseLocationService.checkCodeUnique(baseLocation)) { + return AjaxResult.error("货位编码已存在！"); + } +// else if(baseLocationService.checkNameUnique(baseLocation)){ +// return AjaxResult.error("货位描述已存在！"); +// } + else{ + return toAjax(baseLocationService.insertBaseLocation(baseLocation)); + } } /** diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseWarehouseController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseWarehouseController.java index 306b72c04..d1fb0a581 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseWarehouseController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseWarehouseController.java @@ -72,7 +72,13 @@ public class BaseWarehouseController extends BaseController { @Log(title = "仓库管理", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody BaseWarehouse baseWarehouse) { - return toAjax(baseWarehouseService.insertBaseWarehouse(baseWarehouse)); + if (baseWarehouseService.checkWarehouseCodeUnique(baseWarehouse)) { + return AjaxResult.error("仓库编码已存在！"); + }else if(baseWarehouseService.checkWarehouseNameUnique(baseWarehouse)){ + return AjaxResult.error("仓库名称已存在！"); + }else{ + return toAjax(baseWarehouseService.insertBaseWarehouse(baseWarehouse)); + } } /** diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseLocationMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseLocationMapper.java index 6d47f6680..f7a978f60 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseLocationMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseLocationMapper.java @@ -58,4 +58,7 @@ public interface BaseLocationMapper { * @return 结果 */ public int deleteBaseLocationByLocationIds(String[] locationIds); + + String checkCodeUnique(BaseLocation baseLocation); +// String checkNameUnique(BaseLocation baseLocation); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseWarehouseMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseWarehouseMapper.java index 58435a8a2..3834bd30e 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseWarehouseMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseWarehouseMapper.java @@ -2,6 +2,7 @@ package com.op.wms.mapper; import java.util.List; +import com.op.wms.domain.BaseEquipment; import com.op.wms.domain.BaseWarehouse; /** @@ -60,4 +61,7 @@ public interface BaseWarehouseMapper { public int deleteBaseWarehouseByWarehouseIds(String[] warehouseIds); //查询总数 Integer queryCount(BaseWarehouse baseWarehouse); + + String checkWarehouseCodeUnique(BaseWarehouse baseWarehouse); + String checkWarehouseNameUnique(BaseWarehouse baseWarehouse); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseLocationService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseLocationService.java index 9153409ca..0ccdb992a 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseLocationService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseLocationService.java @@ -57,4 +57,7 @@ public interface IBaseLocationService { * @return 结果 */ public int deleteBaseLocationByLocationId(String locationId); + +// boolean checkNameUnique(BaseLocation baseLocation); + boolean checkCodeUnique(BaseLocation baseLocation); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseWarehouseService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseWarehouseService.java index a2213d10b..09236e03e 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseWarehouseService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseWarehouseService.java @@ -57,4 +57,7 @@ public interface IBaseWarehouseService { * @return 结果 */ public int deleteBaseWarehouseByWarehouseId(String warehouseId); + + boolean checkWarehouseCodeUnique(BaseWarehouse baseWarehouse); + boolean checkWarehouseNameUnique(BaseWarehouse baseWarehouse); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseLocationServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseLocationServiceImpl.java index 467c68123..77ec2add1 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseLocationServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseLocationServiceImpl.java @@ -5,6 +5,7 @@ import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.utils.DateUtils; import com.op.common.security.utils.SecurityUtils; +import com.op.wms.domain.BaseProduct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.wms.mapper.BaseLocationMapper; @@ -97,4 +98,36 @@ public class BaseLocationServiceImpl implements IBaseLocationService { public int deleteBaseLocationByLocationId(String locationId) { return baseLocationMapper.deleteBaseLocationByLocationId(locationId); } + + /** + * 判断货位信息 + * + * @return 结果 + */ + @Override + @DS("#header.poolName") + public boolean checkCodeUnique(BaseLocation baseLocation) { + String code = baseLocationMapper.checkCodeUnique(baseLocation); + if(code == null){ + return false; + }else{ + return true; + } + } + + /** + * 判断货位信息 + * + * @return 结果 + */ +// @Override +// @DS("#header.poolName") +// public boolean checkNameUnique(BaseLocation baseLocation) { +// String name = baseLocationMapper.checkNameUnique(baseLocation); +// if(name == null){ +// return false; +// }else{ +// return true; +// } +// } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseWarehouseServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseWarehouseServiceImpl.java index f6523075b..e7a0d3fcd 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseWarehouseServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseWarehouseServiceImpl.java @@ -5,6 +5,7 @@ import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.utils.DateUtils; import com.op.common.security.utils.SecurityUtils; +import com.op.wms.domain.BaseEquipment; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.wms.mapper.BaseWarehouseMapper; @@ -100,4 +101,36 @@ public class BaseWarehouseServiceImpl implements IBaseWarehouseService { public int deleteBaseWarehouseByWarehouseId(String warehouseId) { return baseWarehouseMapper.deleteBaseWarehouseByWarehouseId(warehouseId); } + + /** + * 判断仓库信息 + * + * @return 结果 + */ + @Override + @DS("#header.poolName") + public boolean checkWarehouseCodeUnique(BaseWarehouse baseWarehouse) { + String code = baseWarehouseMapper.checkWarehouseCodeUnique(baseWarehouse); + if(code == null){ + return false; + }else{ + return true; + } + } + + /** + * 判断仓库信息 + * + * @return 结果 + */ + @Override + @DS("#header.poolName") + public boolean checkWarehouseNameUnique(BaseWarehouse baseWarehouse) { + String name = baseWarehouseMapper.checkWarehouseNameUnique(baseWarehouse); + if(name == null){ + return false; + }else{ + return true; + } + } } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml index 6e30fdc78..16258e37b 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml @@ -183,9 +183,9 @@ \ No newline at end of file diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseLocationMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseLocationMapper.xml index 61ebae812..60389f180 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseLocationMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseLocationMapper.xml @@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + select location_code + from base_location + where location_code = #{locationCode} + + \ No newline at end of file diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseWarehouseMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseWarehouseMapper.xml index e9f130851..4fe2589b4 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseWarehouseMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseWarehouseMapper.xml @@ -33,8 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + \ No newline at end of file