From 5b5f836ad83038f4092b4ef3ed120b8bf36b942e Mon Sep 17 00:00:00 2001 From: liumingxiy Date: Tue, 12 Nov 2024 09:05:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=9B=98=E7=82=B9=E8=AE=A1?= =?UTF-8?q?=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/md/domain/WmsInventoryConfigure.java | 164 ++++++++++-------- .../WmsInventoryConfigureServiceImpl.java | 58 ++++--- 2 files changed, 121 insertions(+), 101 deletions(-) diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/domain/WmsInventoryConfigure.java b/ktg-mes/src/main/java/com/ktg/mes/md/domain/WmsInventoryConfigure.java index e3b8a9d..3b87ddf 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/domain/WmsInventoryConfigure.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/domain/WmsInventoryConfigure.java @@ -1,149 +1,165 @@ package com.ktg.mes.md.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ktg.common.annotation.Excel; import com.ktg.common.core.domain.BaseEntity; +import com.ktg.mes.wm.domain.WmWarehouse; /** * 盘点计划配置对象 WMS_INVENTORY_CONFIGURE - * + * * @author yinjinlu * @date 2024-11-11 */ -public class WmsInventoryConfigure extends BaseEntity -{ +public class WmsInventoryConfigure extends BaseEntity { private static final long serialVersionUID = 1L; - /** 主键 */ + /** + * 主键 + */ private Long wmsInventoryConfigureId; - /** 配置名称 */ + /** + * 配置名称 + */ @Excel(name = "配置名称") private String configureName; - /** 盘点类型 */ + /** + * 盘点类型 + */ @Excel(name = "盘点类型") private String dataType; - /** 盘点形式 */ + /** + * 盘点形式 + */ @Excel(name = "盘点形式") private String inventoryType; - /** 盘点仓库 */ + /** + * 盘点仓库 + */ @Excel(name = "盘点仓库") private Long mWarehouseId; - /** 预留字段1 */ + /** + * 预留字段1 + */ private String attr1; - /** 预留字段2 */ + /** + * 预留字段2 + */ private String attr2; - /** 预留字段3 */ + /** + * 预留字段3 + */ private String attr3; - /** 预留字段4 */ + /** + * 预留字段4 + */ private String attr4; - public void setWmsInventoryConfigureId(Long wmsInventoryConfigureId) - { + /** + * 仓库 + */ + private WmWarehouse mWarehouse; + + public Long getWmsInventoryConfigureId() { + return wmsInventoryConfigureId; + } + + public void setWmsInventoryConfigureId(Long wmsInventoryConfigureId) { this.wmsInventoryConfigureId = wmsInventoryConfigureId; } - public Long getWmsInventoryConfigureId() - { - return wmsInventoryConfigureId; + public String getConfigureName() { + return configureName; } - public void setConfigureName(String configureName) - { + + public void setConfigureName(String configureName) { this.configureName = configureName; } - public String getConfigureName() - { - return configureName; + public String getDataType() { + return dataType; } - public void setDataType(String dataType) - { + + public void setDataType(String dataType) { this.dataType = dataType; } - public String getDataType() - { - return dataType; + public String getInventoryType() { + return inventoryType; } - public void setInventoryType(String inventoryType) - { + + public void setInventoryType(String inventoryType) { this.inventoryType = inventoryType; } - public String getInventoryType() - { - return inventoryType; + public Long getmWarehouseId() { + return mWarehouseId; } - public void setmWarehouseId(Long mWarehouseId) - { + + public void setmWarehouseId(Long mWarehouseId) { this.mWarehouseId = mWarehouseId; } - public Long getmWarehouseId() - { - return mWarehouseId; + public String getAttr1() { + return attr1; } - public void setAttr1(String attr1) - { + + public void setAttr1(String attr1) { this.attr1 = attr1; } - public String getAttr1() - { - return attr1; + public String getAttr2() { + return attr2; } - public void setAttr2(String attr2) - { + + public void setAttr2(String attr2) { this.attr2 = attr2; } - public String getAttr2() - { - return attr2; + public String getAttr3() { + return attr3; } - public void setAttr3(String attr3) - { + + public void setAttr3(String attr3) { this.attr3 = attr3; } - public String getAttr3() - { - return attr3; + public String getAttr4() { + return attr4; } - public void setAttr4(String attr4) - { + + public void setAttr4(String attr4) { this.attr4 = attr4; } - public String getAttr4() - { - return attr4; + public WmWarehouse getmWarehouse() { + return mWarehouse; + } + + public void setmWarehouse(WmWarehouse mWarehouse) { + this.mWarehouse = mWarehouse; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("wmsInventoryConfigureId", getWmsInventoryConfigureId()) - .append("configureName", getConfigureName()) - .append("dataType", getDataType()) - .append("inventoryType", getInventoryType()) - .append("mWarehouseId", getmWarehouseId()) - .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 "WmsInventoryConfigure{" + + "wmsInventoryConfigureId=" + wmsInventoryConfigureId + + ", configureName='" + configureName + '\'' + + ", dataType='" + dataType + '\'' + + ", inventoryType='" + inventoryType + '\'' + + ", mWarehouseId=" + mWarehouseId + + ", attr1='" + attr1 + '\'' + + ", attr2='" + attr2 + '\'' + + ", attr3='" + attr3 + '\'' + + ", attr4='" + attr4 + '\'' + + ", mWarehouse=" + mWarehouse + + '}'; } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsInventoryConfigureServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsInventoryConfigureServiceImpl.java index 8053a09..80bb5d9 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsInventoryConfigureServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsInventoryConfigureServiceImpl.java @@ -1,96 +1,100 @@ package com.ktg.mes.md.service.impl; -import java.util.List; import com.ktg.common.utils.DateUtils; +import com.ktg.mes.md.domain.WmsInventoryConfigure; +import com.ktg.mes.md.mapper.WmsInventoryConfigureMapper; +import com.ktg.mes.md.service.IWmsInventoryConfigureService; +import com.ktg.mes.wm.mapper.WmWarehouseMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ktg.mes.md.mapper.WmsInventoryConfigureMapper; -import com.ktg.mes.md.domain.WmsInventoryConfigure; -import com.ktg.mes.md.service.IWmsInventoryConfigureService; + +import java.util.List; /** * 盘点计划配置Service业务层处理 - * + * * @author yinjinlu * @date 2024-11-11 */ @Service -public class WmsInventoryConfigureServiceImpl implements IWmsInventoryConfigureService -{ +public class WmsInventoryConfigureServiceImpl implements IWmsInventoryConfigureService { @Autowired private WmsInventoryConfigureMapper wmsInventoryConfigureMapper; + @Autowired + private WmWarehouseMapper wmWarehouseMapper; + /** * 查询盘点计划配置 - * + * * @param wmsInventoryConfigureId 盘点计划配置主键 * @return 盘点计划配置 */ @Override - public WmsInventoryConfigure selectWmsInventoryConfigureByWmsInventoryConfigureId(Long wmsInventoryConfigureId) - { - return wmsInventoryConfigureMapper.selectWmsInventoryConfigureByWmsInventoryConfigureId(wmsInventoryConfigureId); + public WmsInventoryConfigure selectWmsInventoryConfigureByWmsInventoryConfigureId(Long wmsInventoryConfigureId) { + WmsInventoryConfigure wmsInventoryConfigure = wmsInventoryConfigureMapper.selectWmsInventoryConfigureByWmsInventoryConfigureId(wmsInventoryConfigureId); + wmsInventoryConfigure.setmWarehouse(wmWarehouseMapper.selectWmWarehouseByWarehouseId(wmsInventoryConfigure.getmWarehouseId())); + return wmsInventoryConfigure; } /** * 查询盘点计划配置列表 - * + * * @param wmsInventoryConfigure 盘点计划配置 * @return 盘点计划配置 */ @Override - public List selectWmsInventoryConfigureList(WmsInventoryConfigure wmsInventoryConfigure) - { - return wmsInventoryConfigureMapper.selectWmsInventoryConfigureList(wmsInventoryConfigure); + public List selectWmsInventoryConfigureList(WmsInventoryConfigure wmsInventoryConfigure) { + List wmsInventoryConfigureList = wmsInventoryConfigureMapper.selectWmsInventoryConfigureList(wmsInventoryConfigure); + wmsInventoryConfigureList.forEach(item -> { + item.setmWarehouse(wmWarehouseMapper.selectWmWarehouseByWarehouseId(item.getmWarehouseId())); + }); + return wmsInventoryConfigureList; } /** * 新增盘点计划配置 - * + * * @param wmsInventoryConfigure 盘点计划配置 * @return 结果 */ @Override - public int insertWmsInventoryConfigure(WmsInventoryConfigure wmsInventoryConfigure) - { + public int insertWmsInventoryConfigure(WmsInventoryConfigure wmsInventoryConfigure) { wmsInventoryConfigure.setCreateTime(DateUtils.getNowDate()); return wmsInventoryConfigureMapper.insertWmsInventoryConfigure(wmsInventoryConfigure); } /** * 修改盘点计划配置 - * + * * @param wmsInventoryConfigure 盘点计划配置 * @return 结果 */ @Override - public int updateWmsInventoryConfigure(WmsInventoryConfigure wmsInventoryConfigure) - { + public int updateWmsInventoryConfigure(WmsInventoryConfigure wmsInventoryConfigure) { wmsInventoryConfigure.setUpdateTime(DateUtils.getNowDate()); return wmsInventoryConfigureMapper.updateWmsInventoryConfigure(wmsInventoryConfigure); } /** * 批量删除盘点计划配置 - * + * * @param wmsInventoryConfigureIds 需要删除的盘点计划配置主键 * @return 结果 */ @Override - public int deleteWmsInventoryConfigureByWmsInventoryConfigureIds(Long[] wmsInventoryConfigureIds) - { + public int deleteWmsInventoryConfigureByWmsInventoryConfigureIds(Long[] wmsInventoryConfigureIds) { return wmsInventoryConfigureMapper.deleteWmsInventoryConfigureByWmsInventoryConfigureIds(wmsInventoryConfigureIds); } /** * 删除盘点计划配置信息 - * + * * @param wmsInventoryConfigureId 盘点计划配置主键 * @return 结果 */ @Override - public int deleteWmsInventoryConfigureByWmsInventoryConfigureId(Long wmsInventoryConfigureId) - { + public int deleteWmsInventoryConfigureByWmsInventoryConfigureId(Long wmsInventoryConfigureId) { return wmsInventoryConfigureMapper.deleteWmsInventoryConfigureByWmsInventoryConfigureId(wmsInventoryConfigureId); } }