pfz_smile
/
depositroy
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

添加身份验证功能

lwx_dev
erdanergou 2 years ago
parent
b94713672f
commit
02b7d69782
20 changed files with 127 additions and 105 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 90
      src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
  2. 4
      src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
  3. 3
      src/main/java/com/dreamchaser/depository_manage/converter/ExcelDepositoryInfoConverter.java
  4. 2
      src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryMapper.java
  5. 2
      src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialMapper.java
  6. 2
      src/main/java/com/dreamchaser/depository_manage/depository_mapper/PlaceMapper.java
  7. 2
      src/main/java/com/dreamchaser/depository_manage/service/DepositoryService.java
  8. 2
      src/main/java/com/dreamchaser/depository_manage/service/MaterialService.java
  9. 6
      src/main/java/com/dreamchaser/depository_manage/service/PlaceService.java
  10. 69
      src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
  11. 2
      src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java
  12. 6
      src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java
  13. 2
      src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
  14. 6
      src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java
  15. 7
      src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java
  16. 6
      src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java
  17. 3
      src/main/resources/templates/pages/applicationForStorageCenter/application-out_back.html
  18. 6
      src/main/resources/templates/pages/depository/table-stock.html
  19. 8
      src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html
  20. 4
      src/test/java/com/dreamchaser/depository_manage/QyWxCallBackTest.java

90
src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
View File

