From b2a9367b562ae3c664ee46745beab73b4568d4d9 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 18 十二月 2023 10:59:28 +0800
Subject: [PATCH] 过滤仓库管理员的显示
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
index ab78c57..87450ce 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
@@ -1,5 +1,7 @@
package com.consum.base.service.impl;
+import static com.walker.db.Sorts.DESC;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -35,7 +37,7 @@
import com.consum.base.pojo.response.LWHFromTransferExtendVO;
import com.consum.base.service.BaseWarehouseManagerService;
import com.consum.base.service.BaseWarehouseService;
-import com.consum.base.service.FinSysTenantServiceImpl;
+import com.consum.base.service.FinSysTenantService;
import com.consum.base.service.LWhFormTransferService;
import com.consum.base.service.LWhGoodsService;
import com.consum.base.service.LWhProcureModelService;
@@ -67,7 +69,7 @@
@Autowired
private CodeGeneratorService codeGeneratorService;
@Autowired
- private FinSysTenantServiceImpl finSysTenantService;
+ private FinSysTenantService finSysTenantService;
@Autowired
private LWhGoodsService lWhGoodsService;
@Autowired
@@ -110,7 +112,6 @@
lWhFormTransfer.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(codeGeneratorEnum));
- Long warehouseId = param.getInWarehouseId();
// 璋冩嫧绫诲瀷鍗曟嵁
if (businessType == TransferBusinessType.STOCK_TRANSFER.getValue()) {
// 鍏ュ簱浠撳簱涓哄綋鍓嶇敤鎴风殑榛樿浠撳簱
@@ -168,7 +169,8 @@
if (finSysTenant == null) {
log.error("璋冩嫧鏈烘瀯涓嶅瓨鍦�");
}
- lWhFormTransfer.setOutAgencyId(finSysTenant.getId());
+ Long outAgencyId = finSysTenant.getId();
+ lWhFormTransfer.setOutAgencyId(outAgencyId);
lWhFormTransfer.setOutAgencyName(finSysTenant.getName());
lWhFormTransfer.setOperatorId(sysInfo.getId());
lWhFormTransfer.setOperatorName(sysInfo.getUserName());
@@ -212,7 +214,12 @@
if (businessType == TransferBusinessType.STOCK_TRANSFER.getValue()) {
lWhProcureModel.setBusinessType(2);
// 鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
- int goodsNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);
+ // 璋冩嫧鐢宠鏃舵病鏈変粨搴搃d 鏌ヨ涓婄骇鏈烘瀯鐨勬墍鏈変粨搴�
+ List<BaseWarehouse> baseWareHouseList =
+ baseWarehouseService.getBaseWareHouseList(outAgencyId, null, (short)1);
+ List<Long> warehouseIdList =
+ baseWareHouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toList());
+ int goodsNum = lWhGoodsService.queryGoodsModelNum(0, warehouseIdList, baseGoodsModelsId, 1, null);
lWhProcureModel.setWorehouseCount(goodsNum);
}
if (businessType == TransferBusinessType.DEPARTMENT_PROCURE.getValue()) {
@@ -398,8 +405,14 @@
&& CategoryType.TYPE_A.getValue().equals(type)) {
Long procureModelId = goodsModelVO.getId();
+ LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord();
+ lWhProcureModelUserRecord.setTransBusinessId(id);
+ List<LWhProcureModelUserRecord> select = lWhProcureModelUserRecordService
+ .select(lWhProcureModelUserRecord, DESC().setField("DEAL_TIME"));
+ LWhProcureModelUserRecord record = select.stream().findFirst().orElse(null);
LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
lWhProcureModelUser.setWhProcureModelId(procureModelId);
+ lWhProcureModelUser.setProcureModelUserRecordId(record.getId());
List<LWhProcureModelUser> procureModelUserList =
this.lWhProcureModelUserService.select(lWhProcureModelUser);
--
Gitblit v1.9.1