From df2a2fa4b27e7c1a1e2ceebb40d0f3637f2b42fe Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Tue, 5 Aug 2025 14:19:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=9F=E8=AE=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/mydojob/service/IMydoJobService.java | 19 +- .../service/impl/StockSummaryServiceImpl.java | 21 +- .../ViewFlatWarehouseInFlowServiceImpl.java | 19 +- .../ViewFlatWarehouseOutFlowServiceImpl.java | 19 +- .../impl/ViewInJobFlowServiceImpl.java | 19 +- .../impl/ViewOutJobFlowServiceImpl.java | 19 +- .../impl/ViewStockDetailServiceImpl.java | 19 +- .../impl/ViewStockSecureServiceImpl.java | 19 +- .../impl/ViewStockWarningServiceImpl.java | 19 +- .../impl/ViewStockinHistoryServiceImpl.java | 19 +- .../impl/ViewStockoutHistoryServiceImpl.java | 19 +- .../search/ViewFlatWarehouseInFlowMapper.xml | 12 +- .../search/ViewFlatWarehouseOutFlowMapper.xml | 12 +- .../mapper/search/ViewInJobFlowMapper.xml | 12 +- .../mapper/search/ViewOutJobFlowMapper.xml | 12 +- .../mapper/search/ViewStockDetailMapper.xml | 3 +- .../mapper/search/ViewStockSecureMapper.xml | 20 +- .../mapper/search/ViewStockWarningMapper.xml | 10 +- .../search/ViewStockinHistoryMapper.xml | 12 +- .../search/ViewStockoutHistoryMapper.xml | 10 +- ruoyi-ui/src/lang/zh.js | 8 +- ruoyi-ui/src/views/bas/basCustomer/index.vue | 25 ++- ruoyi-ui/src/views/bas/basSupplier/index.vue | 31 ++- ruoyi-ui/src/views/bas/port/index.vue | 31 ++- .../search/ViewFlatWarehouseInFlow/index.vue | 85 +++------ .../search/ViewFlatWarehouseOutFlow/index.vue | 179 +----------------- .../src/views/search/ViewInJobFlow/index.vue | 27 +-- .../src/views/search/ViewOutJobFlow/index.vue | 32 ++-- .../views/search/ViewStockSecure/index.vue | 2 +- .../views/search/ViewStockinHistory/index.vue | 24 +-- .../search/ViewStockoutHistory/index.vue | 54 +----- 31 files changed, 325 insertions(+), 487 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java index cce10fe..fed00fe 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java @@ -22,12 +22,18 @@ public interface IMydoJobService public MydoJob selectMydoJobByJobId(String jobId); /** - * 查询任务表列表 + * 查询任务表列表 带数据权限 * * @param mydoJob 任务表 * @return 任务表集合 */ public List selectMydoJobList(MydoJob mydoJob); + + /** + * 查询任务表列表 + * @param mydoJob + * @return + */ public List selectMydoJobListApi(MydoJob mydoJob); /** @@ -85,7 +91,18 @@ public interface IMydoJobService */ AjaxResult OuthandInvalidation(String [] jobIds); + /** + * 指定出库 + * @param stockIds + * @param exitId + * @return + */ AjaxResult pointOut(String [] stockIds,String exitId); + /** + * 通过托盘码查询 + * @param trayCode + * @return + */ MydoJob selectMydoJobByTrayCode(String trayCode); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/service/impl/StockSummaryServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/service/impl/StockSummaryServiceImpl.java index 9f11614..d85eb5f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/service/impl/StockSummaryServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/service/impl/StockSummaryServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.search.StockSummary.service.impl; import java.util.List; + +import com.ruoyi.common.annotation.DataScope; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.search.StockSummary.mapper.StockSummaryMapper; @@ -9,19 +11,19 @@ import com.ruoyi.search.StockSummary.service.IStockSummaryService; /** * 库存汇总Service业务层处理 - * + * * @author ruoyi * @date 2025-05-26 */ @Service -public class StockSummaryServiceImpl implements IStockSummaryService +public class StockSummaryServiceImpl implements IStockSummaryService { @Autowired private StockSummaryMapper stockSummaryMapper; /** * 查询库存汇总 - * + * * @param onlyIdentity 库存汇总主键 * @return 库存汇总 */ @@ -33,11 +35,12 @@ public class StockSummaryServiceImpl implements IStockSummaryService /** * 查询库存汇总列表 - * + * * @param stockSummary 库存汇总 * @return 库存汇总 */ @Override + @DataScope(warehouseAlias = "bw") public List selectStockSummaryList(StockSummary stockSummary) { return stockSummaryMapper.selectStockSummaryList(stockSummary); @@ -45,7 +48,7 @@ public class StockSummaryServiceImpl implements IStockSummaryService /** * 新增库存汇总 - * + * * @param stockSummary 库存汇总 * @return 结果 */ @@ -57,7 +60,7 @@ public class StockSummaryServiceImpl implements IStockSummaryService /** * 修改库存汇总 - * + * * @param stockSummary 库存汇总 * @return 结果 */ @@ -69,7 +72,7 @@ public class StockSummaryServiceImpl implements IStockSummaryService /** * 批量删除库存汇总 - * + * * @param onlyIdentitys 需要删除的库存汇总主键 * @return 结果 */ @@ -81,7 +84,7 @@ public class StockSummaryServiceImpl implements IStockSummaryService /** * 删除库存汇总信息 - * + * * @param onlyIdentity 库存汇总主键 * @return 结果 */ @@ -90,4 +93,4 @@ public class StockSummaryServiceImpl implements IStockSummaryService { return stockSummaryMapper.deleteStockSummaryByOnlyIdentity(onlyIdentity); } -} \ No newline at end of file +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/service/impl/ViewFlatWarehouseInFlowServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/service/impl/ViewFlatWarehouseInFlowServiceImpl.java index d38383a..19d9832 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/service/impl/ViewFlatWarehouseInFlowServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/service/impl/ViewFlatWarehouseInFlowServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.search.ViewFlatWarehouseInFlow.service.impl; import java.util.List; + +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -10,19 +12,19 @@ import com.ruoyi.search.ViewFlatWarehouseInFlow.service.IViewFlatWarehouseInFlow /** * 平库入库流水Service业务层处理 - * + * * @author gw * @date 2025-05-29 */ @Service -public class ViewFlatWarehouseInFlowServiceImpl implements IViewFlatWarehouseInFlowService +public class ViewFlatWarehouseInFlowServiceImpl implements IViewFlatWarehouseInFlowService { @Autowired private ViewFlatWarehouseInFlowMapper viewFlatWarehouseInFlowMapper; /** * 查询平库入库流水 - * + * * @param id 平库入库流水主键 * @return 平库入库流水 */ @@ -34,11 +36,12 @@ public class ViewFlatWarehouseInFlowServiceImpl implements IViewFlatWarehouseInF /** * 查询平库入库流水列表 - * + * * @param viewFlatWarehouseInFlow 平库入库流水 * @return 平库入库流水 */ @Override + @DataScope(warehouseAlias = "vfwif") public List selectViewFlatWarehouseInFlowList(ViewFlatWarehouseInFlow viewFlatWarehouseInFlow) { return viewFlatWarehouseInFlowMapper.selectViewFlatWarehouseInFlowList(viewFlatWarehouseInFlow); @@ -46,7 +49,7 @@ public class ViewFlatWarehouseInFlowServiceImpl implements IViewFlatWarehouseInF /** * 新增平库入库流水 - * + * * @param viewFlatWarehouseInFlow 平库入库流水 * @return 结果 */ @@ -59,7 +62,7 @@ public class ViewFlatWarehouseInFlowServiceImpl implements IViewFlatWarehouseInF /** * 修改平库入库流水 - * + * * @param viewFlatWarehouseInFlow 平库入库流水 * @return 结果 */ @@ -71,7 +74,7 @@ public class ViewFlatWarehouseInFlowServiceImpl implements IViewFlatWarehouseInF /** * 批量删除平库入库流水 - * + * * @param ids 需要删除的平库入库流水主键 * @return 结果 */ @@ -83,7 +86,7 @@ public class ViewFlatWarehouseInFlowServiceImpl implements IViewFlatWarehouseInF /** * 删除平库入库流水信息 - * + * * @param id 平库入库流水主键 * @return 结果 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/service/impl/ViewFlatWarehouseOutFlowServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/service/impl/ViewFlatWarehouseOutFlowServiceImpl.java index 83d43ca..f6f7df5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/service/impl/ViewFlatWarehouseOutFlowServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/service/impl/ViewFlatWarehouseOutFlowServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.search.ViewFlatWarehouseOutFlow.service.impl; import java.util.List; + +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -10,19 +12,19 @@ import com.ruoyi.search.ViewFlatWarehouseOutFlow.service.IViewFlatWarehouseOutFl /** * 平库出库流水Service业务层处理 - * + * * @author gw * @date 2025-05-29 */ @Service -public class ViewFlatWarehouseOutFlowServiceImpl implements IViewFlatWarehouseOutFlowService +public class ViewFlatWarehouseOutFlowServiceImpl implements IViewFlatWarehouseOutFlowService { @Autowired private ViewFlatWarehouseOutFlowMapper viewFlatWarehouseOutFlowMapper; /** * 查询平库出库流水 - * + * * @param id 平库出库流水主键 * @return 平库出库流水 */ @@ -34,11 +36,12 @@ public class ViewFlatWarehouseOutFlowServiceImpl implements IViewFlatWarehouseOu /** * 查询平库出库流水列表 - * + * * @param viewFlatWarehouseOutFlow 平库出库流水 * @return 平库出库流水 */ @Override + @DataScope(warehouseAlias = "vfwof") public List selectViewFlatWarehouseOutFlowList(ViewFlatWarehouseOutFlow viewFlatWarehouseOutFlow) { return viewFlatWarehouseOutFlowMapper.selectViewFlatWarehouseOutFlowList(viewFlatWarehouseOutFlow); @@ -46,7 +49,7 @@ public class ViewFlatWarehouseOutFlowServiceImpl implements IViewFlatWarehouseOu /** * 新增平库出库流水 - * + * * @param viewFlatWarehouseOutFlow 平库出库流水 * @return 结果 */ @@ -59,7 +62,7 @@ public class ViewFlatWarehouseOutFlowServiceImpl implements IViewFlatWarehouseOu /** * 修改平库出库流水 - * + * * @param viewFlatWarehouseOutFlow 平库出库流水 * @return 结果 */ @@ -71,7 +74,7 @@ public class ViewFlatWarehouseOutFlowServiceImpl implements IViewFlatWarehouseOu /** * 批量删除平库出库流水 - * + * * @param ids 需要删除的平库出库流水主键 * @return 结果 */ @@ -83,7 +86,7 @@ public class ViewFlatWarehouseOutFlowServiceImpl implements IViewFlatWarehouseOu /** * 删除平库出库流水信息 - * + * * @param id 平库出库流水主键 * @return 结果 */ 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 index 9d31d19..038157e 100644 --- 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 @@ -1,6 +1,8 @@ package com.ruoyi.search.ViewInJobFlow.service.impl; import java.util.List; + +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -10,19 +12,19 @@ import com.ruoyi.search.ViewInJobFlow.service.IViewInJobFlowService; /** * 入库作业流水Service业务层处理 - * + * * @author gw * @date 2025-05-28 */ @Service -public class ViewInJobFlowServiceImpl implements IViewInJobFlowService +public class ViewInJobFlowServiceImpl implements IViewInJobFlowService { @Autowired private ViewInJobFlowMapper viewInJobFlowMapper; /** * 查询入库作业流水 - * + * * @param jobId 入库作业流水主键 * @return 入库作业流水 */ @@ -34,11 +36,12 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService /** * 查询入库作业流水列表 - * + * * @param viewInJobFlow 入库作业流水 * @return 入库作业流水 */ @Override + @DataScope(warehouseAlias = "vijf") public List selectViewInJobFlowList(ViewInJobFlow viewInJobFlow) { return viewInJobFlowMapper.selectViewInJobFlowList(viewInJobFlow); @@ -46,7 +49,7 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService /** * 新增入库作业流水 - * + * * @param viewInJobFlow 入库作业流水 * @return 结果 */ @@ -59,7 +62,7 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService /** * 修改入库作业流水 - * + * * @param viewInJobFlow 入库作业流水 * @return 结果 */ @@ -71,7 +74,7 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService /** * 批量删除入库作业流水 - * + * * @param jobIds 需要删除的入库作业流水主键 * @return 结果 */ @@ -83,7 +86,7 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService /** * 删除入库作业流水信息 - * + * * @param jobId 入库作业流水主键 * @return 结果 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/impl/ViewOutJobFlowServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/impl/ViewOutJobFlowServiceImpl.java index f048e13..37acb30 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/impl/ViewOutJobFlowServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/service/impl/ViewOutJobFlowServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.search.ViewOutJobFlow.service.impl; import java.util.List; + +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -10,19 +12,19 @@ import com.ruoyi.search.ViewOutJobFlow.service.IViewOutJobFlowService; /** * 出库做业务流水Service业务层处理 - * + * * @author gw * @date 2025-05-29 */ @Service -public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService +public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService { @Autowired private ViewOutJobFlowMapper viewOutJobFlowMapper; /** * 查询出库做业务流水 - * + * * @param jobId 出库做业务流水主键 * @return 出库做业务流水 */ @@ -34,11 +36,12 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService /** * 查询出库做业务流水列表 - * + * * @param viewOutJobFlow 出库做业务流水 * @return 出库做业务流水 */ @Override + @DataScope(warehouseAlias = "vojf") public List selectViewOutJobFlowList(ViewOutJobFlow viewOutJobFlow) { return viewOutJobFlowMapper.selectViewOutJobFlowList(viewOutJobFlow); @@ -46,7 +49,7 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService /** * 新增出库做业务流水 - * + * * @param viewOutJobFlow 出库做业务流水 * @return 结果 */ @@ -59,7 +62,7 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService /** * 修改出库做业务流水 - * + * * @param viewOutJobFlow 出库做业务流水 * @return 结果 */ @@ -71,7 +74,7 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService /** * 批量删除出库做业务流水 - * + * * @param jobIds 需要删除的出库做业务流水主键 * @return 结果 */ @@ -83,7 +86,7 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService /** * 删除出库做业务流水信息 - * + * * @param jobId 出库做业务流水主键 * @return 结果 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/impl/ViewStockDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/impl/ViewStockDetailServiceImpl.java index 9932c7b..6ff7ca6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/impl/ViewStockDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/service/impl/ViewStockDetailServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.search.ViewStockDetail.service.impl; import java.util.List; + +import com.ruoyi.common.annotation.DataScope; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.search.ViewStockDetail.mapper.ViewStockDetailMapper; @@ -9,19 +11,19 @@ import com.ruoyi.search.ViewStockDetail.service.IViewStockDetailService; /** * 库存明细查询Service业务层处理 - * + * * @author gw * @date 2025-05-26 */ @Service -public class ViewStockDetailServiceImpl implements IViewStockDetailService +public class ViewStockDetailServiceImpl implements IViewStockDetailService { @Autowired private ViewStockDetailMapper viewStockDetailMapper; /** * 查询库存明细查询 - * + * * @param onlyIdentity 库存明细查询主键 * @return 库存明细查询 */ @@ -33,11 +35,12 @@ public class ViewStockDetailServiceImpl implements IViewStockDetailService /** * 查询库存明细查询列表 - * + * * @param viewStockDetail 库存明细查询 * @return 库存明细查询 */ @Override + @DataScope(warehouseAlias = "vsd") public List selectViewStockDetailList(ViewStockDetail viewStockDetail) { return viewStockDetailMapper.selectViewStockDetailList(viewStockDetail); @@ -45,7 +48,7 @@ public class ViewStockDetailServiceImpl implements IViewStockDetailService /** * 新增库存明细查询 - * + * * @param viewStockDetail 库存明细查询 * @return 结果 */ @@ -57,7 +60,7 @@ public class ViewStockDetailServiceImpl implements IViewStockDetailService /** * 修改库存明细查询 - * + * * @param viewStockDetail 库存明细查询 * @return 结果 */ @@ -69,7 +72,7 @@ public class ViewStockDetailServiceImpl implements IViewStockDetailService /** * 批量删除库存明细查询 - * + * * @param onlyIdentitys 需要删除的库存明细查询主键 * @return 结果 */ @@ -81,7 +84,7 @@ public class ViewStockDetailServiceImpl implements IViewStockDetailService /** * 删除库存明细查询信息 - * + * * @param onlyIdentity 库存明细查询主键 * @return 结果 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/impl/ViewStockSecureServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/impl/ViewStockSecureServiceImpl.java index bd64d59..85f2d63 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/impl/ViewStockSecureServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/impl/ViewStockSecureServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.search.ViewStockSecure.service.impl; import java.util.List; + +import com.ruoyi.common.annotation.DataScope; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.search.ViewStockSecure.mapper.ViewStockSecureMapper; @@ -9,19 +11,19 @@ import com.ruoyi.search.ViewStockSecure.service.IViewStockSecureService; /** * 安全库存查询Service业务层处理 - * + * * @author gw * @date 2025-05-30 */ @Service -public class ViewStockSecureServiceImpl implements IViewStockSecureService +public class ViewStockSecureServiceImpl implements IViewStockSecureService { @Autowired private ViewStockSecureMapper viewStockSecureMapper; /** * 查询安全库存查询 - * + * * @param stockId 安全库存查询主键 * @return 安全库存查询 */ @@ -33,11 +35,12 @@ public class ViewStockSecureServiceImpl implements IViewStockSecureService /** * 查询安全库存查询列表 - * + * * @param viewStockSecure 安全库存查询 * @return 安全库存查询 */ @Override + @DataScope(warehouseAlias = "vss") public List selectViewStockSecureList(ViewStockSecure viewStockSecure) { return viewStockSecureMapper.selectViewStockSecureList(viewStockSecure); @@ -45,7 +48,7 @@ public class ViewStockSecureServiceImpl implements IViewStockSecureService /** * 新增安全库存查询 - * + * * @param viewStockSecure 安全库存查询 * @return 结果 */ @@ -57,7 +60,7 @@ public class ViewStockSecureServiceImpl implements IViewStockSecureService /** * 修改安全库存查询 - * + * * @param viewStockSecure 安全库存查询 * @return 结果 */ @@ -69,7 +72,7 @@ public class ViewStockSecureServiceImpl implements IViewStockSecureService /** * 批量删除安全库存查询 - * + * * @param stockIds 需要删除的安全库存查询主键 * @return 结果 */ @@ -81,7 +84,7 @@ public class ViewStockSecureServiceImpl implements IViewStockSecureService /** * 删除安全库存查询信息 - * + * * @param stockId 安全库存查询主键 * @return 结果 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/impl/ViewStockWarningServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/impl/ViewStockWarningServiceImpl.java index 8cae769..04e9515 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/impl/ViewStockWarningServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/impl/ViewStockWarningServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.search.ViewStockWarning.service.impl; import java.util.List; + +import com.ruoyi.common.annotation.DataScope; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.search.ViewStockWarning.mapper.ViewStockWarningMapper; @@ -9,19 +11,19 @@ import com.ruoyi.search.ViewStockWarning.service.IViewStockWarningService; /** * 预警库存查询Service业务层处理 - * + * * @author ruoyi * @date 2025-05-30 */ @Service -public class ViewStockWarningServiceImpl implements IViewStockWarningService +public class ViewStockWarningServiceImpl implements IViewStockWarningService { @Autowired private ViewStockWarningMapper viewStockWarningMapper; /** * 查询预警库存查询 - * + * * @param stockId 预警库存查询主键 * @return 预警库存查询 */ @@ -33,11 +35,12 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService /** * 查询预警库存查询列表 - * + * * @param viewStockWarning 预警库存查询 * @return 预警库存查询 */ @Override + @DataScope(warehouseAlias = "vsw") public List selectViewStockWarningList(ViewStockWarning viewStockWarning) { return viewStockWarningMapper.selectViewStockWarningList(viewStockWarning); @@ -45,7 +48,7 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService /** * 新增预警库存查询 - * + * * @param viewStockWarning 预警库存查询 * @return 结果 */ @@ -57,7 +60,7 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService /** * 修改预警库存查询 - * + * * @param viewStockWarning 预警库存查询 * @return 结果 */ @@ -69,7 +72,7 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService /** * 批量删除预警库存查询 - * + * * @param stockIds 需要删除的预警库存查询主键 * @return 结果 */ @@ -81,7 +84,7 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService /** * 删除预警库存查询信息 - * + * * @param stockId 预警库存查询主键 * @return 结果 */ 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 index 8d4305e..433f87b 100644 --- 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 @@ -1,6 +1,8 @@ package com.ruoyi.search.ViewStockinHistory.service.impl; import java.util.List; + +import com.ruoyi.common.annotation.DataScope; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.search.ViewStockinHistory.mapper.ViewStockinHistoryMapper; @@ -9,19 +11,19 @@ import com.ruoyi.search.ViewStockinHistory.service.IViewStockinHistoryService; /** * 入库单据历史Service业务层处理 - * + * * @author gw * @date 2025-05-28 */ @Service -public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService +public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService { @Autowired private ViewStockinHistoryMapper viewStockinHistoryMapper; /** * 查询入库单据历史 - * + * * @param stockinGuid 入库单据历史主键 * @return 入库单据历史 */ @@ -33,11 +35,12 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService /** * 查询入库单据历史列表 - * + * * @param viewStockinHistory 入库单据历史 * @return 入库单据历史 */ @Override + @DataScope(warehouseAlias = "vsh") public List selectViewStockinHistoryList(ViewStockinHistory viewStockinHistory) { return viewStockinHistoryMapper.selectViewStockinHistoryList(viewStockinHistory); @@ -45,7 +48,7 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService /** * 新增入库单据历史 - * + * * @param viewStockinHistory 入库单据历史 * @return 结果 */ @@ -57,7 +60,7 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService /** * 修改入库单据历史 - * + * * @param viewStockinHistory 入库单据历史 * @return 结果 */ @@ -69,7 +72,7 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService /** * 批量删除入库单据历史 - * + * * @param stockinGuids 需要删除的入库单据历史主键 * @return 结果 */ @@ -81,7 +84,7 @@ public class ViewStockinHistoryServiceImpl implements IViewStockinHistoryService /** * 删除入库单据历史信息 - * + * * @param stockinGuid 入库单据历史主键 * @return 结果 */ 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 index 76c80f0..2f10939 100644 --- 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 @@ -1,6 +1,8 @@ package com.ruoyi.search.ViewStockoutHistory.service.impl; import java.util.List; + +import com.ruoyi.common.annotation.DataScope; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.search.ViewStockoutHistory.mapper.ViewStockoutHistoryMapper; @@ -9,19 +11,19 @@ import com.ruoyi.search.ViewStockoutHistory.service.IViewStockoutHistoryService; /** * 出库单据历史Service业务层处理 - * + * * @author gw * @date 2025-05-28 */ @Service -public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryService +public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryService { @Autowired private ViewStockoutHistoryMapper viewStockoutHistoryMapper; /** * 查询出库单据历史 - * + * * @param stockoutId 出库单据历史主键 * @return 出库单据历史 */ @@ -33,11 +35,12 @@ public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryServi /** * 查询出库单据历史列表 - * + * * @param viewStockoutHistory 出库单据历史 * @return 出库单据历史 */ @Override + @DataScope(warehouseAlias = "vsh") public List selectViewStockoutHistoryList(ViewStockoutHistory viewStockoutHistory) { return viewStockoutHistoryMapper.selectViewStockoutHistoryList(viewStockoutHistory); @@ -45,7 +48,7 @@ public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryServi /** * 新增出库单据历史 - * + * * @param viewStockoutHistory 出库单据历史 * @return 结果 */ @@ -57,7 +60,7 @@ public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryServi /** * 修改出库单据历史 - * + * * @param viewStockoutHistory 出库单据历史 * @return 结果 */ @@ -69,7 +72,7 @@ public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryServi /** * 批量删除出库单据历史 - * + * * @param stockoutIds 需要删除的出库单据历史主键 * @return 结果 */ @@ -81,7 +84,7 @@ public class ViewStockoutHistoryServiceImpl implements IViewStockoutHistoryServi /** * 删除出库单据历史信息 - * + * * @param stockoutId 出库单据历史主键 * @return 结果 */ diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseInFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseInFlowMapper.xml index 09a5e90..79a1a0a 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseInFlowMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseInFlowMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -35,12 +35,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, in_or_out, in_or_out_sotck_id, in_or_out_sotck_detail_id, product_guid, product_id, quantity, create_time, create_man, warehouse_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec, unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_flat_warehouse_in_flow + select id, in_or_out, in_or_out_sotck_id, in_or_out_sotck_detail_id, product_guid, product_id, quantity, create_time, create_man, warehouse_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec, unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_flat_warehouse_in_flow vfwif - + - + and in_or_out like concat('%', #{inOrOut}, '%') and in_or_out_sotck_id like concat('%', #{inOrOutSotckId}, '%') and in_or_out_sotck_detail_id like concat('%', #{inOrOutSotckDetailId}, '%') @@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + and job_id like concat('%', #{jobId}, '%') and job_detail_id like concat('%', #{jobDetailId}, '%') and status = #{status} @@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + and job_id like concat('%', #{jobId}, '%') and job_detail_id like concat('%', #{jobDetailId}, '%') and status = #{status} @@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml index a816d51..0afab87 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -38,7 +38,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -57,16 +56,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare5, spare6, product_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec, unit, price, remark, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area,spare7,spare8, remark from view_stock_secure + select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare5, spare6, product_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec, unit, price, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area,spare7,spare8 from view_stock_secure vss - + @@ -165,7 +163,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" spec, unit, price, - remark, cargo_space_name, roadway_id, cargo_area_id, @@ -182,7 +179,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group_coding, cargo_space_logo, this_cargo_area, - remark, spare7, spare8, @@ -220,7 +216,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{spec}, #{unit}, #{price}, - #{remark}, #{cargoSpaceName}, #{roadwayId}, #{cargoAreaId}, @@ -239,7 +234,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{thisCargoArea}, #{spare7}, #{spare8}, - #{remark}, @@ -278,7 +272,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" spec = #{spec}, unit = #{unit}, price = #{price}, - remark = #{remark}, cargo_space_name = #{cargoSpaceName}, roadway_id = #{roadwayId}, cargo_area_id = #{cargoAreaId}, @@ -297,7 +290,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" this_cargo_area = #{thisCargoArea}, spare7 = #{spare7}, spare8 = #{spare8}, - remark = #{remark}, where stock_id = #{stockId} diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml index e2e62df..2f2f2fe 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -51,12 +51,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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, unit, spec, spare1,spare2,spare5,spare6,spare7,spare8 from view_stockin_history + 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, unit, spec, spare1,spare2,spare5,spare6,spare7,spare8 from view_stockin_history vsh - + @@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - +