From 0d704977a91adb83c3ff9c1769fe4b73fc54a565 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 21 十二月 2023 17:29:38 +0800
Subject: [PATCH] 采购单模板下载和导入
---
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 32 +++++++++++---------------------
1 files changed, 11 insertions(+), 21 deletions(-)
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 84b7500..8efad14 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
@@ -24,6 +24,8 @@
import com.consum.base.BaseController;
import com.consum.base.core.WhBusinessEnum;
+import com.consum.base.core.type.StatesType;
+import com.consum.base.core.type.TransferStatesType;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.pojo.GoodsUseRecordVO;
@@ -123,15 +125,14 @@
if (transferBusinessType == 1) {
// 鍏堝嚭搴擄紝鍐嶅叆搴�
// 鍑哄簱鍓� 璁剧疆鍑哄簱浠撳簱
- List<LWhProcureModel> modelByForm = lWhProcureModelService.getModelByForm(WhBusinessEnum.DIAOBO, id);
+ List<LWhProcureModel> modelByForm = lWhProcureModelService.getModelByForm(WhBusinessEnum.BUMENFENFA, id);
Set<Long> baseModelIds =
modelByForm.stream().map(LWhProcureModel::getBaseGoodsModelsId).collect(Collectors.toSet());
- // TODO 涓嶅悓搴撳鐞�
FinSysTenantUser sysTenantUser = this.getSysInfo();
String agencyId = sysTenantUser.getTenantId();
List<BaseWarehouse> baseWarehouseList =
- baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), (short)1);
+ baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), StatesType.NORMAL.getValue());
Set<Long> wareHouseIds = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toSet());
// 閫氳繃璋冩嫧鍗曚腑鐨勫瀷鍙穒d鏌ヨ鍑鸿鍨嬪彿鐗╁搧鎵�鍦ㄧ殑浠撳簱浣嶇疆
List<GoodsInfoDTO> goodsInfoDTOS = lWhGoodsService.queryGoodsInfo(baseModelIds, wareHouseIds);
@@ -139,14 +140,6 @@
if (ObjectUtils.isEmpty(goodsInfoDTO)) {
return ResponseValue.error("璇ュ瀷鍙锋病鏈夊簱瀛樺彲浣跨敤");
}
- // FinSysTenantUser sysTenantUser = this.getSysInfo();
- // String agencyId = sysTenantUser.getTenantId();
- // List<BaseWarehouse> baseWarehouseList =
- // baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), (short)1, (short)1);
- // if (CollectionUtils.isEmpty(baseWarehouseList)) {
- // return ResponseValue.error("鏈烘瀯鏃犻粯璁や粨搴擄紒");
- // }
- // BaseWarehouse baseWarehouse = baseWarehouseList.get(0);
Long wareHouseId = goodsInfoDTO.getWarehouseId();
String warehouseName = goodsInfoDTO.getWarehouseName();
@@ -244,6 +237,8 @@
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
+ String tenantId = sysInfo.getTenantId();
+ param.setInAgencyId(Long.valueOf(tenantId));
GenericPager<Map<String, Object>> mapGenericPager = lWhFormTransferService.queryFormTransferDetailList(param);
return ResponseValue.success(mapGenericPager);
@@ -261,6 +256,10 @@
public ResponseValue updateStatus(Long id) {
if (id == null) {
return ResponseValue.error("鍙傛暟閿欒");
+ }
+ LWhFormTransfer lWhFormTransfer = lWhFormTransferService.selectById(id);
+ if (lWhFormTransfer.getStates() != TransferStatesType.OUT_PENDING.getValue()) {
+ return ResponseValue.error("鐘舵�侀敊璇紝涓嶈兘鎾ら攢");
}
int num = this.lWhFormTransferService.updateStatus(id);
@@ -294,24 +293,15 @@
Set<Long> baseModelIds =
modelByForm.stream().map(LWhProcureModel::getBaseGoodsModelsId).collect(Collectors.toSet());
- // TODO 涓嶅悓搴撳鐞嗕笖涓烘湰鏈烘瀯鐨勪粨搴撶墿鍝�
FinSysTenantUser sysTenantUser = this.getSysInfo();
String agencyId = sysTenantUser.getTenantId();
List<BaseWarehouse> baseWarehouseList =
- baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), (short)1);
+ baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), StatesType.NORMAL.getValue());
Set<Long> wareHouseIds = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toSet());
// 閫氳繃璋冩嫧鍗曚腑鐨勫瀷鍙穒d鏌ヨ鍑鸿鍨嬪彿鐗╁搧鎵�鍦ㄧ殑浠撳簱浣嶇疆
List<GoodsInfoDTO> goodsInfoDTOS = lWhGoodsService.queryGoodsInfo(baseModelIds, wareHouseIds);
GoodsInfoDTO goodsInfoDTO = goodsInfoDTOS.stream().findFirst().orElse(null);
- // 鍑哄簱鍓� 璁剧疆鍑哄簱浠撳簱
- // FinSysTenantUser sysTenantUser = this.getSysInfo();
- // String agencyId = sysTenantUser.getTenantId();
- // List<BaseWarehouse> baseWarehouseList =
- // baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), (short)1, (short)1);
- // if (CollectionUtils.isEmpty(baseWarehouseList)) {
- // return ResponseValue.error("鏈烘瀯鏃犻粯璁や粨搴擄紒");
- // }
if (ObjectUtils.isEmpty(goodsInfoDTO)) {
return ResponseValue.error("璇ュ瀷鍙锋病鏈夊簱瀛樺彲浣跨敤");
}
--
Gitblit v1.9.1