From 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 三月 2025 13:49:53 +0800
Subject: [PATCH] 一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动去出库不能自动出库,且出库之后也不需要在页面展示
---
user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java b/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java
index b1e4805..09bb019 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java
@@ -1,10 +1,18 @@
package com.yuanchu.mom.controller;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
+import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.dto.PersonDto;
+import com.yuanchu.mom.exception.ErrorException;
+import com.yuanchu.mom.mapper.PowerMapper;
+import com.yuanchu.mom.mapper.UserMapper;
import com.yuanchu.mom.pojo.Company;
import com.yuanchu.mom.pojo.Person;
+import com.yuanchu.mom.pojo.Power;
+import com.yuanchu.mom.pojo.User;
import com.yuanchu.mom.service.UserService;
import com.yuanchu.mom.util.HeaderToken;
import com.yuanchu.mom.vo.Result;
@@ -13,6 +21,7 @@
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
@RestController
@@ -25,11 +34,40 @@
private UserService userService;
+ UserMapper userMapper;
+
+ PowerMapper powerMapper;
+
+ private GetLook getLook;
+
@ValueClassify("鐢ㄦ埛绠＄悊")
- @ApiOperation(value = "鑾峰彇浜轰簨绯荤粺缁勭粐鏋舵瀯")
+ @PostMapping("/getSampleUser")
+ @ApiOperation(value = "鏌ョ湅鎸囧畾閮ㄩ棬鐨勪汉浜嬬郴缁熺粍缁囨灦鏋�")
+ public Result<?> getSampleUser(){
+ return Result.success();
+ }
+
+ @ValueClassify("鐢ㄦ埛绠＄悊")
+ @ApiOperation(value = "鏌ョ湅浜轰簨绯荤粺缁勭粐鏋舵瀯")
@GetMapping(value = "/selectCompaniesList")
public Result<List<Company>> selectCompaniesList() {
- return Result.success(headerToken.companyUrl());
+ //鍒ゆ柇鏄惁鏈夌洿鎺ヨ幏鍙栫涓夋柟閮ㄩ棬鐨勬潈闄�
+ Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+ User user = userMapper.selectById(userId);
+ Integer roleId = user.getRoleId();
+ Power power = powerMapper.selectOne(Wrappers.<Power>lambdaQuery().eq(Power::getRoleId, roleId).eq(Power::getMenuMethod, "getSampleUser"));
+ if (ObjectUtils.isNotEmpty(power)){
+ List<Company> companies = new ArrayList<>();
+ Company company = new Company();
+ if (ObjectUtils.isEmpty(user.getCompany())){
+ throw new ErrorException("璇ョ敤鎴锋病鏈夋墍灞炲崟浣�!");
+ }
+ company.setCompanyId(user.getCompany());
+ companies.add(company);
+ return Result.success(companies);
+ }else {
+ return Result.success(headerToken.companyUrl());
+ }
}
@ValueAuth
--
Gitblit v1.9.3