SCP增加供应商过滤条件

win-framework/win-spring-boot-starter-biz-operatelog/src/main/java/com/win/framework/operatelog/core/aop/OperateLogAspect.java

@@ -158,7 +158,7 @@ public class OperateLogAspect {
     }
 
     private static void fillUserFields(OperateLog operateLogObj) {
-        operateLogObj.setUserId(WebFrameworkUtils.getLoginUserId());
+        operateLogObj.setUserId(WebFrameworkUtils.getLoginUserIdRequest());
     }
 
     private static void fillModuleFields(OperateLog operateLogObj,

win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/web/core/util/WebFrameworkUtils.java

@@ -60,7 +60,7 @@ public class WebFrameworkUtils {
         return (Long) request.getAttribute(REQUEST_ATTRIBUTE_LOGIN_USER_ID);
     }
 
-    public static Long getLoginUserId() {
+    public static Long getLoginUserIdRequest() {
         HttpServletRequest request = getRequest();
         return getLoginUserId(request);
     }

win-module-bpm/win-module-bpm-biz/src/main/java/com/win/module/bpm/controller/task/BpmTaskController.java

@@ -16,7 +16,7 @@ import javax.validation.Valid;
 import java.util.List;
 
 import static com.win.framework.common.pojo.CommonResult.success;
-import static com.win.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
+import static com.win.framework.web.core.util.WebFrameworkUtils.getLoginUserIdRequest;
 
 @Tag(name = "管理后台 - 流程任务实例")
 @RestController
@@ -31,14 +31,14 @@ public class BpmTaskController {
     @Operation(summary = "获取 Todo 待办任务分页")
     @PreAuthorize("@ss.hasPermission('bpm:task:query')")
     public CommonResult<PageResult<BpmTaskTodoPageItemRespVO>> getTodoTaskPage(@Valid BpmTaskTodoPageReqVO pageVO) {
-        return success(taskService.getTodoTaskPage(getLoginUserId(), pageVO));
+        return success(taskService.getTodoTaskPage(getLoginUserIdRequest(), pageVO));
     }
 
     @GetMapping("done-page")
     @Operation(summary = "获取 Done 已办任务分页")
     @PreAuthorize("@ss.hasPermission('bpm:task:query')")
     public CommonResult<PageResult<BpmTaskDonePageItemRespVO>> getDoneTaskPage(@Valid BpmTaskDonePageReqVO pageVO) {
-        return success(taskService.getDoneTaskPage(getLoginUserId(), pageVO));
+        return success(taskService.getDoneTaskPage(getLoginUserIdRequest(), pageVO));
     }
 
     @GetMapping("/list-by-process-instance-id")
@@ -54,7 +54,7 @@ public class BpmTaskController {
     @Operation(summary = "通过任务")
     @PreAuthorize("@ss.hasPermission('bpm:task:update')")
     public CommonResult<Boolean> approveTask(@Valid @RequestBody BpmTaskApproveReqVO reqVO) {
-        taskService.approveTask(getLoginUserId(), reqVO);
+        taskService.approveTask(getLoginUserIdRequest(), reqVO);
         return success(true);
     }
 
@@ -62,7 +62,7 @@ public class BpmTaskController {
     @Operation(summary = "不通过任务")
     @PreAuthorize("@ss.hasPermission('bpm:task:update')")
     public CommonResult<Boolean> rejectTask(@Valid @RequestBody BpmTaskRejectReqVO reqVO) {
-        taskService.rejectTask(getLoginUserId(), reqVO);
+        taskService.rejectTask(getLoginUserIdRequest(), reqVO);
         return success(true);
     }
 
@@ -70,7 +70,7 @@ public class BpmTaskController {
     @Operation(summary = "更新任务的负责人", description = "用于【流程详情】的【转派】按钮")
     @PreAuthorize("@ss.hasPermission('bpm:task:update')")
     public CommonResult<Boolean> updateTaskAssignee(@Valid @RequestBody BpmTaskUpdateAssigneeReqVO reqVO) {
-        taskService.updateTaskAssignee(getLoginUserId(), reqVO);
+        taskService.updateTaskAssignee(getLoginUserIdRequest(), reqVO);
         return success(true);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseDetailController.java

@@ -16,6 +16,7 @@ import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO;
 import com.win.module.wms.dal.dataobject.purchase.PurchaseMainDO;
 import com.win.module.wms.dal.mysql.purchase.PurchaseDetailMapper;
 import com.win.module.wms.dal.mysql.purchase.PurchaseMainMapper;
+import com.win.module.wms.dal.mysql.supplieruser.SupplierUserMapper;
 import com.win.module.wms.service.purchase.PurchaseDetailService;
 import com.win.module.wms.service.supplieritem.SupplieritemService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -33,6 +34,7 @@ import java.util.*;
 
 import static com.win.framework.common.pojo.CommonResult.success;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
+import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 @Tag(name = "管理后台 - 采购订单子")
 @RestController
@@ -50,6 +52,8 @@ public class PurchaseDetailController {
     private PurchaseMainMapper purchaseMainMapper;
     @Resource
     private SupplieritemService supplieritemService;
+    @Resource
+    private SupplierUserMapper supplierUserMapper;
 
     @PostMapping("/create")
     @Operation(summary = "创建采购订单子")
@@ -94,6 +98,13 @@ public class PurchaseDetailController {
     @GetMapping("/page")
     @Operation(summary = "获得采购订单子分页")
     public CommonResult<PageResult<PurchaseDetailRespVO>> getPurchaseDetailPage(@Valid PurchaseDetailPageReqVO pageVO) {
+        Long userId = getLoginUserId();
+        if(1 != userId){
+            List<String> supplierCodeList = supplierUserMapper.querySupplierCodeByUserId(getLoginUserId());
+            pageVO.setSupplierCodeList(supplierCodeList);
+        }else {
+            pageVO.setSupplierCodeList(null);
+        }
         PageResult<PurchaseDetailDO> pageResult = purchaseDetailService.getPurchaseDetailPage(pageVO);
         PageResult<PurchaseDetailRespVO> result = PurchaseDetailConvert.INSTANCE.convertPage(pageResult);
         if(pageResult.getList().size() > 0){

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailPageReqVO.java

@@ -9,6 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -116,4 +117,7 @@ public class PurchaseDetailPageReqVO extends PageParam {
     @Schema(description = "行类型")
     private String poLineType;
 
+    @Schema(description = "可访问的供应商代码")
+    private List<String> supplierCodeList;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseprice/PurchasepriceController.java

@@ -36,7 +36,7 @@ import java.util.Map;
 
 import static com.win.framework.common.pojo.CommonResult.success;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-import static com.win.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
+import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 @Tag(name = "管理后台 - 采购价格单")
 @RestController
@@ -91,7 +91,7 @@ public class PurchasepriceController {
     public CommonResult<PageResult<PurchasepriceRespVO>> getPurchasepricePage(@Valid PurchasepricePageReqVO pageVO) {
         Long userId = getLoginUserId();
         if(1 != userId){
-            List<String> supplierCodeList = supplierUserMapper.querySupplierCodeByUserId(getLoginUserId());
+            List<String> supplierCodeList = supplierUserMapper.querySupplierCodeByUserId(userId);
             pageVO.setSupplierCodeList(supplierCodeList);
         }else {
             pageVO.setSupplierCodeList(null);
@@ -110,7 +110,7 @@ public class PurchasepriceController {
     public CommonResult<PageResult<PurchasepriceRespVO>> getPurchasepriceSenior(@Valid @RequestBody CustomConditions conditions) {
         Long userId = getLoginUserId();
         if(1 != userId){
-            List<String> supplierCodeList = supplierUserMapper.querySupplierCodeByUserId(getLoginUserId());
+            List<String> supplierCodeList = supplierUserMapper.querySupplierCodeByUserId(userId);
             List<CustomConditions.Condition>  conditionList = conditions.getFilters();
             CustomConditions.Condition condition = new CustomConditions.Condition();
             condition.setColumn("supplier_code");

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java

@@ -36,7 +36,7 @@ import java.util.Map;
 
 import static com.win.framework.common.pojo.CommonResult.success;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-import static com.win.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
+import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 @Tag(name = "管理后台 - 供应商")
 @RestController
@@ -95,7 +95,7 @@ public class SupplierController {
     public CommonResult<PageResult<SupplierRespVO>> getSupplierPage(@Valid SupplierPageReqVO pageVO) {
         Long userId = getLoginUserId();
         if(1 != userId){
-            List<String> supplierCodeList = supplierUserMapper.querySupplierCodeByUserId(getLoginUserId());
+            List<String> supplierCodeList = supplierUserMapper.querySupplierCodeByUserId(userId);
             pageVO.setSupplierCodeList(supplierCodeList);
         }else {
             pageVO.setSupplierCodeList(null);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java

@@ -8,25 +8,14 @@ import com.win.framework.excel.core.util.ExcelUtils;
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.balance.vo.BalancePageReqVO;
-import com.win.module.wms.controller.balance.vo.BalanceRespVO;
-import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO;
-import com.win.module.wms.controller.purchaseprice.vo.PurchasepriceRespVO;
-import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainImportErrorVO;
 import com.win.module.wms.controller.supplieritem.vo.*;
-import com.win.module.wms.convert.balance.BalanceConvert;
-import com.win.module.wms.convert.itembasic.ItembasicConvert;
-import com.win.module.wms.convert.purchaseprice.PurchasepriceConvert;
 import com.win.module.wms.convert.supplieritem.SupplieritemConvert;
-import com.win.module.wms.dal.dataobject.balance.BalanceDO;
-import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.supplier.SupplierDO;
 import com.win.module.wms.dal.dataobject.supplieritem.SupplieritemDO;
 import com.win.module.wms.dal.mysql.supplier.SupplierMapper;
 import com.win.module.wms.dal.mysql.supplieruser.SupplierUserMapper;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.supplieritem.SupplieritemService;
-import com.win.module.wms.util.JobUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
@@ -42,11 +31,14 @@ import javax.validation.Valid;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import static com.win.framework.common.pojo.CommonResult.success;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-import static com.win.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
+import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 @Tag(name = "管理后台 - 供应商物料")
 @RestController
@@ -100,7 +92,7 @@ public class SupplieritemController {
     public CommonResult<PageResult<SupplieritemRespVO>> getSupplieritemPage(@Valid SupplieritemPageReqVO pageVO) {
         Long userId = getLoginUserId();
         if(1 != userId){
-            List<String> supplierCodeList = supplierUserMapper.querySupplierCodeByUserId(getLoginUserId());
+            List<String> supplierCodeList = supplierUserMapper.querySupplierCodeByUserId(userId);
             pageVO.setSupplierCodeList(supplierCodeList);
         }else {
             pageVO.setSupplierCodeList(null);
@@ -118,7 +110,7 @@ public class SupplieritemController {
     public CommonResult<PageResult<SupplieritemRespVO>> getSupplieritemSenior(@Valid @RequestBody CustomConditions conditions) {
         Long userId = getLoginUserId();
         if(1 != userId){
-            List<String> supplierCodeList = supplierUserMapper.querySupplierCodeByUserId(getLoginUserId());
+            List<String> supplierCodeList = supplierUserMapper.querySupplierCodeByUserId(userId);
             List<CustomConditions.Condition>  conditionList = conditions.getFilters();
             CustomConditions.Condition condition = new CustomConditions.Condition();
             condition.setColumn("supplier_code");

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java

@@ -641,7 +641,7 @@ public class ProductreceiptJobMainServiceImpl implements ProductreceiptJobMainSe
     private void generateProductputawayRequest(ProductreceiptRecordMainDO productreceiptRecordMainDO, List<ProductreceiptRecordDetailDO> productreceiptRecordDetailDOList) {
         ProductputawayRequestMainCreateReqVO productputawayRequestMainCreateReqVO = new ProductputawayRequestMainCreateReqVO();
         productputawayRequestMainCreateReqVO.setStatus(RequestStatusEnum.NEW.getCode());
-        productputawayRequestMainCreateReqVO.setDepartmentCode(String.valueOf(userApi.getUser(WebFrameworkUtils.getLoginUserId()).getDeptId()));
+        productputawayRequestMainCreateReqVO.setDepartmentCode(String.valueOf(userApi.getUser(WebFrameworkUtils.getLoginUserIdRequest()).getDeptId()));
         List<ProductputawayRequestDetailCreateReqVO> subList = new ArrayList<>();
         productreceiptRecordDetailDOList.forEach(itemDetailDO -> {
             ProductputawayRequestDetailCreateReqVO productputawayRequestDetailCreateReqVO = new ProductputawayRequestDetailCreateReqVO();

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java

@@ -13,8 +13,6 @@ import com.win.framework.common.pojo.PageResult;
 import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.module.infra.api.trends.TrendsApi;
 import com.win.module.infra.enums.TrendsTypeEnum;
-import com.win.module.system.api.dict.DictDataApi;
-import com.win.module.system.api.dict.dto.DictDataRespDTO;
 import com.win.module.system.api.serialnumber.SerialNumberApi;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.enums.serialNumber.RuleCodeEnum;
@@ -39,7 +37,6 @@ import com.win.module.wms.dal.mysql.purchase.PurchaseDetailMapper;
 import com.win.module.wms.dal.mysql.purchase.PurchaseMainMapper;
 import com.win.module.wms.dal.mysql.purchasePlan.PurchasePlanDetailMapper;
 import com.win.module.wms.dal.mysql.purchasePlan.PurchasePlanMainMapper;
-import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.enums.order.OrderStatusEnum;
 import com.win.module.wms.enums.plan.PlanStatusEnum;
 import com.win.module.wms.enums.plan.PurchasePlanStatus;
@@ -52,7 +49,6 @@ import com.win.module.wms.service.interfaceinfo.InterfaceInfoService;
 import com.win.module.wms.service.itembasic.ItembasicService;
 import com.win.module.wms.service.purchaseprice.PurchasepriceService;
 import com.win.module.wms.service.rule.RuleService;
-import com.win.module.wms.service.stdcostprice.StdcostpriceService;
 import com.win.module.wms.service.supplier.SupplierService;
 import com.win.module.wms.service.supplieritem.SupplieritemService;
 import com.win.module.wms.util.JobUtils;
@@ -67,7 +63,7 @@ import java.time.LocalDateTime;
 import java.util.*;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.win.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
+import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static com.win.module.wms.enums.ErrorCodeConstants.*;
 
 /**

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestMainServiceImpl.java

@@ -558,7 +558,7 @@ public class RepleinshRequestMainServiceImpl implements RepleinshRequestMainServ
             repleinshRequestMainMapper.updateById(mainDO);
             return;
         }
-        this.urserId = WebFrameworkUtils.getLoginUserId();
+        this.urserId = WebFrameworkUtils.getLoginUserIdRequest();
         if (switchDO.getEffectiveSetValue().equals("TRUE")) {
             this.generateJobByPackage(mainDO, detailDOList);
         } else {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java

@@ -210,7 +210,7 @@ public class TransactionServiceImpl implements TransactionService {
     @Override
     @Transactional
     public Integer createTransaction(List<TransactionCreateReqVO> createReqVOList) {
-        this.urserId = WebFrameworkUtils.getLoginUserId();
+        this.urserId = WebFrameworkUtils.getLoginUserIdRequest();
         if(urserId == null){
             urserId = createReqVOList.get(0).getUserId();
         }