root/yinnihailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt: 优化 因仓库权限改动影响的其它服务

Browse Source
This commit is contained in:
liejiu946
2024-11-01 15:42:14 +08:00
parent f3bd6337f9
commit 78b12c2811
20 changed files with 48 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
View File

@@ -48,9 +48,9 @@ import org.nl.wms.basedata.st.sectattr.service.dao.Sectattr;
import org.nl.wms.basedata.st.sectattr.service.dao.mapper.SectattrMapper;
import org.nl.wms.basedata.st.storattr.service.StorattrService;
import org.nl.wms.basedata.st.storattr.service.dto.StorattrDto;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
import org.nl.wms.basedata.st.structattr.service.dao.Structattr;
import org.nl.wms.basedata.st.structattr.service.dao.mapper.StructattrMapper;
import org.nl.wms.basedata.st.userstor.service.impl.UserStorServiceImpl;
import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.st.inbill.service.StorPublicService;
@@ -144,7 +144,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
page.setOrderBy("input_time DESC");
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();
UserStorServiceImpl userStorService = SpringContextHolder.getBean(UserStorServiceImpl.class);
String in_stor_id = userStorService.getInStor();
if (ObjectUtil.isNotEmpty(in_stor_id)) {

59
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserStorController.java
View File

@@ -1,59 +0,0 @@
//package org.nl.wms.basedata.st.rest;
//
//import com.alibaba.fastjson.JSONObject;
//import lombok.RequiredArgsConstructor;
//import lombok.extern.slf4j.Slf4j;
//import org.nl.modules.logging.annotation.Log;
//import org.nl.wms.basedata.st.service.UserStorService;
//import org.springframework.data.domain.Pageable;
//import org.springframework.http.HttpStatus;
//import org.springframework.http.ResponseEntity;
//import org.springframework.web.bind.annotation.*;
//
//import java.util.Map;
//
//@RestController
//@RequiredArgsConstructor
//
//@RequestMapping("/api/userStor")
//@Slf4j
//public class UserStorController {
// private final UserStorService userStorService;
//
// @GetMapping
// @Log("查询用户信息")
//
// public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
// return new ResponseEntity<>(userStorService.pageQuery(whereJson, page), HttpStatus.OK);
// }
//
// @PostMapping("/queryUserStor")
// @Log("查询用户对应仓库")
//
// public ResponseEntity<Object> queryUserStor(@RequestBody JSONObject whereJson) {
// return new ResponseEntity<>(userStorService.queryUserStor(whereJson), HttpStatus.OK);
// }
//
// @PostMapping("/save")
// @Log("保存用户仓库信息")
//
// public ResponseEntity<Object> save(@RequestBody JSONObject whereJson) {
// userStorService.save(whereJson);
// return new ResponseEntity<>(HttpStatus.OK);
// }
//
// @PostMapping("/getUserStor")
// @Log("获取人员对应下拉框-普通下拉框")
//
// public ResponseEntity<Object> getUserStor() {
// return new ResponseEntity<>(userStorService.getUserStor(), HttpStatus.OK);
// }
//
// @PostMapping("/getSect")
// @Log("获取人员对应下拉框-多级下拉框")
//
// public ResponseEntity<Object> getSect(@RequestBody JSONObject whereJson) {
// return new ResponseEntity<>(userStorService.getSect(whereJson), HttpStatus.OK);
// }
//
//}

5
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/sectattr/service/impl/SectattrServiceImpl.java
View File

@@ -18,6 +18,7 @@ import org.nl.common.domain.query.PageQuery;
import org.nl.common.utils.SecurityUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.basedata.st.sectattr.service.dao.Sectattr;
import org.nl.wms.basedata.st.sectattr.service.dao.mapper.SectattrMapper;
import org.nl.wms.basedata.st.sectattr.service.SectattrService;
@@ -26,7 +27,7 @@ import org.nl.wms.basedata.st.structattr.service.dao.Structattr;
import org.nl.wms.basedata.st.storattr.service.StorattrService;
import org.nl.wms.basedata.st.sectattr.service.dto.SectattrDto;
import org.nl.wms.basedata.st.storattr.service.dto.StorattrDto;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
import org.nl.wms.basedata.st.userstor.service.impl.UserStorServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -60,7 +61,7 @@ public class SectattrServiceImpl extends ServiceImpl<SectattrMapper, Sectattr> i
}
jsonObject.put("stor_id", whereJson.get("stor_id"));
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();
UserStorServiceImpl userStorService = SpringContextHolder.getBean(UserStorServiceImpl.class);
String in_stor_id = userStorService.getInStor();
if (ObjectUtil.isNotEmpty(in_stor_id)) {

50
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/UserStorService.java
View File

@@ -1,50 +0,0 @@
//package org.nl.wms.basedata.st.service;
//
//import com.alibaba.fastjson.JSONArray;
//import com.alibaba.fastjson.JSONObject;
//import org.nl.wms.basedata.st.storattr.service.dao.Storattr;
//import org.springframework.data.domain.Pageable;
//
//import java.util.List;
//import java.util.Map;
//
//public interface UserStorService {
// /**
// * 查询数据分页
// *
// * @param whereJson 条件
// * @param page 分页参数
// * @return Map<String, Object>
// */
// Map<String, Object> pageQuery(Map whereJson, Pageable page);
//
// /**
// * 查询用户对应仓库
// *
// * @param whereJson /
// */
// JSONArray queryUserStor(JSONObject whereJson);
//
// /**
// * 保存
// *
// * @param whereJson /
// */
// void save(JSONObject whereJson);
//
// /**
// * 获取人员对应下拉框 普通下拉框
// */
// List<Storattr> getUserStor();
//
// /**
// * 获取人员对应下拉框 多级下拉框
// */
// JSONObject getSect(JSONObject whereJson);
//
// /**
// * 新，获取用户下所有仓库List
// * @return
// */
// List<String> getUserStorInStor();
//}

6
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java
View File

@@ -19,11 +19,13 @@ import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.common.utils.FileUtil;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.basedata.st.service.StructivtService;
import org.nl.wms.basedata.st.service.dto.StructivtDto;
import org.nl.wms.basedata.st.structattr.service.dao.Structattr;
import org.nl.wms.basedata.st.structattr.service.dao.mapper.StructattrMapper;
import org.nl.wms.basedata.st.userstor.service.impl.UserStorServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
@@ -108,7 +110,7 @@ public class StructivtServiceImpl implements StructivtService {
}
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();
UserStorServiceImpl userStorService = SpringContextHolder.getBean(UserStorServiceImpl.class);
String in_stor_id = userStorService.getInStor();
if (ObjectUtil.isNotEmpty(in_stor_id)) {
@@ -259,7 +261,7 @@ public class StructivtServiceImpl implements StructivtService {
map.put("areas", areas);
}
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();
UserStorServiceImpl userStorService = SpringContextHolder.getBean(UserStorServiceImpl.class);
String in_stor_id = userStorService.getInStor();
if (ObjectUtil.isNotEmpty(in_stor_id)) {

199
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserStorServiceImpl.java
View File

@@ -1,199 +0,0 @@
//package org.nl.wms.basedata.st.service.impl;
//
//import cn.hutool.core.util.ObjectUtil;
//import cn.hutool.core.util.StrUtil;
//import com.alibaba.fastjson.JSONArray;
//import com.alibaba.fastjson.JSONObject;
//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
//import lombok.RequiredArgsConstructor;
//import lombok.extern.slf4j.Slf4j;
//import org.nl.common.utils.SecurityUtils;
//import org.nl.modules.wql.WQL;
//import org.nl.modules.wql.core.bean.WQLObject;
//import org.nl.modules.wql.util.WqlUtil;
//import org.nl.wms.basedata.st.service.UserStorService;
//import org.nl.wms.basedata.st.storattr.service.dao.Storattr;
//import org.nl.wms.basedata.st.storattr.service.dao.mapper.StorattrMapper;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.data.domain.Pageable;
//import org.springframework.stereotype.Service;
//import java.util.*;
//
///**
// * PC端出入库新增
// */
//@Service
//@RequiredArgsConstructor
//@Slf4j
//public class UserStorServiceImpl implements UserStorService {
// @Autowired
// private StorattrMapper storattrMapper;
// @Override
// public Map<String, Object> pageQuery(Map whereJson, Pageable page) {
// HashMap<String, String> map = new HashMap<>(whereJson);
// map.put("flag", "3");
// if (StrUtil.isNotEmpty(map.get("blurry"))) {
// map.put("blurry", "%" + map.get("blurry") + "%");
// }
// JSONObject jo = WQL.getWO("QST_STOR_ATTR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "username desc");
// return jo;
// }
//
// @Override
// public JSONArray queryUserStor(JSONObject whereJson) {
// String user_id = whereJson.getString("user_id");
// JSONArray rows = WQLObject.getWQLObject("st_ivt_userstor").query("user_id = '" + user_id + "'").getResultJSONArray(0);
// return rows;
// }
//
// @Override
// public void save(JSONObject whereJson) {
// JSONObject jo = whereJson.getJSONObject("jo");
// JSONArray rows = whereJson.getJSONArray("rows");
//
// String user_id = jo.getString("user_id");
//
// WQLObject.getWQLObject("st_ivt_userstor").delete("user_id ='" + user_id + "'");
// for (int i = 0; i < rows.size(); i++) {
// JSONObject row = rows.getJSONObject(i);
// String stor_id = row.getString("stor_id");
// JSONObject user_stor = new JSONObject();
// user_stor.put("stor_id", stor_id);
// user_stor.put("user_id", user_id);
// WQLObject.getWQLObject("st_ivt_userstor").insert(user_stor);
// }
// }
//
// @Override
// public List<Storattr> getUserStor() {
// /*
// * 获取人员对应仓库下拉框公共方法 普通下拉框
// */
// String currentUserId = SecurityUtils.getCurrentUserId();
//
// WQLObject userStorTab = WQLObject.getWQLObject("st_ivt_userstor");
//
// JSONArray userStorArr = userStorTab.query("user_id = '" + currentUserId + "'").getResultJSONArray(0);
// // 将仓库id拼成字符串
// Set<String> set = new HashSet<>();
// for (int i = 0; i < userStorArr.size(); i++) {
// JSONObject json = userStorArr.getJSONObject(i);
// set.add(json.getString("stor_id"));
// }
//
// // 查询仓库下拉框
// List<Storattr> resultJSONArray = new ArrayList<Storattr>();
// if (set.size()>0) {
// resultJSONArray =storattrMapper.selectList( Wrappers.lambdaQuery(Storattr.class)
// .eq(Storattr::getIs_delete, "0")
// .eq(Storattr::getIs_used, "1").in(Storattr::getStor_id,set)
// );
// }
// return resultJSONArray;
// }
//
// @Override
// public JSONObject getSect(JSONObject whereJson) {
// /*
// * 获取人员对应仓库下拉框公共方法 多级下拉框
// */
// JSONArray new_ja = new JSONArray();
// HashMap<String, String> stor_map = new HashMap<>();
// stor_map.put("flag", "2");
// stor_map.put("stor_id", whereJson.getString("stor_id"));
//
// //获取人员对应的仓库
// String in_stor_id = this.getInStor();
// if (ObjectUtil.isNotEmpty(in_stor_id)) {
// stor_map.put("in_stor_id", in_stor_id);
// }
//
// JSONArray stor_ja = WQL.getWO("QST_STOR_ATTR").addParamMap(stor_map).process().getResultJSONArray(0);
// for (int i = 0; i < stor_ja.size(); i++) {
// JSONObject stor_jo = stor_ja.getJSONObject(i);
// JSONObject stor_cas = new JSONObject();
// stor_cas.put("value", stor_jo.getString("stor_id"));
// stor_cas.put("label", stor_jo.getString("stor_name"));
// HashMap<String, String> map = new HashMap<>();
// map.put("flag", "2");
// map.put("stor_id", stor_jo.getString("stor_id"));
// JSONArray ja = WQL.getWO("QST_SECT_ATTR").addParamMap(map).process().getResultJSONArray(0);
// if (ja.size() > 0) {
// JSONArray sect_ja = new JSONArray();
// for (int j = 0; j < ja.size(); j++) {
// JSONObject sect_jo = ja.getJSONObject(j);
// JSONObject sect_cas = new JSONObject();
// sect_cas.put("value", sect_jo.getString("sect_id"));
// sect_cas.put("label", sect_jo.getString("sect_name"));
// sect_ja.add(sect_cas);
// }
// stor_cas.put("children", sect_ja);
// }
// new_ja.add(stor_cas);
// }
// JSONObject jo = new JSONObject();
// jo.put("content", new_ja);
// return jo;
// }
//
//
// @Override
// public List<String> getUserStorInStor() {
// /*
// * 获取人员对应仓库下拉框公共方法 普通下拉框
// */
// String currentUserId = SecurityUtils.getCurrentUserId();
//
// WQLObject userStorTab = WQLObject.getWQLObject("st_ivt_userstor");
//
// JSONArray userStorArr = userStorTab.query("user_id = '" + currentUserId + "'").getResultJSONArray(0);
// // 将仓库id拼成字符串
// List<String> set = new ArrayList<>();
// for (int i = 0; i < userStorArr.size(); i++) {
// JSONObject json = userStorArr.getJSONObject(i);
// set.add(json.getString("stor_id"));
// }
// return set;
// }
// /**
// * 获取仓库拼接公共方法
// *
// * @return in_stor_id /
// */
// public String getInStor() {
// String currentUserId = SecurityUtils.getCurrentUserId().toString();
// WQLObject userStorTab = WQLObject.getWQLObject("st_ivt_userstor");
//
// JSONArray userStorArr = userStorTab.query("user_id = '" + currentUserId + "'").getResultJSONArray(0);
// int size = userStorArr.size();
// // 将仓库id拼成字符串
// String in_stor_id = "";
//
// for (int i = 0; i < userStorArr.size(); i++) {
// JSONObject json = userStorArr.getJSONObject(i);
//
// if (size == 1) {
// // 如果只有一条记录
// in_stor_id = "('" + json.getString("stor_id") + "')";
// } else {
// if (i == 0) {
// // 第一条记录拼接
// in_stor_id = "('" + json.getString("stor_id") + "','";
// } else {
// if ((size - 1) == i) {
// // 最后一条记录拼接
// in_stor_id += json.getString("stor_id") + "')";
// } else {
// in_stor_id += json.getString("stor_id") + "','";
// }
// }
// }
// }
//
// if (ObjectUtil.isEmpty(in_stor_id)) {
// in_stor_id = "('')";
// }
// return in_stor_id;
// }
//
//}

5
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/structattr/service/impl/StructattrServiceImpl.java
View File

@@ -30,7 +30,6 @@ import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.wms.basedata.master.storagevehicleinfo.service.StoragevehicleinfoService;
import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.Storagevehicleinfo;
import org.nl.wms.basedata.st.sectattr.service.dao.Sectattr;
import org.nl.wms.basedata.st.service.UserStorService;
import org.nl.wms.basedata.st.structattr.service.dao.Structattr;
import org.nl.wms.basedata.st.structattr.service.dao.mapper.StructattrMapper;
import org.nl.wms.basedata.st.sectattr.service.SectattrService;
@@ -41,7 +40,7 @@ import org.nl.wms.basedata.st.storattr.service.dto.StorattrDto;
import org.nl.wms.basedata.st.structattr.service.dto.StructQuery;
import org.nl.wms.basedata.st.structattr.service.dto.PointToStructattrDto;
import org.nl.wms.basedata.st.structattr.service.dto.StructattrDto;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
import org.nl.wms.basedata.st.userstor.service.UserStorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
@@ -86,7 +85,7 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
public Map<String, Object> queryAll(StructQuery whereJson, PageQuery page) {
//获取人员对应的仓库
List<String> in_stor_id = userStorService.getUserStorInStor();
List<Long> in_stor_id = userStorService.getUserStorInStor();
LambdaQueryWrapper<Structattr> queryWrapper = Wrappers.lambdaQuery(Structattr.class)
.eq(Structattr::getIs_delete, "0")
.in(ObjectUtil.isNotEmpty(in_stor_id), Structattr::getStor_id, in_stor_id)

7
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PdaCheckServiceImpl.java
View File

@@ -12,8 +12,9 @@ import org.nl.common.utils.SecurityUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.basedata.st.storattr.service.dao.Storattr;
import org.nl.wms.basedata.st.userstor.service.impl.UserStorServiceImpl;
import org.nl.wms.pda.st.service.PdaCheckService;
import org.nl.wms.st.instor.service.CheckService;
import org.springframework.stereotype.Service;
@@ -46,7 +47,7 @@ public class PdaCheckServiceImpl implements PdaCheckService {
map.put("check_code", "%" + check_code + "%");
}
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();
UserStorServiceImpl userStorService = SpringContextHolder.getBean(UserStorServiceImpl.class);
String in_stor_id = userStorService.getInStor();
if (ObjectUtil.isNotEmpty(in_stor_id)) {
map.put("in_stor_id", in_stor_id);
@@ -158,7 +159,7 @@ public class PdaCheckServiceImpl implements PdaCheckService {
@Override
public JSONObject getStor() {
UserStorServiceImpl userStorService = new UserStorServiceImpl();
UserStorServiceImpl userStorService = SpringContextHolder.getBean(UserStorServiceImpl.class);
List<Storattr> userStor = userStorService.getUserStor();
JSONArray resultJSONArray = new JSONArray();

4
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java
View File

@@ -19,9 +19,9 @@ import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.system.service.param.impl.SysParamServiceImpl;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
import org.nl.wms.basedata.st.storattr.service.dao.Storattr;
import org.nl.wms.basedata.st.storattr.service.dao.mapper.StorattrMapper;
import org.nl.wms.basedata.st.userstor.service.impl.UserStorServiceImpl;
import org.nl.wms.ext.acs.service.WmsToAcsService;
import org.nl.wms.ext.acs.service.impl.AcsToWmsServiceImpl;
import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl;
@@ -78,7 +78,7 @@ public class ProductInstorServiceImpl implements ProductInstorService {
map.put("box_no", box_no);
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();
UserStorServiceImpl userStorService = SpringContextHolder.getBean(UserStorServiceImpl.class);
String in_stor_id = userStorService.getInStor();
if ("1".equals(option)) {

5
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java
View File

@@ -13,7 +13,8 @@ import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvOutServi
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.basedata.st.userstor.service.impl.UserStorServiceImpl;
import org.nl.wms.pda.st.service.VirtualOutService;
import org.nl.wms.st.inbill.service.CheckOutBillService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +46,7 @@ public class VirtualOutServiceImpl implements VirtualOutService {
map.put("bill_type", whereJson.getString("bill_type"));
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();
UserStorServiceImpl userStorService = SpringContextHolder.getBean(UserStorServiceImpl.class);
String in_stor_id = userStorService.getInStor();
if (ObjectUtil.isNotEmpty(in_stor_id)) {
map.put("in_stor_id", in_stor_id);

5
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java
View File

@@ -17,12 +17,13 @@ import org.nl.modules.common.exception.BadRequestException;
import org.nl.common.utils.CodeUtil;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.basedata.st.sectattr.service.dao.Sectattr;
import org.nl.wms.basedata.st.sectattr.service.dao.mapper.SectattrMapper;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
import org.nl.wms.basedata.st.structattr.service.dao.Structattr;
import org.nl.wms.basedata.st.structattr.service.dao.mapper.StructattrMapper;
import org.nl.wms.basedata.st.userstor.service.impl.UserStorServiceImpl;
import org.nl.wms.st.inbill.service.InchargeService;
import org.nl.wms.st.inbill.service.StorPublicService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -71,7 +72,7 @@ public class InchargeServiceImpl implements InchargeService {
}
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();
UserStorServiceImpl userStorService = SpringContextHolder.getBean(UserStorServiceImpl.class);
String in_stor_id = userStorService.getInStor();
if (ObjectUtil.isNotEmpty(in_stor_id)) {

5
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java
View File

@@ -15,8 +15,9 @@ import org.nl.modules.common.exception.BadRequestException;
import org.nl.common.utils.CodeUtil;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
import org.nl.wms.basedata.st.userstor.service.impl.UserStorServiceImpl;
import org.nl.wms.st.inbill.service.OutChargeService;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
@@ -83,7 +84,7 @@ public class OutChargeServiceImpl implements OutChargeService {
}
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();
UserStorServiceImpl userStorService = SpringContextHolder.getBean(UserStorServiceImpl.class);
String in_stor_id = userStorService.getInStor();
if (ObjectUtil.isNotEmpty(in_stor_id)) {

5
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
View File

@@ -23,6 +23,7 @@ import org.nl.modules.common.exception.BadRequestException;
import org.nl.common.utils.CodeUtil;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.system.service.param.ISysParamService;
import org.nl.wms.basedata.master.unit.service.dao.Unit;
@@ -34,7 +35,7 @@ import org.nl.wms.basedata.st.structattr.service.dao.mapper.StructattrMapper;
import org.nl.wms.basedata.st.storattr.service.StorattrService;
import org.nl.wms.basedata.st.structattr.service.StructattrService;
import org.nl.wms.basedata.st.storattr.service.dto.StorattrDto;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
import org.nl.wms.basedata.st.userstor.service.impl.UserStorServiceImpl;
import org.nl.wms.pda.mps.eum.RegionTypeEnum;
import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.TaskStatusEnum;
@@ -179,7 +180,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
}
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();
UserStorServiceImpl userStorService = SpringContextHolder.getBean(UserStorServiceImpl.class);
String in_stor_id = userStorService.getInStor();
if (ObjectUtil.isNotEmpty(in_stor_id)) {

4
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/movestor/service/impl/HandMoveStorServiceImpl.java
View File

@@ -29,7 +29,7 @@ import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.Storagevehiclee
import org.nl.wms.basedata.master.storagevehicleinfo.service.dao.mapper.StoragevehicleexMapper;
import org.nl.wms.basedata.st.structattr.service.dao.Structattr;
import org.nl.wms.basedata.st.structattr.service.dao.mapper.StructattrMapper;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
import org.nl.wms.basedata.st.userstor.service.impl.UserStorServiceImpl;
import org.nl.wms.pda.mps.eum.RegionTypeEnum;
import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.sch.tasks.OutTask;
@@ -988,7 +988,7 @@ public class HandMoveStorServiceImpl extends ServiceImpl<MoveStorMapper, MoveSto
}
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();
UserStorServiceImpl userStorService = SpringContextHolder.getBean(UserStorServiceImpl.class);
String in_stor_id = userStorService.getInStor();
if (ObjectUtil.isNotEmpty(in_stor_id)) {

5
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java
View File

@@ -15,12 +15,13 @@ import org.nl.modules.common.exception.BadRequestException;
import org.nl.common.utils.CodeUtil;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.basedata.master.customer.service.dao.Customerbase;
import org.nl.wms.basedata.master.customer.service.dao.mapper.CustomerbaseMapper;
import org.nl.wms.basedata.master.unit.service.dao.Unit;
import org.nl.wms.basedata.master.unit.service.dao.mapper.UnitMapper;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
import org.nl.wms.basedata.st.userstor.service.impl.UserStorServiceImpl;
import org.nl.wms.st.instor.service.ChangeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
@@ -61,7 +62,7 @@ public class ChangeServiceImpl implements ChangeService {
}
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();
UserStorServiceImpl userStorService = SpringContextHolder.getBean(UserStorServiceImpl.class);
String in_stor_id = userStorService.getInStor();
if (ObjectUtil.isNotEmpty(in_stor_id)) {

5
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java
View File

@@ -15,10 +15,11 @@ import org.nl.modules.common.utils.FileUtil;
import org.nl.common.utils.CodeUtil;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
import org.nl.wms.basedata.st.storattr.service.dao.Storattr;
import org.nl.wms.basedata.st.storattr.service.dao.mapper.StorattrMapper;
import org.nl.wms.basedata.st.userstor.service.impl.UserStorServiceImpl;
import org.nl.wms.st.instor.service.CheckService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
@@ -51,7 +52,7 @@ public class CheckServiceImpl implements CheckService {
}
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();
UserStorServiceImpl userStorService = SpringContextHolder.getBean(UserStorServiceImpl.class);
String in_stor_id = userStorService.getInStor();
if (ObjectUtil.isNotEmpty(in_stor_id)) {

8
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java
View File

@@ -24,7 +24,7 @@ import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.system.service.user.ISysUserService;
import org.nl.system.service.user.dao.SysUser;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
import org.nl.wms.basedata.st.userstor.service.impl.UserStorServiceImpl;
import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl;
import org.nl.wms.st.inbill.service.CheckOutBillService;
import org.nl.wms.st.instor.service.ProductScrapService;
@@ -67,7 +67,7 @@ public class ProductScrapServiceImpl implements ProductScrapService {
}
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();
UserStorServiceImpl userStorService = SpringContextHolder.getBean(UserStorServiceImpl.class);
String in_stor_id = userStorService.getInStor();
if (ObjectUtil.isNotEmpty(in_stor_id)) {
@@ -472,7 +472,7 @@ public class ProductScrapServiceImpl implements ProductScrapService {
// 获取此仓库的所有库存
String stor_id = request.getParameter("stor_id");
UserStorServiceImpl userStorService = new UserStorServiceImpl();
UserStorServiceImpl userStorService = SpringContextHolder.getBean(UserStorServiceImpl.class);
String in_stor_id = userStorService.getInStor();
List<JSONObject> ivtList = WQL.getWO("QST_IVT_HANDMOVESTOR")
@@ -558,7 +558,7 @@ public class ProductScrapServiceImpl implements ProductScrapService {
map.put("pcsn", (String) whereJson.get("pcsn"));
}
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();
UserStorServiceImpl userStorService = SpringContextHolder.getBean(UserStorServiceImpl.class);
String in_stor_id = userStorService.getInStor();
if (ObjectUtil.isNotEmpty(in_stor_id)) {

5
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/RecutPlanServiceImpl.java
View File

@@ -17,10 +17,11 @@ import org.nl.modules.common.exception.BadRequestException;
import org.nl.common.utils.CodeUtil;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.basedata.master.unit.service.dao.Unit;
import org.nl.wms.basedata.master.unit.service.dao.mapper.UnitMapper;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
import org.nl.wms.basedata.st.userstor.service.impl.UserStorServiceImpl;
import org.nl.wms.st.inbill.service.CheckOutBillService;
import org.nl.wms.st.instor.service.RecutPlanService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -62,7 +63,7 @@ public class RecutPlanServiceImpl implements RecutPlanService {
}
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();
UserStorServiceImpl userStorService = SpringContextHolder.getBean(UserStorServiceImpl.class);
String in_stor_id = userStorService.getInStor();
if (ObjectUtil.isNotEmpty(in_stor_id)) {

4
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -34,9 +34,9 @@ import org.nl.wms.basedata.master.transport.service.dao.TransportationBase;
import org.nl.wms.basedata.master.transport.service.dao.mapper.TransportationBaseMapper;
import org.nl.wms.basedata.st.sectattr.service.dao.Sectattr;
import org.nl.wms.basedata.st.sectattr.service.dao.mapper.SectattrMapper;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
import org.nl.wms.basedata.st.storattr.service.dao.Storattr;
import org.nl.wms.basedata.st.storattr.service.dao.mapper.StorattrMapper;
import org.nl.wms.basedata.st.userstor.service.impl.UserStorServiceImpl;
import org.nl.wms.pda.mps.eum.RegionTypeEnum;
import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.sch.tasks.OutTask;
@@ -200,7 +200,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
}
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();
UserStorServiceImpl userStorService = SpringContextHolder.getBean(UserStorServiceImpl.class);
String in_stor_id = userStorService.getInStor();
if (ObjectUtil.isNotEmpty(in_stor_id)) {

4
lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
View File

@@ -21,11 +21,11 @@ import org.nl.system.service.user.ISysUserService;
import org.nl.system.service.user.dao.SysUser;
import org.nl.wms.basedata.st.sectattr.service.dao.Sectattr;
import org.nl.wms.basedata.st.sectattr.service.dao.mapper.SectattrMapper;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
import org.nl.wms.basedata.st.storattr.service.StorattrService;
import org.nl.wms.basedata.st.storattr.service.dao.Storattr;
import org.nl.wms.basedata.st.storattr.service.dao.mapper.StorattrMapper;
import org.nl.wms.basedata.st.storattr.service.dto.StorattrDto;
import org.nl.wms.basedata.st.userstor.service.impl.UserStorServiceImpl;
import org.nl.wms.ext.mes.service.LmsToMesService;
import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl;
import org.nl.wms.ext.sap.service.impl.LmsToSapServiceImpl;
@@ -146,7 +146,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
}
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();
UserStorServiceImpl userStorService = SpringContextHolder.getBean(UserStorServiceImpl.class);
String in_stor_id = userStorService.getInStor();
if (ObjectUtil.isNotEmpty(in_stor_id)) {