From c1ac6d13630b04b4e11d6f383858e4f8fa64f924 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 02 十二月 2023 17:24:34 +0800
Subject: [PATCH] 盘点查询返回结果修改
---
consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 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..1d1737c 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
@@ -1,20 +1,22 @@
package com.consum.base.core.service;
import cn.hutool.core.convert.Convert;
+import com.consum.base.core.utils.IdUtil;
import com.consum.base.service.BaseGoodsModelsServiceImpl;
import com.consum.base.service.BaseWarehouseServiceImpl;
import com.consum.base.service.LWhWarningServiceImpl;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.WhWarning;
-import com.walker.infrastructure.utils.NumberGenerator;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
+import javax.annotation.Resource;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
/**
@@ -25,6 +27,7 @@
* @Version 1.0
**/
@Service
+@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
public class LWhWarningCoreServiceImpl {
@Resource
@@ -45,6 +48,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 +57,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));
@@ -71,7 +80,7 @@
List<Map<String, Object>> modelInfoList = baseGoodsModelsService.queryGoodsModelInfo(baseGoodsModelsId);
Map<String, Object> modelInfo = modelInfoList.get(0);
- whWarning.setId(NumberGenerator.getLongSequenceNumber());
+ whWarning.setId(IdUtil.generateId());
whWarning.setWarehouseType(0);
whWarning.setBaseWarehouseId(warehouseId);
whWarning.setBaseWarehouseName(baseWarehouses.getWarehouseName());
@@ -105,8 +114,14 @@
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 +129,8 @@
params.add(warehouseId);
StringBuilder sql = new StringBuilder(KU_CUN_NORMAL_MODEL);
- if (!org.springframework.util.CollectionUtils.isEmpty(baseModelIdList)) {
- sql.append(" and BASE_GOODS_MODELS_ID in(?)");
- params.add(baseModelIdList);
+ if (!org.springframework.util.CollectionUtils.isEmpty(normalBaseModelIdList)) {
+ sql.append(" and BASE_GOODS_MODELS_ID in(").append(org.apache.commons.lang3.StringUtils.join(normalBaseModelIdList, ",")).append(")");
}
return lWhWarningService.update(sql.toString(), params.toArray());
}
--
Gitblit v1.9.1