diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseLocationInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseLocationInfoController.java new file mode 100644 index 0000000..9804381 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseLocationInfoController.java @@ -0,0 +1,129 @@ +package com.ruoyi.web.controller.basic; + +import java.util.List; + +import com.ruoyi.web.controller.tool.UUIDTool; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.BaseLocationInfo; +import com.ruoyi.system.service.IBaseLocationInfoService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 库位信息Controller + * + * @author Frank zhou + * @date 2021-09-10 + */ +@Controller +@RequestMapping("/system/baselocationinfo") +public class BaseLocationInfoController extends BaseController +{ + private String prefix = "system/baselocationinfo"; + + @Autowired + private IBaseLocationInfoService baseLocationInfoService; + + @RequiresPermissions("system:baselocationinfo:view") + @GetMapping() + public String baselocationinfo() + { + return prefix + "/baselocationinfo"; + } + + /** + * 查询库位信息列表 + */ + @RequiresPermissions("system:baselocationinfo:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(BaseLocationInfo baseLocationInfo) + { + startPage(); + List list = baseLocationInfoService.selectBaseLocationInfoList(baseLocationInfo); + return getDataTable(list); + } + + /** + * 导出库位信息列表 + */ + @RequiresPermissions("system:baselocationinfo:export") + @Log(title = "库位信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(BaseLocationInfo baseLocationInfo) + { + List list = baseLocationInfoService.selectBaseLocationInfoList(baseLocationInfo); + ExcelUtil util = new ExcelUtil(BaseLocationInfo.class); + return util.exportExcel(list, "库位信息数据"); + } + + /** + * 新增库位信息 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存库位信息 + */ + @RequiresPermissions("system:baselocationinfo:add") + @Log(title = "库位信息", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(BaseLocationInfo baseLocationInfo) + { + baseLocationInfo.setObjid(UUIDTool.generate()); + return toAjax(baseLocationInfoService.insertBaseLocationInfo(baseLocationInfo)); + } + + /** + * 修改库位信息 + */ + @GetMapping("/edit/{objid}") + public String edit(@PathVariable("objid") String objid, ModelMap mmap) + { + BaseLocationInfo baseLocationInfo = baseLocationInfoService.selectBaseLocationInfoByObjid(objid); + mmap.put("baseLocationInfo", baseLocationInfo); + return prefix + "/edit"; + } + + /** + * 修改保存库位信息 + */ + @RequiresPermissions("system:baselocationinfo:edit") + @Log(title = "库位信息", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(BaseLocationInfo baseLocationInfo) + { + return toAjax(baseLocationInfoService.updateBaseLocationInfo(baseLocationInfo)); + } + + /** + * 删除库位信息 + */ + @RequiresPermissions("system:baselocationinfo:remove") + @Log(title = "库位信息", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(baseLocationInfoService.deleteBaseLocationInfoByObjids(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseMaterialStoreController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseMaterialStoreController.java new file mode 100644 index 0000000..fa7591e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseMaterialStoreController.java @@ -0,0 +1,129 @@ +package com.ruoyi.web.controller.basic; + +import java.util.List; + +import com.ruoyi.web.controller.tool.UUIDTool; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.BaseMaterialStore; +import com.ruoyi.system.service.IBaseMaterialStoreService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 物料库位关系Controller + * + * @author Frank zhou + * @date 2021-09-10 + */ +@Controller +@RequestMapping("/system/basematerialstore") +public class BaseMaterialStoreController extends BaseController +{ + private String prefix = "system/basematerialstore"; + + @Autowired + private IBaseMaterialStoreService baseMaterialStoreService; + + @RequiresPermissions("system:basematerialstore:view") + @GetMapping() + public String basematerialstore() + { + return prefix + "/basematerialstore"; + } + + /** + * 查询物料库位关系列表 + */ + @RequiresPermissions("system:basematerialstore:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(BaseMaterialStore baseMaterialStore) + { + startPage(); + List list = baseMaterialStoreService.selectBaseMaterialStoreList(baseMaterialStore); + return getDataTable(list); + } + + /** + * 导出物料库位关系列表 + */ + @RequiresPermissions("system:basematerialstore:export") + @Log(title = "物料库位关系", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(BaseMaterialStore baseMaterialStore) + { + List list = baseMaterialStoreService.selectBaseMaterialStoreList(baseMaterialStore); + ExcelUtil util = new ExcelUtil(BaseMaterialStore.class); + return util.exportExcel(list, "物料库位关系数据"); + } + + /** + * 新增物料库位关系 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存物料库位关系 + */ + @RequiresPermissions("system:basematerialstore:add") + @Log(title = "物料库位关系", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(BaseMaterialStore baseMaterialStore) + { + baseMaterialStore.setObjid(UUIDTool.generate()); + return toAjax(baseMaterialStoreService.insertBaseMaterialStore(baseMaterialStore)); + } + + /** + * 修改物料库位关系 + */ + @GetMapping("/edit/{objid}") + public String edit(@PathVariable("objid") String objid, ModelMap mmap) + { + BaseMaterialStore baseMaterialStore = baseMaterialStoreService.selectBaseMaterialStoreByObjid(objid); + mmap.put("baseMaterialStore", baseMaterialStore); + return prefix + "/edit"; + } + + /** + * 修改保存物料库位关系 + */ + @RequiresPermissions("system:basematerialstore:edit") + @Log(title = "物料库位关系", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(BaseMaterialStore baseMaterialStore) + { + return toAjax(baseMaterialStoreService.updateBaseMaterialStore(baseMaterialStore)); + } + + /** + * 删除物料库位关系 + */ + @RequiresPermissions("system:basematerialstore:remove") + @Log(title = "物料库位关系", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(baseMaterialStoreService.deleteBaseMaterialStoreByObjids(ids)); + } +} diff --git a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/add.html b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/add.html new file mode 100644 index 0000000..c8ab47a --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/add.html @@ -0,0 +1,110 @@ + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html new file mode 100644 index 0000000..9307578 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html @@ -0,0 +1,145 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/edit.html b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/edit.html new file mode 100644 index 0000000..bcf06b7 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/edit.html @@ -0,0 +1,111 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/basematerialstore/add.html b/ruoyi-admin/src/main/resources/templates/system/basematerialstore/add.html new file mode 100644 index 0000000..0674ebf --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/basematerialstore/add.html @@ -0,0 +1,74 @@ + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/basematerialstore/basematerialstore.html b/ruoyi-admin/src/main/resources/templates/system/basematerialstore/basematerialstore.html new file mode 100644 index 0000000..3534274 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/basematerialstore/basematerialstore.html @@ -0,0 +1,114 @@ + + + + + + +
+
+
+
+
+ +
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/basematerialstore/edit.html b/ruoyi-admin/src/main/resources/templates/system/basematerialstore/edit.html new file mode 100644 index 0000000..23d26ad --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/basematerialstore/edit.html @@ -0,0 +1,75 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseLocationInfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseLocationInfo.java new file mode 100644 index 0000000..b27e7e5 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseLocationInfo.java @@ -0,0 +1,208 @@ +package com.ruoyi.system.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 库位信息对象 base_location_info + * + * @author Frank zhou + * @date 2021-09-10 + */ +public class BaseLocationInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String objid; + + /** 库位编号 */ + @Excel(name = "库位编号") + private String locationCode; + + /** 库位名称 */ + @Excel(name = "库位名称") + private String locationName; + + /** 物料类别 */ + @Excel(name = "物料类别") + private String materialType; + + /** 所属仓库 */ + @Excel(name = "所属仓库") + private String storeCode; + + /** 库位区域 */ + @Excel(name = "库位区域") + private String locationArea; + + /** 所处排 */ + @Excel(name = "所处排") + private Long locationRow; + + /** 所处列 */ + @Excel(name = "所处列") + private Long locationLine; + + /** 所处层 */ + @Excel(name = "所处层") + private Long locationTier; + + /** 库位状态 */ + @Excel(name = "库位状态") + private Long locationStatus; + + /** 效率级别 */ + @Excel(name = "效率级别") + private Long efficiency; + + /** 删除标志 */ + private Long deleteFlag; + + /** 记录时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date recordTime; + + public void setObjid(String objid) + { + this.objid = objid; + } + + public String getObjid() + { + return objid; + } + public void setLocationCode(String locationCode) + { + this.locationCode = locationCode; + } + + public String getLocationCode() + { + return locationCode; + } + public void setLocationName(String locationName) + { + this.locationName = locationName; + } + + public String getLocationName() + { + return locationName; + } + public void setMaterialType(String materialType) + { + this.materialType = materialType; + } + + public String getMaterialType() + { + return materialType; + } + public void setStoreCode(String storeCode) + { + this.storeCode = storeCode; + } + + public String getStoreCode() + { + return storeCode; + } + public void setLocationArea(String locationArea) + { + this.locationArea = locationArea; + } + + public String getLocationArea() + { + return locationArea; + } + public void setLocationRow(Long locationRow) + { + this.locationRow = locationRow; + } + + public Long getLocationRow() + { + return locationRow; + } + public void setLocationLine(Long locationLine) + { + this.locationLine = locationLine; + } + + public Long getLocationLine() + { + return locationLine; + } + public void setLocationTier(Long locationTier) + { + this.locationTier = locationTier; + } + + public Long getLocationTier() + { + return locationTier; + } + public void setLocationStatus(Long locationStatus) + { + this.locationStatus = locationStatus; + } + + public Long getLocationStatus() + { + return locationStatus; + } + public void setEfficiency(Long efficiency) + { + this.efficiency = efficiency; + } + + public Long getEfficiency() + { + return efficiency; + } + public void setDeleteFlag(Long deleteFlag) + { + this.deleteFlag = deleteFlag; + } + + public Long getDeleteFlag() + { + return deleteFlag; + } + public void setRecordTime(Date recordTime) + { + this.recordTime = recordTime; + } + + public Date getRecordTime() + { + return recordTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("objid", getObjid()) + .append("locationCode", getLocationCode()) + .append("locationName", getLocationName()) + .append("materialType", getMaterialType()) + .append("storeCode", getStoreCode()) + .append("locationArea", getLocationArea()) + .append("locationRow", getLocationRow()) + .append("locationLine", getLocationLine()) + .append("locationTier", getLocationTier()) + .append("locationStatus", getLocationStatus()) + .append("efficiency", getEfficiency()) + .append("remark", getRemark()) + .append("deleteFlag", getDeleteFlag()) + .append("recordTime", getRecordTime()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseMaterialStore.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseMaterialStore.java new file mode 100644 index 0000000..502a709 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseMaterialStore.java @@ -0,0 +1,137 @@ +package com.ruoyi.system.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 物料库位关系对象 base_material_store + * + * @author Frank zhou + * @date 2021-09-10 + */ +public class BaseMaterialStore extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String objid; + + /** 物料编码 */ + @Excel(name = "物料编码") + private String materialCode; + + /** 物料类型 */ + @Excel(name = "物料类型") + private String materialType; + + /** 库位编码 */ + @Excel(name = "库位编码") + private String locationCode; + + /** 库位状态 */ + @Excel(name = "库位状态") + private Long locationStatus; + + /** 库位区域 */ + @Excel(name = "库位区域") + private String locationArea; + + /** 删除标志 */ + private Long deleteFlag; + + /** 记录时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date recordTime; + + public void setObjid(String objid) + { + this.objid = objid; + } + + public String getObjid() + { + return objid; + } + public void setMaterialCode(String materialCode) + { + this.materialCode = materialCode; + } + + public String getMaterialCode() + { + return materialCode; + } + public void setMaterialType(String materialType) + { + this.materialType = materialType; + } + + public String getMaterialType() + { + return materialType; + } + public void setLocationCode(String locationCode) + { + this.locationCode = locationCode; + } + + public String getLocationCode() + { + return locationCode; + } + public void setLocationStatus(Long locationStatus) + { + this.locationStatus = locationStatus; + } + + public Long getLocationStatus() + { + return locationStatus; + } + public void setLocationArea(String locationArea) + { + this.locationArea = locationArea; + } + + public String getLocationArea() + { + return locationArea; + } + public void setDeleteFlag(Long deleteFlag) + { + this.deleteFlag = deleteFlag; + } + + public Long getDeleteFlag() + { + return deleteFlag; + } + public void setRecordTime(Date recordTime) + { + this.recordTime = recordTime; + } + + public Date getRecordTime() + { + return recordTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("objid", getObjid()) + .append("materialCode", getMaterialCode()) + .append("materialType", getMaterialType()) + .append("locationCode", getLocationCode()) + .append("locationStatus", getLocationStatus()) + .append("locationArea", getLocationArea()) + .append("deleteFlag", getDeleteFlag()) + .append("recordTime", getRecordTime()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseLocationInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseLocationInfoMapper.java new file mode 100644 index 0000000..08018b9 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseLocationInfoMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.BaseLocationInfo; + +/** + * 库位信息Mapper接口 + * + * @author Frank zhou + * @date 2021-09-10 + */ +public interface BaseLocationInfoMapper +{ + /** + * 查询库位信息 + * + * @param objid 库位信息主键 + * @return 库位信息 + */ + public BaseLocationInfo selectBaseLocationInfoByObjid(String objid); + + /** + * 查询库位信息列表 + * + * @param baseLocationInfo 库位信息 + * @return 库位信息集合 + */ + public List selectBaseLocationInfoList(BaseLocationInfo baseLocationInfo); + + /** + * 新增库位信息 + * + * @param baseLocationInfo 库位信息 + * @return 结果 + */ + public int insertBaseLocationInfo(BaseLocationInfo baseLocationInfo); + + /** + * 修改库位信息 + * + * @param baseLocationInfo 库位信息 + * @return 结果 + */ + public int updateBaseLocationInfo(BaseLocationInfo baseLocationInfo); + + /** + * 删除库位信息 + * + * @param objid 库位信息主键 + * @return 结果 + */ + public int deleteBaseLocationInfoByObjid(String objid); + + /** + * 批量删除库位信息 + * + * @param objids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBaseLocationInfoByObjids(String[] objids); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseMaterialStoreMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseMaterialStoreMapper.java new file mode 100644 index 0000000..81fd33f --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseMaterialStoreMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.BaseMaterialStore; + +/** + * 物料库位关系Mapper接口 + * + * @author Frank zhou + * @date 2021-09-10 + */ +public interface BaseMaterialStoreMapper +{ + /** + * 查询物料库位关系 + * + * @param objid 物料库位关系主键 + * @return 物料库位关系 + */ + public BaseMaterialStore selectBaseMaterialStoreByObjid(String objid); + + /** + * 查询物料库位关系列表 + * + * @param baseMaterialStore 物料库位关系 + * @return 物料库位关系集合 + */ + public List selectBaseMaterialStoreList(BaseMaterialStore baseMaterialStore); + + /** + * 新增物料库位关系 + * + * @param baseMaterialStore 物料库位关系 + * @return 结果 + */ + public int insertBaseMaterialStore(BaseMaterialStore baseMaterialStore); + + /** + * 修改物料库位关系 + * + * @param baseMaterialStore 物料库位关系 + * @return 结果 + */ + public int updateBaseMaterialStore(BaseMaterialStore baseMaterialStore); + + /** + * 删除物料库位关系 + * + * @param objid 物料库位关系主键 + * @return 结果 + */ + public int deleteBaseMaterialStoreByObjid(String objid); + + /** + * 批量删除物料库位关系 + * + * @param objids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBaseMaterialStoreByObjids(String[] objids); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseLocationInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseLocationInfoService.java new file mode 100644 index 0000000..1284bc0 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseLocationInfoService.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.BaseLocationInfo; + +/** + * 库位信息Service接口 + * + * @author Frank zhou + * @date 2021-09-10 + */ +public interface IBaseLocationInfoService +{ + /** + * 查询库位信息 + * + * @param objid 库位信息主键 + * @return 库位信息 + */ + public BaseLocationInfo selectBaseLocationInfoByObjid(String objid); + + /** + * 查询库位信息列表 + * + * @param baseLocationInfo 库位信息 + * @return 库位信息集合 + */ + public List selectBaseLocationInfoList(BaseLocationInfo baseLocationInfo); + + /** + * 新增库位信息 + * + * @param baseLocationInfo 库位信息 + * @return 结果 + */ + public int insertBaseLocationInfo(BaseLocationInfo baseLocationInfo); + + /** + * 修改库位信息 + * + * @param baseLocationInfo 库位信息 + * @return 结果 + */ + public int updateBaseLocationInfo(BaseLocationInfo baseLocationInfo); + + /** + * 批量删除库位信息 + * + * @param objids 需要删除的库位信息主键集合 + * @return 结果 + */ + public int deleteBaseLocationInfoByObjids(String objids); + + /** + * 删除库位信息信息 + * + * @param objid 库位信息主键 + * @return 结果 + */ + public int deleteBaseLocationInfoByObjid(String objid); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseMaterialStoreService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseMaterialStoreService.java new file mode 100644 index 0000000..9808032 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseMaterialStoreService.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.BaseMaterialStore; + +/** + * 物料库位关系Service接口 + * + * @author Frank zhou + * @date 2021-09-10 + */ +public interface IBaseMaterialStoreService +{ + /** + * 查询物料库位关系 + * + * @param objid 物料库位关系主键 + * @return 物料库位关系 + */ + public BaseMaterialStore selectBaseMaterialStoreByObjid(String objid); + + /** + * 查询物料库位关系列表 + * + * @param baseMaterialStore 物料库位关系 + * @return 物料库位关系集合 + */ + public List selectBaseMaterialStoreList(BaseMaterialStore baseMaterialStore); + + /** + * 新增物料库位关系 + * + * @param baseMaterialStore 物料库位关系 + * @return 结果 + */ + public int insertBaseMaterialStore(BaseMaterialStore baseMaterialStore); + + /** + * 修改物料库位关系 + * + * @param baseMaterialStore 物料库位关系 + * @return 结果 + */ + public int updateBaseMaterialStore(BaseMaterialStore baseMaterialStore); + + /** + * 批量删除物料库位关系 + * + * @param objids 需要删除的物料库位关系主键集合 + * @return 结果 + */ + public int deleteBaseMaterialStoreByObjids(String objids); + + /** + * 删除物料库位关系信息 + * + * @param objid 物料库位关系主键 + * @return 结果 + */ + public int deleteBaseMaterialStoreByObjid(String objid); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseLocationInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseLocationInfoServiceImpl.java new file mode 100644 index 0000000..d5d642f --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseLocationInfoServiceImpl.java @@ -0,0 +1,94 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.BaseLocationInfoMapper; +import com.ruoyi.system.domain.BaseLocationInfo; +import com.ruoyi.system.service.IBaseLocationInfoService; +import com.ruoyi.common.core.text.Convert; + +/** + * 库位信息Service业务层处理 + * + * @author Frank zhou + * @date 2021-09-10 + */ +@Service +public class BaseLocationInfoServiceImpl implements IBaseLocationInfoService +{ + @Autowired + private BaseLocationInfoMapper baseLocationInfoMapper; + + /** + * 查询库位信息 + * + * @param objid 库位信息主键 + * @return 库位信息 + */ + @Override + public BaseLocationInfo selectBaseLocationInfoByObjid(String objid) + { + return baseLocationInfoMapper.selectBaseLocationInfoByObjid(objid); + } + + /** + * 查询库位信息列表 + * + * @param baseLocationInfo 库位信息 + * @return 库位信息 + */ + @Override + public List selectBaseLocationInfoList(BaseLocationInfo baseLocationInfo) + { + return baseLocationInfoMapper.selectBaseLocationInfoList(baseLocationInfo); + } + + /** + * 新增库位信息 + * + * @param baseLocationInfo 库位信息 + * @return 结果 + */ + @Override + public int insertBaseLocationInfo(BaseLocationInfo baseLocationInfo) + { + return baseLocationInfoMapper.insertBaseLocationInfo(baseLocationInfo); + } + + /** + * 修改库位信息 + * + * @param baseLocationInfo 库位信息 + * @return 结果 + */ + @Override + public int updateBaseLocationInfo(BaseLocationInfo baseLocationInfo) + { + return baseLocationInfoMapper.updateBaseLocationInfo(baseLocationInfo); + } + + /** + * 批量删除库位信息 + * + * @param objids 需要删除的库位信息主键 + * @return 结果 + */ + @Override + public int deleteBaseLocationInfoByObjids(String objids) + { + return baseLocationInfoMapper.deleteBaseLocationInfoByObjids(Convert.toStrArray(objids)); + } + + /** + * 删除库位信息信息 + * + * @param objid 库位信息主键 + * @return 结果 + */ + @Override + public int deleteBaseLocationInfoByObjid(String objid) + { + return baseLocationInfoMapper.deleteBaseLocationInfoByObjid(objid); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseMaterialStoreServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseMaterialStoreServiceImpl.java new file mode 100644 index 0000000..6bf774a --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseMaterialStoreServiceImpl.java @@ -0,0 +1,94 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.BaseMaterialStoreMapper; +import com.ruoyi.system.domain.BaseMaterialStore; +import com.ruoyi.system.service.IBaseMaterialStoreService; +import com.ruoyi.common.core.text.Convert; + +/** + * 物料库位关系Service业务层处理 + * + * @author Frank zhou + * @date 2021-09-10 + */ +@Service +public class BaseMaterialStoreServiceImpl implements IBaseMaterialStoreService +{ + @Autowired + private BaseMaterialStoreMapper baseMaterialStoreMapper; + + /** + * 查询物料库位关系 + * + * @param objid 物料库位关系主键 + * @return 物料库位关系 + */ + @Override + public BaseMaterialStore selectBaseMaterialStoreByObjid(String objid) + { + return baseMaterialStoreMapper.selectBaseMaterialStoreByObjid(objid); + } + + /** + * 查询物料库位关系列表 + * + * @param baseMaterialStore 物料库位关系 + * @return 物料库位关系 + */ + @Override + public List selectBaseMaterialStoreList(BaseMaterialStore baseMaterialStore) + { + return baseMaterialStoreMapper.selectBaseMaterialStoreList(baseMaterialStore); + } + + /** + * 新增物料库位关系 + * + * @param baseMaterialStore 物料库位关系 + * @return 结果 + */ + @Override + public int insertBaseMaterialStore(BaseMaterialStore baseMaterialStore) + { + return baseMaterialStoreMapper.insertBaseMaterialStore(baseMaterialStore); + } + + /** + * 修改物料库位关系 + * + * @param baseMaterialStore 物料库位关系 + * @return 结果 + */ + @Override + public int updateBaseMaterialStore(BaseMaterialStore baseMaterialStore) + { + return baseMaterialStoreMapper.updateBaseMaterialStore(baseMaterialStore); + } + + /** + * 批量删除物料库位关系 + * + * @param objids 需要删除的物料库位关系主键 + * @return 结果 + */ + @Override + public int deleteBaseMaterialStoreByObjids(String objids) + { + return baseMaterialStoreMapper.deleteBaseMaterialStoreByObjids(Convert.toStrArray(objids)); + } + + /** + * 删除物料库位关系信息 + * + * @param objid 物料库位关系主键 + * @return 结果 + */ + @Override + public int deleteBaseMaterialStoreByObjid(String objid) + { + return baseMaterialStoreMapper.deleteBaseMaterialStoreByObjid(objid); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml new file mode 100644 index 0000000..5c7dbea --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + select objid, location_code, location_name, material_type, store_code, location_area, location_row, location_line, location_tier, location_status, efficiency, remark, delete_flag, record_time from base_location_info + + + + + + + + + insert into base_location_info + + objid, + location_code, + location_name, + material_type, + store_code, + location_area, + location_row, + location_line, + location_tier, + location_status, + efficiency, + remark, + delete_flag, + record_time, + + + #{objid}, + #{locationCode}, + #{locationName}, + #{materialType}, + #{storeCode}, + #{locationArea}, + #{locationRow}, + #{locationLine}, + #{locationTier}, + #{locationStatus}, + #{efficiency}, + #{remark}, + #{deleteFlag}, + #{recordTime}, + + + + + update base_location_info + + location_code = #{locationCode}, + location_name = #{locationName}, + material_type = #{materialType}, + store_code = #{storeCode}, + location_area = #{locationArea}, + location_row = #{locationRow}, + location_line = #{locationLine}, + location_tier = #{locationTier}, + location_status = #{locationStatus}, + efficiency = #{efficiency}, + remark = #{remark}, + delete_flag = #{deleteFlag}, + record_time = #{recordTime}, + + where objid = #{objid} + + + + delete from base_location_info where objid = #{objid} + + + + update base_location_info set delete_flag = '1' + where objid in + + #{objid} + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseMaterialStoreMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseMaterialStoreMapper.xml new file mode 100644 index 0000000..1356df1 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/BaseMaterialStoreMapper.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + select objid, material_code, material_type, location_code, location_status, location_area, delete_flag, record_time from base_material_store + + + + + + + + + insert into base_material_store + + objid, + material_code, + material_type, + location_code, + location_status, + location_area, + delete_flag, + record_time, + + + #{objid}, + #{materialCode}, + #{materialType}, + #{locationCode}, + #{locationStatus}, + #{locationArea}, + #{deleteFlag}, + #{recordTime}, + + + + + update base_material_store + + material_code = #{materialCode}, + material_type = #{materialType}, + location_code = #{locationCode}, + location_status = #{locationStatus}, + location_area = #{locationArea}, + delete_flag = #{deleteFlag}, + record_time = #{recordTime}, + + where objid = #{objid} + + + + delete from base_material_store where objid = #{objid} + + + + update base_material_store set DELETE_FLAG = '1' + where objid in + + #{objid} + + + \ No newline at end of file