@ -1,5 +1,6 @@
package com.dreamchaser.depository_manage.controller; package com.dreamchaser.depository_manage.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.dreamchaser.depository_manage.config.PublicConfig; import com.dreamchaser.depository_manage.config.PublicConfig;
import com.dreamchaser.depository_manage.entity.*; import com.dreamchaser.depository_manage.entity.*;
@ -18,7 +19,6 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.File; import java.io.File;
import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -468,7 +468,7 @@ public class DepositoryRecordController {
// 如果是个人 // 如果是个人
// 获取管理员数据 // 获取管理员数据
UserByPort userByPort = userService.findUserByIdForNoPack(uid); UserByPort userByPort = PublicConfig.FindUserById(uid,finalUserKey,finalToken);
// 获取用户的用工关系 // 获取用户的用工关系
int emptype = userByPort.getEmptype(); int emptype = userByPort.getEmptype();
if (emptype > 10) { if (emptype > 10) {
@ -485,7 +485,7 @@ public class DepositoryRecordController {
// 定义用于获取当前岗位下的人的参数map // 定义用于获取当前岗位下的人的参数map
Map<String, Object> paramForGetUserByPost = new HashMap<>(); Map<String, Object> paramForGetUserByPost = new HashMap<>();
paramForGetUserByPost.put("position", uid); paramForGetUserByPost.put("position", uid);
List<UserByPort> userByPortList = userService.findUserByConditionForNoPack(paramForGetUserByPost); List<UserByPort> userByPortList = PublicConfig.FindUserByMap(paramForGetUserByPost,finalUserKey,finalToken);
for (UserByPort userByPort : userByPortList) { for (UserByPort userByPort : userByPortList) {
int emptype = userByPort.getEmptype(); int emptype = userByPort.getEmptype();
if (emptype > 10) { if (emptype > 10) {
@ -529,7 +529,7 @@ public class DepositoryRecordController {
// 如果是个人 // 如果是个人
// 获取管理员数据 // 获取管理员数据
UserByPort userByPort = userService.findUserByIdForNoPack(uid); UserByPort userByPort = PublicConfig.FindUserById(uid,finalUserKey,finalToken);
// 获取用户的用工关系 // 获取用户的用工关系
int emptype = userByPort.getEmptype(); int emptype = userByPort.getEmptype();
if (emptype > 10) { if (emptype > 10) {
@ -546,7 +546,7 @@ public class DepositoryRecordController {
// 定义用于获取当前岗位下的人的参数map // 定义用于获取当前岗位下的人的参数map
Map<String, Object> paramForGetUserByPost = new HashMap<>(); Map<String, Object> paramForGetUserByPost = new HashMap<>();
paramForGetUserByPost.put("position", uid); paramForGetUserByPost.put("position", uid);
List<UserByPort> userByPortList = userService.findUserByConditionForNoPack(paramForGetUserByPost); List<UserByPort> userByPortList = PublicConfig.FindUserByMap(paramForGetUserByPost,finalUserKey,finalToken);
for (UserByPort userByPort : userByPortList) { for (UserByPort userByPort : userByPortList) {
int emptype = userByPort.getEmptype(); int emptype = userByPort.getEmptype();
if (emptype > 10) { if (emptype > 10) {
@ -1097,23 +1097,29 @@ public class DepositoryRecordController {
/** /**
* 将选中的物料暂存到redis中 * 将选中的物料暂存到redis中
* *
* @param map * @param jsonObject
* @param request * @param request
* @return * @return
*/ */
@PostMapping("/addApplicationToRedis") @PostMapping("/addApplicationToRedis")
public RestResponse addApplicationToRedis(@RequestBody Map<String, Object> map, HttpServletRequest request) { public RestResponse addApplicationToRedis(@RequestBody JSONObject jsonObject, HttpServletRequest request) {
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if (token == null) { if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
List<Integer> mids = (List<Integer>) map.get("mids"); JSONArray mids = jsonObject.getJSONArray("mids");
List<Integer> depositoryIds = (List<Integer>) map.get("depositoryIds"); JSONArray depositoryIds = jsonObject.getJSONArray("depositoryIds");
List<String> placeCodes = (List<String>) map.get("placeCodes"); JSONArray placeCodes = jsonObject.getJSONArray("placeCodes");
// List<Long> mids = ObjectFormatUtil.objToList(map.get("mids"),Long.class);
// List<Long> depositoryIds = ObjectFormatUtil.objToList(map.get("depositoryIds"),Long.class);
// List<String> placeCodes = ObjectFormatUtil.objToList(map.get("placeCodes"),String.class);
List<String> nowmids = redisPool.getRedisTemplateByDb(15).opsForList().range("mids" + userToken.getId(), 0, -1); List<String> nowmids = redisPool.getRedisTemplateByDb(15).opsForList().range("mids" + userToken.getId(), 0, -1);
if(nowmids == null){
nowmids = new ArrayList<>();
}
for (int i = 0; i < mids.size(); i++) { for (int i = 0; i < mids.size(); i++) {
if (nowmids.contains(mids.get(i))) { if (nowmids.contains(mids.get(i).toString())) {
continue; continue;
} }
redisPool.getRedisTemplateByDb(15).opsForList().leftPush("mids" + userToken.getId(), mids.get(i).toString()); redisPool.getRedisTemplateByDb(15).opsForList().leftPush("mids" + userToken.getId(), mids.get(i).toString());
@ -1130,27 +1136,28 @@ public class DepositoryRecordController {
/** /**
* 将选中的物料从redis中删除 * 将选中的物料从redis中删除
* *
* @param map * @param jsonParam
* @param request * @param request
* @return * @return
*/ */
@PostMapping("/deleteApplicationToRedis") @PostMapping("/deleteApplicationToRedis")
public RestResponse deleteApplicationToRedis(@RequestBody Map<String, Object> map, HttpServletRequest request) { public RestResponse deleteApplicationToRedis(@RequestBody JSONObject jsonParam, HttpServletRequest request) {
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if (token == null) { if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
List<Integer> mids = (List<Integer>) map.get("iids");
List<Integer> depositoryIds = (List<Integer>) map.get("depositoryIds"); JSONArray iids = jsonParam.getJSONArray("iids");
List<String> placeCodes = (List<String>) map.get("placeCodes"); JSONArray depositoryIds = jsonParam.getJSONArray("depositoryIds");
for (Integer mid : mids) { JSONArray placeCodes = jsonParam.getJSONArray("placeCodes");
for (Object mid : iids) {
redisPool.getRedisTemplateByDb(15).opsForList().remove("mids" + userToken.getId(), 1, mid.toString()); redisPool.getRedisTemplateByDb(15).opsForList().remove("mids" + userToken.getId(), 1, mid.toString());
} }
for (Integer depositoryId : depositoryIds) { for (Object depositoryId : depositoryIds) {
redisPool.getRedisTemplateByDb(15).opsForList().remove("depositoryIds" + userToken.getId(), 1, depositoryId.toString()); redisPool.getRedisTemplateByDb(15).opsForList().remove("depositoryIds" + userToken.getId(), 1, depositoryId.toString());
} }
for (String placeCode : placeCodes) { for (Object placeCode : placeCodes) {
redisPool.getRedisTemplateByDb(15).opsForList().remove("placeCodes" + userToken.getId(), 1, placeCode + " "); redisPool.getRedisTemplateByDb(15).opsForList().remove("placeCodes" + userToken.getId(), 1, placeCode + " ");
} }
return CrudUtil.insertHandle(1, 1); return CrudUtil.insertHandle(1, 1);
@ -1787,7 +1794,8 @@ public class DepositoryRecordController {
} }
}); });
} else if ("out".equals(type)) { }
else if ("out".equals(type)) {
// 获取部门负责人 // 获取部门负责人
List<UserByPort> departmentHeadByUsers = userService.getDepartmentHeaderByIdForNoPack(userToken.getMaindeparment()); List<UserByPort> departmentHeadByUsers = userService.getDepartmentHeaderByIdForNoPack(userToken.getMaindeparment());
StringBuilder departmentHeadId = new StringBuilder(); StringBuilder departmentHeadId = new StringBuilder();
@ -1842,12 +1850,12 @@ public class DepositoryRecordController {
/** /**
* 构造多个出入库表单 * 构造多个出入库表单
* *
* @param map * @param jsonParam
* @param request * @param request
* @return * @return
*/ */
@PostMapping("/createMultiApplications") @PostMapping("/createMultiApplications")
public RestResponse createMultiApplications(@RequestBody Map<String, Object> map, HttpServletRequest request) { public RestResponse createMultiApplications(@RequestBody JSONObject jsonParam, HttpServletRequest request) {
String usertoken = request.getHeader("user-token"); String usertoken = request.getHeader("user-token");
String userkey = request.getHeader("user-key"); String userkey = request.getHeader("user-key");
if (usertoken == null) { if (usertoken == null) {
@ -1860,15 +1868,15 @@ public class DepositoryRecordController {
String header = request.getHeader("user-agent"); String header = request.getHeader("user-agent");
String crypt = Md5.crypt(header); String crypt = Md5.crypt(header);
// 获取要处理的类型 // 获取要处理的类型
String type = (String) map.get("type"); String type = jsonParam.getString("type");
Integer success = 0; Integer success = 0;
List<Long> mids = ObjectFormatUtil.objToList(map.get("mids"), Long.class); JSONArray mids =jsonParam.getJSONArray("mids");
List<Long> iids = ObjectFormatUtil.objToList(map.get("iids"), Long.class); JSONArray iids = jsonParam.getJSONArray("iids");
List<Long> depositoryIds = ObjectFormatUtil.objToList(map.get("depositoryIds"), Long.class); JSONArray depositoryIds = jsonParam.getJSONArray("depositoryIds");
List<Object> quantitys = ObjectFormatUtil.objToList(map.get("quantitys"), Object.class); JSONArray quantitys = jsonParam.getJSONArray("quantitys");
List<String> placeCodes = ObjectFormatUtil.objToList(map.get("placeCodes"), String.class); JSONArray placeCodes = jsonParam.getJSONArray("placeCodes");
List<String> applyRemarks = ObjectFormatUtil.objToList(map.get("applyRemarks"), String.class); JSONArray applyRemarks = jsonParam.getJSONArray("applyRemarks");
List<String> units = ObjectFormatUtil.objToList(map.get("units"), String.class); JSONArray units = jsonParam.getJSONArray("units");
StringBuilder errMsg = new StringBuilder(); StringBuilder errMsg = new StringBuilder();
Long id = 0L; Long id = 0L;
if ("in".equals(type)) { if ("in".equals(type)) {
@ -1878,9 +1886,9 @@ public class DepositoryRecordController {
List<Long> recordIds = new ArrayList<>(); List<Long> recordIds = new ArrayList<>();
for (int i = 0; i < mids.size(); i++) { for (int i = 0; i < mids.size(); i++) {
// 获取库位 // 获取库位
String placeCode = placeCodes.get(i); String placeCode = (String) placeCodes.get(i);
// 获取当前仓库编号 // 获取当前仓库编号
Long depositoryId = depositoryIds.get(i); Object depositoryId = depositoryIds.get(i);
// 获取当前申请数量 // 获取当前申请数量
Double integer = ObjectFormatUtil.toDouble(quantitys.get(i)); Double integer = ObjectFormatUtil.toDouble(quantitys.get(i));
String quantity = integer.toString(); String quantity = integer.toString();
@ -1891,9 +1899,9 @@ public class DepositoryRecordController {
Place place = placeService.findPlaceByDidAndCode(depositoryId, placeCode); Place place = placeService.findPlaceByDidAndCode(depositoryId, placeCode);
placeId = place.getId(); placeId = place.getId();
} }
Long mid = mids.get(i); Object mid = mids.get(i);
String applyRemark = applyRemarks.get(i); String applyRemark = (String) applyRemarks.get(i);
String unit = units.get(i); String unit = (String) units.get(i);
Map<String, Object> inRecord = new HashMap<>(); Map<String, Object> inRecord = new HashMap<>();
inRecord.put("applicantId", userToken.getId()); inRecord.put("applicantId", userToken.getId());
inRecord.put("mid", mid); inRecord.put("mid", mid);
@ -2110,16 +2118,16 @@ public class DepositoryRecordController {
id = ObjectFormatUtil.toLong(mainRecord.get("id")); id = ObjectFormatUtil.toLong(mainRecord.get("id"));
for (int i = 0; i < iids.size(); i++) { for (int i = 0; i < iids.size(); i++) {
// 出库物料 // 出库物料
Long mid = iids.get(i); Long mid = ObjectFormatUtil.toLong(iids.get(i));
// 出库数量 // 出库数量
Double integer = ObjectFormatUtil.toDouble(quantitys.get(i)); Double integer = ObjectFormatUtil.toDouble(quantitys.get(i));
// 获取当前仓库编号 // 获取当前仓库编号
Long depositoryId = depositoryIds.get(i); Long depositoryId = ObjectFormatUtil.toLong(depositoryIds.get(i));
String quantity = String.valueOf((int) (integer * 100)); String quantity = String.valueOf((int) (integer * 100));
// 获取库位 // 获取库位
String placeCode = placeCodes.get(i); String placeCode = (String) placeCodes.get(i);
String unit = units.get(i); String unit = (String) units.get(i);
// 获取每个库位编码 // 获取每个库位编码
String[] s = placeCode.split(" "); String[] s = placeCode.split(" ");
Long place = 0L; Long place = 0L;
@ -2150,13 +2158,13 @@ public class DepositoryRecordController {
if (Long.compare(0, place) == 0) { if (Long.compare(0, place) == 0) {
// 如果当前库位是默认库位 // 如果当前库位是默认库位
Integer quantityByMidAndPid = placeService.findQuantityByMidAndPid(mid, 0L); Integer quantityByMidAndPid = placeService.findQuantityByMidAndPid(mid, 0L);
if (quantityByMidAndPid > integer) { if (quantityByMidAndPid != null && quantityByMidAndPid > integer) {
// 如果默认库位中该物料数量可以出库 // 如果默认库位中该物料数量可以出库
flag = true; flag = true;
} }
} }
if (flag) { if (flag) {
String applyRemark = applyRemarks.get(i); String applyRemark = (String)applyRemarks.get(i);
Map<String, Object> outRecord = new HashMap<>(); Map<String, Object> outRecord = new HashMap<>();
outRecord.put("quantity", quantity); outRecord.put("quantity", quantity);
outRecord.put("mid", mid); outRecord.put("mid", mid);

4
src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
View File

@ -1704,9 +1704,9 @@ public class MaterialController {
String materialCode = materialService.findMaterialCodeByQrCode(qrCode); String materialCode = materialService.findMaterialCodeByQrCode(qrCode);
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
// 0为非法码，1为物料，2为库位，3为仓库 // 0为非法码，1为物料，2为库位，3为仓库
Integer flag = 0; int flag = 0;
// 1为二维码2为条形码 // 1为二维码2为条形码
Integer CodeType = 0; int CodeType = 0;
if (materialCode != null) { if (materialCode != null) {
// 如果当前不为空,则扫描的为物料二维码 // 如果当前不为空,则扫描的为物料二维码
flag = 1; flag = 1;

3
src/main/java/com/dreamchaser/depository_manage/converter/ExcelDepositoryInfoConverter.java
View File

@ -3,19 +3,16 @@ package com.dreamchaser.depository_manage.converter;
import com.alibaba.excel.converters.Converter; import com.alibaba.excel.converters.Converter;
import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.enums.CellDataTypeEnum;
import com.alibaba.excel.exception.ExcelDataConvertException;
import com.alibaba.excel.metadata.GlobalConfiguration; import com.alibaba.excel.metadata.GlobalConfiguration;
import com.alibaba.excel.metadata.data.ReadCellData; import com.alibaba.excel.metadata.data.ReadCellData;
import com.alibaba.excel.metadata.data.WriteCellData; import com.alibaba.excel.metadata.data.WriteCellData;
import com.alibaba.excel.metadata.property.ExcelContentProperty; import com.alibaba.excel.metadata.property.ExcelContentProperty;
import com.dreamchaser.depository_manage.entity.Depository; import com.dreamchaser.depository_manage.entity.Depository;
import com.dreamchaser.depository_manage.entity.MaterialType;
import com.dreamchaser.depository_manage.service.DepositoryService; import com.dreamchaser.depository_manage.service.DepositoryService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import java.util.List;
/** /**
* 用于将仓库编码转为仓库id * 用于将仓库编码转为仓库id

2
src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryMapper.java
View File

@ -72,7 +72,7 @@ public interface DepositoryMapper {
* @param id 参数id * @param id 参数id
* @return 对应仓库信息 * @return 对应仓库信息
*/ */
Depository findDepositoryById(Long id); Depository findDepositoryById(Object id);
/** /**
* 根据主键id批量获取数据 * 根据主键id批量获取数据

2
src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialMapper.java
View File

@ -205,7 +205,7 @@ public interface MaterialMapper {
* @param id 库存id * @param id 库存id
* @return 库存信息 * @return 库存信息
*/ */
Material findMaterialById(Long id); Material findMaterialById(Object id);
/** /**
* 根据库存id查询库存信息 * 根据库存id查询库存信息

2
src/main/java/com/dreamchaser/depository_manage/depository_mapper/PlaceMapper.java
View File

@ -80,7 +80,7 @@ public interface PlaceMapper {
* @param did * @param did
* @return * @return
*/ */
List<Place> findPlaceByDid(Long did); List<Place> findPlaceByDid(Object did);
/** /**
* 根据id将库位状态改为删除 * 根据id将库位状态改为删除

2
src/main/java/com/dreamchaser/depository_manage/service/DepositoryService.java
View File

@ -55,7 +55,7 @@ public interface DepositoryService {
* @param id * @param id
* @return 查询数据 * @return 查询数据
*/ */
Depository findDepositoryById(Long id); Depository findDepositoryById(Object id);
/** /**

2
src/main/java/com/dreamchaser/depository_manage/service/MaterialService.java
View File

@ -134,7 +134,7 @@ public interface MaterialService {
* @param id 库存id * @param id 库存id
* @return 库存信息 * @return 库存信息
*/ */
Material findMaterialById(Long id); Material findMaterialById(Object id);
/** /**
* 根据库存id查询库存信息 * 根据库存id查询库存信息

6
src/main/java/com/dreamchaser/depository_manage/service/PlaceService.java
View File

@ -72,7 +72,7 @@ public interface PlaceService {
* @param did * @param did
* @return * @return
*/ */
List<Place> findPlaceByDid(Long did); List<Place> findPlaceByDid(Object did);
/** /**
@ -95,7 +95,7 @@ public interface PlaceService {
* @param code 库位编码 * @param code 库位编码
* @return * @return
*/ */
Place findPlaceByDidAndCode(Long did,String code); Place findPlaceByDidAndCode(Object did, String code);
/** /**
* 根据id将库位状态改为删除 * 根据id将库位状态改为删除
@ -198,7 +198,7 @@ public interface PlaceService {
* @param pid * @param pid
* @return * @return
*/ */
Integer findQuantityByMidAndPid(Long mid,Long pid); Integer findQuantityByMidAndPid(Object mid, Long pid);
/** /**
* 修改当前库位存放物料 * 修改当前库位存放物料

69
src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
View File

@ -8,8 +8,6 @@ import com.dreamchaser.depository_manage.entity.*;
import com.dreamchaser.depository_manage.entity.MaterialAndPlace; import com.dreamchaser.depository_manage.entity.MaterialAndPlace;
import com.dreamchaser.depository_manage.exception.MyException; import com.dreamchaser.depository_manage.exception.MyException;
import com.dreamchaser.depository_manage.depository_mapper.*; import com.dreamchaser.depository_manage.depository_mapper.*;
import com.dreamchaser.depository_manage.hrNew_mapper.AdministrativeMapper;
import com.dreamchaser.depository_manage.hrNew_mapper.UserMapper;
import com.dreamchaser.depository_manage.pojo.*; import com.dreamchaser.depository_manage.pojo.*;
import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details; import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details;
import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details_Approver; import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details_Approver;
@ -245,7 +243,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
} else { } else {
List<Long> depositoryIdForUserHas = roleService.findDepositoryIdForUser(userToken); List<Long> depositoryIdForUserHas = roleService.findDepositoryIdForUser(userToken);
map.put("flagForOpenDepository", 2); map.put("flagForOpenDepository", 2);
if (depositoryIdForUserHas.contains(ObjectFormatUtil.toInteger(depositoryId))) { if (depositoryIdForUserHas.contains(ObjectFormatUtil.toLong(depositoryId))) {
map.put("flagForOpenDepository", 1); map.put("flagForOpenDepository", 1);
} }
@ -756,7 +754,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
// 定义用于获取当前岗位下的人的参数map // 定义用于获取当前岗位下的人的参数map
Map<String, Object> paramForGetUserByPost = new HashMap<>(); Map<String, Object> paramForGetUserByPost = new HashMap<>();
paramForGetUserByPost.put("position", roleAndDepository.getUserId()); paramForGetUserByPost.put("position", roleAndDepository.getUserId());
List<UserByPort> userByPortList = userService.findUserByConditionForNoPack(paramForGetUserByPost); List<UserByPort> userByPortList = PublicConfig.FindUserByMap(paramForGetUserByPost,null,null);
for (UserByPort userByPort : userByPortList) { for (UserByPort userByPort : userByPortList) {
int emptype = userByPort.getEmptype(); int emptype = userByPort.getEmptype();
if (emptype > 10) { if (emptype > 10) {
@ -795,7 +793,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
// 定义用于获取当前岗位下的人的参数map // 定义用于获取当前岗位下的人的参数map
Map<String, Object> paramForGetUserByPost = new HashMap<>(); Map<String, Object> paramForGetUserByPost = new HashMap<>();
paramForGetUserByPost.put("position", uid); paramForGetUserByPost.put("position", uid);
List<UserByPort> userByPortList = userService.findUserByConditionForNoPack(paramForGetUserByPost); List<UserByPort> userByPortList = PublicConfig.FindUserByMap(paramForGetUserByPost,null,null);
for (UserByPort userByPort : userByPortList) { for (UserByPort userByPort : userByPortList) {
int emptype = userByPort.getEmptype(); int emptype = userByPort.getEmptype();
if (emptype > 10) { if (emptype > 10) {
@ -1923,7 +1921,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
// 强行完成出库 // 强行完成出库
// 获取当前出库人员 // 获取当前出库人员
UserByPort userByPort = userService.findUserByIdForNoPack(outRecordMin.getCheckId()); UserByPort userByPort = PublicConfig.FindUserById(outRecordMin.getCheckId(),userKey,token);
outRecord.setPass(1); outRecord.setPass(1);
updateApplicationMinOutInfo(id, outRecordMin, outRecord, (double) (quantity), userByPort, placeById.getId(), userAgent, userKey, token); updateApplicationMinOutInfo(id, outRecordMin, outRecord, (double) (quantity), userByPort, placeById.getId(), userAgent, userKey, token);
@ -1942,7 +1940,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
for (RoleAndMaterialType mt : materialTypeIdForIn for (RoleAndMaterialType mt : materialTypeIdForIn
) { ) {
// 获取管理员数据 // 获取管理员数据
UserByPort userByPort = userService.findUserByIdForNoPack(mt.getUid()); UserByPort userByPort = PublicConfig.FindUserById(mt.getUid(),userKey,token);
// 获取用户的用工关系 // 获取用户的用工关系
int emptype = userByPort.getEmptype(); int emptype = userByPort.getEmptype();
if (emptype > 10) { if (emptype > 10) {
@ -1960,7 +1958,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
for (RoleAndDepository mt : materialTypeIdForIn for (RoleAndDepository mt : materialTypeIdForIn
) { ) {
// 获取管理员数据 // 获取管理员数据
UserByPort userByPort = userService.findUserByIdForNoPack(mt.getUserId()); UserByPort userByPort = PublicConfig.FindUserById(mt.getUserId(),userKey,token);
// 获取用户的用工关系 // 获取用户的用工关系
int emptype = userByPort.getEmptype(); int emptype = userByPort.getEmptype();
if (emptype > 10) { if (emptype > 10) {
@ -2369,7 +2367,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
continue; continue;
} }
Long uid = ObjectFormatUtil.toLong(s); Long uid = ObjectFormatUtil.toLong(s);
UserByPort depositoryManager = userService.findUserByIdForNoPack(uid); UserByPort depositoryManager = PublicConfig.FindUserById(uid,userKey,token);
// 获取用户的用工关系 // 获取用户的用工关系
int emptype = depositoryManager.getEmptype(); int emptype = depositoryManager.getEmptype();
if (emptype > 10) { if (emptype > 10) {
@ -2916,7 +2914,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
// 获取审批人userId // 获取审批人userId
String userId = approver.getUserId(); String userId = approver.getUserId();
// 获取审批人 // 获取审批人
UserByPort userByPort = userService.findUserByWorkWechat(userId); // UserByPort userByPort = userService.findUserByWorkWechat(userId);
Map<String, Object> userByQyWxUserId = PublicConfig.findUserByQyWxUserId(userId);
UserByPort userByPort = (UserByPort) userByQyWxUserId.get("user");
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("approverId", userByPort.getId()); map.put("approverId", userByPort.getId());
map.put("approverTime", System.currentTimeMillis()); map.put("approverTime", System.currentTimeMillis());
@ -3096,7 +3096,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
map.put("transferId", transferId); map.put("transferId", transferId);
// 获取当前转移物料仓库 // 获取当前转移物料仓库
Depository depositoryRecordById = depositoryMapper.findDepositoryById(material.getDepositoryId()); Depository depositoryRecordById = depositoryMapper.findDepositoryById(material.getDepositoryId());
Administration company = administrativeService.findAdministrationById(userByPort.getMaindeparment()); // Administration company = administrativeService.findAdministrationById(userByPort.getMaindeparment());
Administration company = PublicConfig.getCompany(userByPort.getMaindeparment(),userKey,token);
// 生成出库订单 // 生成出库订单
map.put("code", createCode(depositoryRecordById.getDname(), "outOrderNumber", "out", company.getName())); map.put("code", createCode(depositoryRecordById.getDname(), "outOrderNumber", "out", company.getName()));
Object placeId = map.get("fromPlaceId"); Object placeId = map.get("fromPlaceId");
@ -3186,7 +3187,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
List<ApplicationOutRecordMin> minByParent = depositoryRecordMapper.findApplicationOutRecordMinByParent(record.getId()); List<ApplicationOutRecordMin> minByParent = depositoryRecordMapper.findApplicationOutRecordMinByParent(record.getId());
// 获取申请用户 // 获取申请用户
UserByPort applicantUser = userService.findUserByIdForNoPack(record.getApplicantId()); UserByPort applicantUser = PublicConfig.FindUserById(record.getApplicantId(),userKey,token);
// 用于标志该仓库是否为前置仓下的仓库 // 用于标志该仓库是否为前置仓下的仓库
boolean flagForHasOtherDepository = true; //默认是前置仓下的仓库 boolean flagForHasOtherDepository = true; //默认是前置仓下的仓库
// 获取当前出库是否为开放出库 // 获取当前出库是否为开放出库
@ -3194,9 +3195,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
int flagForOpenDepository = record.getFlagForOpenDepository(); int flagForOpenDepository = record.getFlagForOpenDepository();
if (manager1 != null && !"".equals(manager1)) { if (manager1 != null && !"".equals(manager1)) {
flagForHasOtherDepository = false; flagForHasOtherDepository = false;
} else { }
else {
if (flagForOpenDepository != 1) { if (flagForOpenDepository != 1) {
// 如果是开放仓库 // 如果是开放仓库
flagForHasOtherDepository = false; flagForHasOtherDepository = false;
} else { } else {
@ -3272,7 +3275,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
// 获取当前仓库所属的部门 // 获取当前仓库所属的部门
String adminorg = depositoryById.getAdminorg(); String adminorg = depositoryById.getAdminorg();
List<UserByPort> departmentHeadByUser = userService.getDepartmentHeaderByIdForNoPack(ObjectFormatUtil.toLong(adminorg)); // List<UserByPort> departmentHeadByUser = userService.getDepartmentHeaderByIdForNoPack(ObjectFormatUtil.toLong(adminorg));
List<UserByPort> departmentHeadByUser = PublicConfig.findDepartmentHeadByUser(ObjectFormatUtil.toLong(adminorg),userKey,token);
for (UserByPort departmentHead : departmentHeadByUser for (UserByPort departmentHead : departmentHeadByUser
) { ) {
depositoryManager.append(departmentHead.getId()).append(","); depositoryManager.append(departmentHead.getId()).append(",");
@ -3287,7 +3292,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
// 获取仓储中心负责人 // 获取仓储中心负责人
List<UserByPort> departmentHeadByUser = userService.getDepartmentHeaderByIdForNoPack(361L); List<UserByPort> departmentHeadByUser = PublicConfig.findDepartmentHeadByUser(361L,userKey,token);
for (UserByPort userByPort : departmentHeadByUser) { for (UserByPort userByPort : departmentHeadByUser) {
depositoryManager.append(userByPort.getId()).append(","); depositoryManager.append(userByPort.getId()).append(",");
@ -3306,7 +3311,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
// 如果是第一个节点 // 如果是第一个节点
List<String> qyWxLabelUserList = QyWxConfig.getQyWxLabelUserListForLabelName(userAgent, "平衡岗"); List<String> qyWxLabelUserList = QyWxConfig.getQyWxLabelUserListForLabelName(userAgent, "平衡岗");
for (String s : qyWxLabelUserList) { for (String s : qyWxLabelUserList) {
UserByPort user = userService.findUserByWorkWechat(s); UserByPort user = (UserByPort) PublicConfig.findUserByQyWxUserId(s).get("user");
String workwechat = user.getWorkwechat(); String workwechat = user.getWorkwechat();
if (workwechat == null || "".equals(workwechat)) { if (workwechat == null || "".equals(workwechat)) {
workwechat = user.getWechat(); workwechat = user.getWechat();
@ -3336,7 +3341,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if ("".equals(depositorymanager)) { if ("".equals(depositorymanager)) {
continue; continue;
} }
UserByPort depositoryManage = userService.findUserByIdForNoPack(ObjectFormatUtil.toLong(depositorymanager)); UserByPort depositoryManage = PublicConfig.FindUserById(ObjectFormatUtil.toLong(depositorymanager),userKey,token);
// 获取用户的用工关系 // 获取用户的用工关系
int emptype = depositoryManage.getEmptype(); int emptype = depositoryManage.getEmptype();
if (emptype > 10) { if (emptype > 10) {
@ -3395,7 +3400,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if ("".equals(s)) { if ("".equals(s)) {
continue; continue;
} }
UserByPort userByPort = userService.findUserByIdForNoPack(ObjectFormatUtil.toLong(s)); UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toLong(s),userKey,token);
// 获取用户的用工关系 // 获取用户的用工关系
int emptype = userByPort.getEmptype(); int emptype = userByPort.getEmptype();
if (emptype > 10) { if (emptype > 10) {
@ -3411,7 +3416,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
s = "PangFuZhen,"; s = "PangFuZhen,";
qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toLong(id), s, userAgent, 1, userKey, token); qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toLong(id), s, userAgent, 1, userKey, token);
}); });
} else if (map.containsKey("balancePosterPass") && !flagForHasOtherDepository) { }
else if (map.containsKey("balancePosterPass") && !flagForHasOtherDepository) {
// 如果是平衡岗人员审批且进入该流程 // 如果是平衡岗人员审批且进入该流程
String result = ""; String result = "";
@ -3431,7 +3437,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
// 获取综合办负责人 // 获取综合办负责人
List<UserByPort> departmentHeadByUser = userService.getDepartmentHeaderByIdForNoPack(268L); List<UserByPort> departmentHeadByUser = PublicConfig.findDepartmentHeadByUser(268L,userKey,token);
for (UserByPort userByPort : departmentHeadByUser) { for (UserByPort userByPort : departmentHeadByUser) {
depositoryManager.append(userByPort.getId()).append(","); depositoryManager.append(userByPort.getId()).append(",");
@ -3456,7 +3462,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if ("".equals(depositorymanager)) { if ("".equals(depositorymanager)) {
continue; continue;
} }
UserByPort depositoryManage = userService.findUserByIdForNoPack(ObjectFormatUtil.toLong(depositorymanager)); UserByPort depositoryManage = PublicConfig.FindUserById(ObjectFormatUtil.toLong(depositorymanager),userKey,token);
// 获取用户的用工关系 // 获取用户的用工关系
int emptype = depositoryManage.getEmptype(); int emptype = depositoryManage.getEmptype();
if (emptype > 10) { if (emptype > 10) {
@ -3515,7 +3521,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if ("".equals(s)) { if ("".equals(s)) {
continue; continue;
} }
UserByPort userByPort = userService.findUserByIdForNoPack(ObjectFormatUtil.toLong(s)); UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toLong(s),userKey,token);
// 获取用户的用工关系 // 获取用户的用工关系
int emptype = userByPort.getEmptype(); int emptype = userByPort.getEmptype();
if (emptype > 10) { if (emptype > 10) {
@ -3531,7 +3537,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
s = "PangFuZhen,"; s = "PangFuZhen,";
qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toLong(id), s, userAgent, 1, userKey, token); qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toLong(id), s, userAgent, 1, userKey, token);
}); });
} else { }
else {
String result = ""; String result = "";
// 开启线程更改其他用户卡片模板样式 // 开启线程更改其他用户卡片模板样式
String simpleTime = DateUtil.getSimpleTime(new Date()); String simpleTime = DateUtil.getSimpleTime(new Date());
@ -3634,7 +3641,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
// 定义用于获取当前岗位下的人的参数map // 定义用于获取当前岗位下的人的参数map
Map<String, Object> paramForGetUserByPost = new HashMap<>(); Map<String, Object> paramForGetUserByPost = new HashMap<>();
paramForGetUserByPost.put("position", roleAndMaterialType.getUid()); paramForGetUserByPost.put("position", roleAndMaterialType.getUid());
List<UserByPort> userByPortList = userService.findUserByConditionForNoPack(paramForGetUserByPost); List<UserByPort> userByPortList = PublicConfig.FindUserByMap(paramForGetUserByPost,userKey,token);
for (UserByPort userByPort : userByPortList) { for (UserByPort userByPort : userByPortList) {
int emptype = userByPort.getEmptype(); int emptype = userByPort.getEmptype();
if (emptype > 10) { if (emptype > 10) {
@ -3657,7 +3664,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
for (Long integer : userIdByDid) { for (Long integer : userIdByDid) {
// 获取仓库管理员信息 // 获取仓库管理员信息
UserByPort manager = userService.findUserByIdForNoPack(integer); UserByPort manager = PublicConfig.FindUserById(integer,userKey,token);
// 获取用户的用工关系 // 获取用户的用工关系
int emptype = manager.getEmptype(); int emptype = manager.getEmptype();
if (emptype > 10) { if (emptype > 10) {
@ -3721,7 +3728,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
// 定义用于获取当前岗位下的人的参数map // 定义用于获取当前岗位下的人的参数map
Map<String, Object> paramForGetUserByPost = new HashMap<>(); Map<String, Object> paramForGetUserByPost = new HashMap<>();
paramForGetUserByPost.put("position", roleAndDepository.getUserId()); paramForGetUserByPost.put("position", roleAndDepository.getUserId());
List<UserByPort> userByPortList = userService.findUserByConditionForNoPack(paramForGetUserByPost); List<UserByPort> userByPortList = PublicConfig.FindUserByMap(paramForGetUserByPost,userKey,token);
for (UserByPort userByPort : userByPortList) { for (UserByPort userByPort : userByPortList) {
int emptype = userByPort.getEmptype(); int emptype = userByPort.getEmptype();
if (emptype > 10) { if (emptype > 10) {
@ -3746,7 +3753,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
// 修改redis中用户的数据 // 修改redis中用户的数据
updateRedisDataForUserManager(integer, minRecordKey); updateRedisDataForUserManager(integer, minRecordKey);
// 获取仓库管理员信息 // 获取仓库管理员信息
UserByPort manager = userService.findUserByIdForNoPack(integer); UserByPort manager = PublicConfig.FindUserById(integer,userKey,token);
// 获取用户的用工关系 // 获取用户的用工关系
int emptype = manager.getEmptype(); int emptype = manager.getEmptype();
if (emptype > 10) { if (emptype > 10) {
@ -3784,7 +3791,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if ("".equals(s)) { if ("".equals(s)) {
continue; continue;
} }
UserByPort userByPort = userService.findUserByIdForNoPack(ObjectFormatUtil.toLong(s)); UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toLong(s),userKey,token);
// 获取用户的用工关系 // 获取用户的用工关系
int emptype = userByPort.getEmptype(); int emptype = userByPort.getEmptype();
if (emptype > 10) { if (emptype > 10) {
@ -3831,7 +3838,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
SendQyWxMessageThreadPool.execute(() -> { SendQyWxMessageThreadPool.execute(() -> {
// 获取responseCode（key为申请人number） // 获取responseCode（key为申请人number）
//获取部门负责人信息 //获取部门负责人信息
UserByPort departHead = userService.findUserByIdForNoPack(ObjectFormatUtil.toLong(record.getDepartmenthead())); UserByPort departHead = PublicConfig.FindUserById(ObjectFormatUtil.toLong(record.getDepartmenthead()),userKey,token);
// 获取用户的用工关系 // 获取用户的用工关系
int emptype = departHead.getEmptype(); int emptype = departHead.getEmptype();
if (emptype <= 10) { if (emptype <= 10) {
@ -5803,7 +5810,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
List<SimpleApplicationOutOrInRecordP> result = new ArrayList<>(list.size()); List<SimpleApplicationOutOrInRecordP> result = new ArrayList<>(list.size());
for (SimpleApplicationOutRecord record : list) { for (SimpleApplicationOutRecord record : list) {
SimpleApplicationOutOrInRecordP d = new SimpleApplicationOutOrInRecordP(record); SimpleApplicationOutOrInRecordP d = new SimpleApplicationOutOrInRecordP(record);
UserByPort userByPort = userService.findUserByIdForNoPack(record.getApplicantId()); UserByPort userByPort = userService.findUserById(record.getApplicantId());
d.setApplyRemark(d.getApplyRemark() == null ? "" : d.getApplyRemark()); d.setApplyRemark(d.getApplyRemark() == null ? "" : d.getApplyRemark());
d.setApplicantName(userByPort.getMaindeparmentname() + "_" + userByPort.getName()); d.setApplicantName(userByPort.getMaindeparmentname() + "_" + userByPort.getName());
@ -5816,7 +5823,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
List<SimpleApplicationOutOrInRecordP> result = new ArrayList<>(list.size()); List<SimpleApplicationOutOrInRecordP> result = new ArrayList<>(list.size());
for (SimpleApplicationInRecord record : list) { for (SimpleApplicationInRecord record : list) {
SimpleApplicationOutOrInRecordP d = new SimpleApplicationOutOrInRecordP(record); SimpleApplicationOutOrInRecordP d = new SimpleApplicationOutOrInRecordP(record);
UserByPort userByPort = userService.findUserByIdForNoPack(record.getApplicantId()); UserByPort userByPort = userService.findUserById(record.getApplicantId());
d.setApplyRemark(d.getApplyRemark() == null ? "" : d.getApplyRemark()); d.setApplyRemark(d.getApplyRemark() == null ? "" : d.getApplyRemark());
d.setApplicantName(userByPort.getMaindeparmentname() + "_" + userByPort.getName()); d.setApplicantName(userByPort.getMaindeparmentname() + "_" + userByPort.getName());
result.add(d); result.add(d);

2
src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java
View File

@ -209,7 +209,7 @@ public class DepositoryServiceImpl implements DepositoryService {
* @return 查询结果 * @return 查询结果
*/ */
@Override @Override
public Depository findDepositoryById(Long id) { public Depository findDepositoryById(Object id) {
return depositoryMapper.findDepositoryById(id); return depositoryMapper.findDepositoryById(id);
} }

6
src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java
View File

@ -719,7 +719,7 @@ public class GroupServiceImpl implements GroupService {
paramForOut.put("state", "待部门负责人审核"); paramForOut.put("state", "待部门负责人审核");
paramForOut.put("applyRemark", map.get("applyRemark")); paramForOut.put("applyRemark", map.get("applyRemark"));
// 获取当前部门名称 // 获取当前部门名称
Administration company = administrativeMapper.findAdministrationById(userToken.getMaindeparment()); Administration company = PublicConfig.getCompany(userToken.getMaindeparment(),userKey,token);
// 构造出库订单编码 // 构造出库订单编码
String code = createOutCode("outOrderNumber", company.getName()); String code = createOutCode("outOrderNumber", company.getName());
paramForOut.put("code", code); paramForOut.put("code", code);
@ -785,7 +785,7 @@ public class GroupServiceImpl implements GroupService {
// 获取当前提交数 // 获取当前提交数
List<String> params = (List<String>) map.get("params"); List<String> params = ObjectFormatUtil.objToList(map.get("params"),String.class);
// 用于存储申请数 // 用于存储申请数
Integer result = 0; Integer result = 0;
@ -868,7 +868,7 @@ public class GroupServiceImpl implements GroupService {
for (RoleAndMaterialType mt : materialTypeIdForIn for (RoleAndMaterialType mt : materialTypeIdForIn
) { ) {
// 获取管理员数据 // 获取管理员数据
UserByPort userByPort = userMapper.findUserById(mt.getUid()); UserByPort userByPort = PublicConfig.FindUserById(mt.getUid(),userKey,token);
// 获取用户的用工关系 // 获取用户的用工关系
int emptype = userByPort.getEmptype(); int emptype = userByPort.getEmptype();
if(emptype > 10){ if(emptype > 10){

2
src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
View File

@ -460,7 +460,7 @@ public class MaterialServiceImpl implements MaterialService {
* @return 库存信息 * @return 库存信息
*/ */
@Override @Override
public Material findMaterialById(Long id) { public Material findMaterialById(Object id) {
Material material = materialMapper.findMaterialById(id); Material material = materialMapper.findMaterialById(id);
if (material != null) { if (material != null) {
if (material.getMaterialTypeId() != null) { if (material.getMaterialTypeId() != null) {

6
src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java
View File

@ -183,7 +183,7 @@ public class PlaceServiceImpl implements PlaceService {
* @return * @return
*/ */
@Override @Override
public List<Place> findPlaceByDid(Long did) { public List<Place> findPlaceByDid(Object did) {
return placeMapper.findPlaceByDid(did); return placeMapper.findPlaceByDid(did);
} }
@ -215,7 +215,7 @@ public class PlaceServiceImpl implements PlaceService {
* @return * @return
*/ */
@Override @Override
public Place findPlaceByDidAndCode(Long did, String code) { public Place findPlaceByDidAndCode(Object did, String code) {
Map<String, Object> paramForPlace = new HashMap<>(); Map<String, Object> paramForPlace = new HashMap<>();
paramForPlace.put("code", code); paramForPlace.put("code", code);
paramForPlace.put("did", did); paramForPlace.put("did", did);
@ -395,7 +395,7 @@ public class PlaceServiceImpl implements PlaceService {
* @return * @return
*/ */
@Override @Override
public Integer findQuantityByMidAndPid(Long mid, Long pid) { public Integer findQuantityByMidAndPid(Object mid, Long pid) {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("pid", pid); map.put("pid", pid);
map.put("mid", mid); map.put("mid", mid);

7
src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java
View File

@ -11,7 +11,6 @@ import com.dreamchaser.depository_manage.entity.*;
import com.dreamchaser.depository_manage.exception.MyException; import com.dreamchaser.depository_manage.exception.MyException;
import com.dreamchaser.depository_manage.depository_mapper.*; import com.dreamchaser.depository_manage.depository_mapper.*;
import com.dreamchaser.depository_manage.hrNew_mapper.AdministrativeMapper; import com.dreamchaser.depository_manage.hrNew_mapper.AdministrativeMapper;
import com.dreamchaser.depository_manage.hrNew_mapper.UserMapper;
import com.dreamchaser.depository_manage.pojo.RoleAndDepository; import com.dreamchaser.depository_manage.pojo.RoleAndDepository;
import com.dreamchaser.depository_manage.pojo.RoleAndMaterialType; import com.dreamchaser.depository_manage.pojo.RoleAndMaterialType;
import com.dreamchaser.depository_manage.service.UserService; import com.dreamchaser.depository_manage.service.UserService;
@ -735,7 +734,7 @@ public class QyWxOperationService {
// 申请人id // 申请人id
Long applicantId = recordP.getApplicantId(); Long applicantId = recordP.getApplicantId();
// 申请人 // 申请人
UserByPort applicant = userService.findUserByIdForNoPack(applicantId); UserByPort applicant =PublicConfig.FindUserById(applicantId,userKey,token);
// 获取所有子订单 // 获取所有子订单
List<ApplicationOutRecordMin> applicationOutRecordMinByParent = depositoryRecordMapper.findApplicationOutRecordMinByParent(outId); List<ApplicationOutRecordMin> applicationOutRecordMinByParent = depositoryRecordMapper.findApplicationOutRecordMinByParent(outId);
@ -769,7 +768,7 @@ public class QyWxOperationService {
// 获取仓库信息 // 获取仓库信息
Depository depositoryRecordById = depositoryMapper.findDepositoryById(recordMin.getDepositoryId()); Depository depositoryRecordById = depositoryMapper.findDepositoryById(recordMin.getDepositoryId());
// 获取处理人信息 // 获取处理人信息
UserByPort userByPort = userService.findUserByIdForNoPack(recordMin.getCheckId()); UserByPort userByPort = PublicConfig.FindUserById(recordMin.getCheckId(),userKey,token);
// 获取对应出库单位 // 获取对应出库单位
String unit = recordMin.getUnit(); String unit = recordMin.getUnit();
@ -2656,7 +2655,7 @@ public class QyWxOperationService {
// 获取申请人的userId // 获取申请人的userId
UserByPort userByPort = userService.findUserByIdForNoPack(minRecordList.get(0).getApplicantId()); UserByPort userByPort = PublicConfig.FindUserById(minRecordList.get(0).getApplicantId(),userKey,token);
// 获取用户的用工关系 // 获取用户的用工关系
int emptype = userByPort.getEmptype(); int emptype = userByPort.getEmptype();
if (emptype > 10) { if (emptype > 10) {

6
src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java
View File

@ -14,6 +14,7 @@ import com.dreamchaser.depository_manage.security.pool.SendQyWxMessageThreadPool
import com.dreamchaser.depository_manage.service.DepositoryRecordService; import com.dreamchaser.depository_manage.service.DepositoryRecordService;
import com.dreamchaser.depository_manage.service.SplitUnitService; import com.dreamchaser.depository_manage.service.SplitUnitService;
import com.dreamchaser.depository_manage.service.StockTakingService; import com.dreamchaser.depository_manage.service.StockTakingService;
import com.dreamchaser.depository_manage.service.UserService;
import com.dreamchaser.depository_manage.utils.DateUtil; import com.dreamchaser.depository_manage.utils.DateUtil;
import com.dreamchaser.depository_manage.utils.ObjectFormatUtil; import com.dreamchaser.depository_manage.utils.ObjectFormatUtil;
import com.dreamchaser.depository_manage.utils.WordUtil; import com.dreamchaser.depository_manage.utils.WordUtil;
@ -56,6 +57,9 @@ public class StockTakingServiceImpl implements StockTakingService {
@Autowired @Autowired
private RedisPool redisPool; private RedisPool redisPool;
@Autowired
private UserService userService;
/** /**
* 用于插入盘点记录主表 * 用于插入盘点记录主表
* *
@ -255,7 +259,7 @@ public class StockTakingServiceImpl implements StockTakingService {
SimpleStockTakingP ssp = new SimpleStockTakingP(stockTaking); SimpleStockTakingP ssp = new SimpleStockTakingP(stockTaking);
Depository depositoryRecordById = depositoryMapper.findDepositoryById(stockTaking.getDepositoryId()); Depository depositoryRecordById = depositoryMapper.findDepositoryById(stockTaking.getDepositoryId());
ssp.setDepositoryName(depositoryRecordById.getDname()); ssp.setDepositoryName(depositoryRecordById.getDname());
UserByPort userByPort = PublicConfig.FindUserById(stockTaking.getOriginator(), userKey, token); UserByPort userByPort = userService.findUserById(stockTaking.getOriginator());
ssp.setOriginatorName(userByPort.getMaindeparmentname() + "_" + userByPort.getName()); ssp.setOriginatorName(userByPort.getMaindeparmentname() + "_" + userByPort.getName());
stockTakingPS.add(ssp); stockTakingPS.add(ssp);
} }

3
src/main/resources/templates/pages/applicationForStorageCenter/application-out_back.html
View File

@ -501,6 +501,9 @@
flagForForm = true; flagForForm = true;
data = data.field; data = data.field;
var params = []; var params = [];
if(data.outType === ""){
delete data["outType"];
}
data.params = params; data.params = params;
$.ajax({ $.ajax({
url: "/depositoryRecord/applicationOut", url: "/depositoryRecord/applicationOut",

6
src/main/resources/templates/pages/depository/table-stock.html
View File

@ -403,9 +403,9 @@
req.depositoryIds = []; req.depositoryIds = [];
req.placeCodes = []; req.placeCodes = [];
for (i = 0, len = data.length; i < len; i++) { for (i = 0, len = data.length; i < len; i++) {
req.mids[i] = data[i].id; req.mids[i] = String(data[i].id);
req.depositoryIds[i] = data[i].depositoryId; req.depositoryIds[i] = String(data[i].depositoryId);
req.placeCodes[i] = data[i].placeCode; req.placeCodes[i] = String(data[i].placeCode);
} }
if (req.mids.length > 0) { if (req.mids.length > 0) {
$.ajax({ $.ajax({

8
src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html
View File

@ -63,7 +63,11 @@
} else { } else {
wxScan = wxScan.parent.wx; wxScan = wxScan.parent.wx;
} }
wxScan.scanQRCode({ var result = "1641262864907149312";//当needResult为1时返回处理结果
var req = {};
req.qrCode = result;
outboundLogic(req);
/*wxScan.scanQRCode({
desc: 'scanQRCode desc', desc: 'scanQRCode desc',
needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
scanType: ["barCode", "qrCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 scanType: ["barCode", "qrCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
@ -82,7 +86,7 @@
} }
}); });*/
}); });

4
src/test/java/com/dreamchaser/depository_manage/QyWxCallBackTest.java
View File

@ -241,7 +241,7 @@ public class QyWxCallBackTest {
ApprovalInfo approvalInfo = new ApprovalInfo(); ApprovalInfo approvalInfo = new ApprovalInfo();
approvalInfo.setTemplateId("3WKiKVCzyLv3Y1LaHZxp4DimQEpCdvYP52HsAUtF"); approvalInfo.setTemplateId("3WKiKVCzyLv3Y1LaHZxp4DimQEpCdvYP52HsAUtF");
approvalInfo.setSpNo("202307110024"); approvalInfo.setSpNo("202307240005");
// 模拟第一个节点（部门负责人） // 模拟第一个节点（部门负责人）
@ -251,7 +251,7 @@ public class QyWxCallBackTest {
List<ApprovalInfo_Details> approvalInfo_Details1 = new ArrayList<>(); List<ApprovalInfo_Details> approvalInfo_Details1 = new ArrayList<>();
ApprovalInfo_Details ad1 = new ApprovalInfo_Details(); ApprovalInfo_Details ad1 = new ApprovalInfo_Details();
ad1.setSpStatus("2"); ad1.setSpStatus("2");
ad1.setSpTime("1689062324000"); ad1.setSpTime("1690159327000");
ApprovalInfo_Details_Approver approver1 = new ApprovalInfo_Details_Approver(); ApprovalInfo_Details_Approver approver1 = new ApprovalInfo_Details_Approver();
approver1.setUserId("WoBenShanLiang_3"); approver1.setUserId("WoBenShanLiang_3");
ad1.setApprover(approver1); ad1.setApprover(approver1);

Write Preview
Loading…
Cancel
Save