From 7c16cc4a64ce28d8a954d2ad1f642afba45b5c69 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, 4 Jun 2025 11:07:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewNoDoneOutWorkController.java | 86 ++ .../ruoyi/work/domain/ViewNoDoneOutWork.java | 145 ++ .../work/mapper/ViewNoDoneOutWorkMapper.java | 24 + .../service/IViewNoDoneOutWorkService.java | 24 + .../impl/ViewNoDoneOutWorkServiceImpl.java | 43 + .../mapper/work/ViewNoDoneOutWorkMapper.xml | 31 + ruoyi-ui/src/api/work.js | 34 + ruoyi-ui/src/views/index.vue | 1244 +++-------------- 8 files changed, 558 insertions(+), 1073 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/work/controller/ViewNoDoneOutWorkController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/work/domain/ViewNoDoneOutWork.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/work/mapper/ViewNoDoneOutWorkMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/work/service/IViewNoDoneOutWorkService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/work/service/impl/ViewNoDoneOutWorkServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/work/ViewNoDoneOutWorkMapper.xml create mode 100644 ruoyi-ui/src/api/work.js diff --git a/ruoyi-admin/src/main/java/com/ruoyi/work/controller/ViewNoDoneOutWorkController.java b/ruoyi-admin/src/main/java/com/ruoyi/work/controller/ViewNoDoneOutWorkController.java new file mode 100644 index 0000000..ace9f50 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/work/controller/ViewNoDoneOutWorkController.java @@ -0,0 +1,86 @@ +package com.ruoyi.work.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.work.domain.ViewNoDoneOutWork; +import com.ruoyi.work.service.IViewNoDoneOutWorkService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 出库未完成任务Controller + * + * @author gw + * @date 2025-06-04 + */ +@RestController +@RequestMapping("/work") +public class ViewNoDoneOutWorkController extends BaseController +{ + @Autowired + private IViewNoDoneOutWorkService viewNoDoneOutWorkService; + + /** + * 查询已完成入库任务列表 + */ + @PreAuthorize("@ss.hasPermi('work:list1')") + @GetMapping("/list1") + public TableDataInfo list1(ViewNoDoneOutWork viewNoDoneOutWork) + { +// startPage(); + List list = viewNoDoneOutWorkService.selectViewNoDoneOutWorkList1(viewNoDoneOutWork); + return getDataTable(list); + } + + /** + * 查询已完成出库任务列表 + */ + @PreAuthorize("@ss.hasPermi('work:list2')") + @GetMapping("/list2") + public TableDataInfo list2(ViewNoDoneOutWork viewNoDoneOutWork) + { +// startPage(); + List list = viewNoDoneOutWorkService.selectViewNoDoneOutWorkList2(viewNoDoneOutWork); + return getDataTable(list); + } + + /** + * 查询未完成入库任务列表 + */ + @PreAuthorize("@ss.hasPermi('work:list3')") + @GetMapping("/list3") + public TableDataInfo list3(ViewNoDoneOutWork viewNoDoneOutWork) + { +// startPage(); + List list = viewNoDoneOutWorkService.selectViewNoDoneOutWorkList3(viewNoDoneOutWork); + return getDataTable(list); + } + + /** + * 查询未完成出库任务列表 + */ + @PreAuthorize("@ss.hasPermi('work:list4')") + @GetMapping("/list4") + public TableDataInfo list4(ViewNoDoneOutWork viewNoDoneOutWork) + { +// startPage(); + List list = viewNoDoneOutWorkService.selectViewNoDoneOutWorkList4(viewNoDoneOutWork); + return getDataTable(list); + } + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/work/domain/ViewNoDoneOutWork.java b/ruoyi-admin/src/main/java/com/ruoyi/work/domain/ViewNoDoneOutWork.java new file mode 100644 index 0000000..5437c82 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/work/domain/ViewNoDoneOutWork.java @@ -0,0 +1,145 @@ +package com.ruoyi.work.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; + +import java.util.List; + +/** + * 出库未完成任务对象 view_no_done_out_work + * + * @author gw + * @date 2025-06-04 + */ +public class ViewNoDoneOutWork extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String workName; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String workValue; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long workNum; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long by1; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String by2; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String by3; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String by4; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String by5; + + public void setWorkName(String workName) + { + this.workName = workName; + } + + public String getWorkName() + { + return workName; + } + + public void setWorkValue(String workValue) + { + this.workValue = workValue; + } + + public String getWorkValue() + { + return workValue; + } + + public void setWorkNum(Long workNum) + { + this.workNum = workNum; + } + + public Long getWorkNum() + { + return workNum; + } + + public void setBy1(Long by1) + { + this.by1 = by1; + } + + public Long getBy1() + { + return by1; + } + + public void setBy2(String by2) + { + this.by2 = by2; + } + + public String getBy2() + { + return by2; + } + + public void setBy3(String by3) + { + this.by3 = by3; + } + + public String getBy3() + { + return by3; + } + + public void setBy4(String by4) + { + this.by4 = by4; + } + + public String getBy4() + { + return by4; + } + + public void setBy5(String by5) + { + this.by5 = by5; + } + + public String getBy5() + { + return by5; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("workName", getWorkName()) + .append("workValue", getWorkValue()) + .append("workNum", getWorkNum()) + .append("by1", getBy1()) + .append("by2", getBy2()) + .append("by3", getBy3()) + .append("by4", getBy4()) + .append("by5", getBy5()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/work/mapper/ViewNoDoneOutWorkMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/work/mapper/ViewNoDoneOutWorkMapper.java new file mode 100644 index 0000000..328c326 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/work/mapper/ViewNoDoneOutWorkMapper.java @@ -0,0 +1,24 @@ +package com.ruoyi.work.mapper; + +import java.util.List; +import com.ruoyi.work.domain.ViewNoDoneOutWork; + +/** + * 出库未完成任务Mapper接口 + * + * @author gw + * @date 2025-06-04 + */ +public interface ViewNoDoneOutWorkMapper +{ + /** + * 查询work列表 + * + * @param viewNoDoneOutWork work + * @return work集合 + */ + public List selectViewNoDoneOutWorkList1(ViewNoDoneOutWork viewNoDoneOutWork); + public List selectViewNoDoneOutWorkList2(ViewNoDoneOutWork viewNoDoneOutWork); + public List selectViewNoDoneOutWorkList3(ViewNoDoneOutWork viewNoDoneOutWork); + public List selectViewNoDoneOutWorkList4(ViewNoDoneOutWork viewNoDoneOutWork); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/work/service/IViewNoDoneOutWorkService.java b/ruoyi-admin/src/main/java/com/ruoyi/work/service/IViewNoDoneOutWorkService.java new file mode 100644 index 0000000..51439ad --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/work/service/IViewNoDoneOutWorkService.java @@ -0,0 +1,24 @@ +package com.ruoyi.work.service; + +import java.util.List; +import com.ruoyi.work.domain.ViewNoDoneOutWork; + +/** + * 出库未完成任务Service接口 + * + * @author gw + * @date 2025-06-04 + */ +public interface IViewNoDoneOutWorkService +{ + + + + List selectViewNoDoneOutWorkList1(ViewNoDoneOutWork viewNoDoneOutWork); + + List selectViewNoDoneOutWorkList2(ViewNoDoneOutWork viewNoDoneOutWork); + + List selectViewNoDoneOutWorkList3(ViewNoDoneOutWork viewNoDoneOutWork); + + List selectViewNoDoneOutWorkList4(ViewNoDoneOutWork viewNoDoneOutWork); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/work/service/impl/ViewNoDoneOutWorkServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/work/service/impl/ViewNoDoneOutWorkServiceImpl.java new file mode 100644 index 0000000..1682bd9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/work/service/impl/ViewNoDoneOutWorkServiceImpl.java @@ -0,0 +1,43 @@ +package com.ruoyi.work.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.work.mapper.ViewNoDoneOutWorkMapper; +import com.ruoyi.work.domain.ViewNoDoneOutWork; +import com.ruoyi.work.service.IViewNoDoneOutWorkService; + +/** + * 出库未完成任务Service业务层处理 + * + * @author gw + * @date 2025-06-04 + */ +@Service +public class ViewNoDoneOutWorkServiceImpl implements IViewNoDoneOutWorkService +{ + @Autowired + private ViewNoDoneOutWorkMapper viewNoDoneOutWorkMapper; + + @Override + public List selectViewNoDoneOutWorkList1(ViewNoDoneOutWork viewNoDoneOutWork) + { + return viewNoDoneOutWorkMapper.selectViewNoDoneOutWorkList1(viewNoDoneOutWork); + } + @Override + public List selectViewNoDoneOutWorkList2(ViewNoDoneOutWork viewNoDoneOutWork) + { + return viewNoDoneOutWorkMapper.selectViewNoDoneOutWorkList2(viewNoDoneOutWork); + } + @Override + public List selectViewNoDoneOutWorkList3(ViewNoDoneOutWork viewNoDoneOutWork) + { + return viewNoDoneOutWorkMapper.selectViewNoDoneOutWorkList3(viewNoDoneOutWork); + } + @Override + public List selectViewNoDoneOutWorkList4(ViewNoDoneOutWork viewNoDoneOutWork) + { + return viewNoDoneOutWorkMapper.selectViewNoDoneOutWorkList4(viewNoDoneOutWork); + } + +} diff --git a/ruoyi-admin/src/main/resources/mapper/work/ViewNoDoneOutWorkMapper.xml b/ruoyi-admin/src/main/resources/mapper/work/ViewNoDoneOutWorkMapper.xml new file mode 100644 index 0000000..79869d6 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/work/ViewNoDoneOutWorkMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/api/work.js b/ruoyi-ui/src/api/work.js new file mode 100644 index 0000000..79ebb34 --- /dev/null +++ b/ruoyi-ui/src/api/work.js @@ -0,0 +1,34 @@ +import request from '@/utils/request' + +// 已完成入库任务 +export function listWork1(query) { + return request({ + url: '/work/list1', + method: 'get', + params: query + }) +} +// 已完成出库任务 +export function listWork2(query) { + return request({ + url: '/work/list2', + method: 'get', + params: query + }) +} +// 未完成入库任务 +export function listWork3(query) { + return request({ + url: '/work/list3', + method: 'get', + params: query + }) +} +// 未完成出库任务 +export function listWork4(query) { + return request({ + url: '/work/list4', + method: 'get', + params: query + }) +} diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 316038e..1df904b 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -1,1100 +1,198 @@ - -