diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmStorageAreaController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmStorageAreaController.java new file mode 100644 index 0000000..39553a2 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmStorageAreaController.java @@ -0,0 +1,104 @@ +package com.ktg.mes.wm.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ktg.common.annotation.Log; +import com.ktg.common.core.controller.BaseController; +import com.ktg.common.core.domain.AjaxResult; +import com.ktg.common.enums.BusinessType; +import com.ktg.mes.wm.domain.WmStorageArea; +import com.ktg.mes.wm.service.IWmStorageAreaService; +import com.ktg.common.utils.poi.ExcelUtil; +import com.ktg.common.core.page.TableDataInfo; + +/** + * 库位设置Controller + * + * @author yinjinlu + * @date 2022-05-08 + */ +@RestController +@RequestMapping("/mes/wm/area") +public class WmStorageAreaController extends BaseController +{ + @Autowired + private IWmStorageAreaService wmStorageAreaService; + + /** + * 查询库位设置列表 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:area:list')") + @GetMapping("/list") + public TableDataInfo list(WmStorageArea wmStorageArea) + { + startPage(); + List list = wmStorageAreaService.selectWmStorageAreaList(wmStorageArea); + return getDataTable(list); + } + + /** + * 导出库位设置列表 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:area:export')") + @Log(title = "库位设置", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WmStorageArea wmStorageArea) + { + List list = wmStorageAreaService.selectWmStorageAreaList(wmStorageArea); + ExcelUtil util = new ExcelUtil(WmStorageArea.class); + util.exportExcel(response, list, "库位设置数据"); + } + + /** + * 获取库位设置详细信息 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:area:query')") + @GetMapping(value = "/{areaId}") + public AjaxResult getInfo(@PathVariable("areaId") Long areaId) + { + return AjaxResult.success(wmStorageAreaService.selectWmStorageAreaByAreaId(areaId)); + } + + /** + * 新增库位设置 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:area:add')") + @Log(title = "库位设置", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WmStorageArea wmStorageArea) + { + return toAjax(wmStorageAreaService.insertWmStorageArea(wmStorageArea)); + } + + /** + * 修改库位设置 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:area:edit')") + @Log(title = "库位设置", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WmStorageArea wmStorageArea) + { + return toAjax(wmStorageAreaService.updateWmStorageArea(wmStorageArea)); + } + + /** + * 删除库位设置 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:area:remove')") + @Log(title = "库位设置", businessType = BusinessType.DELETE) + @DeleteMapping("/{areaIds}") + public AjaxResult remove(@PathVariable Long[] areaIds) + { + return toAjax(wmStorageAreaService.deleteWmStorageAreaByAreaIds(areaIds)); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmStorageArea.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmStorageArea.java new file mode 100644 index 0000000..ddc615f --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmStorageArea.java @@ -0,0 +1,221 @@ +package com.ktg.mes.wm.domain; + +import java.math.BigDecimal; +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; + +/** + * 库位设置对象 wm_storage_area + * + * @author yinjinlu + * @date 2022-05-08 + */ +public class WmStorageArea extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 库位ID */ + private Long areaId; + + /** 库位编码 */ + @Excel(name = "库位编码") + private String areaCode; + + /** 库位名称 */ + @Excel(name = "库位名称") + private String areaName; + + /** 库区ID */ + @Excel(name = "库区ID") + private Long locationId; + + /** 面积 */ + @Excel(name = "面积") + private BigDecimal area; + + /** 最大载重量 */ + @Excel(name = "最大载重量") + private BigDecimal maxLoa; + + /** 库位位置X */ + @Excel(name = "库位位置X") + private Long positionX; + + /** 库位位置y */ + @Excel(name = "库位位置y") + private Long positionY; + + /** 库位位置z */ + @Excel(name = "库位位置z") + private Long positionZ; + + /** 是否启用 */ + @Excel(name = "是否启用") + private String enableFlag; + + /** 预留字段1 */ + private String attr1; + + /** 预留字段2 */ + private String attr2; + + /** 预留字段3 */ + private Long attr3; + + /** 预留字段4 */ + private Long attr4; + + public void setAreaId(Long areaId) + { + this.areaId = areaId; + } + + public Long getAreaId() + { + return areaId; + } + public void setAreaCode(String areaCode) + { + this.areaCode = areaCode; + } + + public String getAreaCode() + { + return areaCode; + } + public void setAreaName(String areaName) + { + this.areaName = areaName; + } + + public String getAreaName() + { + return areaName; + } + public void setLocationId(Long locationId) + { + this.locationId = locationId; + } + + public Long getLocationId() + { + return locationId; + } + public void setArea(BigDecimal area) + { + this.area = area; + } + + public BigDecimal getArea() + { + return area; + } + public void setMaxLoa(BigDecimal maxLoa) + { + this.maxLoa = maxLoa; + } + + public BigDecimal getMaxLoa() + { + return maxLoa; + } + public void setPositionX(Long positionX) + { + this.positionX = positionX; + } + + public Long getPositionX() + { + return positionX; + } + public void setPositionY(Long positionY) + { + this.positionY = positionY; + } + + public Long getPositionY() + { + return positionY; + } + public void setPositionZ(Long positionZ) + { + this.positionZ = positionZ; + } + + public Long getPositionZ() + { + return positionZ; + } + public void setEnableFlag(String enableFlag) + { + this.enableFlag = enableFlag; + } + + public String getEnableFlag() + { + return enableFlag; + } + public void setAttr1(String attr1) + { + this.attr1 = attr1; + } + + public String getAttr1() + { + return attr1; + } + public void setAttr2(String attr2) + { + this.attr2 = attr2; + } + + public String getAttr2() + { + return attr2; + } + public void setAttr3(Long attr3) + { + this.attr3 = attr3; + } + + public Long getAttr3() + { + return attr3; + } + public void setAttr4(Long attr4) + { + this.attr4 = attr4; + } + + public Long getAttr4() + { + return attr4; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("areaId", getAreaId()) + .append("areaCode", getAreaCode()) + .append("areaName", getAreaName()) + .append("locationId", getLocationId()) + .append("area", getArea()) + .append("maxLoa", getMaxLoa()) + .append("positionX", getPositionX()) + .append("positionY", getPositionY()) + .append("positionZ", getPositionZ()) + .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(); + } +} 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 new file mode 100644 index 0000000..9ede938 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmStorageAreaMapper.java @@ -0,0 +1,61 @@ +package com.ktg.mes.wm.mapper; + +import java.util.List; +import com.ktg.mes.wm.domain.WmStorageArea; + +/** + * 库位设置Mapper接口 + * + * @author yinjinlu + * @date 2022-05-08 + */ +public interface WmStorageAreaMapper +{ + /** + * 查询库位设置 + * + * @param areaId 库位设置主键 + * @return 库位设置 + */ + public WmStorageArea selectWmStorageAreaByAreaId(Long areaId); + + /** + * 查询库位设置列表 + * + * @param wmStorageArea 库位设置 + * @return 库位设置集合 + */ + public List selectWmStorageAreaList(WmStorageArea wmStorageArea); + + /** + * 新增库位设置 + * + * @param wmStorageArea 库位设置 + * @return 结果 + */ + public int insertWmStorageArea(WmStorageArea wmStorageArea); + + /** + * 修改库位设置 + * + * @param wmStorageArea 库位设置 + * @return 结果 + */ + public int updateWmStorageArea(WmStorageArea wmStorageArea); + + /** + * 删除库位设置 + * + * @param areaId 库位设置主键 + * @return 结果 + */ + public int deleteWmStorageAreaByAreaId(Long areaId); + + /** + * 批量删除库位设置 + * + * @param areaIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWmStorageAreaByAreaIds(Long[] areaIds); +} 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 new file mode 100644 index 0000000..7dbf528 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageAreaService.java @@ -0,0 +1,61 @@ +package com.ktg.mes.wm.service; + +import java.util.List; +import com.ktg.mes.wm.domain.WmStorageArea; + +/** + * 库位设置Service接口 + * + * @author yinjinlu + * @date 2022-05-08 + */ +public interface IWmStorageAreaService +{ + /** + * 查询库位设置 + * + * @param areaId 库位设置主键 + * @return 库位设置 + */ + public WmStorageArea selectWmStorageAreaByAreaId(Long areaId); + + /** + * 查询库位设置列表 + * + * @param wmStorageArea 库位设置 + * @return 库位设置集合 + */ + public List selectWmStorageAreaList(WmStorageArea wmStorageArea); + + /** + * 新增库位设置 + * + * @param wmStorageArea 库位设置 + * @return 结果 + */ + public int insertWmStorageArea(WmStorageArea wmStorageArea); + + /** + * 修改库位设置 + * + * @param wmStorageArea 库位设置 + * @return 结果 + */ + public int updateWmStorageArea(WmStorageArea wmStorageArea); + + /** + * 批量删除库位设置 + * + * @param areaIds 需要删除的库位设置主键集合 + * @return 结果 + */ + public int deleteWmStorageAreaByAreaIds(Long[] areaIds); + + /** + * 删除库位设置信息 + * + * @param areaId 库位设置主键 + * @return 结果 + */ + public int deleteWmStorageAreaByAreaId(Long areaId); +} 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 new file mode 100644 index 0000000..45c2b9d --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageAreaServiceImpl.java @@ -0,0 +1,96 @@ +package com.ktg.mes.wm.service.impl; + +import java.util.List; +import com.ktg.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ktg.mes.wm.mapper.WmStorageAreaMapper; +import com.ktg.mes.wm.domain.WmStorageArea; +import com.ktg.mes.wm.service.IWmStorageAreaService; + +/** + * 库位设置Service业务层处理 + * + * @author yinjinlu + * @date 2022-05-08 + */ +@Service +public class WmStorageAreaServiceImpl implements IWmStorageAreaService +{ + @Autowired + private WmStorageAreaMapper wmStorageAreaMapper; + + /** + * 查询库位设置 + * + * @param areaId 库位设置主键 + * @return 库位设置 + */ + @Override + public WmStorageArea selectWmStorageAreaByAreaId(Long areaId) + { + return wmStorageAreaMapper.selectWmStorageAreaByAreaId(areaId); + } + + /** + * 查询库位设置列表 + * + * @param wmStorageArea 库位设置 + * @return 库位设置 + */ + @Override + public List selectWmStorageAreaList(WmStorageArea wmStorageArea) + { + return wmStorageAreaMapper.selectWmStorageAreaList(wmStorageArea); + } + + /** + * 新增库位设置 + * + * @param wmStorageArea 库位设置 + * @return 结果 + */ + @Override + public int insertWmStorageArea(WmStorageArea wmStorageArea) + { + wmStorageArea.setCreateTime(DateUtils.getNowDate()); + return wmStorageAreaMapper.insertWmStorageArea(wmStorageArea); + } + + /** + * 修改库位设置 + * + * @param wmStorageArea 库位设置 + * @return 结果 + */ + @Override + public int updateWmStorageArea(WmStorageArea wmStorageArea) + { + wmStorageArea.setUpdateTime(DateUtils.getNowDate()); + return wmStorageAreaMapper.updateWmStorageArea(wmStorageArea); + } + + /** + * 批量删除库位设置 + * + * @param areaIds 需要删除的库位设置主键 + * @return 结果 + */ + @Override + public int deleteWmStorageAreaByAreaIds(Long[] areaIds) + { + return wmStorageAreaMapper.deleteWmStorageAreaByAreaIds(areaIds); + } + + /** + * 删除库位设置信息 + * + * @param areaId 库位设置主键 + * @return 结果 + */ + @Override + public int deleteWmStorageAreaByAreaId(Long areaId) + { + return wmStorageAreaMapper.deleteWmStorageAreaByAreaId(areaId); + } +} diff --git a/ktg-mes/src/main/resources/mapper/wm/WmStorageAreaMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmStorageAreaMapper.xml new file mode 100644 index 0000000..63aa11f --- /dev/null +++ b/ktg-mes/src/main/resources/mapper/wm/WmStorageAreaMapper.xml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + select area_id, area_code, area_name, location_id, area, max_loa, position_x, position_y, position_z, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_storage_area + + + + + + + + insert into wm_storage_area + + area_code, + area_name, + location_id, + area, + max_loa, + position_x, + position_y, + position_z, + enable_flag, + remark, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + + + #{areaCode}, + #{areaName}, + #{locationId}, + #{area}, + #{maxLoa}, + #{positionX}, + #{positionY}, + #{positionZ}, + #{enableFlag}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update wm_storage_area + + area_code = #{areaCode}, + area_name = #{areaName}, + location_id = #{locationId}, + area = #{area}, + max_loa = #{maxLoa}, + position_x = #{positionX}, + position_y = #{positionY}, + position_z = #{positionZ}, + enable_flag = #{enableFlag}, + remark = #{remark}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where area_id = #{areaId} + + + + delete from wm_storage_area where area_id = #{areaId} + + + + delete from wm_storage_area where area_id in + + #{areaId} + + + \ No newline at end of file