From c23a06866606ce4ae4eb4a504047ef392c832acb Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Sat, 10 Sep 2022 10:15:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E3=80=81=E5=BA=93=E5=8C=BA?= =?UTF-8?q?=E3=80=81=E5=BA=93=E4=BD=8D=E6=B7=BB=E5=8A=A0=E6=8C=89=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E6=9F=A5=E6=89=BE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ktg/mes/md/domain/MdWorkstation.java | 123 ++++++++++++++---- .../mes/wm/mapper/WmStorageAreaMapper.java | 8 ++ .../wm/mapper/WmStorageLocationMapper.java | 7 + .../ktg/mes/wm/mapper/WmWarehouseMapper.java | 8 ++ .../mes/wm/service/IWmStorageAreaService.java | 8 ++ .../wm/service/IWmStorageLocationService.java | 9 ++ .../mes/wm/service/IWmWarehouseService.java | 7 + .../impl/WmStorageAreaServiceImpl.java | 5 + .../impl/WmStorageLocationServiceImpl.java | 5 + .../service/impl/WmWarehouseServiceImpl.java | 5 + .../mapper/wm/WmStorageAreaMapper.xml | 5 + .../mapper/wm/WmStorageLocationMapper.xml | 5 + .../resources/mapper/wm/WmWarehouseMapper.xml | 5 + 13 files changed, 177 insertions(+), 23 deletions(-) diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkstation.java b/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkstation.java index 0b8f684..0f9b93d 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkstation.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkstation.java @@ -196,7 +196,80 @@ public class MdWorkstation extends BaseEntity { return processName; } - public void setEnableFlag(String enableFlag) + + public Long getWarehouseId() { + return warehouseId; + } + + public void setWarehouseId(Long warehouseId) { + this.warehouseId = warehouseId; + } + + public String getWarehouseCode() { + return warehouseCode; + } + + public void setWarehouseCode(String warehouseCode) { + this.warehouseCode = warehouseCode; + } + + public String getWarehouseName() { + return warehouseName; + } + + public void setWarehouseName(String warehouseName) { + this.warehouseName = warehouseName; + } + + public Long getLocationId() { + return locationId; + } + + public void setLocationId(Long locationId) { + this.locationId = locationId; + } + + public String getLocationCode() { + return locationCode; + } + + public void setLocationCode(String locationCode) { + this.locationCode = locationCode; + } + + public String getLocationName() { + return locationName; + } + + public void setLocationName(String locationName) { + this.locationName = locationName; + } + + public Long getAreaId() { + return areaId; + } + + public void setAreaId(Long areaId) { + this.areaId = areaId; + } + + public String getAreaCode() { + return areaCode; + } + + public void setAreaCode(String areaCode) { + this.areaCode = areaCode; + } + + public String getAreaName() { + return areaName; + } + + public void setAreaName(String areaName) { + this.areaName = areaName; + } + + public void setEnableFlag(String enableFlag) { this.enableFlag = enableFlag; } @@ -244,27 +317,31 @@ public class MdWorkstation extends BaseEntity @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("workstationId", getWorkstationId()) - .append("workstationCode", getWorkstationCode()) - .append("workstationName", getWorkstationName()) - .append("workstationAddress", getWorkstationAddress()) - .append("workshopId", getWorkshopId()) - .append("workshopCode", getWorkshopCode()) - .append("workshopName", getWorkshopName()) - .append("processId", getProcessId()) - .append("processCode", getProcessCode()) - .append("processName", getProcessName()) - .append("enableFlag", getEnableFlag()) - .append("remark", getRemark()) - .append("attr1", getAttr1()) - .append("attr2", getAttr2()) - .append("attr3", getAttr3()) - .append("attr4", getAttr4()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); + return "MdWorkstation{" + + "workstationId=" + workstationId + + ", workstationCode='" + workstationCode + '\'' + + ", workstationName='" + workstationName + '\'' + + ", workstationAddress='" + workstationAddress + '\'' + + ", workshopId=" + workshopId + + ", workshopCode='" + workshopCode + '\'' + + ", workshopName='" + workshopName + '\'' + + ", processId=" + processId + + ", processCode='" + processCode + '\'' + + ", processName='" + processName + '\'' + + ", warehouseId=" + warehouseId + + ", warehouseCode='" + warehouseCode + '\'' + + ", warehouseName='" + warehouseName + '\'' + + ", locationId=" + locationId + + ", locationCode='" + locationCode + '\'' + + ", locationName='" + locationName + '\'' + + ", areaId=" + areaId + + ", areaCode='" + areaCode + '\'' + + ", areaName='" + areaName + '\'' + + ", enableFlag='" + enableFlag + '\'' + + ", attr1='" + attr1 + '\'' + + ", attr2='" + attr2 + '\'' + + ", attr3=" + attr3 + + ", attr4=" + attr4 + + '}'; } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmStorageAreaMapper.java b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmStorageAreaMapper.java index 743fa60..2f000e3 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmStorageAreaMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmStorageAreaMapper.java @@ -19,6 +19,14 @@ public interface WmStorageAreaMapper */ public WmStorageArea selectWmStorageAreaByAreaId(Long areaId); + + /** + * 根据库位编码查询库位 + * @param areaCode + * @return + */ + public WmStorageArea selectWmStorageAreaByAreaCode(String areaCode); + /** * 查询库位设置列表 * diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmStorageLocationMapper.java b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmStorageLocationMapper.java index 6488d72..9f30244 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmStorageLocationMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmStorageLocationMapper.java @@ -19,6 +19,13 @@ public interface WmStorageLocationMapper */ public WmStorageLocation selectWmStorageLocationByLocationId(Long locationId); + /** + * 根据库区编码查询库区 + * @param locationCode + * @return + */ + public WmStorageLocation selectWmStorageLocationByLocationCode(String locationCode); + /** * 查询库区设置列表 * diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmWarehouseMapper.java b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmWarehouseMapper.java index 1cc1225..4b631d0 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmWarehouseMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmWarehouseMapper.java @@ -19,6 +19,14 @@ public interface WmWarehouseMapper */ public WmWarehouse selectWmWarehouseByWarehouseId(Long warehouseId); + /** + * 根据编码查询仓库 + * @param warehouseCdoe + * @return + */ + public WmWarehouse selectWmWarehouseByWarehouseCode(String warehouseCdoe); + + /** * 查询仓库设置列表 * diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageAreaService.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageAreaService.java index 3a19c57..1431ddc 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageAreaService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageAreaService.java @@ -19,6 +19,14 @@ public interface IWmStorageAreaService */ public WmStorageArea selectWmStorageAreaByAreaId(Long areaId); + + /** + * 根据库位编码查询库位 + * @param areaCode + * @return + */ + public WmStorageArea selectWmStorageAreaByAreaCode(String areaCode); + /** * 查询库位设置列表 * diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageLocationService.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageLocationService.java index e173c54..3e3427c 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageLocationService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageLocationService.java @@ -19,6 +19,15 @@ public interface IWmStorageLocationService */ public WmStorageLocation selectWmStorageLocationByLocationId(Long locationId); + + /** + * 根据库区编码查询库区 + * @param locationCode + * @return + */ + public WmStorageLocation selectWmStorageLocationByLocationCode(String locationCode); + + /** * 查询库区设置列表 * diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmWarehouseService.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmWarehouseService.java index f416de2..a294d3d 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmWarehouseService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmWarehouseService.java @@ -19,6 +19,13 @@ public interface IWmWarehouseService */ public WmWarehouse selectWmWarehouseByWarehouseId(Long warehouseId); + /** + * 根据编码查询仓库 + * @param warehouseCdoe + * @return + */ + public WmWarehouse selectWmWarehouseByWarehouseCode(String warehouseCdoe); + /** * 查询仓库设置列表 * diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageAreaServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageAreaServiceImpl.java index d5b3e56..244b8e9 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageAreaServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageAreaServiceImpl.java @@ -32,6 +32,11 @@ public class WmStorageAreaServiceImpl implements IWmStorageAreaService return wmStorageAreaMapper.selectWmStorageAreaByAreaId(areaId); } + @Override + public WmStorageArea selectWmStorageAreaByAreaCode(String areaCode) { + return wmStorageAreaMapper.selectWmStorageAreaByAreaCode(areaCode); + } + /** * 查询库位设置列表 * diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageLocationServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageLocationServiceImpl.java index 14d81f1..2339f77 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageLocationServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageLocationServiceImpl.java @@ -36,6 +36,11 @@ public class WmStorageLocationServiceImpl implements IWmStorageLocationService return wmStorageLocationMapper.selectWmStorageLocationByLocationId(locationId); } + @Override + public WmStorageLocation selectWmStorageLocationByLocationCode(String locationCode) { + return wmStorageLocationMapper.selectWmStorageLocationByLocationCode(locationCode); + } + /** * 查询库区设置列表 * diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmWarehouseServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmWarehouseServiceImpl.java index d5c32fc..8ed061f 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmWarehouseServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmWarehouseServiceImpl.java @@ -36,6 +36,11 @@ public class WmWarehouseServiceImpl implements IWmWarehouseService return wmWarehouseMapper.selectWmWarehouseByWarehouseId(warehouseId); } + @Override + public WmWarehouse selectWmWarehouseByWarehouseCode(String warehouseCdoe) { + return wmWarehouseMapper.selectWmWarehouseByWarehouseCode(warehouseCdoe); + } + /** * 查询仓库设置列表 * diff --git a/ktg-mes/src/main/resources/mapper/wm/WmStorageAreaMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmStorageAreaMapper.xml index 0d8169f..dfcef61 100644 --- a/ktg-mes/src/main/resources/mapper/wm/WmStorageAreaMapper.xml +++ b/ktg-mes/src/main/resources/mapper/wm/WmStorageAreaMapper.xml @@ -49,6 +49,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where area_id = #{areaId} + + insert into wm_storage_area diff --git a/ktg-mes/src/main/resources/mapper/wm/WmStorageLocationMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmStorageLocationMapper.xml index 3884435..e54fb44 100644 --- a/ktg-mes/src/main/resources/mapper/wm/WmStorageLocationMapper.xml +++ b/ktg-mes/src/main/resources/mapper/wm/WmStorageLocationMapper.xml @@ -42,6 +42,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where location_id = #{locationId} + + + +