From 0fdac321828bffa833f7d0155a5c147d23bd78d8 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 15 十二月 2023 12:26:25 +0800
Subject: [PATCH] 1.修改调拨查询物品分类接口 2.解决超级管理员无法登录 3.修改手机号
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java | 6
consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java | 2
consum-base/src/main/java/com/consum/base/service/BaseWarehouseService.java | 13 --
consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java | 39 ---------
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 4
consum-base/src/main/java/com/consum/base/cache/RedisFinSysTenantUserCache.java | 4 +
consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java | 17 ++--
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java | 58 ++++++++------
consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java | 46 +++++------
consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsServiceImpl.java | 29 +++++++
consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java | 3
consum-base/src/main/java/com/consum/base/handler/WhWarningImportVerifyHandler.java | 2
12 files changed, 114 insertions(+), 109 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/cache/RedisFinSysTenantUserCache.java b/consum-base/src/main/java/com/consum/base/cache/RedisFinSysTenantUserCache.java
index 0ae906c..4b39f84 100644
--- a/consum-base/src/main/java/com/consum/base/cache/RedisFinSysTenantUserCache.java
+++ b/consum-base/src/main/java/com/consum/base/cache/RedisFinSysTenantUserCache.java
@@ -29,6 +29,10 @@
logger.warn("浠庢暟鎹簱鏈煡璇㈠埌鐢ㄦ埛锛屾棤娉曠紦瀛橈紝userId = {}", userId);
return null;
}
+ // TODO 瓒呯骇绠＄悊鍛�
+ if (finSysTenantUser.getId() == 0) {
+ finSysTenantUser.setTenantId("0");
+ }
this.putCacheData(userId, finSysTenantUser);
}
return finSysTenantUser;
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
index 79e8593..50da269 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
@@ -6,6 +6,7 @@
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import java.util.stream.Collectors;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.factory.annotation.Autowired;
@@ -255,7 +256,7 @@
return ResponseValue.success("鏌ヨ鎴愬姛!", list);
}
- @ApiOperation(value = "鏌ヨ鏈烘瀯涓嬮粯璁や粨搴撲笅鐨勫垎绫绘ā鏉夸俊鎭�", notes = "鏌ヨ鏈烘瀯涓嬮粯璁や粨搴撲笅鐨勫垎绫绘ā鏉夸俊鎭�")
+ @ApiOperation(value = "璋冩嫧鏌ヨ鏈烘瀯涓嬫墍鏈変粨搴撲笅鐨勫垎绫绘ā鏉夸俊鎭�", notes = "璋冩嫧鏌ヨ鏈烘瀯涓嬫墍鏈変粨搴撲笅鐨勫垎绫绘ā鏉夸俊鎭�")
@ApiImplicitParams({
@ApiImplicitParam(name = "agencyId", value = "鐖剁骇鏈烘瀯id", required = true, dataType = "java.lang.Long",
paramType = "query"),
@@ -264,22 +265,22 @@
@GetMapping("/query/warehouse/goods")
public ResponseValue queryWarehouseGoods(Long agencyId, Long categoryId) {
- // TODO 璋冩嫧鏌ヨ浠撳簱鐗╁搧
+ // 璋冩嫧鏌ヨ鎵�鏈変粨搴撶墿鍝佹ā鏉夸俊鎭�
Map<String, Object> map = new HashMap<>();
map.put("categoryId", categoryId);
- List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getByAgencyId(agencyId, (short)1, (short)1);
+ List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getBaseWareHouseList(agencyId, null, (short)1);
if (CollectionUtils.isEmpty(baseWarehouseList)) {
- return ResponseValue.error("鏈烘瀯鏃犻粯璁や粨搴擄紒");
+ return ResponseValue.error("鏈烘瀯鏃犱粨搴擄紒");
}
- map.put("warehouseId", baseWarehouseList.get(0).getId());
+ List<Long> warehouseIdList = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toList());
+ map.put("warehouseIdList", warehouseIdList);
String sql =
"SELECT DISTINCT bgt.id,bgt.GOODS_NAME, CLASSIFICATION type FROM l_wh_goods g LEFT JOIN base_goods_template bgt ON g.BASE_GOODS_TEMPLATE_ID = bgt.id "
- + "WHERE WAREHOUSE_TYPE = 0 " + "AND WAREHOUSE_ID = :warehouseId "
- // TODO 涓存椂瑙ｅ喅
- /*+ "AND CATEGORY_ID = :categoryId "*/
+ + "WHERE WAREHOUSE_TYPE = 0 " + "AND WAREHOUSE_ID in (:warehouseIdList) "
+ + "AND CATEGORY_ID = :categoryId "
// 1:闆嗛噰,2:鑷噰
+ "AND BUY_TYPE =1";
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
index 059859c..a0716a9 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
@@ -1,8 +1,8 @@
package com.consum.base.controller;
-import io.swagger.annotations.Api;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -23,6 +23,7 @@
import com.walker.infrastructure.utils.StringUtils;
import com.walker.web.ResponseValue;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -59,7 +60,7 @@
}
// TODO 鍔犳潈闄� 鐪佺骇绠＄悊鍛樺綍鍏ユ墍鏈変粨搴撲俊鎭�
- int result = this.baseWarehouseService.add(param);
+ int result = baseWarehouseService.add(param);
if (result > 0) {
return ResponseValue.success(1);
}
@@ -83,7 +84,7 @@
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
param.setAgencyId(Long.valueOf(currentUser.getTenantId()));
- GenericPager<BaseWarehouse> pager = this.baseWarehouseService.queryList(param, currentUser);
+ GenericPager<BaseWarehouse> pager = baseWarehouseService.queryList(param, currentUser);
return ResponseValue.success(pager);
}
@@ -107,7 +108,7 @@
return ResponseValue.error("浠撳簱鍚嶇О涓虹┖");
}
- int num = this.baseWarehouseService.updateBaseWarehouse(baseWarehouse);
+ int num = baseWarehouseService.updateBaseWarehouse(baseWarehouse);
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("缂栬緫澶辫触锛�");
}
@@ -122,7 +123,7 @@
if (id == null) {
return ResponseValue.error("浠撳簱id涓虹┖");
}
- BaseWarehouse baseWarehouse = this.baseWarehouseService.getById(id);
+ BaseWarehouse baseWarehouse = baseWarehouseService.getById(id);
if (baseWarehouse == null) {
return ResponseValue.error("鏌ヨ澶辫触锛�");
}
@@ -144,23 +145,9 @@
if (baseWarehouse.getId() == null) {
return ResponseValue.error("浠撳簱id涓虹┖");
}
- int num = this.baseWarehouseService.updateById(baseWarehouse);
+ int num = baseWarehouseService.updateById(baseWarehouse);
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鍒犻櫎澶辫触锛�");
- }
-
- /**
- * @Description 鏍规嵁浠撳簱id鑾峰彇鏈烘瀯鐢ㄦ埛淇℃伅
- * @Author 鍗㈠簡闃�
- * @Date 2023/10/26
- */
- @GetMapping("/select/userList")
- public ResponseValue queryList(Long baseWarehouseId) {
- if (baseWarehouseId == null) {
- return ResponseValue.error("浠撳簱id涓虹┖");
- }
- this.baseWarehouseService.queryUserList(baseWarehouseId);
- return ResponseValue.success();
}
/**
@@ -173,7 +160,7 @@
if (agencyId == null) {
return ResponseValue.success(new ArrayList<>());
}
- List<BaseWarehouse> list = this.baseWarehouseService.getByAgencyId(agencyId, null, null);
+ List<BaseWarehouse> list = baseWarehouseService.getBaseWareHouseList(agencyId, null, null);
if (list == null) {
return ResponseValue.error("鏌ヨ澶辫触锛�");
}
@@ -193,8 +180,7 @@
Long warehouseId = warehouseQry.getWarehouseId();
if (warehouseId == null) {
Long agencyId = warehouseQry.getAgencyId();
- BaseWarehouse defaultWarehouseByAgencyId =
- this.baseWarehouseService.getDefaultWarehouseByAgencyId(agencyId);
+ BaseWarehouse defaultWarehouseByAgencyId = baseWarehouseService.getDefaultWarehouseByAgencyId(agencyId);
warehouseId = defaultWarehouseByAgencyId.getId();
}
Long baseGoodsModelsId = warehouseQry.getBaseGoodsModelsId();
@@ -202,7 +188,31 @@
Integer states = warehouseQry.getStates();
Integer buyType = warehouseQry.getBuyType();
- int num = this.lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseId, baseGoodsModelsId, 1, buyType);
+ int num = lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseId, baseGoodsModelsId, 1, buyType);
+ return ResponseValue.success(num);
+ }
+
+ @ApiOperation(value = "鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨", notes = "鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨")
+ @ApiImplicitParams({@ApiImplicitParam(name = "warehouseQry", value = "浠撳簱id鍜屽瀷鍙穒d", required = true,
+ dataType = "WarehouseQry", paramType = "query")})
+ @GetMapping("/select/in/warehouse/num")
+ public ResponseValue selectAllNumber() {
+ WarehouseQry warehouseQry = CommonUtil.getObjFromReq(WarehouseQry.class);
+ WarehouseQry param2 = new WarehouseQry();
+ CommonUtil.copyProperties(warehouseQry, param2);
+ warehouseQry = param2;
+
+ Long agencyId = warehouseQry.getAgencyId();
+ List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getBaseWareHouseList(agencyId, null, (short)1);
+ List<Long> warehouseIdList = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toList());
+
+ Long baseGoodsModelsId = warehouseQry.getBaseGoodsModelsId();
+ Integer warehouseType = warehouseQry.getWarehouseType();
+ Integer states = warehouseQry.getStates();
+ Integer buyType = warehouseQry.getBuyType();
+
+ int num = lWhGoodsService.queryGoodsModelInWareHouseNum(warehouseType, warehouseIdList, baseGoodsModelsId,
+ states, buyType);
return ResponseValue.success(num);
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
index 3b0d3a2..9cfab13 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
@@ -9,6 +9,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.TreeMap;
import org.springframework.beans.factory.annotation.Autowired;
@@ -81,36 +82,33 @@
private long defaultParentId = 0L;
/**
- * @Description 鑾峰彇鍖哄垝鏍�
+ * @Description 鑾峰彇鏈烘瀯鏍�
* @Author wh
* @Date 2023/7/11 11:15
*/
@GetMapping("/select/tree_fin_tenant")
public ResponseValue listOrgRootTree() {
- List<FinSysTenant> finSysTenantList = null;
- FinSysTenantUser finSysTenantUser = new FinSysTenantUser();
- finSysTenantUser.setSysUserId(this.getCurrentUser().getId());
- List<FinSysTenantUser> finSysTenantUserList = finSysTenantUserService.select(finSysTenantUser);
- FinSysTenantUser user = null; // 绯荤粺鐢ㄦ埛
- FinSysTenant finSysTenant1 = null;
- List<TreeNode> treeRootList = null; // 鏁板垪琛�
- FinSysTenant finSysTenant = new FinSysTenant();
- // 鑾峰彇鍦板尯鐖剁骇
- finSysTenantList = this.finSysTenantService.queryForTree();
- // 鏍规嵁鐧婚檰浜篿d鑾峰彇绯荤粺鐢ㄦ埛锛屽鏋滄湁绯荤粺鐢ㄦ埛鏃�
- if (finSysTenantUserList.size() > 0) {
- // 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
- user = finSysTenantUserList.get(0);
- String tenantId = user.getTenantId();
- finSysTenant.setId(new Long(tenantId));
- // 鏌ヨ鍖哄煙
- List<FinSysTenant> select = finSysTenantService.select(finSysTenant);
- if (select.size() > 0) {
- finSysTenant1 = select.get(0);
- }
+ // 绯荤粺鐢ㄦ埛
+ FinSysTenantUser user = this.getSysInfo();
+ if (Objects.isNull(user)) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- if (finSysTenant1 != null) {
- if (finSysTenant1.getLv() != 1 && finSysTenant1.getParentId() != 0 && user != null) {
+
+ // 鑾峰彇鎵�鏈夋満鏋�
+ List<FinSysTenant> finSysTenantList = this.finSysTenantService.queryForTree();
+ // 鏍规嵁鐧婚檰浜篿d鑾峰彇绯荤粺鐢ㄦ埛锛屽鏋滄湁绯荤粺鐢ㄦ埛鏃�
+ // 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
+ String tenantId = user.getTenantId();
+ FinSysTenant finSysTenant = new FinSysTenant();
+ finSysTenant.setId(new Long(tenantId));
+ // 涓婚敭鏄疶empId
+ finSysTenant.setTempId(new Long(tenantId));
+ // 鏌ヨ褰撳墠鐢ㄦ埛鐨勬満鏋�
+ FinSysTenant userTenant = finSysTenantService.get(finSysTenant);
+ // 鏍戝垪琛�
+ List<TreeNode> treeRootList;
+ if (userTenant != null) {
+ if (userTenant.getLv() != 1 && userTenant.getParentId() != 0) {
rootMap.clear();
this.childMap.clear();
this.defaultParentId = new Long(user.getTenantId());
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
index 42f11ce..51092ab 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
@@ -219,7 +219,7 @@
// 鍔犲瘑鎵嬫満鍙�
String key = PlatformRSAUtils.AES_KEY;
String encPhone = "";
- if (tenantUser.getUserPhone() != null) {
+ if (StringUtils.isNotEmpty(userPhone)) {
encPhone = AESUtils.encryptStrAES(userPhone, key);
}
tenantUser.setUserPhone(encPhone);
@@ -715,12 +715,12 @@
return ResponseValue.error("鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
String avatar = userParam.getAvatar();
- if (!picFormatArr.contains(avatar.substring(avatar.lastIndexOf(".")))) {
+ if (StringUtils.isNotEmpty(avatar) && !picFormatArr.contains(avatar.substring(avatar.lastIndexOf(".")))) {
return ResponseValue.error("澶村儚鏍煎紡涓嶅厑璁�");
}
FinSysTenantUser updUser = new FinSysTenantUser();
updUser.setId(sysInfo.getId());
- updUser.setAvatar(userParam.getAvatar());
+ updUser.setAvatar(avatar);
updUser.setEmail(userParam.getEmail());
updUser.setUserName(userParam.getUserName());
updUser.setSex(userParam.getSex());
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index e5fa35c..a6d8f21 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -118,7 +118,7 @@
FinSysTenantUser sysTenantUser = this.getSysInfo();
String agencyId = sysTenantUser.getTenantId();
List<BaseWarehouse> baseWarehouseList =
- baseWarehouseService.getByAgencyId(Long.valueOf(agencyId), (short)1, (short)1);
+ baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), (short)1, (short)1);
if (CollectionUtils.isEmpty(baseWarehouseList)) {
return ResponseValue.error("鏈烘瀯鏃犻粯璁や粨搴擄紒");
}
@@ -268,7 +268,7 @@
FinSysTenantUser sysTenantUser = this.getSysInfo();
String agencyId = sysTenantUser.getTenantId();
List<BaseWarehouse> baseWarehouseList =
- baseWarehouseService.getByAgencyId(Long.valueOf(agencyId), (short)1, (short)1);
+ baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), (short)1, (short)1);
if (CollectionUtils.isEmpty(baseWarehouseList)) {
return ResponseValue.error("鏈烘瀯鏃犻粯璁や粨搴擄紒");
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java b/consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java
index 6bd3d9e..7f45179 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java
@@ -5,7 +5,7 @@
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
import cn.hutool.core.convert.Convert;
import com.consum.base.BaseController;
-import com.consum.base.config.WhWarningImportVerifyHandler;
+import com.consum.base.handler.WhWarningImportVerifyHandler;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.pojo.WarnConfImEntity;
diff --git a/consum-base/src/main/java/com/consum/base/config/WhWarningImportVerifyHandler.java b/consum-base/src/main/java/com/consum/base/handler/WhWarningImportVerifyHandler.java
similarity index 98%
rename from consum-base/src/main/java/com/consum/base/config/WhWarningImportVerifyHandler.java
rename to consum-base/src/main/java/com/consum/base/handler/WhWarningImportVerifyHandler.java
index e956fae..5ea2b12 100644
--- a/consum-base/src/main/java/com/consum/base/config/WhWarningImportVerifyHandler.java
+++ b/consum-base/src/main/java/com/consum/base/handler/WhWarningImportVerifyHandler.java
@@ -1,4 +1,4 @@
-package com.consum.base.config;
+package com.consum.base.handler;
import java.util.HashMap;
import java.util.List;
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseService.java b/consum-base/src/main/java/com/consum/base/service/BaseWarehouseService.java
index b5d7ed3..6855ab0 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseService.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseWarehouseService.java
@@ -1,11 +1,12 @@
package com.consum.base.service;
+import java.util.List;
+
import com.consum.base.pojo.BaseWarehouseParam;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
import com.walker.db.page.GenericPager;
import com.walker.jdbc.service.BaseService;
-import java.util.List;
public interface BaseWarehouseService extends BaseService {
@@ -41,20 +42,12 @@
int updateById(BaseWarehouse baseWarehouse);
/**
- * @Description 鏍规嵁浠撳簱id鑾峰彇鏈烘瀯鐢ㄦ埛淇℃伅
- * @Author 鍗㈠簡闃�
- * @Date 2023/10/26
- */
- void queryUserList(Long baseWarehouseId);
-
- /**
* @return
* @Description 鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯浠撳簱
* @Author 鍗㈠簡闃�
* @Date 2023/10/27
*/
- List<BaseWarehouse> getByAgencyId(Long agencyId, Short isDefault, Short states);
-
+ List<BaseWarehouse> getBaseWareHouseList(Long agencyId, Short isDefault, Short states);
/**
* 鏍规嵁鏈烘瀯id鏌ヨ榛樿浠撳簱
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java b/consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java
index 81a48ef..c405c34 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java
@@ -16,6 +16,9 @@
int queryGoodsModelNum(Integer warehouseType, Long warehouseId, Long baseGoodsModelsId, Integer states,
Integer buyType);
+ int queryGoodsModelInWareHouseNum(Integer warehouseType, List<Long> warehouseId, Long baseGoodsModelsId, Integer states,
+ Integer buyType);
+
List<Map<String, Object>> queryOutGoods(Integer warehouseType, Long warehouseId, Long baseGoodsModelsId,
Integer states, Integer buyType, Integer goodsModelNum);
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java
index 9b1754a..62f6b34 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java
@@ -3,9 +3,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,12 +13,10 @@
import com.consum.base.core.utils.IdUtil;
import com.consum.base.pojo.BaseWarehouseParam;
import com.consum.base.service.BaseWarehouseService;
-import com.consum.base.service.FinSysTenantDepartmentService;
import com.consum.base.service.FinSysTenantService;
import com.consum.base.service.SDictDataServiceImpl;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenant;
-import com.consum.model.po.FinSysTenantDepartment;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.SDictData;
import com.walker.db.page.GenericPager;
@@ -41,8 +36,6 @@
private CodeGeneratorService codeGeneratorService;
@Autowired
private FinSysTenantService finSysTenantService;
- @Autowired
- private FinSysTenantDepartmentService departmentService;
@Autowired
private SDictDataServiceImpl sDictDataService;
@@ -163,36 +156,13 @@
}
/**
- * @Description 鏍规嵁浠撳簱id鑾峰彇鏈烘瀯鐢ㄦ埛淇℃伅
- * @Author 鍗㈠簡闃�
- * @Date 2023/10/26
- */
- @Override
- public void queryUserList(Long baseWarehouseId) {
- // 1.鏍规嵁浠撳簱id鏌ヨ浠撳簱
- BaseWarehouse baseWarehouse = this.getById(baseWarehouseId);
- if (baseWarehouse != null) {
- Long agencyId = baseWarehouse.getAgencyId();
- String agencyName = baseWarehouse.getAgencyName();
- // 2.鏍规嵁鏈烘瀯id鏌ヨ閮ㄩ棬
- List<FinSysTenantDepartment> list = this.departmentService.getByTenantId(agencyId);
- // 鑾峰彇閮ㄩ棬id
- Set<Long> deptIds = list.stream().map(dept -> dept.getId()).collect(Collectors.toSet());
- // 3.鏍规嵁閮ㄩ棬id鏌ヨ鐢ㄦ埛
- // this.userService.getByDeptIds();
-
- }
-
- }
-
- /**
* @return
* @Description 鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯浠撳簱
* @Author 鍗㈠簡闃�
* @Date 2023/10/27
*/
@Override
- public List<BaseWarehouse> getByAgencyId(Long agencyId, Short isDefault, Short states) {
+ public List<BaseWarehouse> getBaseWareHouseList(Long agencyId, Short isDefault, Short states) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
@@ -227,11 +197,8 @@
Map<String, Object> param = new HashMap<>();
param.put("agencyId", agencyId);
List<BaseWarehouse> select = select(sql.toString(), param, new BaseWarehouse());
- Optional<BaseWarehouse> optional = select.stream().findFirst();
- if (optional.isPresent()) {
- return optional.get();
- }
- return null;
+ BaseWarehouse baseWarehouse = select.stream().findFirst().orElse(null);
+ return baseWarehouse;
}
@Override
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsServiceImpl.java
index cab1558..caeb70c 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsServiceImpl.java
@@ -66,6 +66,35 @@
return queryForInt(sql.toString(), paramts);
}
+ @Override
+ public int queryGoodsModelInWareHouseNum(Integer warehouseType, List<Long> warehouseId, Long baseGoodsModelsId,
+ Integer states, Integer buyType) {
+ StringBuilder sql = new StringBuilder(query_Goods_Model_Num);
+ Map<String, Object> paramts = new HashMap<>();
+
+ if (warehouseType != null) {
+ sql.append(" and WAREHOUSE_TYPE=:warehouseType");
+ paramts.put("warehouseType", warehouseType);
+ }
+ if (warehouseId != null) {
+ sql.append(" and WAREHOUSE_ID in (:warehouseId)");
+ paramts.put("warehouseId", warehouseId);
+ }
+ if (baseGoodsModelsId != null) {
+ sql.append(" and BASE_GOODS_MODELS_ID=:baseGoodsModelsId");
+ paramts.put("baseGoodsModelsId", baseGoodsModelsId);
+ }
+ if (states != null) {
+ sql.append(" and STATES=:states");
+ paramts.put("states", states);
+ }
+ if (buyType != null) {
+ sql.append(" and BUY_TYPE=:buyType");
+ paramts.put("buyType", buyType);
+ }
+ return queryForInt(sql.toString(), paramts);
+ }
+
/**
* 鍑哄簱鏃跺�欙紝鍏堝叆搴撶殑鍏堝嚭搴擄紝鍚屾椂鍏ュ簱鐨勶紝鎸変环鏍奸珮鐨勫厛鍑哄簱
*
--
Gitblit v1.9.1