From a5a9555202b2f38368fd1992a9486ee78efada85 Mon Sep 17 00:00:00 2001 From: lsymicc Date: Tue, 17 Jun 2025 17:26:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=B9=E5=99=A8=E7=AE=A1=E7=90=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BasContainerController.java | 115 +++++++++++++++++ .../bas/container/domain/BasContainer.java | 118 ++---------------- .../container/mapper/BasContainerMapper.java | 9 ++ .../service/IBasContainerService.java | 6 + .../service/impl/BasContainerServiceImpl.java | 9 ++ .../BasContainerDetailsController.java | 104 +++++++++++++++ .../domain/BasContainerDetails.java | 109 +--------------- .../mapper/bas/BasContainerMapper.xml | 13 +- ruoyi-ui/src/api/bas/container.js | 2 +- ruoyi-ui/src/views/bas/container/index.vue | 81 ++++++++---- 10 files changed, 325 insertions(+), 241 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/bas/container/controller/BasContainerController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/bas/containerDetails/controller/BasContainerDetailsController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/container/controller/BasContainerController.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/container/controller/BasContainerController.java new file mode 100644 index 0000000..5a0f64a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/container/controller/BasContainerController.java @@ -0,0 +1,115 @@ +package com.ruoyi.bas.container.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.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.bas.container.domain.BasContainer; +import com.ruoyi.bas.container.service.IBasContainerService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 容器管理Controller + * + * @author ruoyi + * @date 2025-06-17 + */ +@RestController +@RequestMapping("/bas/container") +public class BasContainerController extends BaseController +{ + @Autowired + private IBasContainerService basContainerService; + + /** + * 查询容器管理列表 + */ + @PreAuthorize("@ss.hasPermi('bas:container:list')") + @GetMapping("/list") + public TableDataInfo list(BasContainer basContainer) + { + startPage(); + List list = basContainerService.selectBasContainerList(basContainer); + return getDataTable(list); + } + + /** + * 导出容器管理列表 + */ + @PreAuthorize("@ss.hasPermi('bas:container:export')") + @Log(title = "容器管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BasContainer basContainer) + { + List list = basContainerService.selectBasContainerList(basContainer); + ExcelUtil util = new ExcelUtil(BasContainer.class); + util.exportExcel(response, list, "容器管理数据"); + } + + /** + * 获取容器管理详细信息 + */ + @PreAuthorize("@ss.hasPermi('bas:container:query')") + @GetMapping(value = "/{containerId}") + public AjaxResult getInfo(@PathVariable("containerId") String containerId) + { + return success(basContainerService.selectBasContainerByContainerId(containerId)); + } + + /** + * 新增容器管理 + */ + @PreAuthorize("@ss.hasPermi('bas:container:add')") + @Log(title = "容器管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BasContainer basContainer) + { + return toAjax(basContainerService.insertBasContainer(basContainer)); + } + + /** + * 修改容器管理 + */ + @PreAuthorize("@ss.hasPermi('bas:container:edit')") + @Log(title = "容器管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BasContainer basContainer) + { + return toAjax(basContainerService.updateBasContainer(basContainer)); + } + + /** + * 删除容器管理 + */ + @PreAuthorize("@ss.hasPermi('bas:container:remove')") + @Log(title = "容器管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{containerIds}") + public AjaxResult remove(@PathVariable String[] containerIds) + { + return toAjax(basContainerService.deleteBasContainerByContainerIds(containerIds)); + } + + /** + * + * @return + */ + @GetMapping("/portNames") + public AjaxResult getPortNames() { + List portNames = basContainerService.getPortNames(); + return AjaxResult.success(portNames); + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/container/domain/BasContainer.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/container/domain/BasContainer.java index 9823b9c..cae1b68 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/container/domain/BasContainer.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/container/domain/BasContainer.java @@ -1,5 +1,8 @@ package com.ruoyi.bas.container.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -11,6 +14,9 @@ import com.ruoyi.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-06-17 */ +@Data +@AllArgsConstructor +@NoArgsConstructor public class BasContainer extends BaseEntity { private static final long serialVersionUID = 1L; @@ -28,11 +34,11 @@ public class BasContainer extends BaseEntity private Long status; /** 物料种类数量 */ - @Excel(name = "物料种类数量") - private Long productTypeQuantity; + @Excel(name = "物料种类") + private String productTypeQuantity; /** 容量（可存放料箱数量） */ - @Excel(name = "容量", readConverterExp = "可=存放料箱数量") + @Excel(name = "容量", readConverterExp = "可存放料箱数量") private Long capacity; /** 操作人 */ @@ -48,110 +54,4 @@ public class BasContainer extends BaseEntity /** 备用 */ private String spare3; - public void setContainerId(String containerId) - { - this.containerId = containerId; - } - - public String getContainerId() - { - return containerId; - } - - public void setPortName(String portName) - { - this.portName = portName; - } - - public String getPortName() - { - return portName; - } - - public void setStatus(Long status) - { - this.status = status; - } - - public Long getStatus() - { - return status; - } - - public void setProductTypeQuantity(Long productTypeQuantity) - { - this.productTypeQuantity = productTypeQuantity; - } - - public Long getProductTypeQuantity() - { - return productTypeQuantity; - } - - public void setCapacity(Long capacity) - { - this.capacity = capacity; - } - - public Long getCapacity() - { - return capacity; - } - - public void setOperationMan(String operationMan) - { - this.operationMan = operationMan; - } - - public String getOperationMan() - { - return operationMan; - } - - public void setSpare1(String spare1) - { - this.spare1 = spare1; - } - - public String getSpare1() - { - return spare1; - } - - public void setSpare2(String spare2) - { - this.spare2 = spare2; - } - - public String getSpare2() - { - return spare2; - } - - public void setSpare3(String spare3) - { - this.spare3 = spare3; - } - - public String getSpare3() - { - return spare3; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("containerId", getContainerId()) - .append("portName", getPortName()) - .append("status", getStatus()) - .append("productTypeQuantity", getProductTypeQuantity()) - .append("capacity", getCapacity()) - .append("createTime", getCreateTime()) - .append("updateTime", getUpdateTime()) - .append("operationMan", getOperationMan()) - .append("spare1", getSpare1()) - .append("spare2", getSpare2()) - .append("spare3", getSpare3()) - .toString(); - } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/container/mapper/BasContainerMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/container/mapper/BasContainerMapper.java index 67961f8..0ae2c02 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/container/mapper/BasContainerMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/container/mapper/BasContainerMapper.java @@ -58,4 +58,13 @@ public interface BasContainerMapper * @return 结果 */ public int deleteBasContainerByContainerIds(String[] containerIds); + + /** + * 获取点位管理的点位值集合 + * + * @return 结果 + */ + List selectPortNames(); + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/container/service/IBasContainerService.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/container/service/IBasContainerService.java index 35338e1..408d4be 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/container/service/IBasContainerService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/container/service/IBasContainerService.java @@ -58,4 +58,10 @@ public interface IBasContainerService * @return 结果 */ public int deleteBasContainerByContainerId(String containerId); + + /** + * 获取点位名称集合 + * @return + */ + public List getPortNames(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/container/service/impl/BasContainerServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/container/service/impl/BasContainerServiceImpl.java index cc2a5cf..b67986b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/container/service/impl/BasContainerServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/container/service/impl/BasContainerServiceImpl.java @@ -93,4 +93,13 @@ public class BasContainerServiceImpl implements IBasContainerService { return basContainerMapper.deleteBasContainerByContainerId(containerId); } + + /** + * 获取点位名称集合 + * @return + */ + public List getPortNames() { + return basContainerMapper.selectPortNames(); + } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/containerDetails/controller/BasContainerDetailsController.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/containerDetails/controller/BasContainerDetailsController.java new file mode 100644 index 0000000..0446bbb --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/containerDetails/controller/BasContainerDetailsController.java @@ -0,0 +1,104 @@ +package com.ruoyi.bas.containerDetails.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.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.bas.containerDetails.domain.BasContainerDetails; +import com.ruoyi.bas.containerDetails.service.IBasContainerDetailsService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 容器物料明细Controller + * + * @author ruoyi + * @date 2025-06-17 + */ +@RestController +@RequestMapping("/bas/containerDetails") +public class BasContainerDetailsController extends BaseController +{ + @Autowired + private IBasContainerDetailsService basContainerDetailsService; + + /** + * 查询容器物料明细列表 + */ + @PreAuthorize("@ss.hasPermi('bas:containerDetails:list')") + @GetMapping("/list") + public TableDataInfo list(BasContainerDetails basContainerDetails) + { + startPage(); + List list = basContainerDetailsService.selectBasContainerDetailsList(basContainerDetails); + return getDataTable(list); + } + + /** + * 导出容器物料明细列表 + */ + @PreAuthorize("@ss.hasPermi('bas:containerDetails:export')") + @Log(title = "容器物料明细", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BasContainerDetails basContainerDetails) + { + List list = basContainerDetailsService.selectBasContainerDetailsList(basContainerDetails); + ExcelUtil util = new ExcelUtil(BasContainerDetails.class); + util.exportExcel(response, list, "容器物料明细数据"); + } + + /** + * 获取容器物料明细详细信息 + */ + @PreAuthorize("@ss.hasPermi('bas:containerDetails:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(basContainerDetailsService.selectBasContainerDetailsById(id)); + } + + /** + * 新增容器物料明细 + */ + @PreAuthorize("@ss.hasPermi('bas:containerDetails:add')") + @Log(title = "容器物料明细", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BasContainerDetails basContainerDetails) + { + return toAjax(basContainerDetailsService.insertBasContainerDetails(basContainerDetails)); + } + + /** + * 修改容器物料明细 + */ + @PreAuthorize("@ss.hasPermi('bas:containerDetails:edit')") + @Log(title = "容器物料明细", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BasContainerDetails basContainerDetails) + { + return toAjax(basContainerDetailsService.updateBasContainerDetails(basContainerDetails)); + } + + /** + * 删除容器物料明细 + */ + @PreAuthorize("@ss.hasPermi('bas:containerDetails:remove')") + @Log(title = "容器物料明细", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(basContainerDetailsService.deleteBasContainerDetailsByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/containerDetails/domain/BasContainerDetails.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/containerDetails/domain/BasContainerDetails.java index 78add9a..50aa7fa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/containerDetails/domain/BasContainerDetails.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/containerDetails/domain/BasContainerDetails.java @@ -1,5 +1,8 @@ package com.ruoyi.bas.containerDetails.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -11,6 +14,9 @@ import com.ruoyi.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-06-17 */ +@Data +@AllArgsConstructor +@NoArgsConstructor public class BasContainerDetails extends BaseEntity { private static final long serialVersionUID = 1L; @@ -50,108 +56,5 @@ public class BasContainerDetails extends BaseEntity @Excel(name = "备用") private String spare3; - public void setId(Long id) - { - this.id = id; - } - public Long getId() - { - return id; - } - - public void setContainerId(String containerId) - { - this.containerId = containerId; - } - - public String getContainerId() - { - return containerId; - } - - public void setProductId(String productId) - { - this.productId = productId; - } - - public String getProductId() - { - return productId; - } - - public void setProductName(String productName) - { - this.productName = productName; - } - - public String getProductName() - { - return productName; - } - - public void setQuantity(Long quantity) - { - this.quantity = quantity; - } - - public Long getQuantity() - { - return quantity; - } - - public void setUnit(String unit) - { - this.unit = unit; - } - - public String getUnit() - { - return unit; - } - - public void setSpare1(String spare1) - { - this.spare1 = spare1; - } - - public String getSpare1() - { - return spare1; - } - - public void setSpare2(String spare2) - { - this.spare2 = spare2; - } - - public String getSpare2() - { - return spare2; - } - - public void setSpare3(String spare3) - { - this.spare3 = spare3; - } - - public String getSpare3() - { - return spare3; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("containerId", getContainerId()) - .append("productId", getProductId()) - .append("productName", getProductName()) - .append("quantity", getQuantity()) - .append("unit", getUnit()) - .append("spare1", getSpare1()) - .append("spare2", getSpare2()) - .append("spare3", getSpare3()) - .toString(); - } } diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasContainerMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasContainerMapper.xml index 2b0a5b4..8007783 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/BasContainerMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasContainerMapper.xml @@ -48,7 +48,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" product_type_quantity, capacity, create_time, - update_time, + + update_time, operation_man, spare1, spare2, @@ -61,7 +62,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{productTypeQuantity}, #{capacity}, #{createTime}, - #{updateTime}, + + GETDATE(), #{operationMan}, #{spare1}, #{spare2}, @@ -77,7 +79,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" product_type_quantity = #{productTypeQuantity}, capacity = #{capacity}, create_time = #{createTime}, - update_time = #{updateTime}, + + GETDATE(), operation_man = #{operationMan}, spare1 = #{spare1}, spare2 = #{spare2}, @@ -96,4 +99,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{containerId} + + \ No newline at end of file diff --git a/ruoyi-ui/src/api/bas/container.js b/ruoyi-ui/src/api/bas/container.js index 1498190..f34b70e 100644 --- a/ruoyi-ui/src/api/bas/container.js +++ b/ruoyi-ui/src/api/bas/container.js @@ -46,7 +46,7 @@ export function delContainer(containerId) { // 获取点位名称 export function getPortNames() { return request({ - url: '/product/port/list', + url: '/bas/container/portNames', method: 'get' }); } diff --git a/ruoyi-ui/src/views/bas/container/index.vue b/ruoyi-ui/src/views/bas/container/index.vue index 057c5e0..6a6e172 100644 --- a/ruoyi-ui/src/views/bas/container/index.vue +++ b/ruoyi-ui/src/views/bas/container/index.vue @@ -12,10 +12,10 @@ @@ -50,7 +50,7 @@ size="mini" @click="handleAdd" v-hasPermi="['bas:container:add']" - >新增 + >新增/绑定 删除 + >删除/解绑 - + @@ -132,19 +132,28 @@ - - - - - - + + + + + + + + + + @@ -158,10 +167,12 @@