From fda942a13398486e58f60b8897dd168e771ac8dc Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 21 十二月 2023 13:23:14 +0800
Subject: [PATCH] 机构新增和编辑
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java | 50 +++++++++++++++++++++++++++++++-------------------
1 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java
index 0588f87..c652171 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java
@@ -1,28 +1,36 @@
package com.consum.base.service.impl;
-import cn.hutool.core.convert.Convert;
-import com.consum.base.core.WhBusinessEnum;
-import com.consum.base.core.service.LWhWarningCoreServiceImpl;
-import com.consum.base.core.utils.IdUtil;
-import com.consum.base.core.utils.LockManage;
-import com.consum.base.service.*;
-import com.consum.model.po.LWarehouseFlow;
-import com.consum.model.po.LWhFormScrapped;
-import com.consum.model.po.LWhFormScrappedGoods;
-import com.consum.model.po.LWhGoodsRecord;
-import com.iplatform.model.po.S_user_core;
-import com.walker.infrastructure.utils.CollectionUtils;
-import lombok.extern.slf4j.Slf4j;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+import com.consum.base.core.WhBusinessEnum;
+import com.consum.base.core.service.LWhWarningCoreServiceImpl;
+import com.consum.base.core.utils.IdUtil;
+import com.consum.base.core.utils.LockManage;
+import com.consum.base.service.BaseGoodsTemplateService;
+import com.consum.base.service.GoodsBaseServiceImpl;
+import com.consum.base.service.LWarehouseFlowService;
+import com.consum.base.service.LWhFormScrappedGoodsService;
+import com.consum.base.service.LWhGoodsRecordService;
+import com.consum.base.service.LWhGoodsService;
+import com.consum.model.po.LWarehouseFlow;
+import com.consum.model.po.LWhFormScrapped;
+import com.consum.model.po.LWhFormScrappedGoods;
+import com.consum.model.po.LWhGoodsRecord;
+import com.iplatform.model.po.S_user_core;
+import com.walker.infrastructure.utils.CollectionUtils;
+
+import cn.hutool.core.convert.Convert;
+import lombok.extern.slf4j.Slf4j;
/**
* @ClassName LWhFormScrappedCoreService
@@ -144,7 +152,9 @@
int goodsModelNum = 0;
List<Long> srappedGoodsIds = null;
if (warehouseType == null || warehouseType == 0) {
- goodsModelNum = lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseId, baseGoodsModelsId, 1, null);
+ List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
+ goodsModelNum =
+ lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseIds, baseGoodsModelsId, 1, null);
srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(warehouseType, warehouseId, null, null,
baseGoodsModelsId, (short)1, counts);
} else {
@@ -153,7 +163,9 @@
// 鏍规嵁鍒嗗彂鍗曘�佽鏍煎瀷鍙风紪鍙枫�佷娇鐢ㄤ汉鍛樺悕绉帮紝杩涜鎶ュ簾
srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(warehouseType, warehouseId,
transBusinessId, userName, baseGoodsModelsId, (short)2, counts);
- goodsModelNum = lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseId, baseGoodsModelsId, 2, null);
+ List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
+ goodsModelNum =
+ lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseIds, baseGoodsModelsId, 2, null);
}
if (goodsModelNum < counts) {
--
Gitblit v1.9.1