From a393347bab71103aa4ae2c6788afa918e8e28be0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=AB=E7=8C=ABguowen?= <9290821+guowen-the-cat@user.noreply.gitee.com> Date: Thu, 29 May 2025 17:57:33 +0800 Subject: [PATCH] =?UTF-8?q?KPI=E4=BF=AE=E6=94=B9=E5=85=A5=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD=E3=80=81=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=8D=AE=E6=B5=81=E6=B0=B4=E3=80=81=E5=B9=B3?= =?UTF-8?q?=E5=BA=93=E5=85=A5=E5=BA=93=E6=B5=81=E6=B0=B4=E3=80=81=E5=B9=B3?= =?UTF-8?q?=E5=BA=93=E5=87=BA=E5=BA=93=E6=B5=81=E6=B0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kpi/service/impl/KpiServiceImpl.java | 10 +- .../ViewFlatWarehouseInFlowController.java | 123 +++ .../domain/ViewFlatWarehouseInFlow.java | 324 ++++++++ .../mapper/ViewFlatWarehouseInFlowMapper.java | 61 ++ .../IViewFlatWarehouseInFlowService.java | 61 ++ .../ViewFlatWarehouseInFlowServiceImpl.java | 95 +++ .../ViewFlatWarehouseOutFlowController.java | 104 +++ .../domain/ViewFlatWarehouseOutFlow.java | 324 ++++++++ .../ViewFlatWarehouseOutFlowMapper.java | 61 ++ .../IViewFlatWarehouseOutFlowService.java | 61 ++ .../ViewFlatWarehouseOutFlowServiceImpl.java | 95 +++ .../controller/ViewOutJobFlowController.java | 104 +++ .../ViewOutJobFlow/domain/ViewOutJobFlow.java | 489 ++++++++++++ .../mapper/ViewOutJobFlowMapper.java | 61 ++ .../service/IViewOutJobFlowService.java | 61 ++ .../impl/ViewOutJobFlowServiceImpl.java | 95 +++ .../search/ViewFlatWarehouseInFlowMapper.xml | 156 ++++ .../search/ViewFlatWarehouseOutFlowMapper.xml | 156 ++++ .../mapper/search/ViewOutJobFlowMapper.xml | 209 +++++ .../src/api/search/ViewFlatWarehouseInFlow.js | 50 ++ .../api/search/ViewFlatWarehouseOutFlow.js | 51 ++ ruoyi-ui/src/api/search/ViewOutJobFlow.js | 44 ++ .../search/ViewFlatWarehouseInFlow/index.vue | 525 +++++++++++++ .../search/ViewFlatWarehouseOutFlow/index.vue | 519 +++++++++++++ .../src/views/search/ViewOutJobFlow/index.vue | 727 ++++++++++++++++++ 25 files changed, 4561 insertions(+), 5 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/controller/ViewFlatWarehouseInFlowController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/domain/ViewFlatWarehouseInFlow.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/mapper/ViewFlatWarehouseInFlowMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/service/IViewFlatWarehouseInFlowService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/service/impl/ViewFlatWarehouseInFlowServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/controller/ViewFlatWarehouseOutFlowController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/domain/ViewFlatWarehouseOutFlow.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/mapper/ViewFlatWarehouseOutFlowMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/service/IViewFlatWarehouseOutFlowService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/service/impl/ViewFlatWarehouseOutFlowServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/controller/ViewOutJobFlowController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/mapper/ViewOutJobFlowMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/IViewOutJobFlowService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/impl/ViewOutJobFlowServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseInFlowMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseOutFlowMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml create mode 100644 ruoyi-ui/src/api/search/ViewFlatWarehouseInFlow.js create mode 100644 ruoyi-ui/src/api/search/ViewFlatWarehouseOutFlow.js create mode 100644 ruoyi-ui/src/api/search/ViewOutJobFlow.js create mode 100644 ruoyi-ui/src/views/search/ViewFlatWarehouseInFlow/index.vue create mode 100644 ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue create mode 100644 ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue diff --git a/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java index 31edc5d..c056815 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java @@ -50,7 +50,7 @@ public class KpiServiceImpl implements KpiService for (MydoJobFinish job : list) { // 检查入库作业标识是否小于10 - if (job.getInOrOut() == null || Integer.parseInt(job.getInOrOut()) >= 10) { + if (job.getInOrOut() == null || Integer.parseInt(job.getInOrOut()) >= 20) { continue; } @@ -89,11 +89,11 @@ public class KpiServiceImpl implements KpiService } /** - * 获取入库均匀分析数据 + * 获取出库均匀分析数据 * * @param warehouseId 仓库ID * @param yearMonth 年月（格式：yyyy-MM） - * @return 入库均匀分析数据 + * @return 出库均匀分析数据 */ @Override public Map getOutAnalysis(String warehouseId, String yearMonth) @@ -106,7 +106,7 @@ public class KpiServiceImpl implements KpiService for (MydoJobFinish job : list) { // 检查出入库作业标识是否大于10 - if (job.getInOrOut() == null || Integer.parseInt(job.getInOrOut()) < 10) { + if (job.getInOrOut() == null || Integer.parseInt(job.getInOrOut()) < 20) { continue; } @@ -185,7 +185,7 @@ public class KpiServiceImpl implements KpiService // 区分入库和出库作业 if (job.getInOrOut() != null) { int inOrOut = Integer.parseInt(job.getInOrOut()); - if (inOrOut < 10) { + if (inOrOut < 20) { // 入库作业 inCounts.put(roadwayId, inCounts.getOrDefault(roadwayId, 0) + 1); } else { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/controller/ViewFlatWarehouseInFlowController.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/controller/ViewFlatWarehouseInFlowController.java new file mode 100644 index 0000000..8bd3740 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/controller/ViewFlatWarehouseInFlowController.java @@ -0,0 +1,123 @@ +package com.ruoyi.search.ViewFlatWarehouseInFlow.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.search.ViewFlatWarehouseInFlow.domain.ViewFlatWarehouseInFlow; +import com.ruoyi.search.ViewFlatWarehouseInFlow.service.IViewFlatWarehouseInFlowService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.bas.warehouse.domain.BasWarehouse; +import com.ruoyi.bas.warehouse.service.IBasWarehouseService; + +/** + * 平库入库流水Controller + * + * @author gw + * @date 2025-05-29 + */ +@RestController +@RequestMapping("/search/ViewFlatWarehouseInFlow") +public class ViewFlatWarehouseInFlowController extends BaseController +{ + @Autowired + private IViewFlatWarehouseInFlowService viewFlatWarehouseInFlowService; + + @Autowired + private IBasWarehouseService basWarehouseService; + + /** + * 查询平库入库流水列表 + */ + @PreAuthorize("@ss.hasPermi('search:ViewFlatWarehouseInFlow:list')") + @GetMapping("/list") + public TableDataInfo list(ViewFlatWarehouseInFlow viewFlatWarehouseInFlow) + { + startPage(); + List list = viewFlatWarehouseInFlowService.selectViewFlatWarehouseInFlowList(viewFlatWarehouseInFlow); + return getDataTable(list); + } + + /** + * 导出平库入库流水列表 + */ + @PreAuthorize("@ss.hasPermi('search:ViewFlatWarehouseInFlow:export')") + @Log(title = "平库入库流水", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ViewFlatWarehouseInFlow viewFlatWarehouseInFlow) + { + List list = viewFlatWarehouseInFlowService.selectViewFlatWarehouseInFlowList(viewFlatWarehouseInFlow); + ExcelUtil util = new ExcelUtil(ViewFlatWarehouseInFlow.class); + util.exportExcel(response, list, "平库入库流水数据"); + } + + /** + * 获取平库入库流水详细信息 + */ + @PreAuthorize("@ss.hasPermi('search:ViewFlatWarehouseInFlow:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(viewFlatWarehouseInFlowService.selectViewFlatWarehouseInFlowById(id)); + } + + /** + * 新增平库入库流水 + */ + @PreAuthorize("@ss.hasPermi('search:ViewFlatWarehouseInFlow:add')") + @Log(title = "平库入库流水", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ViewFlatWarehouseInFlow viewFlatWarehouseInFlow) + { + return toAjax(viewFlatWarehouseInFlowService.insertViewFlatWarehouseInFlow(viewFlatWarehouseInFlow)); + } + + /** + * 修改平库入库流水 + */ + @PreAuthorize("@ss.hasPermi('search:ViewFlatWarehouseInFlow:edit')") + @Log(title = "平库入库流水", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ViewFlatWarehouseInFlow viewFlatWarehouseInFlow) + { + return toAjax(viewFlatWarehouseInFlowService.updateViewFlatWarehouseInFlow(viewFlatWarehouseInFlow)); + } + + /** + * 删除平库入库流水 + */ + @PreAuthorize("@ss.hasPermi('search:ViewFlatWarehouseInFlow:remove')") + @Log(title = "平库入库流水", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(viewFlatWarehouseInFlowService.deleteViewFlatWarehouseInFlowByIds(ids)); + } + + /** + * 查询仓库管理列表(warehouse_type=3) + */ + @PreAuthorize("@ss.hasPermi('search:ViewFlatWarehouseInFlow:list')") + @GetMapping("/warehouseList") + public TableDataInfo warehouseList() + { + startPage(); + BasWarehouse basWarehouse = new BasWarehouse(); + basWarehouse.setWarehouseType("3"); + List list = basWarehouseService.selectBasWarehouseList(basWarehouse); + return getDataTable(list); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/domain/ViewFlatWarehouseInFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/domain/ViewFlatWarehouseInFlow.java new file mode 100644 index 0000000..ef89063 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/domain/ViewFlatWarehouseInFlow.java @@ -0,0 +1,324 @@ +package com.ruoyi.search.ViewFlatWarehouseInFlow.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; + +/** + * 平库入库流水对象 view_flat_warehouse_in_flow + * + * @author gw + * @date 2025-05-29 + */ +public class ViewFlatWarehouseInFlow extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 入出库类型 */ + @Excel(name = "入出库类型") + private String inOrOut; + + /** 入出库主单据ID */ + @Excel(name = "入出库主单据ID") + private String inOrOutSotckId; + + /** 入出库主子单据ID */ + @Excel(name = "入出库主子单据ID") + private String inOrOutSotckDetailId; + + /** 物料GUID */ + @Excel(name = "物料GUID") + private String productGuid; + + /** 物料ID */ + @Excel(name = "物料ID") + private String productId; + + /** 数量 */ + @Excel(name = "数量") + private String quantity; + + /** 创建人 */ + @Excel(name = "创建人") + private String createMan; + + /** 仓库id */ + @Excel(name = "仓库id") + private String warehouseId; + + /** 仓库名称 */ + @Excel(name = "仓库名称") + private String warehouseName; + + /** 仓库地址 */ + @Excel(name = "仓库地址") + private String address; + + /** 仓库描述 */ + @Excel(name = "仓库描述") + private String cDesc; + + /** 仓库级别 */ + @Excel(name = "仓库级别") + private String warehouseKind; + + /** 仓库类型 */ + @Excel(name = "仓库类型") + private String warehouseType; + + /** 是否可用 */ + @Excel(name = "是否可用") + private String isCurrent; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String productName; + + /** 规格 */ + @Excel(name = "规格") + private String spec; + + /** 品牌 */ + @Excel(name = "品牌") + private String cargoNo; + + /** 单位 */ + @Excel(name = "单位") + private String unit; + + /** 价格 */ + @Excel(name = "价格") + private String price; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + + public void setInOrOut(String inOrOut) + { + this.inOrOut = inOrOut; + } + + public String getInOrOut() + { + return inOrOut; + } + + public void setInOrOutSotckId(String inOrOutSotckId) + { + this.inOrOutSotckId = inOrOutSotckId; + } + + public String getInOrOutSotckId() + { + return inOrOutSotckId; + } + + public void setInOrOutSotckDetailId(String inOrOutSotckDetailId) + { + this.inOrOutSotckDetailId = inOrOutSotckDetailId; + } + + public String getInOrOutSotckDetailId() + { + return inOrOutSotckDetailId; + } + + public void setProductGuid(String productGuid) + { + this.productGuid = productGuid; + } + + public String getProductGuid() + { + return productGuid; + } + + public void setProductId(String productId) + { + this.productId = productId; + } + + public String getProductId() + { + return productId; + } + + public void setQuantity(String quantity) + { + this.quantity = quantity; + } + + public String getQuantity() + { + return quantity; + } + + public void setCreateMan(String createMan) + { + this.createMan = createMan; + } + + public String getCreateMan() + { + return createMan; + } + + public void setWarehouseId(String warehouseId) + { + this.warehouseId = warehouseId; + } + + public String getWarehouseId() + { + return warehouseId; + } + + public void setWarehouseName(String warehouseName) + { + this.warehouseName = warehouseName; + } + + public String getWarehouseName() + { + return warehouseName; + } + + public void setAddress(String address) + { + this.address = address; + } + + public String getAddress() + { + return address; + } + + public void setcDesc(String cDesc) + { + this.cDesc = cDesc; + } + + public String getcDesc() + { + return cDesc; + } + + public void setWarehouseKind(String warehouseKind) + { + this.warehouseKind = warehouseKind; + } + + public String getWarehouseKind() + { + return warehouseKind; + } + + public void setWarehouseType(String warehouseType) + { + this.warehouseType = warehouseType; + } + + public String getWarehouseType() + { + return warehouseType; + } + + public void setIsCurrent(String isCurrent) + { + this.isCurrent = isCurrent; + } + + public String getIsCurrent() + { + return isCurrent; + } + + public void setProductName(String productName) + { + this.productName = productName; + } + + public String getProductName() + { + return productName; + } + + public void setSpec(String spec) + { + this.spec = spec; + } + + public String getSpec() + { + return spec; + } + + public void setCargoNo(String cargoNo) + { + this.cargoNo = cargoNo; + } + + public String getCargoNo() + { + return cargoNo; + } + + public void setUnit(String unit) + { + this.unit = unit; + } + + public String getUnit() + { + return unit; + } + + public void setPrice(String price) + { + this.price = price; + } + + public String getPrice() + { + return price; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("inOrOut", getInOrOut()) + .append("inOrOutSotckId", getInOrOutSotckId()) + .append("inOrOutSotckDetailId", getInOrOutSotckDetailId()) + .append("productGuid", getProductGuid()) + .append("productId", getProductId()) + .append("quantity", getQuantity()) + .append("createTime", getCreateTime()) + .append("createMan", getCreateMan()) + .append("warehouseId", getWarehouseId()) + .append("warehouseName", getWarehouseName()) + .append("address", getAddress()) + .append("cDesc", getcDesc()) + .append("warehouseKind", getWarehouseKind()) + .append("warehouseType", getWarehouseType()) + .append("isCurrent", getIsCurrent()) + .append("productName", getProductName()) + .append("spec", getSpec()) + .append("cargoNo", getCargoNo()) + .append("unit", getUnit()) + .append("price", getPrice()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/mapper/ViewFlatWarehouseInFlowMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/mapper/ViewFlatWarehouseInFlowMapper.java new file mode 100644 index 0000000..0865741 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/mapper/ViewFlatWarehouseInFlowMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.search.ViewFlatWarehouseInFlow.mapper; + +import java.util.List; +import com.ruoyi.search.ViewFlatWarehouseInFlow.domain.ViewFlatWarehouseInFlow; + +/** + * 平库入库流水Mapper接口 + * + * @author gw + * @date 2025-05-29 + */ +public interface ViewFlatWarehouseInFlowMapper +{ + /** + * 查询平库入库流水 + * + * @param id 平库入库流水主键 + * @return 平库入库流水 + */ + public ViewFlatWarehouseInFlow selectViewFlatWarehouseInFlowById(Long id); + + /** + * 查询平库入库流水列表 + * + * @param viewFlatWarehouseInFlow 平库入库流水 + * @return 平库入库流水集合 + */ + public List selectViewFlatWarehouseInFlowList(ViewFlatWarehouseInFlow viewFlatWarehouseInFlow); + + /** + * 新增平库入库流水 + * + * @param viewFlatWarehouseInFlow 平库入库流水 + * @return 结果 + */ + public int insertViewFlatWarehouseInFlow(ViewFlatWarehouseInFlow viewFlatWarehouseInFlow); + + /** + * 修改平库入库流水 + * + * @param viewFlatWarehouseInFlow 平库入库流水 + * @return 结果 + */ + public int updateViewFlatWarehouseInFlow(ViewFlatWarehouseInFlow viewFlatWarehouseInFlow); + + /** + * 删除平库入库流水 + * + * @param id 平库入库流水主键 + * @return 结果 + */ + public int deleteViewFlatWarehouseInFlowById(Long id); + + /** + * 批量删除平库入库流水 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteViewFlatWarehouseInFlowByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/service/IViewFlatWarehouseInFlowService.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/service/IViewFlatWarehouseInFlowService.java new file mode 100644 index 0000000..bbfece5 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/service/IViewFlatWarehouseInFlowService.java @@ -0,0 +1,61 @@ +package com.ruoyi.search.ViewFlatWarehouseInFlow.service; + +import java.util.List; +import com.ruoyi.search.ViewFlatWarehouseInFlow.domain.ViewFlatWarehouseInFlow; + +/** + * 平库入库流水Service接口 + * + * @author gw + * @date 2025-05-29 + */ +public interface IViewFlatWarehouseInFlowService +{ + /** + * 查询平库入库流水 + * + * @param id 平库入库流水主键 + * @return 平库入库流水 + */ + public ViewFlatWarehouseInFlow selectViewFlatWarehouseInFlowById(Long id); + + /** + * 查询平库入库流水列表 + * + * @param viewFlatWarehouseInFlow 平库入库流水 + * @return 平库入库流水集合 + */ + public List selectViewFlatWarehouseInFlowList(ViewFlatWarehouseInFlow viewFlatWarehouseInFlow); + + /** + * 新增平库入库流水 + * + * @param viewFlatWarehouseInFlow 平库入库流水 + * @return 结果 + */ + public int insertViewFlatWarehouseInFlow(ViewFlatWarehouseInFlow viewFlatWarehouseInFlow); + + /** + * 修改平库入库流水 + * + * @param viewFlatWarehouseInFlow 平库入库流水 + * @return 结果 + */ + public int updateViewFlatWarehouseInFlow(ViewFlatWarehouseInFlow viewFlatWarehouseInFlow); + + /** + * 批量删除平库入库流水 + * + * @param ids 需要删除的平库入库流水主键集合 + * @return 结果 + */ + public int deleteViewFlatWarehouseInFlowByIds(Long[] ids); + + /** + * 删除平库入库流水信息 + * + * @param id 平库入库流水主键 + * @return 结果 + */ + public int deleteViewFlatWarehouseInFlowById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/service/impl/ViewFlatWarehouseInFlowServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/service/impl/ViewFlatWarehouseInFlowServiceImpl.java new file mode 100644 index 0000000..d38383a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/service/impl/ViewFlatWarehouseInFlowServiceImpl.java @@ -0,0 +1,95 @@ +package com.ruoyi.search.ViewFlatWarehouseInFlow.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.search.ViewFlatWarehouseInFlow.mapper.ViewFlatWarehouseInFlowMapper; +import com.ruoyi.search.ViewFlatWarehouseInFlow.domain.ViewFlatWarehouseInFlow; +import com.ruoyi.search.ViewFlatWarehouseInFlow.service.IViewFlatWarehouseInFlowService; + +/** + * 平库入库流水Service业务层处理 + * + * @author gw + * @date 2025-05-29 + */ +@Service +public class ViewFlatWarehouseInFlowServiceImpl implements IViewFlatWarehouseInFlowService +{ + @Autowired + private ViewFlatWarehouseInFlowMapper viewFlatWarehouseInFlowMapper; + + /** + * 查询平库入库流水 + * + * @param id 平库入库流水主键 + * @return 平库入库流水 + */ + @Override + public ViewFlatWarehouseInFlow selectViewFlatWarehouseInFlowById(Long id) + { + return viewFlatWarehouseInFlowMapper.selectViewFlatWarehouseInFlowById(id); + } + + /** + * 查询平库入库流水列表 + * + * @param viewFlatWarehouseInFlow 平库入库流水 + * @return 平库入库流水 + */ + @Override + public List selectViewFlatWarehouseInFlowList(ViewFlatWarehouseInFlow viewFlatWarehouseInFlow) + { + return viewFlatWarehouseInFlowMapper.selectViewFlatWarehouseInFlowList(viewFlatWarehouseInFlow); + } + + /** + * 新增平库入库流水 + * + * @param viewFlatWarehouseInFlow 平库入库流水 + * @return 结果 + */ + @Override + public int insertViewFlatWarehouseInFlow(ViewFlatWarehouseInFlow viewFlatWarehouseInFlow) + { + viewFlatWarehouseInFlow.setCreateTime(DateUtils.getNowDate()); + return viewFlatWarehouseInFlowMapper.insertViewFlatWarehouseInFlow(viewFlatWarehouseInFlow); + } + + /** + * 修改平库入库流水 + * + * @param viewFlatWarehouseInFlow 平库入库流水 + * @return 结果 + */ + @Override + public int updateViewFlatWarehouseInFlow(ViewFlatWarehouseInFlow viewFlatWarehouseInFlow) + { + return viewFlatWarehouseInFlowMapper.updateViewFlatWarehouseInFlow(viewFlatWarehouseInFlow); + } + + /** + * 批量删除平库入库流水 + * + * @param ids 需要删除的平库入库流水主键 + * @return 结果 + */ + @Override + public int deleteViewFlatWarehouseInFlowByIds(Long[] ids) + { + return viewFlatWarehouseInFlowMapper.deleteViewFlatWarehouseInFlowByIds(ids); + } + + /** + * 删除平库入库流水信息 + * + * @param id 平库入库流水主键 + * @return 结果 + */ + @Override + public int deleteViewFlatWarehouseInFlowById(Long id) + { + return viewFlatWarehouseInFlowMapper.deleteViewFlatWarehouseInFlowById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/controller/ViewFlatWarehouseOutFlowController.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/controller/ViewFlatWarehouseOutFlowController.java new file mode 100644 index 0000000..73ccb5a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/controller/ViewFlatWarehouseOutFlowController.java @@ -0,0 +1,104 @@ +package com.ruoyi.search.ViewFlatWarehouseOutFlow.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.search.ViewFlatWarehouseOutFlow.domain.ViewFlatWarehouseOutFlow; +import com.ruoyi.search.ViewFlatWarehouseOutFlow.service.IViewFlatWarehouseOutFlowService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 平库出库流水Controller + * + * @author gw + * @date 2025-05-29 + */ +@RestController +@RequestMapping("/search/ViewFlatWarehouseOutFlow") +public class ViewFlatWarehouseOutFlowController extends BaseController +{ + @Autowired + private IViewFlatWarehouseOutFlowService viewFlatWarehouseOutFlowService; + + /** + * 查询平库出库流水列表 + */ + @PreAuthorize("@ss.hasPermi('search:ViewFlatWarehouseOutFlow:list')") + @GetMapping("/list") + public TableDataInfo list(ViewFlatWarehouseOutFlow viewFlatWarehouseOutFlow) + { + startPage(); + List list = viewFlatWarehouseOutFlowService.selectViewFlatWarehouseOutFlowList(viewFlatWarehouseOutFlow); + return getDataTable(list); + } + + /** + * 导出平库出库流水列表 + */ + @PreAuthorize("@ss.hasPermi('search:ViewFlatWarehouseOutFlow:export')") + @Log(title = "平库出库流水", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ViewFlatWarehouseOutFlow viewFlatWarehouseOutFlow) + { + List list = viewFlatWarehouseOutFlowService.selectViewFlatWarehouseOutFlowList(viewFlatWarehouseOutFlow); + ExcelUtil util = new ExcelUtil(ViewFlatWarehouseOutFlow.class); + util.exportExcel(response, list, "平库出库流水数据"); + } + + /** + * 获取平库出库流水详细信息 + */ + @PreAuthorize("@ss.hasPermi('search:ViewFlatWarehouseOutFlow:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(viewFlatWarehouseOutFlowService.selectViewFlatWarehouseOutFlowById(id)); + } + + /** + * 新增平库出库流水 + */ + @PreAuthorize("@ss.hasPermi('search:ViewFlatWarehouseOutFlow:add')") + @Log(title = "平库出库流水", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ViewFlatWarehouseOutFlow viewFlatWarehouseOutFlow) + { + return toAjax(viewFlatWarehouseOutFlowService.insertViewFlatWarehouseOutFlow(viewFlatWarehouseOutFlow)); + } + + /** + * 修改平库出库流水 + */ + @PreAuthorize("@ss.hasPermi('search:ViewFlatWarehouseOutFlow:edit')") + @Log(title = "平库出库流水", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ViewFlatWarehouseOutFlow viewFlatWarehouseOutFlow) + { + return toAjax(viewFlatWarehouseOutFlowService.updateViewFlatWarehouseOutFlow(viewFlatWarehouseOutFlow)); + } + + /** + * 删除平库出库流水 + */ + @PreAuthorize("@ss.hasPermi('search:ViewFlatWarehouseOutFlow:remove')") + @Log(title = "平库出库流水", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(viewFlatWarehouseOutFlowService.deleteViewFlatWarehouseOutFlowByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/domain/ViewFlatWarehouseOutFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/domain/ViewFlatWarehouseOutFlow.java new file mode 100644 index 0000000..4305d40 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/domain/ViewFlatWarehouseOutFlow.java @@ -0,0 +1,324 @@ +package com.ruoyi.search.ViewFlatWarehouseOutFlow.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; + +/** + * 平库出库流水对象 view_flat_warehouse_out_flow + * + * @author gw + * @date 2025-05-29 + */ +public class ViewFlatWarehouseOutFlow extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 入出库类型 */ + @Excel(name = "入出库类型") + private String inOrOut; + + /** 入出库主单据ID */ + @Excel(name = "入出库主单据ID") + private String inOrOutSotckId; + + /** 入出库主子单据ID */ + @Excel(name = "入出库主子单据ID") + private String inOrOutSotckDetailId; + + /** 物料GUID */ + @Excel(name = "物料GUID") + private String productGuid; + + /** 物料ID */ + @Excel(name = "物料ID") + private String productId; + + /** 入出库数量 */ + @Excel(name = "入出库数量") + private String quantity; + + /** 创建人 */ + @Excel(name = "创建人") + private String createMan; + + /** 仓库ID */ + @Excel(name = "仓库ID") + private String warehouseId; + + /** 仓库名称 */ + @Excel(name = "仓库名称") + private String warehouseName; + + /** 仓库地址 */ + @Excel(name = "仓库地址") + private String address; + + /** 仓库描述 */ + @Excel(name = "仓库描述") + private String cDesc; + + /** 仓库级别 */ + @Excel(name = "仓库级别") + private String warehouseKind; + + /** 仓库类型 */ + @Excel(name = "仓库类型") + private String warehouseType; + + /** 是否可用 */ + @Excel(name = "是否可用") + private String isCurrent; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String productName; + + /** 规格 */ + @Excel(name = "规格") + private String spec; + + /** 品牌 */ + @Excel(name = "品牌") + private String cargoNo; + + /** 单位 */ + @Excel(name = "单位") + private String unit; + + /** 价格 */ + @Excel(name = "价格") + private String price; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + + public void setInOrOut(String inOrOut) + { + this.inOrOut = inOrOut; + } + + public String getInOrOut() + { + return inOrOut; + } + + public void setInOrOutSotckId(String inOrOutSotckId) + { + this.inOrOutSotckId = inOrOutSotckId; + } + + public String getInOrOutSotckId() + { + return inOrOutSotckId; + } + + public void setInOrOutSotckDetailId(String inOrOutSotckDetailId) + { + this.inOrOutSotckDetailId = inOrOutSotckDetailId; + } + + public String getInOrOutSotckDetailId() + { + return inOrOutSotckDetailId; + } + + public void setProductGuid(String productGuid) + { + this.productGuid = productGuid; + } + + public String getProductGuid() + { + return productGuid; + } + + public void setProductId(String productId) + { + this.productId = productId; + } + + public String getProductId() + { + return productId; + } + + public void setQuantity(String quantity) + { + this.quantity = quantity; + } + + public String getQuantity() + { + return quantity; + } + + public void setCreateMan(String createMan) + { + this.createMan = createMan; + } + + public String getCreateMan() + { + return createMan; + } + + public void setWarehouseId(String warehouseId) + { + this.warehouseId = warehouseId; + } + + public String getWarehouseId() + { + return warehouseId; + } + + public void setWarehouseName(String warehouseName) + { + this.warehouseName = warehouseName; + } + + public String getWarehouseName() + { + return warehouseName; + } + + public void setAddress(String address) + { + this.address = address; + } + + public String getAddress() + { + return address; + } + + public void setcDesc(String cDesc) + { + this.cDesc = cDesc; + } + + public String getcDesc() + { + return cDesc; + } + + public void setWarehouseKind(String warehouseKind) + { + this.warehouseKind = warehouseKind; + } + + public String getWarehouseKind() + { + return warehouseKind; + } + + public void setWarehouseType(String warehouseType) + { + this.warehouseType = warehouseType; + } + + public String getWarehouseType() + { + return warehouseType; + } + + public void setIsCurrent(String isCurrent) + { + this.isCurrent = isCurrent; + } + + public String getIsCurrent() + { + return isCurrent; + } + + public void setProductName(String productName) + { + this.productName = productName; + } + + public String getProductName() + { + return productName; + } + + public void setSpec(String spec) + { + this.spec = spec; + } + + public String getSpec() + { + return spec; + } + + public void setCargoNo(String cargoNo) + { + this.cargoNo = cargoNo; + } + + public String getCargoNo() + { + return cargoNo; + } + + public void setUnit(String unit) + { + this.unit = unit; + } + + public String getUnit() + { + return unit; + } + + public void setPrice(String price) + { + this.price = price; + } + + public String getPrice() + { + return price; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("inOrOut", getInOrOut()) + .append("inOrOutSotckId", getInOrOutSotckId()) + .append("inOrOutSotckDetailId", getInOrOutSotckDetailId()) + .append("productGuid", getProductGuid()) + .append("productId", getProductId()) + .append("quantity", getQuantity()) + .append("createTime", getCreateTime()) + .append("createMan", getCreateMan()) + .append("warehouseId", getWarehouseId()) + .append("warehouseName", getWarehouseName()) + .append("address", getAddress()) + .append("cDesc", getcDesc()) + .append("warehouseKind", getWarehouseKind()) + .append("warehouseType", getWarehouseType()) + .append("isCurrent", getIsCurrent()) + .append("productName", getProductName()) + .append("spec", getSpec()) + .append("cargoNo", getCargoNo()) + .append("unit", getUnit()) + .append("price", getPrice()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/mapper/ViewFlatWarehouseOutFlowMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/mapper/ViewFlatWarehouseOutFlowMapper.java new file mode 100644 index 0000000..ef89c98 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/mapper/ViewFlatWarehouseOutFlowMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.search.ViewFlatWarehouseOutFlow.mapper; + +import java.util.List; +import com.ruoyi.search.ViewFlatWarehouseOutFlow.domain.ViewFlatWarehouseOutFlow; + +/** + * 平库出库流水Mapper接口 + * + * @author gw + * @date 2025-05-29 + */ +public interface ViewFlatWarehouseOutFlowMapper +{ + /** + * 查询平库出库流水 + * + * @param id 平库出库流水主键 + * @return 平库出库流水 + */ + public ViewFlatWarehouseOutFlow selectViewFlatWarehouseOutFlowById(Long id); + + /** + * 查询平库出库流水列表 + * + * @param viewFlatWarehouseOutFlow 平库出库流水 + * @return 平库出库流水集合 + */ + public List selectViewFlatWarehouseOutFlowList(ViewFlatWarehouseOutFlow viewFlatWarehouseOutFlow); + + /** + * 新增平库出库流水 + * + * @param viewFlatWarehouseOutFlow 平库出库流水 + * @return 结果 + */ + public int insertViewFlatWarehouseOutFlow(ViewFlatWarehouseOutFlow viewFlatWarehouseOutFlow); + + /** + * 修改平库出库流水 + * + * @param viewFlatWarehouseOutFlow 平库出库流水 + * @return 结果 + */ + public int updateViewFlatWarehouseOutFlow(ViewFlatWarehouseOutFlow viewFlatWarehouseOutFlow); + + /** + * 删除平库出库流水 + * + * @param id 平库出库流水主键 + * @return 结果 + */ + public int deleteViewFlatWarehouseOutFlowById(Long id); + + /** + * 批量删除平库出库流水 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteViewFlatWarehouseOutFlowByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/service/IViewFlatWarehouseOutFlowService.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/service/IViewFlatWarehouseOutFlowService.java new file mode 100644 index 0000000..6a9ab38 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/service/IViewFlatWarehouseOutFlowService.java @@ -0,0 +1,61 @@ +package com.ruoyi.search.ViewFlatWarehouseOutFlow.service; + +import java.util.List; +import com.ruoyi.search.ViewFlatWarehouseOutFlow.domain.ViewFlatWarehouseOutFlow; + +/** + * 平库出库流水Service接口 + * + * @author gw + * @date 2025-05-29 + */ +public interface IViewFlatWarehouseOutFlowService +{ + /** + * 查询平库出库流水 + * + * @param id 平库出库流水主键 + * @return 平库出库流水 + */ + public ViewFlatWarehouseOutFlow selectViewFlatWarehouseOutFlowById(Long id); + + /** + * 查询平库出库流水列表 + * + * @param viewFlatWarehouseOutFlow 平库出库流水 + * @return 平库出库流水集合 + */ + public List selectViewFlatWarehouseOutFlowList(ViewFlatWarehouseOutFlow viewFlatWarehouseOutFlow); + + /** + * 新增平库出库流水 + * + * @param viewFlatWarehouseOutFlow 平库出库流水 + * @return 结果 + */ + public int insertViewFlatWarehouseOutFlow(ViewFlatWarehouseOutFlow viewFlatWarehouseOutFlow); + + /** + * 修改平库出库流水 + * + * @param viewFlatWarehouseOutFlow 平库出库流水 + * @return 结果 + */ + public int updateViewFlatWarehouseOutFlow(ViewFlatWarehouseOutFlow viewFlatWarehouseOutFlow); + + /** + * 批量删除平库出库流水 + * + * @param ids 需要删除的平库出库流水主键集合 + * @return 结果 + */ + public int deleteViewFlatWarehouseOutFlowByIds(Long[] ids); + + /** + * 删除平库出库流水信息 + * + * @param id 平库出库流水主键 + * @return 结果 + */ + public int deleteViewFlatWarehouseOutFlowById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/service/impl/ViewFlatWarehouseOutFlowServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/service/impl/ViewFlatWarehouseOutFlowServiceImpl.java new file mode 100644 index 0000000..83d43ca --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/service/impl/ViewFlatWarehouseOutFlowServiceImpl.java @@ -0,0 +1,95 @@ +package com.ruoyi.search.ViewFlatWarehouseOutFlow.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.search.ViewFlatWarehouseOutFlow.mapper.ViewFlatWarehouseOutFlowMapper; +import com.ruoyi.search.ViewFlatWarehouseOutFlow.domain.ViewFlatWarehouseOutFlow; +import com.ruoyi.search.ViewFlatWarehouseOutFlow.service.IViewFlatWarehouseOutFlowService; + +/** + * 平库出库流水Service业务层处理 + * + * @author gw + * @date 2025-05-29 + */ +@Service +public class ViewFlatWarehouseOutFlowServiceImpl implements IViewFlatWarehouseOutFlowService +{ + @Autowired + private ViewFlatWarehouseOutFlowMapper viewFlatWarehouseOutFlowMapper; + + /** + * 查询平库出库流水 + * + * @param id 平库出库流水主键 + * @return 平库出库流水 + */ + @Override + public ViewFlatWarehouseOutFlow selectViewFlatWarehouseOutFlowById(Long id) + { + return viewFlatWarehouseOutFlowMapper.selectViewFlatWarehouseOutFlowById(id); + } + + /** + * 查询平库出库流水列表 + * + * @param viewFlatWarehouseOutFlow 平库出库流水 + * @return 平库出库流水 + */ + @Override + public List selectViewFlatWarehouseOutFlowList(ViewFlatWarehouseOutFlow viewFlatWarehouseOutFlow) + { + return viewFlatWarehouseOutFlowMapper.selectViewFlatWarehouseOutFlowList(viewFlatWarehouseOutFlow); + } + + /** + * 新增平库出库流水 + * + * @param viewFlatWarehouseOutFlow 平库出库流水 + * @return 结果 + */ + @Override + public int insertViewFlatWarehouseOutFlow(ViewFlatWarehouseOutFlow viewFlatWarehouseOutFlow) + { + viewFlatWarehouseOutFlow.setCreateTime(DateUtils.getNowDate()); + return viewFlatWarehouseOutFlowMapper.insertViewFlatWarehouseOutFlow(viewFlatWarehouseOutFlow); + } + + /** + * 修改平库出库流水 + * + * @param viewFlatWarehouseOutFlow 平库出库流水 + * @return 结果 + */ + @Override + public int updateViewFlatWarehouseOutFlow(ViewFlatWarehouseOutFlow viewFlatWarehouseOutFlow) + { + return viewFlatWarehouseOutFlowMapper.updateViewFlatWarehouseOutFlow(viewFlatWarehouseOutFlow); + } + + /** + * 批量删除平库出库流水 + * + * @param ids 需要删除的平库出库流水主键 + * @return 结果 + */ + @Override + public int deleteViewFlatWarehouseOutFlowByIds(Long[] ids) + { + return viewFlatWarehouseOutFlowMapper.deleteViewFlatWarehouseOutFlowByIds(ids); + } + + /** + * 删除平库出库流水信息 + * + * @param id 平库出库流水主键 + * @return 结果 + */ + @Override + public int deleteViewFlatWarehouseOutFlowById(Long id) + { + return viewFlatWarehouseOutFlowMapper.deleteViewFlatWarehouseOutFlowById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/controller/ViewOutJobFlowController.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/controller/ViewOutJobFlowController.java new file mode 100644 index 0000000..260430f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/controller/ViewOutJobFlowController.java @@ -0,0 +1,104 @@ +package com.ruoyi.search.ViewOutJobFlow.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.search.ViewOutJobFlow.domain.ViewOutJobFlow; +import com.ruoyi.search.ViewOutJobFlow.service.IViewOutJobFlowService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 出库做业务流水Controller + * + * @author gw + * @date 2025-05-29 + */ +@RestController +@RequestMapping("/search/ViewOutJobFlow") +public class ViewOutJobFlowController extends BaseController +{ + @Autowired + private IViewOutJobFlowService viewOutJobFlowService; + + /** + * 查询出库做业务流水列表 + */ + @PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:list')") + @GetMapping("/list") + public TableDataInfo list(ViewOutJobFlow viewOutJobFlow) + { + startPage(); + List list = viewOutJobFlowService.selectViewOutJobFlowList(viewOutJobFlow); + return getDataTable(list); + } + + /** + * 导出出库做业务流水列表 + */ + @PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:export')") + @Log(title = "出库做业务流水", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ViewOutJobFlow viewOutJobFlow) + { + List list = viewOutJobFlowService.selectViewOutJobFlowList(viewOutJobFlow); + ExcelUtil util = new ExcelUtil(ViewOutJobFlow.class); + util.exportExcel(response, list, "出库做业务流水数据"); + } + + /** + * 获取出库做业务流水详细信息 + */ + @PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:query')") + @GetMapping(value = "/{jobId}") + public AjaxResult getInfo(@PathVariable("jobId") String jobId) + { + return success(viewOutJobFlowService.selectViewOutJobFlowByJobId(jobId)); + } + + /** + * 新增出库做业务流水 + */ + @PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:add')") + @Log(title = "出库做业务流水", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ViewOutJobFlow viewOutJobFlow) + { + return toAjax(viewOutJobFlowService.insertViewOutJobFlow(viewOutJobFlow)); + } + + /** + * 修改出库做业务流水 + */ + @PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:edit')") + @Log(title = "出库做业务流水", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ViewOutJobFlow viewOutJobFlow) + { + return toAjax(viewOutJobFlowService.updateViewOutJobFlow(viewOutJobFlow)); + } + + /** + * 删除出库做业务流水 + */ + @PreAuthorize("@ss.hasPermi('search:ViewOutJobFlow:remove')") + @Log(title = "出库做业务流水", businessType = BusinessType.DELETE) + @DeleteMapping("/{jobIds}") + public AjaxResult remove(@PathVariable String[] jobIds) + { + return toAjax(viewOutJobFlowService.deleteViewOutJobFlowByJobIds(jobIds)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java new file mode 100644 index 0000000..29c0af4 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java @@ -0,0 +1,489 @@ +package com.ruoyi.search.ViewOutJobFlow.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; + +/** + * 出库做业务流水对象 view_out_job_flow + * + * @author gw + * @date 2025-05-29 + */ +public class ViewOutJobFlow extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 作业ID */ + @Excel(name = "作业ID") + private String jobId; + + /** 子作业ID */ + @Excel(name = "子作业ID") + private String jobDetailId; + + /** 状态 */ + @Excel(name = "状态") + private String status; + + /** 任务号 */ + @Excel(name = "任务号") + private String taskNo; + + /** 托盘码 */ + @Excel(name = "托盘码") + private String trayCode; + + /** 巷道ID */ + @Excel(name = "巷道ID") + private String roadwayId; + + /** 货位ID */ + @Excel(name = "货位ID") + private String cargoSpaceId; + + /** 货位名称 */ + @Excel(name = "货位名称") + private String cargoSpaceName; + + /** 排 */ + @Excel(name = "排") + private Long thePlatoon; + + /** 列 */ + @Excel(name = "列") + private Long theColumn; + + /** 层 */ + @Excel(name = "层") + private Long theFloor; + + /** 优先级 */ + @Excel(name = "优先级") + private Long priority; + + /** 执行阶段 */ + @Excel(name = "执行阶段") + private String executionPhase; + + /** 作业类型 */ + @Excel(name = "作业类型") + private String inOrOut; + + /** 出口ID */ + @Excel(name = "出口ID") + private String exitId; + + /** 物料ID */ + @Excel(name = "物料ID") + private String productId; + + /** 批号 */ + @Excel(name = "批号") + private String lotNo; + + /** 剁型ID */ + @Excel(name = "剁型ID") + private String stackingId; + + /** 库存状态 */ + @Excel(name = "库存状态") + private String stockStatus; + + /** 出库数量 */ + @Excel(name = "出库数量") + private String outQuantity; + + /** 回流数量 */ + @Excel(name = "回流数量") + private String giveNum; + + /** 单据ID */ + @Excel(name = "单据ID") + private String inOrOutId; + + /** 子单据ID */ + @Excel(name = "子单据ID") + private String inOrOutDId; + + /** 开始时间 */ + @Excel(name = "开始时间") + private String startTime; + + /** 结束时间 */ + @Excel(name = "结束时间") + private String finishTime; + + /** 仓库ID */ + @Excel(name = "仓库ID") + private String warehouseId; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String productName; + + /** 规格 */ + @Excel(name = "规格") + private String spec; + + /** 品牌 */ + @Excel(name = "品牌") + private String cargoNo; + + /** 单位 */ + @Excel(name = "单位") + private String unit; + + /** 客户名称 */ + @Excel(name = "客户名称") + private String customerName; + + public void setJobId(String jobId) + { + this.jobId = jobId; + } + + public String getJobId() + { + return jobId; + } + + public void setJobDetailId(String jobDetailId) + { + this.jobDetailId = jobDetailId; + } + + public String getJobDetailId() + { + return jobDetailId; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + + public void setTaskNo(String taskNo) + { + this.taskNo = taskNo; + } + + public String getTaskNo() + { + return taskNo; + } + + public void setTrayCode(String trayCode) + { + this.trayCode = trayCode; + } + + public String getTrayCode() + { + return trayCode; + } + + public void setRoadwayId(String roadwayId) + { + this.roadwayId = roadwayId; + } + + public String getRoadwayId() + { + return roadwayId; + } + + public void setCargoSpaceId(String cargoSpaceId) + { + this.cargoSpaceId = cargoSpaceId; + } + + public String getCargoSpaceId() + { + return cargoSpaceId; + } + + public void setCargoSpaceName(String cargoSpaceName) + { + this.cargoSpaceName = cargoSpaceName; + } + + public String getCargoSpaceName() + { + return cargoSpaceName; + } + + public void setThePlatoon(Long thePlatoon) + { + this.thePlatoon = thePlatoon; + } + + public Long getThePlatoon() + { + return thePlatoon; + } + + public void setTheColumn(Long theColumn) + { + this.theColumn = theColumn; + } + + public Long getTheColumn() + { + return theColumn; + } + + public void setTheFloor(Long theFloor) + { + this.theFloor = theFloor; + } + + public Long getTheFloor() + { + return theFloor; + } + + public void setPriority(Long priority) + { + this.priority = priority; + } + + public Long getPriority() + { + return priority; + } + + public void setExecutionPhase(String executionPhase) + { + this.executionPhase = executionPhase; + } + + public String getExecutionPhase() + { + return executionPhase; + } + + public void setInOrOut(String inOrOut) + { + this.inOrOut = inOrOut; + } + + public String getInOrOut() + { + return inOrOut; + } + + public void setExitId(String exitId) + { + this.exitId = exitId; + } + + public String getExitId() + { + return exitId; + } + + public void setProductId(String productId) + { + this.productId = productId; + } + + public String getProductId() + { + return productId; + } + + public void setLotNo(String lotNo) + { + this.lotNo = lotNo; + } + + public String getLotNo() + { + return lotNo; + } + + public void setStackingId(String stackingId) + { + this.stackingId = stackingId; + } + + public String getStackingId() + { + return stackingId; + } + + public void setStockStatus(String stockStatus) + { + this.stockStatus = stockStatus; + } + + public String getStockStatus() + { + return stockStatus; + } + + public void setOutQuantity(String outQuantity) + { + this.outQuantity = outQuantity; + } + + public String getOutQuantity() + { + return outQuantity; + } + + public void setGiveNum(String giveNum) + { + this.giveNum = giveNum; + } + + public String getGiveNum() + { + return giveNum; + } + + public void setInOrOutId(String inOrOutId) + { + this.inOrOutId = inOrOutId; + } + + public String getInOrOutId() + { + return inOrOutId; + } + + public void setInOrOutDId(String inOrOutDId) + { + this.inOrOutDId = inOrOutDId; + } + + public String getInOrOutDId() + { + return inOrOutDId; + } + + public void setStartTime(String startTime) + { + this.startTime = startTime; + } + + public String getStartTime() + { + return startTime; + } + + public void setFinishTime(String finishTime) + { + this.finishTime = finishTime; + } + + public String getFinishTime() + { + return finishTime; + } + + public void setWarehouseId(String warehouseId) + { + this.warehouseId = warehouseId; + } + + public String getWarehouseId() + { + return warehouseId; + } + + public void setProductName(String productName) + { + this.productName = productName; + } + + public String getProductName() + { + return productName; + } + + public void setSpec(String spec) + { + this.spec = spec; + } + + public String getSpec() + { + return spec; + } + + public void setCargoNo(String cargoNo) + { + this.cargoNo = cargoNo; + } + + public String getCargoNo() + { + return cargoNo; + } + + public void setUnit(String unit) + { + this.unit = unit; + } + + public String getUnit() + { + return unit; + } + + public void setCustomerName(String customerName) + { + this.customerName = customerName; + } + + public String getCustomerName() + { + return customerName; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("jobId", getJobId()) + .append("jobDetailId", getJobDetailId()) + .append("status", getStatus()) + .append("taskNo", getTaskNo()) + .append("trayCode", getTrayCode()) + .append("roadwayId", getRoadwayId()) + .append("cargoSpaceId", getCargoSpaceId()) + .append("cargoSpaceName", getCargoSpaceName()) + .append("thePlatoon", getThePlatoon()) + .append("theColumn", getTheColumn()) + .append("theFloor", getTheFloor()) + .append("priority", getPriority()) + .append("executionPhase", getExecutionPhase()) + .append("inOrOut", getInOrOut()) + .append("exitId", getExitId()) + .append("productId", getProductId()) + .append("lotNo", getLotNo()) + .append("stackingId", getStackingId()) + .append("stockStatus", getStockStatus()) + .append("outQuantity", getOutQuantity()) + .append("giveNum", getGiveNum()) + .append("inOrOutId", getInOrOutId()) + .append("inOrOutDId", getInOrOutDId()) + .append("createTime", getCreateTime()) + .append("startTime", getStartTime()) + .append("finishTime", getFinishTime()) + .append("warehouseId", getWarehouseId()) + .append("productName", getProductName()) + .append("spec", getSpec()) + .append("cargoNo", getCargoNo()) + .append("unit", getUnit()) + .append("customerName", getCustomerName()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/mapper/ViewOutJobFlowMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/mapper/ViewOutJobFlowMapper.java new file mode 100644 index 0000000..a134d69 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/mapper/ViewOutJobFlowMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.search.ViewOutJobFlow.mapper; + +import java.util.List; +import com.ruoyi.search.ViewOutJobFlow.domain.ViewOutJobFlow; + +/** + * 出库做业务流水Mapper接口 + * + * @author gw + * @date 2025-05-29 + */ +public interface ViewOutJobFlowMapper +{ + /** + * 查询出库做业务流水 + * + * @param jobId 出库做业务流水主键 + * @return 出库做业务流水 + */ + public ViewOutJobFlow selectViewOutJobFlowByJobId(String jobId); + + /** + * 查询出库做业务流水列表 + * + * @param viewOutJobFlow 出库做业务流水 + * @return 出库做业务流水集合 + */ + public List selectViewOutJobFlowList(ViewOutJobFlow viewOutJobFlow); + + /** + * 新增出库做业务流水 + * + * @param viewOutJobFlow 出库做业务流水 + * @return 结果 + */ + public int insertViewOutJobFlow(ViewOutJobFlow viewOutJobFlow); + + /** + * 修改出库做业务流水 + * + * @param viewOutJobFlow 出库做业务流水 + * @return 结果 + */ + public int updateViewOutJobFlow(ViewOutJobFlow viewOutJobFlow); + + /** + * 删除出库做业务流水 + * + * @param jobId 出库做业务流水主键 + * @return 结果 + */ + public int deleteViewOutJobFlowByJobId(String jobId); + + /** + * 批量删除出库做业务流水 + * + * @param jobIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteViewOutJobFlowByJobIds(String[] jobIds); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/IViewOutJobFlowService.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/IViewOutJobFlowService.java new file mode 100644 index 0000000..2e85040 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/IViewOutJobFlowService.java @@ -0,0 +1,61 @@ +package com.ruoyi.search.ViewOutJobFlow.service; + +import java.util.List; +import com.ruoyi.search.ViewOutJobFlow.domain.ViewOutJobFlow; + +/** + * 出库做业务流水Service接口 + * + * @author gw + * @date 2025-05-29 + */ +public interface IViewOutJobFlowService +{ + /** + * 查询出库做业务流水 + * + * @param jobId 出库做业务流水主键 + * @return 出库做业务流水 + */ + public ViewOutJobFlow selectViewOutJobFlowByJobId(String jobId); + + /** + * 查询出库做业务流水列表 + * + * @param viewOutJobFlow 出库做业务流水 + * @return 出库做业务流水集合 + */ + public List selectViewOutJobFlowList(ViewOutJobFlow viewOutJobFlow); + + /** + * 新增出库做业务流水 + * + * @param viewOutJobFlow 出库做业务流水 + * @return 结果 + */ + public int insertViewOutJobFlow(ViewOutJobFlow viewOutJobFlow); + + /** + * 修改出库做业务流水 + * + * @param viewOutJobFlow 出库做业务流水 + * @return 结果 + */ + public int updateViewOutJobFlow(ViewOutJobFlow viewOutJobFlow); + + /** + * 批量删除出库做业务流水 + * + * @param jobIds 需要删除的出库做业务流水主键集合 + * @return 结果 + */ + public int deleteViewOutJobFlowByJobIds(String[] jobIds); + + /** + * 删除出库做业务流水信息 + * + * @param jobId 出库做业务流水主键 + * @return 结果 + */ + public int deleteViewOutJobFlowByJobId(String jobId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/impl/ViewOutJobFlowServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/impl/ViewOutJobFlowServiceImpl.java new file mode 100644 index 0000000..f048e13 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/impl/ViewOutJobFlowServiceImpl.java @@ -0,0 +1,95 @@ +package com.ruoyi.search.ViewOutJobFlow.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.search.ViewOutJobFlow.mapper.ViewOutJobFlowMapper; +import com.ruoyi.search.ViewOutJobFlow.domain.ViewOutJobFlow; +import com.ruoyi.search.ViewOutJobFlow.service.IViewOutJobFlowService; + +/** + * 出库做业务流水Service业务层处理 + * + * @author gw + * @date 2025-05-29 + */ +@Service +public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService +{ + @Autowired + private ViewOutJobFlowMapper viewOutJobFlowMapper; + + /** + * 查询出库做业务流水 + * + * @param jobId 出库做业务流水主键 + * @return 出库做业务流水 + */ + @Override + public ViewOutJobFlow selectViewOutJobFlowByJobId(String jobId) + { + return viewOutJobFlowMapper.selectViewOutJobFlowByJobId(jobId); + } + + /** + * 查询出库做业务流水列表 + * + * @param viewOutJobFlow 出库做业务流水 + * @return 出库做业务流水 + */ + @Override + public List selectViewOutJobFlowList(ViewOutJobFlow viewOutJobFlow) + { + return viewOutJobFlowMapper.selectViewOutJobFlowList(viewOutJobFlow); + } + + /** + * 新增出库做业务流水 + * + * @param viewOutJobFlow 出库做业务流水 + * @return 结果 + */ + @Override + public int insertViewOutJobFlow(ViewOutJobFlow viewOutJobFlow) + { + viewOutJobFlow.setCreateTime(DateUtils.getNowDate()); + return viewOutJobFlowMapper.insertViewOutJobFlow(viewOutJobFlow); + } + + /** + * 修改出库做业务流水 + * + * @param viewOutJobFlow 出库做业务流水 + * @return 结果 + */ + @Override + public int updateViewOutJobFlow(ViewOutJobFlow viewOutJobFlow) + { + return viewOutJobFlowMapper.updateViewOutJobFlow(viewOutJobFlow); + } + + /** + * 批量删除出库做业务流水 + * + * @param jobIds 需要删除的出库做业务流水主键 + * @return 结果 + */ + @Override + public int deleteViewOutJobFlowByJobIds(String[] jobIds) + { + return viewOutJobFlowMapper.deleteViewOutJobFlowByJobIds(jobIds); + } + + /** + * 删除出库做业务流水信息 + * + * @param jobId 出库做业务流水主键 + * @return 结果 + */ + @Override + public int deleteViewOutJobFlowByJobId(String jobId) + { + return viewOutJobFlowMapper.deleteViewOutJobFlowByJobId(jobId); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseInFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseInFlowMapper.xml new file mode 100644 index 0000000..d58b9d1 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseInFlowMapper.xml @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, in_or_out, in_or_out_sotck_id, in_or_out_sotck_detail_id, product_guid, product_id, quantity, create_time, create_man, warehouse_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec, cargo_no, unit, price, remark from view_flat_warehouse_in_flow + + + + + + + + insert into view_flat_warehouse_in_flow + + id, + in_or_out, + in_or_out_sotck_id, + in_or_out_sotck_detail_id, + product_guid, + product_id, + quantity, + create_time, + create_man, + warehouse_id, + warehouse_name, + address, + c_desc, + warehouse_kind, + warehouse_type, + is_current, + product_name, + spec, + cargo_no, + unit, + price, + remark, + + + #{id}, + #{inOrOut}, + #{inOrOutSotckId}, + #{inOrOutSotckDetailId}, + #{productGuid}, + #{productId}, + #{quantity}, + #{createTime}, + #{createMan}, + #{warehouseId}, + #{warehouseName}, + #{address}, + #{cDesc}, + #{warehouseKind}, + #{warehouseType}, + #{isCurrent}, + #{productName}, + #{spec}, + #{cargoNo}, + #{unit}, + #{price}, + #{remark}, + + + + + update view_flat_warehouse_in_flow + + in_or_out = #{inOrOut}, + in_or_out_sotck_id = #{inOrOutSotckId}, + in_or_out_sotck_detail_id = #{inOrOutSotckDetailId}, + product_guid = #{productGuid}, + product_id = #{productId}, + quantity = #{quantity}, + create_time = #{createTime}, + create_man = #{createMan}, + warehouse_id = #{warehouseId}, + warehouse_name = #{warehouseName}, + address = #{address}, + c_desc = #{cDesc}, + warehouse_kind = #{warehouseKind}, + warehouse_type = #{warehouseType}, + is_current = #{isCurrent}, + product_name = #{productName}, + spec = #{spec}, + cargo_no = #{cargoNo}, + unit = #{unit}, + price = #{price}, + remark = #{remark}, + + where id = #{id} + + + + delete from view_flat_warehouse_in_flow where id = #{id} + + + + delete from view_flat_warehouse_in_flow where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseOutFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseOutFlowMapper.xml new file mode 100644 index 0000000..3b7aec3 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseOutFlowMapper.xml @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, in_or_out, in_or_out_sotck_id, in_or_out_sotck_detail_id, product_guid, product_id, quantity, create_time, create_man, warehouse_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec, cargo_no, unit, price, remark from view_flat_warehouse_out_flow + + + + + + + + insert into view_flat_warehouse_out_flow + + id, + in_or_out, + in_or_out_sotck_id, + in_or_out_sotck_detail_id, + product_guid, + product_id, + quantity, + create_time, + create_man, + warehouse_id, + warehouse_name, + address, + c_desc, + warehouse_kind, + warehouse_type, + is_current, + product_name, + spec, + cargo_no, + unit, + price, + remark, + + + #{id}, + #{inOrOut}, + #{inOrOutSotckId}, + #{inOrOutSotckDetailId}, + #{productGuid}, + #{productId}, + #{quantity}, + #{createTime}, + #{createMan}, + #{warehouseId}, + #{warehouseName}, + #{address}, + #{cDesc}, + #{warehouseKind}, + #{warehouseType}, + #{isCurrent}, + #{productName}, + #{spec}, + #{cargoNo}, + #{unit}, + #{price}, + #{remark}, + + + + + update view_flat_warehouse_out_flow + + in_or_out = #{inOrOut}, + in_or_out_sotck_id = #{inOrOutSotckId}, + in_or_out_sotck_detail_id = #{inOrOutSotckDetailId}, + product_guid = #{productGuid}, + product_id = #{productId}, + quantity = #{quantity}, + create_time = #{createTime}, + create_man = #{createMan}, + warehouse_id = #{warehouseId}, + warehouse_name = #{warehouseName}, + address = #{address}, + c_desc = #{cDesc}, + warehouse_kind = #{warehouseKind}, + warehouse_type = #{warehouseType}, + is_current = #{isCurrent}, + product_name = #{productName}, + spec = #{spec}, + cargo_no = #{cargoNo}, + unit = #{unit}, + price = #{price}, + remark = #{remark}, + + where id = #{id} + + + + delete from view_flat_warehouse_out_flow where id = #{id} + + + + delete from view_flat_warehouse_out_flow where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml new file mode 100644 index 0000000..adaf1e6 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml @@ -0,0 +1,209 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select job_id, job_detail_id, status, task_no, tray_code, roadway_id, cargo_space_id, cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out, exit_id, product_id, lot_no, stacking_id, stock_status, out_quantity, give_num, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_name, spec, cargo_no, unit, customer_name from view_out_job_flow + + + + + + + + insert into view_out_job_flow + + job_id, + job_detail_id, + status, + task_no, + tray_code, + roadway_id, + cargo_space_id, + cargo_space_name, + the_platoon, + the_column, + the_floor, + priority, + execution_phase, + in_or_out, + exit_id, + product_id, + lot_no, + stacking_id, + stock_status, + out_quantity, + give_num, + in_or_out_id, + in_or_out_d_id, + create_time, + start_time, + finish_time, + warehouse_id, + product_name, + spec, + cargo_no, + unit, + customer_name, + + + #{jobId}, + #{jobDetailId}, + #{status}, + #{taskNo}, + #{trayCode}, + #{roadwayId}, + #{cargoSpaceId}, + #{cargoSpaceName}, + #{thePlatoon}, + #{theColumn}, + #{theFloor}, + #{priority}, + #{executionPhase}, + #{inOrOut}, + #{exitId}, + #{productId}, + #{lotNo}, + #{stackingId}, + #{stockStatus}, + #{outQuantity}, + #{giveNum}, + #{inOrOutId}, + #{inOrOutDId}, + #{createTime}, + #{startTime}, + #{finishTime}, + #{warehouseId}, + #{productName}, + #{spec}, + #{cargoNo}, + #{unit}, + #{customerName}, + + + + + update view_out_job_flow + + job_detail_id = #{jobDetailId}, + status = #{status}, + task_no = #{taskNo}, + tray_code = #{trayCode}, + roadway_id = #{roadwayId}, + cargo_space_id = #{cargoSpaceId}, + cargo_space_name = #{cargoSpaceName}, + the_platoon = #{thePlatoon}, + the_column = #{theColumn}, + the_floor = #{theFloor}, + priority = #{priority}, + execution_phase = #{executionPhase}, + in_or_out = #{inOrOut}, + exit_id = #{exitId}, + product_id = #{productId}, + lot_no = #{lotNo}, + stacking_id = #{stackingId}, + stock_status = #{stockStatus}, + out_quantity = #{outQuantity}, + give_num = #{giveNum}, + in_or_out_id = #{inOrOutId}, + in_or_out_d_id = #{inOrOutDId}, + create_time = #{createTime}, + start_time = #{startTime}, + finish_time = #{finishTime}, + warehouse_id = #{warehouseId}, + product_name = #{productName}, + spec = #{spec}, + cargo_no = #{cargoNo}, + unit = #{unit}, + customer_name = #{customerName}, + + where job_id = #{jobId} + + + + delete from view_out_job_flow where job_id = #{jobId} + + + + delete from view_out_job_flow where job_id in + + #{jobId} + + + \ No newline at end of file diff --git a/ruoyi-ui/src/api/search/ViewFlatWarehouseInFlow.js b/ruoyi-ui/src/api/search/ViewFlatWarehouseInFlow.js new file mode 100644 index 0000000..8f9e20f --- /dev/null +++ b/ruoyi-ui/src/api/search/ViewFlatWarehouseInFlow.js @@ -0,0 +1,50 @@ +import request from '@/utils/request' +// 查询仓库列表 +export function warehouseList() { + return request({ + url: '/search/ViewFlatWarehouseInFlow/warehouseList', + method: 'get' + }) +} +// 查询平库入库流水列表 +export function listViewFlatWarehouseInFlow(query) { + return request({ + url: '/search/ViewFlatWarehouseInFlow/list', + method: 'get', + params: query + }) +} + +// 查询平库入库流水详细 +export function getViewFlatWarehouseInFlow(id) { + return request({ + url: '/search/ViewFlatWarehouseInFlow/' + id, + method: 'get' + }) +} + +// 新增平库入库流水 +export function addViewFlatWarehouseInFlow(data) { + return request({ + url: '/search/ViewFlatWarehouseInFlow', + method: 'post', + data: data + }) +} + +// 修改平库入库流水 +export function updateViewFlatWarehouseInFlow(data) { + return request({ + url: '/search/ViewFlatWarehouseInFlow', + method: 'put', + data: data + }) +} + +// 删除平库入库流水 +export function delViewFlatWarehouseInFlow(id) { + return request({ + url: '/search/ViewFlatWarehouseInFlow/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/search/ViewFlatWarehouseOutFlow.js b/ruoyi-ui/src/api/search/ViewFlatWarehouseOutFlow.js new file mode 100644 index 0000000..62cb282 --- /dev/null +++ b/ruoyi-ui/src/api/search/ViewFlatWarehouseOutFlow.js @@ -0,0 +1,51 @@ +import request from '@/utils/request' +// 查询仓库列表 +export function warehouseList() { + return request({ + url: '/search/ViewFlatWarehouseInFlow/warehouseList', + method: 'get' + }) +} + +// 查询平库出库流水列表 +export function listViewFlatWarehouseOutFlow(query) { + return request({ + url: '/search/ViewFlatWarehouseOutFlow/list', + method: 'get', + params: query + }) +} + +// 查询平库出库流水详细 +export function getViewFlatWarehouseOutFlow(id) { + return request({ + url: '/search/ViewFlatWarehouseOutFlow/' + id, + method: 'get' + }) +} + +// 新增平库出库流水 +export function addViewFlatWarehouseOutFlow(data) { + return request({ + url: '/search/ViewFlatWarehouseOutFlow', + method: 'post', + data: data + }) +} + +// 修改平库出库流水 +export function updateViewFlatWarehouseOutFlow(data) { + return request({ + url: '/search/ViewFlatWarehouseOutFlow', + method: 'put', + data: data + }) +} + +// 删除平库出库流水 +export function delViewFlatWarehouseOutFlow(id) { + return request({ + url: '/search/ViewFlatWarehouseOutFlow/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/search/ViewOutJobFlow.js b/ruoyi-ui/src/api/search/ViewOutJobFlow.js new file mode 100644 index 0000000..f7bb823 --- /dev/null +++ b/ruoyi-ui/src/api/search/ViewOutJobFlow.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询出库做业流水列表 +export function listViewOutJobFlow(query) { + return request({ + url: '/search/ViewOutJobFlow/list', + method: 'get', + params: query + }) +} + +// 查询出库做业流水详细 +export function getViewOutJobFlow(jobId) { + return request({ + url: '/search/ViewOutJobFlow/' + jobId, + method: 'get' + }) +} + +// 新增出库做业流水 +export function addViewOutJobFlow(data) { + return request({ + url: '/search/ViewOutJobFlow', + method: 'post', + data: data + }) +} + +// 修改出库做业流水 +export function updateViewOutJobFlow(data) { + return request({ + url: '/search/ViewOutJobFlow', + method: 'put', + data: data + }) +} + +// 删除出库做业流水 +export function delViewOutJobFlow(jobId) { + return request({ + url: '/search/ViewOutJobFlow/' + jobId, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/search/ViewFlatWarehouseInFlow/index.vue b/ruoyi-ui/src/views/search/ViewFlatWarehouseInFlow/index.vue new file mode 100644 index 0000000..96a4137 --- /dev/null +++ b/ruoyi-ui/src/views/search/ViewFlatWarehouseInFlow/index.vue @@ -0,0 +1,525 @@ + + + diff --git a/ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue b/ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue new file mode 100644 index 0000000..c3a1c85 --- /dev/null +++ b/ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue @@ -0,0 +1,519 @@ + + + diff --git a/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue b/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue new file mode 100644 index 0000000..b98b98b --- /dev/null +++ b/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue @@ -0,0 +1,727 @@ + + +