From 0ec6c7ee0b8236cbc6f49a8cc0e466099a09e08d Mon Sep 17 00:00:00 2001
From: haoyahui <2032914783@qq.com>
Date: 星期一, 27 十一月 2023 10:25:32 +0800
Subject: [PATCH] 物品报废
---
consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java b/consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java
index 84a9f49..7abdabd 100644
--- a/consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java
@@ -15,6 +15,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
@@ -45,6 +46,7 @@
if (baseModelIdList == null) {
baseModelIdList = new ArrayList<>();
}
+ sysInfo = sysInfo == null ? new FinSysTenantUser() : sysInfo;
// 鑾峰彇鍒拌揪鍒伴槇鍊肩殑鐗╁搧
List<Map<String, Object>> kuCunNotifyList = lWhWarningService.checkKuCun(warehouseType, warehouseId, baseModelIdList);
//
@@ -53,6 +55,11 @@
kuCunNormalModel(warehouseType, warehouseId, baseModelIdList);
return;
}
+ List<Long> allChangModelList = baseModelIdList.stream()
+ .distinct()
+ .collect(Collectors.toList());
+ baseModelIdList = allChangModelList;
+
// 灏嗘暟鎹彃鍏ュ簱瀛橀璀︺�怶H_WARNING銆�
BaseWarehouse baseWarehouses = baseWarehouseService.get(new BaseWarehouse(warehouseId));
@@ -105,8 +112,15 @@
private String KU_CUN_NORMAL_MODEL = "update WH_WARNING set STATES=2 where WAREHOUSE_TYPE=? and BASE_WAREHOUSE_ID=?";
- private int kuCunNormalModel(Short warehouseType, Long warehouseId, List<Long> baseModelIdList) {
- if (CollectionUtils.isEmpty(baseModelIdList)) {
+ /**
+ *
+ * @param warehouseType
+ * @param warehouseId
+ * @param normalBaseModelIdList 搴撳瓨姝ｅ父鐨�
+ * @return
+ */
+ private int kuCunNormalModel(Short warehouseType, Long warehouseId, List<Long> normalBaseModelIdList) {
+ if (CollectionUtils.isEmpty(normalBaseModelIdList)) {
return 1;
}
ArrayList<Object> params = new ArrayList<>();
@@ -114,9 +128,9 @@
params.add(warehouseId);
StringBuilder sql = new StringBuilder(KU_CUN_NORMAL_MODEL);
- if (!org.springframework.util.CollectionUtils.isEmpty(baseModelIdList)) {
+ if (!org.springframework.util.CollectionUtils.isEmpty(normalBaseModelIdList)) {
sql.append(" and BASE_GOODS_MODELS_ID in(?)");
- params.add(baseModelIdList);
+ params.add(org.apache.commons.lang3.StringUtils.join(normalBaseModelIdList, ","));
}
return lWhWarningService.update(sql.toString(), params.toArray());
}
--
Gitblit v1.9.1