From 4f7461f79b11c44786415707d6fd92912e012b10 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: Wed, 28 May 2025 17:24:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E4=BD=9C=E4=B8=9A=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E3=80=81=E5=85=A5=E5=BA=93=E5=8D=95=E6=8D=AE=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E3=80=81=E5=87=BA=E5=BA=93=E5=8D=95=E6=8D=AE=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E3=80=81KPI=E6=89=80=E6=9C=89=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=94=B9=E4=BB=93=E5=BA=93=E4=B8=8B=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ViewInJobFlowController.java | 104 +++ .../ViewInJobFlow/domain/ViewInJobFlow.java | 459 +++++++++++ .../mapper/ViewInJobFlowMapper.java | 61 ++ .../service/IViewInJobFlowService.java | 61 ++ .../impl/ViewInJobFlowServiceImpl.java | 95 +++ .../ViewStockinHistoryController.java | 104 +++ .../domain/ViewStockinHistory.java | 579 ++++++++++++++ .../mapper/ViewStockinHistoryMapper.java | 61 ++ .../service/IViewStockinHistoryService.java | 61 ++ .../impl/ViewStockinHistoryServiceImpl.java | 93 +++ .../ViewStockoutHistoryController.java | 104 +++ .../domain/ViewStockoutHistory.java | 324 ++++++++ .../mapper/ViewStockoutHistoryMapper.java | 61 ++ .../service/IViewStockoutHistoryService.java | 61 ++ .../impl/ViewStockoutHistoryServiceImpl.java | 93 +++ .../mapper/search/ViewInJobFlowMapper.xml | 199 +++++ .../search/ViewStockinHistoryMapper.xml | 239 ++++++ .../search/ViewStockoutHistoryMapper.xml | 149 ++++ ruoyi-ui/src/api/search/ViewInJobFlow.js | 44 ++ ruoyi-ui/src/api/search/ViewStockinHistory.js | 44 ++ .../src/api/search/ViewStockoutHistory.js | 44 ++ ruoyi-ui/src/views/kpi/inAnalysis/index.vue | 6 +- ruoyi-ui/src/views/kpi/outAnalysis/index.vue | 6 +- .../src/views/kpi/roadwayAnalysis/index.vue | 6 +- .../src/views/kpi/spaceAnalysis/index.vue | 6 +- ruoyi-ui/src/views/kpi/spacePlan/index.vue | 22 +- .../src/views/search/ViewInJobFlow/index.vue | 714 ++++++++++++++++++ .../views/search/ViewStockinHistory/index.vue | 709 +++++++++++++++++ .../search/ViewStockoutHistory/index.vue | 548 ++++++++++++++ 29 files changed, 5050 insertions(+), 7 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/controller/ViewInJobFlowController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/mapper/ViewInJobFlowMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/IViewInJobFlowService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/impl/ViewInJobFlowServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/controller/ViewStockinHistoryController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/mapper/ViewStockinHistoryMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/service/IViewStockinHistoryService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/service/impl/ViewStockinHistoryServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/controller/ViewStockoutHistoryController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/mapper/ViewStockoutHistoryMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/service/IViewStockoutHistoryService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/service/impl/ViewStockoutHistoryServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml create mode 100644 ruoyi-ui/src/api/search/ViewInJobFlow.js create mode 100644 ruoyi-ui/src/api/search/ViewStockinHistory.js create mode 100644 ruoyi-ui/src/api/search/ViewStockoutHistory.js create mode 100644 ruoyi-ui/src/views/search/ViewInJobFlow/index.vue create mode 100644 ruoyi-ui/src/views/search/ViewStockinHistory/index.vue create mode 100644 ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/controller/ViewInJobFlowController.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/controller/ViewInJobFlowController.java new file mode 100644 index 0000000..0749a31 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/controller/ViewInJobFlowController.java @@ -0,0 +1,104 @@ +package com.ruoyi.search.ViewInJobFlow.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.ViewInJobFlow.domain.ViewInJobFlow; +import com.ruoyi.search.ViewInJobFlow.service.IViewInJobFlowService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 入库作业流水Controller + * + * @author gw + * @date 2025-05-28 + */ +@RestController +@RequestMapping("/search/ViewInJobFlow") +public class ViewInJobFlowController extends BaseController +{ + @Autowired + private IViewInJobFlowService viewInJobFlowService; + + /** + * 查询入库作业流水列表 + */ + @PreAuthorize("@ss.hasPermi('search:ViewInJobFlow:list')") + @GetMapping("/list") + public TableDataInfo list(ViewInJobFlow viewInJobFlow) + { + startPage(); + List list = viewInJobFlowService.selectViewInJobFlowList(viewInJobFlow); + return getDataTable(list); + } + + /** + * 导出入库作业流水列表 + */ + @PreAuthorize("@ss.hasPermi('search:ViewInJobFlow:export')") + @Log(title = "入库作业流水", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ViewInJobFlow viewInJobFlow) + { + List list = viewInJobFlowService.selectViewInJobFlowList(viewInJobFlow); + ExcelUtil util = new ExcelUtil(ViewInJobFlow.class); + util.exportExcel(response, list, "入库作业流水数据"); + } + + /** + * 获取入库作业流水详细信息 + */ + @PreAuthorize("@ss.hasPermi('search:ViewInJobFlow:query')") + @GetMapping(value = "/{jobId}") + public AjaxResult getInfo(@PathVariable("jobId") String jobId) + { + return success(viewInJobFlowService.selectViewInJobFlowByJobId(jobId)); + } + + /** + * 新增入库作业流水 + */ + @PreAuthorize("@ss.hasPermi('search:ViewInJobFlow:add')") + @Log(title = "入库作业流水", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ViewInJobFlow viewInJobFlow) + { + return toAjax(viewInJobFlowService.insertViewInJobFlow(viewInJobFlow)); + } + + /** + * 修改入库作业流水 + */ + @PreAuthorize("@ss.hasPermi('search:ViewInJobFlow:edit')") + @Log(title = "入库作业流水", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ViewInJobFlow viewInJobFlow) + { + return toAjax(viewInJobFlowService.updateViewInJobFlow(viewInJobFlow)); + } + + /** + * 删除入库作业流水 + */ + @PreAuthorize("@ss.hasPermi('search:ViewInJobFlow:remove')") + @Log(title = "入库作业流水", businessType = BusinessType.DELETE) + @DeleteMapping("/{jobIds}") + public AjaxResult remove(@PathVariable String[] jobIds) + { + return toAjax(viewInJobFlowService.deleteViewInJobFlowByJobIds(jobIds)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java new file mode 100644 index 0000000..c953dc6 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java @@ -0,0 +1,459 @@ +package com.ruoyi.search.ViewInJobFlow.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_in_job_flow + * + * @author gw + * @date 2025-05-28 + */ +public class ViewInJobFlow 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 entranceId; + + /** 物料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 inQuantity; + + /** 单据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; + + 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 setEntranceId(String entranceId) + { + this.entranceId = entranceId; + } + + public String getEntranceId() + { + return entranceId; + } + + 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 setInQuantity(String inQuantity) + { + this.inQuantity = inQuantity; + } + + public String getInQuantity() + { + return inQuantity; + } + + 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; + } + + @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("entranceId", getEntranceId()) + .append("productId", getProductId()) + .append("lotNo", getLotNo()) + .append("stackingId", getStackingId()) + .append("stockStatus", getStockStatus()) + .append("inQuantity", getInQuantity()) + .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()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/mapper/ViewInJobFlowMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/mapper/ViewInJobFlowMapper.java new file mode 100644 index 0000000..1790ad2 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/mapper/ViewInJobFlowMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.search.ViewInJobFlow.mapper; + +import java.util.List; +import com.ruoyi.search.ViewInJobFlow.domain.ViewInJobFlow; + +/** + * 入库作业流水Mapper接口 + * + * @author gw + * @date 2025-05-28 + */ +public interface ViewInJobFlowMapper +{ + /** + * 查询入库作业流水 + * + * @param jobId 入库作业流水主键 + * @return 入库作业流水 + */ + public ViewInJobFlow selectViewInJobFlowByJobId(String jobId); + + /** + * 查询入库作业流水列表 + * + * @param viewInJobFlow 入库作业流水 + * @return 入库作业流水集合 + */ + public List selectViewInJobFlowList(ViewInJobFlow viewInJobFlow); + + /** + * 新增入库作业流水 + * + * @param viewInJobFlow 入库作业流水 + * @return 结果 + */ + public int insertViewInJobFlow(ViewInJobFlow viewInJobFlow); + + /** + * 修改入库作业流水 + * + * @param viewInJobFlow 入库作业流水 + * @return 结果 + */ + public int updateViewInJobFlow(ViewInJobFlow viewInJobFlow); + + /** + * 删除入库作业流水 + * + * @param jobId 入库作业流水主键 + * @return 结果 + */ + public int deleteViewInJobFlowByJobId(String jobId); + + /** + * 批量删除入库作业流水 + * + * @param jobIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteViewInJobFlowByJobIds(String[] jobIds); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/IViewInJobFlowService.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/IViewInJobFlowService.java new file mode 100644 index 0000000..a0c8b36 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/IViewInJobFlowService.java @@ -0,0 +1,61 @@ +package com.ruoyi.search.ViewInJobFlow.service; + +import java.util.List; +import com.ruoyi.search.ViewInJobFlow.domain.ViewInJobFlow; + +/** + * 入库作业流水Service接口 + * + * @author gw + * @date 2025-05-28 + */ +public interface IViewInJobFlowService +{ + /** + * 查询入库作业流水 + * + * @param jobId 入库作业流水主键 + * @return 入库作业流水 + */ + public ViewInJobFlow selectViewInJobFlowByJobId(String jobId); + + /** + * 查询入库作业流水列表 + * + * @param viewInJobFlow 入库作业流水 + * @return 入库作业流水集合 + */ + public List selectViewInJobFlowList(ViewInJobFlow viewInJobFlow); + + /** + * 新增入库作业流水 + * + * @param viewInJobFlow 入库作业流水 + * @return 结果 + */ + public int insertViewInJobFlow(ViewInJobFlow viewInJobFlow); + + /** + * 修改入库作业流水 + * + * @param viewInJobFlow 入库作业流水 + * @return 结果 + */ + public int updateViewInJobFlow(ViewInJobFlow viewInJobFlow); + + /** + * 批量删除入库作业流水 + * + * @param jobIds 需要删除的入库作业流水主键集合 + * @return 结果 + */ + public int deleteViewInJobFlowByJobIds(String[] jobIds); + + /** + * 删除入库作业流水信息 + * + * @param jobId 入库作业流水主键 + * @return 结果 + */ + public int deleteViewInJobFlowByJobId(String jobId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/impl/ViewInJobFlowServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/impl/ViewInJobFlowServiceImpl.java new file mode 100644 index 0000000..9d31d19 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/service/impl/ViewInJobFlowServiceImpl.java @@ -0,0 +1,95 @@ +package com.ruoyi.search.ViewInJobFlow.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.ViewInJobFlow.mapper.ViewInJobFlowMapper; +import com.ruoyi.search.ViewInJobFlow.domain.ViewInJobFlow; +import com.ruoyi.search.ViewInJobFlow.service.IViewInJobFlowService; + +/** + * 入库作业流水Service业务层处理 + * + * @author gw + * @date 2025-05-28 + */ +@Service +public class ViewInJobFlowServiceImpl implements IViewInJobFlowService +{ + @Autowired + private ViewInJobFlowMapper viewInJobFlowMapper; + + /** + * 查询入库作业流水 + * + * @param jobId 入库作业流水主键 + * @return 入库作业流水 + */ + @Override + public ViewInJobFlow selectViewInJobFlowByJobId(String jobId) + { + return viewInJobFlowMapper.selectViewInJobFlowByJobId(jobId); + } + + /** + * 查询入库作业流水列表 + * + * @param viewInJobFlow 入库作业流水 + * @return 入库作业流水 + */ + @Override + public List selectViewInJobFlowList(ViewInJobFlow viewInJobFlow) + { + return viewInJobFlowMapper.selectViewInJobFlowList(viewInJobFlow); + } + + /** + * 新增入库作业流水 + * + * @param viewInJobFlow 入库作业流水 + * @return 结果 + */ + @Override + public int insertViewInJobFlow(ViewInJobFlow viewInJobFlow) + { + viewInJobFlow.setCreateTime(DateUtils.getNowDate()); + return viewInJobFlowMapper.insertViewInJobFlow(viewInJobFlow); + } + + /** + * 修改入库作业流水 + * + * @param viewInJobFlow 入库作业流水 + * @return 结果 + */ + @Override + public int updateViewInJobFlow(ViewInJobFlow viewInJobFlow) + { + return viewInJobFlowMapper.updateViewInJobFlow(viewInJobFlow); + } + + /** + * 批量删除入库作业流水 + * + * @param jobIds 需要删除的入库作业流水主键 + * @return 结果 + */ + @Override + public int deleteViewInJobFlowByJobIds(String[] jobIds) + { + return viewInJobFlowMapper.deleteViewInJobFlowByJobIds(jobIds); + } + + /** + * 删除入库作业流水信息 + * + * @param jobId 入库作业流水主键 + * @return 结果 + */ + @Override + public int deleteViewInJobFlowByJobId(String jobId) + { + return viewInJobFlowMapper.deleteViewInJobFlowByJobId(jobId); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/controller/ViewStockinHistoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/controller/ViewStockinHistoryController.java new file mode 100644 index 0000000..22a4560 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/controller/ViewStockinHistoryController.java @@ -0,0 +1,104 @@ +package com.ruoyi.search.ViewStockinHistory.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.ViewStockinHistory.domain.ViewStockinHistory; +import com.ruoyi.search.ViewStockinHistory.service.IViewStockinHistoryService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 入库单据历史Controller + * + * @author gw + * @date 2025-05-28 + */ +@RestController +@RequestMapping("/search/ViewStockinHistory") +public class ViewStockinHistoryController extends BaseController +{ + @Autowired + private IViewStockinHistoryService viewStockinHistoryService; + + /** + * 查询入库单据历史列表 + */ + @PreAuthorize("@ss.hasPermi('search:ViewStockinHistory:list')") + @GetMapping("/list") + public TableDataInfo list(ViewStockinHistory viewStockinHistory) + { + startPage(); + List list = viewStockinHistoryService.selectViewStockinHistoryList(viewStockinHistory); + return getDataTable(list); + } + + /** + * 导出入库单据历史列表 + */ + @PreAuthorize("@ss.hasPermi('search:ViewStockinHistory:export')") + @Log(title = "入库单据历史", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ViewStockinHistory viewStockinHistory) + { + List list = viewStockinHistoryService.selectViewStockinHistoryList(viewStockinHistory); + ExcelUtil util = new ExcelUtil(ViewStockinHistory.class); + util.exportExcel(response, list, "入库单据历史数据"); + } + + /** + * 获取入库单据历史详细信息 + */ + @PreAuthorize("@ss.hasPermi('search:ViewStockinHistory:query')") + @GetMapping(value = "/{stockinGuid}") + public AjaxResult getInfo(@PathVariable("stockinGuid") String stockinGuid) + { + return success(viewStockinHistoryService.selectViewStockinHistoryByStockinGuid(stockinGuid)); + } + + /** + * 新增入库单据历史 + */ + @PreAuthorize("@ss.hasPermi('search:ViewStockinHistory:add')") + @Log(title = "入库单据历史", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ViewStockinHistory viewStockinHistory) + { + return toAjax(viewStockinHistoryService.insertViewStockinHistory(viewStockinHistory)); + } + + /** + * 修改入库单据历史 + */ + @PreAuthorize("@ss.hasPermi('search:ViewStockinHistory:edit')") + @Log(title = "入库单据历史", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ViewStockinHistory viewStockinHistory) + { + return toAjax(viewStockinHistoryService.updateViewStockinHistory(viewStockinHistory)); + } + + /** + * 删除入库单据历史 + */ + @PreAuthorize("@ss.hasPermi('search:ViewStockinHistory:remove')") + @Log(title = "入库单据历史", businessType = BusinessType.DELETE) + @DeleteMapping("/{stockinGuids}") + public AjaxResult remove(@PathVariable String[] stockinGuids) + { + return toAjax(viewStockinHistoryService.deleteViewStockinHistoryByStockinGuids(stockinGuids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java new file mode 100644 index 0000000..a9a048e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java @@ -0,0 +1,579 @@ +package com.ruoyi.search.ViewStockinHistory.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_stockin_history + * + * @author gw + * @date 2025-05-28 + */ +public class ViewStockinHistory extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 入库单guid */ + @Excel(name = "入库单guid") + private String stockinGuid; + + /** 入库单号 */ + @Excel(name = "入库单号") + private String stockinId; + + /** 入库类型 */ + @Excel(name = "入库类型") + private String inType; + + /** 创建时间 */ + @Excel(name = "创建时间") + private String createDate; + + /** 创建人 */ + @Excel(name = "创建人") + private String createManId; + + /** 单据状态 */ + @Excel(name = "单据状态") + private String status; + + /** 仓库ID */ + @Excel(name = "仓库ID") + private String warehouseId; + + /** 完成时间 */ + @Excel(name = "完成时间") + private String finishDate; + + /** ERP单号 */ + @Excel(name = "ERP单号") + private String erpBill; + + /** 单据来源 */ + @Excel(name = "单据来源") + private String stockSource; + + /** 部门编码 */ + @Excel(name = "部门编码") + private String departmentNo; + + /** 班组编码 */ + @Excel(name = "班组编码") + private String classNo; + + /** 供应商编号 */ + @Excel(name = "供应商编号") + private String supplierNo; + + /** 供应商名称 */ + @Excel(name = "供应商名称") + private String supplierName; + + /** 供应商简称 */ + @Excel(name = "供应商简称") + private String simpleName; + + /** 联系人 */ + @Excel(name = "联系人") + private String contactName; + + /** 联系电话 */ + @Excel(name = "联系电话") + private String contactNumber; + + /** 供应商地址 */ + @Excel(name = "供应商地址") + private String address; + + /** 入库明细ID */ + @Excel(name = "入库明细ID") + private String stockinDetailId; + + /** 批次号 */ + @Excel(name = "批次号") + private String lotNo; + + /** 计划数量 */ + @Excel(name = "计划数量") + private String quantity; + + /** 计划箱数 */ + @Excel(name = "计划箱数") + private String quantityX; + + /** 计划件数 */ + @Excel(name = "计划件数") + private String quantityJ; + + /** 实际数量 */ + @Excel(name = "实际数量") + private String assignNum; + + /** 实际箱数 */ + @Excel(name = "实际箱数") + private String assignNumX; + + /** 实际件数 */ + @Excel(name = "实际件数") + private String assignNumJ; + + /** 扫码数量 */ + @Excel(name = "扫码数量") + private String scanNum; + + /** 扫码箱数 */ + @Excel(name = "扫码箱数") + private String scanNumX; + + /** 扫码件数 */ + @Excel(name = "扫码件数") + private String scanNumJ; + + /** 入库日期 */ + @Excel(name = "入库日期") + private String printDate; + + /** 库存状态 */ + @Excel(name = "库存状态") + private String stockStatus; + + /** 单价 */ + @Excel(name = "单价") + private String price; + + /** 物料编码 */ + @Excel(name = "物料编码") + private String productId; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String productName; + + /** 品牌 */ + @Excel(name = "品牌") + private String cargoNo; + + /** 单位 */ + @Excel(name = "单位") + private String unit; + + /** 规格 */ + @Excel(name = "规格") + private String spec; + + public void setStockinGuid(String stockinGuid) + { + this.stockinGuid = stockinGuid; + } + + public String getStockinGuid() + { + return stockinGuid; + } + + public void setStockinId(String stockinId) + { + this.stockinId = stockinId; + } + + public String getStockinId() + { + return stockinId; + } + + public void setInType(String inType) + { + this.inType = inType; + } + + public String getInType() + { + return inType; + } + + public void setCreateDate(String createDate) + { + this.createDate = createDate; + } + + public String getCreateDate() + { + return createDate; + } + + public void setCreateManId(String createManId) + { + this.createManId = createManId; + } + + public String getCreateManId() + { + return createManId; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + + public void setWarehouseId(String warehouseId) + { + this.warehouseId = warehouseId; + } + + public String getWarehouseId() + { + return warehouseId; + } + + public void setFinishDate(String finishDate) + { + this.finishDate = finishDate; + } + + public String getFinishDate() + { + return finishDate; + } + + public void setErpBill(String erpBill) + { + this.erpBill = erpBill; + } + + public String getErpBill() + { + return erpBill; + } + + public void setStockSource(String stockSource) + { + this.stockSource = stockSource; + } + + public String getStockSource() + { + return stockSource; + } + + public void setDepartmentNo(String departmentNo) + { + this.departmentNo = departmentNo; + } + + public String getDepartmentNo() + { + return departmentNo; + } + + public void setClassNo(String classNo) + { + this.classNo = classNo; + } + + public String getClassNo() + { + return classNo; + } + + public void setSupplierNo(String supplierNo) + { + this.supplierNo = supplierNo; + } + + public String getSupplierNo() + { + return supplierNo; + } + + public void setSupplierName(String supplierName) + { + this.supplierName = supplierName; + } + + public String getSupplierName() + { + return supplierName; + } + + public void setSimpleName(String simpleName) + { + this.simpleName = simpleName; + } + + public String getSimpleName() + { + return simpleName; + } + + public void setContactName(String contactName) + { + this.contactName = contactName; + } + + public String getContactName() + { + return contactName; + } + + public void setContactNumber(String contactNumber) + { + this.contactNumber = contactNumber; + } + + public String getContactNumber() + { + return contactNumber; + } + + public void setAddress(String address) + { + this.address = address; + } + + public String getAddress() + { + return address; + } + + public void setStockinDetailId(String stockinDetailId) + { + this.stockinDetailId = stockinDetailId; + } + + public String getStockinDetailId() + { + return stockinDetailId; + } + + public void setLotNo(String lotNo) + { + this.lotNo = lotNo; + } + + public String getLotNo() + { + return lotNo; + } + + public void setQuantity(String quantity) + { + this.quantity = quantity; + } + + public String getQuantity() + { + return quantity; + } + + public void setQuantityX(String quantityX) + { + this.quantityX = quantityX; + } + + public String getQuantityX() + { + return quantityX; + } + + public void setQuantityJ(String quantityJ) + { + this.quantityJ = quantityJ; + } + + public String getQuantityJ() + { + return quantityJ; + } + + public void setAssignNum(String assignNum) + { + this.assignNum = assignNum; + } + + public String getAssignNum() + { + return assignNum; + } + + public void setAssignNumX(String assignNumX) + { + this.assignNumX = assignNumX; + } + + public String getAssignNumX() + { + return assignNumX; + } + + public void setAssignNumJ(String assignNumJ) + { + this.assignNumJ = assignNumJ; + } + + public String getAssignNumJ() + { + return assignNumJ; + } + + public void setScanNum(String scanNum) + { + this.scanNum = scanNum; + } + + public String getScanNum() + { + return scanNum; + } + + public void setScanNumX(String scanNumX) + { + this.scanNumX = scanNumX; + } + + public String getScanNumX() + { + return scanNumX; + } + + public void setScanNumJ(String scanNumJ) + { + this.scanNumJ = scanNumJ; + } + + public String getScanNumJ() + { + return scanNumJ; + } + + public void setPrintDate(String printDate) + { + this.printDate = printDate; + } + + public String getPrintDate() + { + return printDate; + } + + public void setStockStatus(String stockStatus) + { + this.stockStatus = stockStatus; + } + + public String getStockStatus() + { + return stockStatus; + } + + public void setPrice(String price) + { + this.price = price; + } + + public String getPrice() + { + return price; + } + + 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 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 setSpec(String spec) + { + this.spec = spec; + } + + public String getSpec() + { + return spec; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("stockinGuid", getStockinGuid()) + .append("stockinId", getStockinId()) + .append("inType", getInType()) + .append("createDate", getCreateDate()) + .append("createManId", getCreateManId()) + .append("status", getStatus()) + .append("warehouseId", getWarehouseId()) + .append("finishDate", getFinishDate()) + .append("erpBill", getErpBill()) + .append("stockSource", getStockSource()) + .append("departmentNo", getDepartmentNo()) + .append("classNo", getClassNo()) + .append("supplierNo", getSupplierNo()) + .append("supplierName", getSupplierName()) + .append("simpleName", getSimpleName()) + .append("contactName", getContactName()) + .append("contactNumber", getContactNumber()) + .append("address", getAddress()) + .append("stockinDetailId", getStockinDetailId()) + .append("lotNo", getLotNo()) + .append("quantity", getQuantity()) + .append("quantityX", getQuantityX()) + .append("quantityJ", getQuantityJ()) + .append("assignNum", getAssignNum()) + .append("assignNumX", getAssignNumX()) + .append("assignNumJ", getAssignNumJ()) + .append("scanNum", getScanNum()) + .append("scanNumX", getScanNumX()) + .append("scanNumJ", getScanNumJ()) + .append("printDate", getPrintDate()) + .append("stockStatus", getStockStatus()) + .append("price", getPrice()) + .append("remark", getRemark()) + .append("productId", getProductId()) + .append("productName", getProductName()) + .append("cargoNo", getCargoNo()) + .append("unit", getUnit()) + .append("spec", getSpec()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/mapper/ViewStockinHistoryMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/mapper/ViewStockinHistoryMapper.java new file mode 100644 index 0000000..9fa6147 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/mapper/ViewStockinHistoryMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.search.ViewStockinHistory.mapper; + +import java.util.List; +import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory; + +/** + * 入库单据历史Mapper接口 + * + * @author gw + * @date 2025-05-28 + */ +public interface ViewStockinHistoryMapper +{ + /** + * 查询入库单据历史 + * + * @param stockinGuid 入库单据历史主键 + * @return 入库单据历史 + */ + public ViewStockinHistory selectViewStockinHistoryByStockinGuid(String stockinGuid); + + /** + * 查询入库单据历史列表 + * + * @param viewStockinHistory 入库单据历史 + * @return 入库单据历史集合 + */ + public List selectViewStockinHistoryList(ViewStockinHistory viewStockinHistory); + + /** + * 新增入库单据历史 + * + * @param viewStockinHistory 入库单据历史 + * @return 结果 + */ + public int insertViewStockinHistory(ViewStockinHistory viewStockinHistory); + + /** + * 修改入库单据历史 + * + * @param viewStockinHistory 入库单据历史 + * @return 结果 + */ + public int updateViewStockinHistory(ViewStockinHistory viewStockinHistory); + + /** + * 删除入库单据历史 + * + * @param stockinGuid 入库单据历史主键 + * @return 结果 + */ + public int deleteViewStockinHistoryByStockinGuid(String stockinGuid); + + /** + * 批量删除入库单据历史 + * + * @param stockinGuids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteViewStockinHistoryByStockinGuids(String[] stockinGuids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/service/IViewStockinHistoryService.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/service/IViewStockinHistoryService.java new file mode 100644 index 0000000..d576ae2 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/service/IViewStockinHistoryService.java @@ -0,0 +1,61 @@ +package com.ruoyi.search.ViewStockinHistory.service; + +import java.util.List; +import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory; + +/** + * 入库单据历史Service接口 + * + * @author gw + * @date 2025-05-28 + */ +public interface IViewStockinHistoryService +{ + /** + * 查询入库单据历史 + * + * @param stockinGuid 入库单据历史主键 + * @return 入库单据历史 + */ + public ViewStockinHistory selectViewStockinHistoryByStockinGuid(String stockinGuid); + + /** + * 查询入库单据历史列表 + * + * @param viewStockinHistory 入库单据历史 + * @return 入库单据历史集合 + */ + public List selectViewStockinHistoryList(ViewStockinHistory viewStockinHistory); + + /** + * 新增入库单据历史 + * + * @param viewStockinHistory 入库单据历史 + * @return 结果 + */ + public int insertViewStockinHistory(ViewStockinHistory viewStockinHistory); + + /** + * 修改入库单据历史 + * + * @param viewStockinHistory 入库单据历史 + * @return 结果 + */ + public int updateViewStockinHistory(ViewStockinHistory viewStockinHistory); + + /** + * 批量删除入库单据历史 + * + * @param stockinGuids 需要删除的入库单据历史主键集合 + * @return 结果 + */ + public int deleteViewStockinHistoryByStockinGuids(String[] stockinGuids); + + /** + * 删除入库单据历史信息 + * + * @param stockinGuid 入库单据历史主键 + * @return 结果 + */ + public int deleteViewStockinHistoryByStockinGuid(String stockinGuid); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/service/impl/ViewStockinHistoryServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/service/impl/ViewStockinHistoryServiceImpl.java new file mode 100644 index 0000000..8d4305e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/service/impl/ViewStockinHistoryServiceImpl.java @@ -0,0 +1,93 @@ +package com.ruoyi.search.ViewStockinHistory.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.search.ViewStockinHistory.mapper.ViewStockinHistoryMapper; +import com.ruoyi.search.ViewStockinHistory.domain.ViewStockinHistory; +import com.ruoyi.search.ViewStockinHistory.service.IViewStockinHistoryService; + +/** + * 入库单据历史Service业务层处理 + * + * @author gw + * @date 2025-05-28 + */ +@Service +public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService +{ + @Autowired + private ViewStockinHistoryMapper viewStockinHistoryMapper; + + /** + * 查询入库单据历史 + * + * @param stockinGuid 入库单据历史主键 + * @return 入库单据历史 + */ + @Override + public ViewStockinHistory selectViewStockinHistoryByStockinGuid(String stockinGuid) + { + return viewStockinHistoryMapper.selectViewStockinHistoryByStockinGuid(stockinGuid); + } + + /** + * 查询入库单据历史列表 + * + * @param viewStockinHistory 入库单据历史 + * @return 入库单据历史 + */ + @Override + public List selectViewStockinHistoryList(ViewStockinHistory viewStockinHistory) + { + return viewStockinHistoryMapper.selectViewStockinHistoryList(viewStockinHistory); + } + + /** + * 新增入库单据历史 + * + * @param viewStockinHistory 入库单据历史 + * @return 结果 + */ + @Override + public int insertViewStockinHistory(ViewStockinHistory viewStockinHistory) + { + return viewStockinHistoryMapper.insertViewStockinHistory(viewStockinHistory); + } + + /** + * 修改入库单据历史 + * + * @param viewStockinHistory 入库单据历史 + * @return 结果 + */ + @Override + public int updateViewStockinHistory(ViewStockinHistory viewStockinHistory) + { + return viewStockinHistoryMapper.updateViewStockinHistory(viewStockinHistory); + } + + /** + * 批量删除入库单据历史 + * + * @param stockinGuids 需要删除的入库单据历史主键 + * @return 结果 + */ + @Override + public int deleteViewStockinHistoryByStockinGuids(String[] stockinGuids) + { + return viewStockinHistoryMapper.deleteViewStockinHistoryByStockinGuids(stockinGuids); + } + + /** + * 删除入库单据历史信息 + * + * @param stockinGuid 入库单据历史主键 + * @return 结果 + */ + @Override + public int deleteViewStockinHistoryByStockinGuid(String stockinGuid) + { + return viewStockinHistoryMapper.deleteViewStockinHistoryByStockinGuid(stockinGuid); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/controller/ViewStockoutHistoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/controller/ViewStockoutHistoryController.java new file mode 100644 index 0000000..5db866e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/controller/ViewStockoutHistoryController.java @@ -0,0 +1,104 @@ +package com.ruoyi.search.ViewStockoutHistory.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.ViewStockoutHistory.domain.ViewStockoutHistory; +import com.ruoyi.search.ViewStockoutHistory.service.IViewStockoutHistoryService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 出库单据历史Controller + * + * @author gw + * @date 2025-05-28 + */ +@RestController +@RequestMapping("/search/ViewStockoutHistory") +public class ViewStockoutHistoryController extends BaseController +{ + @Autowired + private IViewStockoutHistoryService viewStockoutHistoryService; + + /** + * 查询出库单据历史列表 + */ + @PreAuthorize("@ss.hasPermi('search:ViewStockoutHistory:list')") + @GetMapping("/list") + public TableDataInfo list(ViewStockoutHistory viewStockoutHistory) + { + startPage(); + List list = viewStockoutHistoryService.selectViewStockoutHistoryList(viewStockoutHistory); + return getDataTable(list); + } + + /** + * 导出出库单据历史列表 + */ + @PreAuthorize("@ss.hasPermi('search:ViewStockoutHistory:export')") + @Log(title = "出库单据历史", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ViewStockoutHistory viewStockoutHistory) + { + List list = viewStockoutHistoryService.selectViewStockoutHistoryList(viewStockoutHistory); + ExcelUtil util = new ExcelUtil(ViewStockoutHistory.class); + util.exportExcel(response, list, "出库单据历史数据"); + } + + /** + * 获取出库单据历史详细信息 + */ + @PreAuthorize("@ss.hasPermi('search:ViewStockoutHistory:query')") + @GetMapping(value = "/{stockoutId}") + public AjaxResult getInfo(@PathVariable("stockoutId") String stockoutId) + { + return success(viewStockoutHistoryService.selectViewStockoutHistoryByStockoutId(stockoutId)); + } + + /** + * 新增出库单据历史 + */ + @PreAuthorize("@ss.hasPermi('search:ViewStockoutHistory:add')") + @Log(title = "出库单据历史", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ViewStockoutHistory viewStockoutHistory) + { + return toAjax(viewStockoutHistoryService.insertViewStockoutHistory(viewStockoutHistory)); + } + + /** + * 修改出库单据历史 + */ + @PreAuthorize("@ss.hasPermi('search:ViewStockoutHistory:edit')") + @Log(title = "出库单据历史", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ViewStockoutHistory viewStockoutHistory) + { + return toAjax(viewStockoutHistoryService.updateViewStockoutHistory(viewStockoutHistory)); + } + + /** + * 删除出库单据历史 + */ + @PreAuthorize("@ss.hasPermi('search:ViewStockoutHistory:remove')") + @Log(title = "出库单据历史", businessType = BusinessType.DELETE) + @DeleteMapping("/{stockoutIds}") + public AjaxResult remove(@PathVariable String[] stockoutIds) + { + return toAjax(viewStockoutHistoryService.deleteViewStockoutHistoryByStockoutIds(stockoutIds)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java new file mode 100644 index 0000000..3ced8ef --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java @@ -0,0 +1,324 @@ +package com.ruoyi.search.ViewStockoutHistory.domain; + +import java.math.BigDecimal; +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_stockout_history + * + * @author gw + * @date 2025-05-28 + */ +public class ViewStockoutHistory extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 出库单号 */ + @Excel(name = "出库单号") + private String stockoutId; + + /** 出库类型 */ + @Excel(name = "出库类型") + private String outType; + + /** 创建日期 */ + @Excel(name = "创建日期") + private String createDate; + + /** 创建人ID */ + @Excel(name = "创建人ID") + private String createManId; + + /** 出库状态 */ + @Excel(name = "出库状态") + private String status; + + /** 出库来源 */ + @Excel(name = "出库来源") + private String stockoutSource; + + /** 出口类型 */ + @Excel(name = "出口类型") + private String exitId; + + /** 出库明细ID */ + @Excel(name = "出库明细ID") + private String stockoutDetailId; + + /** 产品ID */ + @Excel(name = "产品ID") + private String productId; + + /** 产品名称 */ + @Excel(name = "产品名称") + private String productName; + + /** 批次号 */ + @Excel(name = "批次号") + private String lotNo; + + /** 出库数量 */ + @Excel(name = "出库数量") + private BigDecimal quantity; + + /** 分配数量 */ + @Excel(name = "分配数量") + private BigDecimal allotQuantity; + + /** 分配编号 */ + @Excel(name = "分配编号") + private BigDecimal assignNum; + + /** ERP出库单ID */ + @Excel(name = "ERP出库单ID") + private String erpStockoutId; + + /** 客户编号 */ + @Excel(name = "客户编号") + private String entryid; + + /** 客户名称 */ + @Excel(name = "客户名称") + private String customerName; + + /** 规格 */ + @Excel(name = "规格") + private String spec; + + /** 品牌 */ + @Excel(name = "品牌") + private String cargoNo; + + /** 单位 */ + @Excel(name = "单位") + private String unit; + + public void setStockoutId(String stockoutId) + { + this.stockoutId = stockoutId; + } + + public String getStockoutId() + { + return stockoutId; + } + + public void setOutType(String outType) + { + this.outType = outType; + } + + public String getOutType() + { + return outType; + } + + public void setCreateDate(String createDate) + { + this.createDate = createDate; + } + + public String getCreateDate() + { + return createDate; + } + + public void setCreateManId(String createManId) + { + this.createManId = createManId; + } + + public String getCreateManId() + { + return createManId; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + + public void setStockoutSource(String stockoutSource) + { + this.stockoutSource = stockoutSource; + } + + public String getStockoutSource() + { + return stockoutSource; + } + + public void setExitId(String exitId) + { + this.exitId = exitId; + } + + public String getExitId() + { + return exitId; + } + + public void setStockoutDetailId(String stockoutDetailId) + { + this.stockoutDetailId = stockoutDetailId; + } + + public String getStockoutDetailId() + { + return stockoutDetailId; + } + + 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 setLotNo(String lotNo) + { + this.lotNo = lotNo; + } + + public String getLotNo() + { + return lotNo; + } + + public void setQuantity(BigDecimal quantity) + { + this.quantity = quantity; + } + + public BigDecimal getQuantity() + { + return quantity; + } + + public void setAllotQuantity(BigDecimal allotQuantity) + { + this.allotQuantity = allotQuantity; + } + + public BigDecimal getAllotQuantity() + { + return allotQuantity; + } + + public void setAssignNum(BigDecimal assignNum) + { + this.assignNum = assignNum; + } + + public BigDecimal getAssignNum() + { + return assignNum; + } + + public void setErpStockoutId(String erpStockoutId) + { + this.erpStockoutId = erpStockoutId; + } + + public String getErpStockoutId() + { + return erpStockoutId; + } + + public void setEntryid(String entryid) + { + this.entryid = entryid; + } + + public String getEntryid() + { + return entryid; + } + + public void setCustomerName(String customerName) + { + this.customerName = customerName; + } + + public String getCustomerName() + { + return customerName; + } + + 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; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("stockoutId", getStockoutId()) + .append("outType", getOutType()) + .append("createDate", getCreateDate()) + .append("createManId", getCreateManId()) + .append("status", getStatus()) + .append("stockoutSource", getStockoutSource()) + .append("exitId", getExitId()) + .append("stockoutDetailId", getStockoutDetailId()) + .append("productId", getProductId()) + .append("productName", getProductName()) + .append("lotNo", getLotNo()) + .append("quantity", getQuantity()) + .append("allotQuantity", getAllotQuantity()) + .append("assignNum", getAssignNum()) + .append("erpStockoutId", getErpStockoutId()) + .append("entryid", getEntryid()) + .append("customerName", getCustomerName()) + .append("spec", getSpec()) + .append("cargoNo", getCargoNo()) + .append("unit", getUnit()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/mapper/ViewStockoutHistoryMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/mapper/ViewStockoutHistoryMapper.java new file mode 100644 index 0000000..486206a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/mapper/ViewStockoutHistoryMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.search.ViewStockoutHistory.mapper; + +import java.util.List; +import com.ruoyi.search.ViewStockoutHistory.domain.ViewStockoutHistory; + +/** + * 出库单据历史Mapper接口 + * + * @author gw + * @date 2025-05-28 + */ +public interface ViewStockoutHistoryMapper +{ + /** + * 查询出库单据历史 + * + * @param stockoutId 出库单据历史主键 + * @return 出库单据历史 + */ + public ViewStockoutHistory selectViewStockoutHistoryByStockoutId(String stockoutId); + + /** + * 查询出库单据历史列表 + * + * @param viewStockoutHistory 出库单据历史 + * @return 出库单据历史集合 + */ + public List selectViewStockoutHistoryList(ViewStockoutHistory viewStockoutHistory); + + /** + * 新增出库单据历史 + * + * @param viewStockoutHistory 出库单据历史 + * @return 结果 + */ + public int insertViewStockoutHistory(ViewStockoutHistory viewStockoutHistory); + + /** + * 修改出库单据历史 + * + * @param viewStockoutHistory 出库单据历史 + * @return 结果 + */ + public int updateViewStockoutHistory(ViewStockoutHistory viewStockoutHistory); + + /** + * 删除出库单据历史 + * + * @param stockoutId 出库单据历史主键 + * @return 结果 + */ + public int deleteViewStockoutHistoryByStockoutId(String stockoutId); + + /** + * 批量删除出库单据历史 + * + * @param stockoutIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteViewStockoutHistoryByStockoutIds(String[] stockoutIds); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/service/IViewStockoutHistoryService.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/service/IViewStockoutHistoryService.java new file mode 100644 index 0000000..20e2b02 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/service/IViewStockoutHistoryService.java @@ -0,0 +1,61 @@ +package com.ruoyi.search.ViewStockoutHistory.service; + +import java.util.List; +import com.ruoyi.search.ViewStockoutHistory.domain.ViewStockoutHistory; + +/** + * 出库单据历史Service接口 + * + * @author gw + * @date 2025-05-28 + */ +public interface IViewStockoutHistoryService +{ + /** + * 查询出库单据历史 + * + * @param stockoutId 出库单据历史主键 + * @return 出库单据历史 + */ + public ViewStockoutHistory selectViewStockoutHistoryByStockoutId(String stockoutId); + + /** + * 查询出库单据历史列表 + * + * @param viewStockoutHistory 出库单据历史 + * @return 出库单据历史集合 + */ + public List selectViewStockoutHistoryList(ViewStockoutHistory viewStockoutHistory); + + /** + * 新增出库单据历史 + * + * @param viewStockoutHistory 出库单据历史 + * @return 结果 + */ + public int insertViewStockoutHistory(ViewStockoutHistory viewStockoutHistory); + + /** + * 修改出库单据历史 + * + * @param viewStockoutHistory 出库单据历史 + * @return 结果 + */ + public int updateViewStockoutHistory(ViewStockoutHistory viewStockoutHistory); + + /** + * 批量删除出库单据历史 + * + * @param stockoutIds 需要删除的出库单据历史主键集合 + * @return 结果 + */ + public int deleteViewStockoutHistoryByStockoutIds(String[] stockoutIds); + + /** + * 删除出库单据历史信息 + * + * @param stockoutId 出库单据历史主键 + * @return 结果 + */ + public int deleteViewStockoutHistoryByStockoutId(String stockoutId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/service/impl/ViewStockoutHistoryServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/service/impl/ViewStockoutHistoryServiceImpl.java new file mode 100644 index 0000000..76c80f0 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/service/impl/ViewStockoutHistoryServiceImpl.java @@ -0,0 +1,93 @@ +package com.ruoyi.search.ViewStockoutHistory.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.search.ViewStockoutHistory.mapper.ViewStockoutHistoryMapper; +import com.ruoyi.search.ViewStockoutHistory.domain.ViewStockoutHistory; +import com.ruoyi.search.ViewStockoutHistory.service.IViewStockoutHistoryService; + +/** + * 出库单据历史Service业务层处理 + * + * @author gw + * @date 2025-05-28 + */ +@Service +public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryService +{ + @Autowired + private ViewStockoutHistoryMapper viewStockoutHistoryMapper; + + /** + * 查询出库单据历史 + * + * @param stockoutId 出库单据历史主键 + * @return 出库单据历史 + */ + @Override + public ViewStockoutHistory selectViewStockoutHistoryByStockoutId(String stockoutId) + { + return viewStockoutHistoryMapper.selectViewStockoutHistoryByStockoutId(stockoutId); + } + + /** + * 查询出库单据历史列表 + * + * @param viewStockoutHistory 出库单据历史 + * @return 出库单据历史 + */ + @Override + public List selectViewStockoutHistoryList(ViewStockoutHistory viewStockoutHistory) + { + return viewStockoutHistoryMapper.selectViewStockoutHistoryList(viewStockoutHistory); + } + + /** + * 新增出库单据历史 + * + * @param viewStockoutHistory 出库单据历史 + * @return 结果 + */ + @Override + public int insertViewStockoutHistory(ViewStockoutHistory viewStockoutHistory) + { + return viewStockoutHistoryMapper.insertViewStockoutHistory(viewStockoutHistory); + } + + /** + * 修改出库单据历史 + * + * @param viewStockoutHistory 出库单据历史 + * @return 结果 + */ + @Override + public int updateViewStockoutHistory(ViewStockoutHistory viewStockoutHistory) + { + return viewStockoutHistoryMapper.updateViewStockoutHistory(viewStockoutHistory); + } + + /** + * 批量删除出库单据历史 + * + * @param stockoutIds 需要删除的出库单据历史主键 + * @return 结果 + */ + @Override + public int deleteViewStockoutHistoryByStockoutIds(String[] stockoutIds) + { + return viewStockoutHistoryMapper.deleteViewStockoutHistoryByStockoutIds(stockoutIds); + } + + /** + * 删除出库单据历史信息 + * + * @param stockoutId 出库单据历史主键 + * @return 结果 + */ + @Override + public int deleteViewStockoutHistoryByStockoutId(String stockoutId) + { + return viewStockoutHistoryMapper.deleteViewStockoutHistoryByStockoutId(stockoutId); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml new file mode 100644 index 0000000..863e0f0 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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, entrance_id, product_id, lot_no, stacking_id, stock_status, in_quantity, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_name, spec, cargo_no, unit from view_in_job_flow + + + + + + + + insert into view_in_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, + entrance_id, + product_id, + lot_no, + stacking_id, + stock_status, + in_quantity, + in_or_out_id, + in_or_out_d_id, + create_time, + start_time, + finish_time, + warehouse_id, + product_name, + spec, + cargo_no, + unit, + + + #{jobId}, + #{jobDetailId}, + #{status}, + #{taskNo}, + #{trayCode}, + #{roadwayId}, + #{cargoSpaceId}, + #{cargoSpaceName}, + #{thePlatoon}, + #{theColumn}, + #{theFloor}, + #{priority}, + #{executionPhase}, + #{inOrOut}, + #{entranceId}, + #{productId}, + #{lotNo}, + #{stackingId}, + #{stockStatus}, + #{inQuantity}, + #{inOrOutId}, + #{inOrOutDId}, + #{createTime}, + #{startTime}, + #{finishTime}, + #{warehouseId}, + #{productName}, + #{spec}, + #{cargoNo}, + #{unit}, + + + + + update view_in_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}, + entrance_id = #{entranceId}, + product_id = #{productId}, + lot_no = #{lotNo}, + stacking_id = #{stackingId}, + stock_status = #{stockStatus}, + in_quantity = #{inQuantity}, + 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}, + + where job_id = #{jobId} + + + + delete from view_in_job_flow where job_id = #{jobId} + + + + delete from view_in_job_flow where job_id in + + #{jobId} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml new file mode 100644 index 0000000..cdc0b48 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml @@ -0,0 +1,239 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, class_no, supplier_no, supplier_name, simple_name, contact_name, contact_number, address, stockin_detail_id, lot_no, quantity, quantity_x, quantity_j, assign_num, assign_num_x, assign_num_j, scan_num, scan_num_x, scan_num_j, print_date, stock_status, price, remark, product_id, product_name, cargo_no, unit, spec from view_stockin_history + + + + + + + + insert into view_stockin_history + + stockin_guid, + stockin_id, + in_type, + create_date, + create_man_id, + status, + warehouse_id, + finish_date, + erp_bill, + stock_source, + department_no, + class_no, + supplier_no, + supplier_name, + simple_name, + contact_name, + contact_number, + address, + stockin_detail_id, + lot_no, + quantity, + quantity_x, + quantity_j, + assign_num, + assign_num_x, + assign_num_j, + scan_num, + scan_num_x, + scan_num_j, + print_date, + stock_status, + price, + remark, + product_id, + product_name, + cargo_no, + unit, + spec, + + + #{stockinGuid}, + #{stockinId}, + #{inType}, + #{createDate}, + #{createManId}, + #{status}, + #{warehouseId}, + #{finishDate}, + #{erpBill}, + #{stockSource}, + #{departmentNo}, + #{classNo}, + #{supplierNo}, + #{supplierName}, + #{simpleName}, + #{contactName}, + #{contactNumber}, + #{address}, + #{stockinDetailId}, + #{lotNo}, + #{quantity}, + #{quantityX}, + #{quantityJ}, + #{assignNum}, + #{assignNumX}, + #{assignNumJ}, + #{scanNum}, + #{scanNumX}, + #{scanNumJ}, + #{printDate}, + #{stockStatus}, + #{price}, + #{remark}, + #{productId}, + #{productName}, + #{cargoNo}, + #{unit}, + #{spec}, + + + + + update view_stockin_history + + stockin_id = #{stockinId}, + in_type = #{inType}, + create_date = #{createDate}, + create_man_id = #{createManId}, + status = #{status}, + warehouse_id = #{warehouseId}, + finish_date = #{finishDate}, + erp_bill = #{erpBill}, + stock_source = #{stockSource}, + department_no = #{departmentNo}, + class_no = #{classNo}, + supplier_no = #{supplierNo}, + supplier_name = #{supplierName}, + simple_name = #{simpleName}, + contact_name = #{contactName}, + contact_number = #{contactNumber}, + address = #{address}, + stockin_detail_id = #{stockinDetailId}, + lot_no = #{lotNo}, + quantity = #{quantity}, + quantity_x = #{quantityX}, + quantity_j = #{quantityJ}, + assign_num = #{assignNum}, + assign_num_x = #{assignNumX}, + assign_num_j = #{assignNumJ}, + scan_num = #{scanNum}, + scan_num_x = #{scanNumX}, + scan_num_j = #{scanNumJ}, + print_date = #{printDate}, + stock_status = #{stockStatus}, + price = #{price}, + remark = #{remark}, + product_id = #{productId}, + product_name = #{productName}, + cargo_no = #{cargoNo}, + unit = #{unit}, + spec = #{spec}, + + where stockin_guid = #{stockinGuid} + + + + delete from view_stockin_history where stockin_guid = #{stockinGuid} + + + + delete from view_stockin_history where stockin_guid in + + #{stockinGuid} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml new file mode 100644 index 0000000..8fa1ad6 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select stockout_id, out_type, create_date, create_man_id, status, stockout_source, exit_id, stockout_detail_id, product_id, product_name, lot_no, quantity, allot_quantity, assign_num, erp_stockout_id, entryid, customer_name, spec, cargo_no, unit from view_stockout_history + + + + + + + + insert into view_stockout_history + + stockout_id, + out_type, + create_date, + create_man_id, + status, + stockout_source, + exit_id, + stockout_detail_id, + product_id, + product_name, + lot_no, + quantity, + allot_quantity, + assign_num, + erp_stockout_id, + entryid, + customer_name, + spec, + cargo_no, + unit, + + + #{stockoutId}, + #{outType}, + #{createDate}, + #{createManId}, + #{status}, + #{stockoutSource}, + #{exitId}, + #{stockoutDetailId}, + #{productId}, + #{productName}, + #{lotNo}, + #{quantity}, + #{allotQuantity}, + #{assignNum}, + #{erpStockoutId}, + #{entryid}, + #{customerName}, + #{spec}, + #{cargoNo}, + #{unit}, + + + + + update view_stockout_history + + out_type = #{outType}, + create_date = #{createDate}, + create_man_id = #{createManId}, + status = #{status}, + stockout_source = #{stockoutSource}, + exit_id = #{exitId}, + stockout_detail_id = #{stockoutDetailId}, + product_id = #{productId}, + product_name = #{productName}, + lot_no = #{lotNo}, + quantity = #{quantity}, + allot_quantity = #{allotQuantity}, + assign_num = #{assignNum}, + erp_stockout_id = #{erpStockoutId}, + entryid = #{entryid}, + customer_name = #{customerName}, + spec = #{spec}, + cargo_no = #{cargoNo}, + unit = #{unit}, + + where stockout_id = #{stockoutId} + + + + delete from view_stockout_history where stockout_id = #{stockoutId} + + + + delete from view_stockout_history where stockout_id in + + #{stockoutId} + + + \ No newline at end of file diff --git a/ruoyi-ui/src/api/search/ViewInJobFlow.js b/ruoyi-ui/src/api/search/ViewInJobFlow.js new file mode 100644 index 0000000..ace8294 --- /dev/null +++ b/ruoyi-ui/src/api/search/ViewInJobFlow.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询入库作业流水列表 +export function listViewInJobFlow(query) { + return request({ + url: '/search/ViewInJobFlow/list', + method: 'get', + params: query + }) +} + +// 查询入库作业流水详细 +export function getViewInJobFlow(jobId) { + return request({ + url: '/search/ViewInJobFlow/' + jobId, + method: 'get' + }) +} + +// 新增入库作业流水 +export function addViewInJobFlow(data) { + return request({ + url: '/search/ViewInJobFlow', + method: 'post', + data: data + }) +} + +// 修改入库作业流水 +export function updateViewInJobFlow(data) { + return request({ + url: '/search/ViewInJobFlow', + method: 'put', + data: data + }) +} + +// 删除入库作业流水 +export function delViewInJobFlow(jobId) { + return request({ + url: '/search/ViewInJobFlow/' + jobId, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/search/ViewStockinHistory.js b/ruoyi-ui/src/api/search/ViewStockinHistory.js new file mode 100644 index 0000000..857e54f --- /dev/null +++ b/ruoyi-ui/src/api/search/ViewStockinHistory.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询入库单据历史列表 +export function listViewStockinHistory(query) { + return request({ + url: '/search/ViewStockinHistory/list', + method: 'get', + params: query + }) +} + +// 查询入库单据历史详细 +export function getViewStockinHistory(stockinGuid) { + return request({ + url: '/search/ViewStockinHistory/' + stockinGuid, + method: 'get' + }) +} + +// 新增入库单据历史 +export function addViewStockinHistory(data) { + return request({ + url: '/search/ViewStockinHistory', + method: 'post', + data: data + }) +} + +// 修改入库单据历史 +export function updateViewStockinHistory(data) { + return request({ + url: '/search/ViewStockinHistory', + method: 'put', + data: data + }) +} + +// 删除入库单据历史 +export function delViewStockinHistory(stockinGuid) { + return request({ + url: '/search/ViewStockinHistory/' + stockinGuid, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/search/ViewStockoutHistory.js b/ruoyi-ui/src/api/search/ViewStockoutHistory.js new file mode 100644 index 0000000..4754f95 --- /dev/null +++ b/ruoyi-ui/src/api/search/ViewStockoutHistory.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询出库单据历史列表 +export function listViewStockoutHistory(query) { + return request({ + url: '/search/ViewStockoutHistory/list', + method: 'get', + params: query + }) +} + +// 查询出库单据历史详细 +export function getViewStockoutHistory(stockoutId) { + return request({ + url: '/search/ViewStockoutHistory/' + stockoutId, + method: 'get' + }) +} + +// 新增出库单据历史 +export function addViewStockoutHistory(data) { + return request({ + url: '/search/ViewStockoutHistory', + method: 'post', + data: data + }) +} + +// 修改出库单据历史 +export function updateViewStockoutHistory(data) { + return request({ + url: '/search/ViewStockoutHistory', + method: 'put', + data: data + }) +} + +// 删除出库单据历史 +export function delViewStockoutHistory(stockoutId) { + return request({ + url: '/search/ViewStockoutHistory/' + stockoutId, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/kpi/inAnalysis/index.vue b/ruoyi-ui/src/views/kpi/inAnalysis/index.vue index 321b120..a67a1a5 100644 --- a/ruoyi-ui/src/views/kpi/inAnalysis/index.vue +++ b/ruoyi-ui/src/views/kpi/inAnalysis/index.vue @@ -37,6 +37,7 @@ diff --git a/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue b/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue new file mode 100644 index 0000000..f278849 --- /dev/null +++ b/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue @@ -0,0 +1,709 @@ + + + diff --git a/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue b/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue new file mode 100644 index 0000000..1b4710a --- /dev/null +++ b/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue @@ -0,0 +1,548 @@ + + +