From 7e527b3c55aa04127df900ada855ea1d6c81c946 Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Wed, 4 Jun 2025 10:27:36 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/CheckStockinDetail.java | 10 +++++ .../impl/CheckStockinDetailServiceImpl.java | 9 ++++- .../CheckStockinDetailFinishServiceImpl.java | 9 ++++- .../impl/ReceiveStockinServiceImpl.java | 6 ++- .../mapper/check/CheckStockinDetailMapper.xml | 2 +- ruoyi-ui/src/views/check/stockCheck/index.vue | 37 +++++-------------- ruoyi-ui/src/views/in/stockIn/index.vue | 2 +- 7 files changed, 41 insertions(+), 34 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/domain/CheckStockinDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/domain/CheckStockinDetail.java index b438c85..fba9a07 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/domain/CheckStockinDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/domain/CheckStockinDetail.java @@ -1,5 +1,6 @@ package com.ruoyi.check.stockcheckdetail.domain; +import com.ruoyi.common.domain.ExtraField; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -132,6 +133,15 @@ public class CheckStockinDetail extends BaseEntity private String status; + private ExtraField extraField; + + public ExtraField getExtraField() { + return extraField; + } + public void setExtraField(ExtraField extraField) { + this.extraField = extraField; + } + public String getStatus() { return status; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java index 312296e..e779c05 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java @@ -2,7 +2,10 @@ package com.ruoyi.check.stockcheckdetail.service.impl; import java.util.List; +import cn.hutool.json.JSONUtil; import com.ruoyi.check.stockcheck.domain.CheckStockin; +import com.ruoyi.common.domain.ExtraField; +import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.check.stockcheckdetail.mapper.CheckStockinDetailMapper; @@ -42,7 +45,11 @@ public class CheckStockinDetailServiceImpl implements ICheckStockinDetailService @Override public List selectCheckStockinDetailList(CheckStockinDetail checkStockinDetail) { - return checkStockinDetailMapper.selectCheckStockinDetailList(checkStockinDetail); + List checkStockinDetails = checkStockinDetailMapper.selectCheckStockinDetailList(checkStockinDetail); + for (CheckStockinDetail stockinDetail : checkStockinDetails) { + stockinDetail.setExtraField(JSONUtil.toBean(stockinDetail.getSpare1(), ExtraField.class)); + } + return checkStockinDetails; } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/impl/CheckStockinDetailFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/impl/CheckStockinDetailFinishServiceImpl.java index f8b1865..b7b39bc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/impl/CheckStockinDetailFinishServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/impl/CheckStockinDetailFinishServiceImpl.java @@ -2,7 +2,9 @@ package com.ruoyi.check.stockcheckdetailfinish.service.impl; import java.util.List; +import cn.hutool.json.JSONUtil; import com.ruoyi.check.stockcheckdetail.domain.CheckStockinDetail; +import com.ruoyi.common.domain.ExtraField; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.check.stockcheckdetailfinish.mapper.CheckStockinDetailFinishMapper; @@ -95,7 +97,10 @@ public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailF @Override public List selectCheckStockinDetailList(CheckStockinDetail checkStockinDetail) { - return checkStockinDetailFinishMapper.selectCheckStockinDetailList(checkStockinDetail); - + List checkStockinDetails = checkStockinDetailFinishMapper.selectCheckStockinDetailList(checkStockinDetail); + for (CheckStockinDetail stockinDetail : checkStockinDetails) { + stockinDetail.setExtraField(JSONUtil.toBean(stockinDetail.getSpare1(), ExtraField.class)); + } + return checkStockinDetails; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java index 2410ee9..7990126 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java @@ -113,7 +113,7 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService BasProduct basProduct = iBasProductService.selectBasProductByProductId(receiveProductVo.getProductId()); ReceiveStockinDetail receiveStockinDetail = new ReceiveStockinDetail(); receiveStockinDetail.setQuantity(receiveProductVo.getQuantity()); - receiveStockinDetail.setProductGuid(receiveProductVo.getProductId()); + receiveStockinDetail.setProductGuid(basProduct.getProductGuid()); receiveStockinDetail.setProductId(basProduct.getProductId()); receiveStockinDetail.setStockinId(receiveStockin.getStockinId()); receiveStockinDetail.setStockinDetailId(receiveStockin.getStockinId()+"-"+i++); @@ -176,7 +176,7 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService List collect = list.stream().map(ReceiveProductVo::getProductId).collect(Collectors.toList()); List result = iBasProductService.selectBasProductListByProductIds(collect); for (BasProduct basProduct : result) { - Optional first = list.stream().filter(x -> x.getProductId().equals(basProduct.getProductGuid())).findFirst(); + Optional first = list.stream().filter(x -> x.getProductId().equals(basProduct.getProductId())).findFirst(); first.ifPresent(receiveProductVo -> basProduct.setQuantity(receiveProductVo.getQuantity())); first.ifPresent(receiveProductVo -> basProduct.setLotNo(receiveProductVo.getLotNo())); } @@ -259,6 +259,7 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService inStockinDetail.setStockStatus("0"); inStockinDetail.setAssignNum("0"); inStockinDetail.setScanNum("0"); + inStockinDetail.setSpare2(receiveStockinDetail.getStockinDetailId()); inStockinDetailList.add(inStockinDetail); } return inStockinDetailList; @@ -279,6 +280,7 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService inStockin.setStockinId(iBasJobIdService.getJobId("RKD")); // 设置状态等默认值 inStockin.setStatus("1"); + inStockin.setSpare1(receiveStockin.getStockinId()); return inStockin; } diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml index 511bce7..1c9d3b4 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml @@ -149,7 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into check_stockin_detail_finish - select * from check_stockin_detail where stock_check_guid = #{stockCheckGuid} + select * from check_stockin_detail where stock_check_id = #{stockCheckId} diff --git a/ruoyi-ui/src/views/check/stockCheck/index.vue b/ruoyi-ui/src/views/check/stockCheck/index.vue index c937ca8..1344a7f 100644 --- a/ruoyi-ui/src/views/check/stockCheck/index.vue +++ b/ruoyi-ui/src/views/check/stockCheck/index.vue @@ -223,33 +223,16 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + --> - + 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 2/5] =?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 @@ - - From f445445c0b2cc68dc621b3591ec6c9d1cce5d32c Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Wed, 4 Jun 2025 14:40:48 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86=20=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/check/difference/index.vue | 90 +-- ruoyi-ui/src/views/check/job/in/index.vue | 574 ++++++++++++++++++ ruoyi-ui/src/views/check/job/out/index.vue | 574 ++++++++++++++++++ ruoyi-ui/src/views/in/stockIn/index.vue | 52 -- 4 files changed, 1193 insertions(+), 97 deletions(-) create mode 100644 ruoyi-ui/src/views/check/job/in/index.vue create mode 100644 ruoyi-ui/src/views/check/job/out/index.vue diff --git a/ruoyi-ui/src/views/check/difference/index.vue b/ruoyi-ui/src/views/check/difference/index.vue index 133d082..b169cec 100644 --- a/ruoyi-ui/src/views/check/difference/index.vue +++ b/ruoyi-ui/src/views/check/difference/index.vue @@ -95,51 +95,51 @@ - - - - 导出 - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/check/job/in/index.vue b/ruoyi-ui/src/views/check/job/in/index.vue new file mode 100644 index 0000000..4b77e22 --- /dev/null +++ b/ruoyi-ui/src/views/check/job/in/index.vue @@ -0,0 +1,574 @@ + + + + + diff --git a/ruoyi-ui/src/views/check/job/out/index.vue b/ruoyi-ui/src/views/check/job/out/index.vue new file mode 100644 index 0000000..a8e0cce --- /dev/null +++ b/ruoyi-ui/src/views/check/job/out/index.vue @@ -0,0 +1,574 @@ + + + + + diff --git a/ruoyi-ui/src/views/in/stockIn/index.vue b/ruoyi-ui/src/views/in/stockIn/index.vue index d03ca34..c085b2c 100644 --- a/ruoyi-ui/src/views/in/stockIn/index.vue +++ b/ruoyi-ui/src/views/in/stockIn/index.vue @@ -251,39 +251,13 @@ - - - - - - - @@ -309,30 +281,6 @@ - - Date: Wed, 4 Jun 2025 14:44:41 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=A6=81=E7=94=A8=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/check/job/out/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-ui/src/views/check/job/out/index.vue b/ruoyi-ui/src/views/check/job/out/index.vue index a8e0cce..d9876bd 100644 --- a/ruoyi-ui/src/views/check/job/out/index.vue +++ b/ruoyi-ui/src/views/check/job/out/index.vue @@ -207,7 +207,7 @@ - + + –> - + --> From 404269b400de3b9b3f02223d40cec9f689269f18 Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Wed, 4 Jun 2025 17:32:20 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/InMydoJobController.java | 2 +- ruoyi-ui/src/api/job/inmydoJob.js | 17 +++++++ ruoyi-ui/src/views/in/job/index.vue | 19 ++++++-- ruoyi-ui/src/views/in/receive/add/index.vue | 2 +- ruoyi-ui/src/views/in/receive/index.vue | 45 ++++++++++++------- 5 files changed, 63 insertions(+), 22 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java index e1042c6..acc374c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java @@ -127,7 +127,7 @@ public class InMydoJobController extends BaseController * 手动完成任务表 */ @PreAuthorize("@ss.hasPermi('job:mydoJob:manualCompleted')") - @Log(title = "任务表", businessType = BusinessType.DELETE) + @Log(title = "任务表", businessType = BusinessType.OTHER) @PostMapping("/manualCompleted") public AjaxResult manualCompleted(@RequestBody MydoJob mydoJob) { diff --git a/ruoyi-ui/src/api/job/inmydoJob.js b/ruoyi-ui/src/api/job/inmydoJob.js index d33c2ab..734b412 100644 --- a/ruoyi-ui/src/api/job/inmydoJob.js +++ b/ruoyi-ui/src/api/job/inmydoJob.js @@ -42,3 +42,20 @@ export function delMydoJob(jobId) { method: 'delete' }) } +// 新增任务表 +export function manualInvalidation(data) { + return request({ + url: '/job/inmydoJob/manualInvalidation', + method: 'post', + data: data + }) +} +// 新增任务表 +export function manualCompleted(data) { + return request({ + url: '/job/inmydoJob/manualCompleted', + method: 'post', + data: data + }) +} + diff --git a/ruoyi-ui/src/views/in/job/index.vue b/ruoyi-ui/src/views/in/job/index.vue index ff70309..2783450 100644 --- a/ruoyi-ui/src/views/in/job/index.vue +++ b/ruoyi-ui/src/views/in/job/index.vue @@ -215,7 +215,7 @@ icon="el-icon-edit" size="mini" @click="handleCompletedManually({type: 'invalid'})" - v-hasPermi="['job:mydoJob:CompletedManually']" + v-hasPermi="['job:mydoJob:manualInvalidation']" >手动作废 @@ -225,7 +225,7 @@ icon="el-icon-edit" size="mini" @click="handleCompletedManually({type: 'completed'})" - v-hasPermi="['job:mydoJob:CompletedManually']" + v-hasPermi="['job:mydoJob:manualCompleted']" >手动完成