diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/service/impl/BasWarehouseServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/service/impl/BasWarehouseServiceImpl.java index e4d836f..1cfdb49 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/service/impl/BasWarehouseServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/service/impl/BasWarehouseServiceImpl.java @@ -44,7 +44,7 @@ public class BasWarehouseServiceImpl implements IBasWarehouseService * @return 仓库管理 */ @Override - @DataScope + //@DataScope public List selectBasWarehouseList(BasWarehouse basWarehouse) { return basWarehouseMapper.selectBasWarehouseList(basWarehouse); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/BillStatusCountServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/BillStatusCountServiceImpl.java index b4f7348..1f0e0aa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/BillStatusCountServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/BillStatusCountServiceImpl.java @@ -25,7 +25,7 @@ public class BillStatusCountServiceImpl implements IBillStatusCountService { * @return 单据状态统计列表 */ @Override - @DataScope + //@DataScope // @DataScope(warehouseAlias = "") public List selectAllBillStatusCount(BaseEntity baseEntity) { List resultList = new ArrayList<>(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/CargoSpaceCountServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/CargoSpaceCountServiceImpl.java index 3e51181..e4b038f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/CargoSpaceCountServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/CargoSpaceCountServiceImpl.java @@ -26,28 +26,28 @@ public class CargoSpaceCountServiceImpl implements ICargoSpaceCountService { * @return 货位状态统计对象 */ @Override - @DataScope + //@DataScope public CargoSpaceCount selectStatusCount(BaseEntity baseEntity) { // 查询各状态货位数量 List> statusCounts = cargoSpaceCountMapper.selectStatusCount(baseEntity); - + // 初始化结果数组,默认所有状态数量为0 List counts = new ArrayList<>(); for (int i = 0; i < 6; i++) { counts.add(0); } - + // 填充实际统计数量 for (Map count : statusCounts) { int status = Integer.parseInt(count.get("status").toString()); long countValue = Long.parseLong(count.get("count").toString()); counts.set(status - 1, (int)countValue); } - + // 封装结果 CargoSpaceCount result = new CargoSpaceCount(); result.setStatusCounts(counts); - + return result; } -} \ No newline at end of file +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/IndexCountServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/IndexCountServiceImpl.java index f73a705..6a980d3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/IndexCountServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/IndexCountServiceImpl.java @@ -26,7 +26,7 @@ public class IndexCountServiceImpl implements IIndexCountService * @return 统计结果 */ @Override - @DataScope + //@DataScope public IndexCount selectFinishCount(BaseEntity baseEntity) { IndexCount indexCount = new IndexCount(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java index e7a6b4e..fdb01dc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java @@ -136,6 +136,7 @@ public class OutStockoutServiceImpl implements IOutStockoutService outStockout.setCreateManId(username); outStockout.setStatus("1"); outStockout.setStockoutSource(outStockoutVo.getOutStockout().getStockoutSource()); + outStockout.setDepartmentNo(SecurityUtils.getDeptId().toString()); // outStockout.setWarehouseId("01"); for (int i = 0; i < detailList.size(); i++) { OutStockoutDetail outStockoutDetail = detailList.get(i); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java index cfeb939..7d938e3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java @@ -207,6 +207,7 @@ public class PdaServiceImp implements PdaService { public AjaxResult rkSure(TrayCodeMsg trayCodeMsg) { HashMap map = new HashMap<>(); map.put("v_tray_code", trayCodeMsg.getTrayCode()); + map.put("v_dept_id", SecurityUtils.getDeptId().toString()); map.put("v_warehouse_id", trayCodeMsg.getWarehouseId()); pdaMapper.rkSure(map); String result = map.get("v_result").toString(); 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 index 7684bdb..6922c89 100644 --- 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 @@ -172,8 +172,17 @@ public class ViewInJobFlow extends BaseEntity //@Excel(name = "质量",dictType = "quality_type") private String quality; + private String departmentId; + public String getDepartmentId() { + return departmentId; + } + + public void setDepartmentId(String departmentId) { + this.departmentId = departmentId; + } + public void setJobDetailId(String jobDetailId) { this.jobDetailId = jobDetailId; 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 99ec28b..3676d75 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 @@ -4,6 +4,7 @@ import java.util.List; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.search.ViewInJobFlow.mapper.ViewInJobFlowMapper; @@ -44,6 +45,9 @@ public class ViewInJobFlowServiceImpl implements IViewInJobFlowService //@DataScope(warehouseAlias = "vijf") public List selectViewInJobFlowList(ViewInJobFlow viewInJobFlow) { + if (!"admin".equals(SecurityUtils.getUsername())){ + viewInJobFlow.setDepartmentId(SecurityUtils.getDeptId().toString()); + } return viewInJobFlowMapper.selectViewInJobFlowList(viewInJobFlow); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java index efc4c84..c08c4de 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java @@ -165,7 +165,15 @@ public class ViewOutJobFlow extends BaseEntity /** 质量 */ //@Excel(name = "质量",dictType = "quality_type") private String quality; + private String departmentId; + public String getDepartmentId() { + return departmentId; + } + + public void setDepartmentId(String departmentId) { + this.departmentId = departmentId; + } public void setJobDetailId(String jobDetailId) { 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 0d15709..7e3ac84 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 @@ -4,6 +4,7 @@ import java.util.List; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.search.ViewOutJobFlow.mapper.ViewOutJobFlowMapper; @@ -44,6 +45,9 @@ public class ViewOutJobFlowServiceImpl implements IViewOutJobFlowService //@DataScope(warehouseAlias = "vojf") public List selectViewOutJobFlowList(ViewOutJobFlow viewOutJobFlow) { + if (!"admin".equals(SecurityUtils.getUsername())){ + viewOutJobFlow.setDepartmentId(SecurityUtils.getDeptId().toString()); + } return viewOutJobFlowMapper.selectViewOutJobFlowList(viewOutJobFlow); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java index db7d268..7a110f8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java @@ -147,6 +147,7 @@ public class ViewStockDetail extends BaseEntity private String productType; private String outside; private String spare4; + private String model; 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 8b3ff3b..9b1693d 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,7 @@ package com.ruoyi.search.ViewStockDetail.service.impl; import com.ruoyi.common.annotation.DataScope; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.search.ViewStockDetail.domain.ViewStockDetail; import com.ruoyi.search.ViewStockDetail.mapper.ViewStockDetailMapper; import com.ruoyi.search.ViewStockDetail.service.IViewStockDetailService; @@ -43,6 +44,9 @@ public class ViewStockDetailServiceImpl implements IViewStockDetailService //@DataScope(warehouseAlias = "bw") public List selectViewStockDetailList(ViewStockDetail viewStockDetail) { + if (!"admin".equals(SecurityUtils.getUsername())){ + viewStockDetail.setModel(SecurityUtils.getDeptId().toString()); + } return viewStockDetailMapper.selectViewStockDetailList(viewStockDetail); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java index f4f362d..6397f8e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java @@ -58,6 +58,9 @@ public class BasStockServiceImpl implements IBasStockService @Override public List selectBasStockList(BasStock basStock) { + if (!"admin".equals(SecurityUtils.getUsername())){ + basStock.setModel(SecurityUtils.getDeptId().toString()); + } return basStockMapper.selectBasStockList(basStock); } /** diff --git a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml index 951e8b8..6594880 100644 --- a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml @@ -114,6 +114,7 @@ @@ -92,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and cases = #{cases} and quality = #{quality} and managementNo = #{managementNo} + and (department_id = #{departmentId} or department_id is null) ${params.warehouseDataScope} diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml index 37f5666..eac921f 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml @@ -45,10 +45,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select job_detail_id, job_id, task_no, status, in_or_out, tray_code, create_time, start_time, finish_time, exit_id, warehouse_id, product_id, product_name, parent_id, price, cargo_no, unit, spec, remark, productType, systemItem, productCtm, productCtu, upperNum, limitNum, enableFlag, out_quantity, lot_no, in_or_out_id, in_or_out_d_id, priceTotal, origin, turnovertype, account, purpose, units, contract, cases, quality, managementNo from view_out_job_flow vojf + select job_detail_id, job_id, task_no, status, in_or_out, tray_code, create_time, start_time, finish_time, exit_id, warehouse_id, product_id, product_name, parent_id, price, cargo_no, unit, spec, remark, productType, systemItem, productCtm, productCtu, upperNum, limitNum, enableFlag, out_quantity, lot_no, in_or_out_id, in_or_out_d_id, priceTotal, origin, turnovertype, account, purpose, units, contract, cases, quality, managementNo,department_id from view_out_job_flow vojf