From 810770a8a089be71f0218f0621f5be9d7c62a841 Mon Sep 17 00:00:00 2001 From: 15066119699 Date: Tue, 4 Mar 2025 10:56:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=93=E5=BA=93=E8=A1=A8?= =?UTF-8?q?=20=E4=BE=9B=E5=BA=94=E5=95=86=E8=A1=A8=E5=A2=9E=E5=8A=A0type?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=8C=BA=E5=88=86=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E5=92=8C=E5=AE=A2=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/AppStorageController.java | 104 +++++++++ .../com/ruoyi/app/domain/AppProvider.java | 10 + .../java/com/ruoyi/app/domain/AppStorage.java | 209 ++++++++++++++++++ .../ruoyi/app/mapper/AppStorageMapper.java | 61 +++++ .../ruoyi/app/service/IAppStorageService.java | 61 +++++ .../service/impl/AppStorageServiceImpl.java | 96 ++++++++ .../mapper/app/AppProviderMapper.xml | 8 +- .../resources/mapper/app/AppStorageMapper.xml | 127 +++++++++++ 8 files changed, 674 insertions(+), 2 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppStorageController.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/app/domain/AppStorage.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppStorageMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/app/service/IAppStorageService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppStorageServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/app/AppStorageMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppStorageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppStorageController.java new file mode 100644 index 00000000..221819d2 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppStorageController.java @@ -0,0 +1,104 @@ +package com.ruoyi.web.controller.app; + +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.app.domain.AppStorage; +import com.ruoyi.app.service.IAppStorageService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 仓库Controller + * + * @author ruoyi + * @date 2025-03-04 + */ +@RestController +@RequestMapping("/app/storage") +public class AppStorageController extends BaseController +{ + @Autowired + private IAppStorageService appStorageService; + + /** + * 查询仓库列表 + */ + @PreAuthorize("@ss.hasPermi('app:storage:list')") + @GetMapping("/list") + public TableDataInfo list(AppStorage appStorage) + { + startPage(); + List list = appStorageService.selectAppStorageList(appStorage); + return getDataTable(list); + } + + /** + * 导出仓库列表 + */ + @PreAuthorize("@ss.hasPermi('app:storage:export')") + @Log(title = "仓库", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, AppStorage appStorage) + { + List list = appStorageService.selectAppStorageList(appStorage); + ExcelUtil util = new ExcelUtil(AppStorage.class); + util.exportExcel(response, list, "仓库数据"); + } + + /** + * 获取仓库详细信息 + */ + @PreAuthorize("@ss.hasPermi('app:storage:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(appStorageService.selectAppStorageById(id)); + } + + /** + * 新增仓库 + */ + @PreAuthorize("@ss.hasPermi('app:storage:add')") + @Log(title = "仓库", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody AppStorage appStorage) + { + return toAjax(appStorageService.insertAppStorage(appStorage)); + } + + /** + * 修改仓库 + */ + @PreAuthorize("@ss.hasPermi('app:storage:edit')") + @Log(title = "仓库", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody AppStorage appStorage) + { + return toAjax(appStorageService.updateAppStorage(appStorage)); + } + + /** + * 删除仓库 + */ + @PreAuthorize("@ss.hasPermi('app:storage:remove')") + @Log(title = "仓库", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(appStorageService.deleteAppStorageByIds(ids)); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppProvider.java b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppProvider.java index 16e79d29..3c9aa296 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppProvider.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppProvider.java @@ -45,6 +45,16 @@ public class AppProvider extends BaseEntity @Excel(name = "最近更新时间", width = 30, dateFormat = "yyyy-MM-dd") private Date lastUpdateTime; + private Integer type; + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + public void setProviderId(String providerId) { this.providerId = providerId; diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppStorage.java b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppStorage.java new file mode 100644 index 00000000..36eca64a --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppStorage.java @@ -0,0 +1,209 @@ +package com.ruoyi.app.domain; + +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; + +/** + * 仓库对象 app_storage + * + * @author ruoyi + * @date 2025-03-04 + */ +public class AppStorage extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 厂区 */ + @Excel(name = "厂区") + private String factoryId; + + /** 所属部门 */ + @Excel(name = "所属部门") + private Long deptId; + + /** 仓库编号 */ + @Excel(name = "仓库编号") + private String storageId; + + /** 仓库简称 */ + @Excel(name = "仓库简称") + private String storageShortName; + + /** 仓库名称 */ + @Excel(name = "仓库名称") + private String storageName; + + /** 仓库地址 */ + @Excel(name = "仓库地址") + private String storageAddress; + + /** 仓库联系人名称 */ + @Excel(name = "仓库联系人名称") + private String storageConcatsName; + + /** 仓库联系人方式 */ + @Excel(name = "仓库联系人方式") + private String storageConcatsMobile; + + /** 是否为立体库1:立体库 0：平库 */ + @Excel(name = "是否为立体库1:立体库 0：平库") + private String autoStatus; + + /** 是否是AGV库 0：否 1：是 */ + @Excel(name = "是否是AGV库 0：否 1：是") + private String isAgv; + + /** 是否可用 */ + @Excel(name = "是否可用") + private String status; + + /** 仓储类型 1AGV 2堆垛机 3穿梭4 人工库 5 其他 */ + @Excel(name = "仓储类型 1AGV 2堆垛机 3穿梭4 人工库 5 其他") + private String type; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setFactoryId(String factoryId) + { + this.factoryId = factoryId; + } + + public String getFactoryId() + { + return factoryId; + } + public void setDeptId(Long deptId) + { + this.deptId = deptId; + } + + public Long getDeptId() + { + return deptId; + } + public void setStorageId(String storageId) + { + this.storageId = storageId; + } + + public String getStorageId() + { + return storageId; + } + public void setStorageShortName(String storageShortName) + { + this.storageShortName = storageShortName; + } + + public String getStorageShortName() + { + return storageShortName; + } + public void setStorageName(String storageName) + { + this.storageName = storageName; + } + + public String getStorageName() + { + return storageName; + } + public void setStorageAddress(String storageAddress) + { + this.storageAddress = storageAddress; + } + + public String getStorageAddress() + { + return storageAddress; + } + public void setStorageConcatsName(String storageConcatsName) + { + this.storageConcatsName = storageConcatsName; + } + + public String getStorageConcatsName() + { + return storageConcatsName; + } + public void setStorageConcatsMobile(String storageConcatsMobile) + { + this.storageConcatsMobile = storageConcatsMobile; + } + + public String getStorageConcatsMobile() + { + return storageConcatsMobile; + } + public void setAutoStatus(String autoStatus) + { + this.autoStatus = autoStatus; + } + + public String getAutoStatus() + { + return autoStatus; + } + public void setIsAgv(String isAgv) + { + this.isAgv = isAgv; + } + + public String getIsAgv() + { + return isAgv; + } + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + public void setType(String type) + { + this.type = type; + } + + public String getType() + { + return type; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("factoryId", getFactoryId()) + .append("deptId", getDeptId()) + .append("storageId", getStorageId()) + .append("storageShortName", getStorageShortName()) + .append("storageName", getStorageName()) + .append("storageAddress", getStorageAddress()) + .append("storageConcatsName", getStorageConcatsName()) + .append("storageConcatsMobile", getStorageConcatsMobile()) + .append("autoStatus", getAutoStatus()) + .append("isAgv", getIsAgv()) + .append("status", getStatus()) + .append("createTime", getCreateTime()) + .append("createBy", getCreateBy()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("type", getType()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppStorageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppStorageMapper.java new file mode 100644 index 00000000..8696396f --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppStorageMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.app.mapper; + +import java.util.List; +import com.ruoyi.app.domain.AppStorage; + +/** + * 仓库Mapper接口 + * + * @author ruoyi + * @date 2025-03-04 + */ +public interface AppStorageMapper +{ + /** + * 查询仓库 + * + * @param id 仓库主键 + * @return 仓库 + */ + public AppStorage selectAppStorageById(Long id); + + /** + * 查询仓库列表 + * + * @param appStorage 仓库 + * @return 仓库集合 + */ + public List selectAppStorageList(AppStorage appStorage); + + /** + * 新增仓库 + * + * @param appStorage 仓库 + * @return 结果 + */ + public int insertAppStorage(AppStorage appStorage); + + /** + * 修改仓库 + * + * @param appStorage 仓库 + * @return 结果 + */ + public int updateAppStorage(AppStorage appStorage); + + /** + * 删除仓库 + * + * @param id 仓库主键 + * @return 结果 + */ + public int deleteAppStorageById(Long id); + + /** + * 批量删除仓库 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteAppStorageByIds(Long[] ids); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppStorageService.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppStorageService.java new file mode 100644 index 00000000..511ba4ba --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppStorageService.java @@ -0,0 +1,61 @@ +package com.ruoyi.app.service; + +import java.util.List; +import com.ruoyi.app.domain.AppStorage; + +/** + * 仓库Service接口 + * + * @author ruoyi + * @date 2025-03-04 + */ +public interface IAppStorageService +{ + /** + * 查询仓库 + * + * @param id 仓库主键 + * @return 仓库 + */ + public AppStorage selectAppStorageById(Long id); + + /** + * 查询仓库列表 + * + * @param appStorage 仓库 + * @return 仓库集合 + */ + public List selectAppStorageList(AppStorage appStorage); + + /** + * 新增仓库 + * + * @param appStorage 仓库 + * @return 结果 + */ + public int insertAppStorage(AppStorage appStorage); + + /** + * 修改仓库 + * + * @param appStorage 仓库 + * @return 结果 + */ + public int updateAppStorage(AppStorage appStorage); + + /** + * 批量删除仓库 + * + * @param ids 需要删除的仓库主键集合 + * @return 结果 + */ + public int deleteAppStorageByIds(Long[] ids); + + /** + * 删除仓库信息 + * + * @param id 仓库主键 + * @return 结果 + */ + public int deleteAppStorageById(Long id); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppStorageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppStorageServiceImpl.java new file mode 100644 index 00000000..34018cc5 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppStorageServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.app.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.app.mapper.AppStorageMapper; +import com.ruoyi.app.domain.AppStorage; +import com.ruoyi.app.service.IAppStorageService; + +/** + * 仓库Service业务层处理 + * + * @author ruoyi + * @date 2025-03-04 + */ +@Service +public class AppStorageServiceImpl implements IAppStorageService +{ + @Autowired + private AppStorageMapper appStorageMapper; + + /** + * 查询仓库 + * + * @param id 仓库主键 + * @return 仓库 + */ + @Override + public AppStorage selectAppStorageById(Long id) + { + return appStorageMapper.selectAppStorageById(id); + } + + /** + * 查询仓库列表 + * + * @param appStorage 仓库 + * @return 仓库 + */ + @Override + public List selectAppStorageList(AppStorage appStorage) + { + return appStorageMapper.selectAppStorageList(appStorage); + } + + /** + * 新增仓库 + * + * @param appStorage 仓库 + * @return 结果 + */ + @Override + public int insertAppStorage(AppStorage appStorage) + { + appStorage.setCreateTime(DateUtils.getNowDate()); + return appStorageMapper.insertAppStorage(appStorage); + } + + /** + * 修改仓库 + * + * @param appStorage 仓库 + * @return 结果 + */ + @Override + public int updateAppStorage(AppStorage appStorage) + { + appStorage.setUpdateTime(DateUtils.getNowDate()); + return appStorageMapper.updateAppStorage(appStorage); + } + + /** + * 批量删除仓库 + * + * @param ids 需要删除的仓库主键 + * @return 结果 + */ + @Override + public int deleteAppStorageByIds(Long[] ids) + { + return appStorageMapper.deleteAppStorageByIds(ids); + } + + /** + * 删除仓库信息 + * + * @param id 仓库主键 + * @return 结果 + */ + @Override + public int deleteAppStorageById(Long id) + { + return appStorageMapper.deleteAppStorageById(id); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/app/AppProviderMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppProviderMapper.xml index 2025f0ec..7cefc818 100644 --- a/ruoyi-system/src/main/resources/mapper/app/AppProviderMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/app/AppProviderMapper.xml @@ -12,10 +12,11 @@ + - select provider_id, provider_name, provider_contact, provider_address, provider_status, last_update_user, last_update_time from app_provider + select provider_id, provider_name, provider_contact, provider_address, provider_status, last_update_user, last_update_time,type from app_provider @@ -45,6 +47,7 @@ provider_status, last_update_user, last_update_time, + type, #{providerId}, @@ -54,6 +57,7 @@ #{providerStatus}, #{lastUpdateUser}, #{lastUpdateTime}, + #{type}, @@ -80,4 +84,4 @@ #{providerId} - \ No newline at end of file + diff --git a/ruoyi-system/src/main/resources/mapper/app/AppStorageMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppStorageMapper.xml new file mode 100644 index 00000000..45f0ffa7 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/app/AppStorageMapper.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + select id, factory_id, dept_id, storage_id, storage_short_name, storage_name, storage_address, storage_concats_name, storage_concats_mobile, auto_status, is_agv, status, create_time, create_by, update_by, update_time, type from app_storage + + + + + + + + insert into app_storage + + factory_id, + dept_id, + storage_id, + storage_short_name, + storage_name, + storage_address, + storage_concats_name, + storage_concats_mobile, + auto_status, + is_agv, + status, + create_time, + create_by, + update_by, + update_time, + type, + + + #{factoryId}, + #{deptId}, + #{storageId}, + #{storageShortName}, + #{storageName}, + #{storageAddress}, + #{storageConcatsName}, + #{storageConcatsMobile}, + #{autoStatus}, + #{isAgv}, + #{status}, + #{createTime}, + #{createBy}, + #{updateBy}, + #{updateTime}, + #{type}, + + + + + update app_storage + + factory_id = #{factoryId}, + dept_id = #{deptId}, + storage_id = #{storageId}, + storage_short_name = #{storageShortName}, + storage_name = #{storageName}, + storage_address = #{storageAddress}, + storage_concats_name = #{storageConcatsName}, + storage_concats_mobile = #{storageConcatsMobile}, + auto_status = #{autoStatus}, + is_agv = #{isAgv}, + status = #{status}, + create_time = #{createTime}, + create_by = #{createBy}, + update_by = #{updateBy}, + update_time = #{updateTime}, + type = #{type}, + + where id = #{id} + + + + delete from app_storage where id = #{id} + + + + delete from app_storage where id in + + #{id} + + +