From 3884e330379c96e7576ada6b7a988a84e8757886 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 18 十二月 2023 16:12:50 +0800
Subject: [PATCH] 修改查询库存的仓库参数
---
admin-web/src/views/stock/transfer/transferApplication/edit.vue | 2
consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputCoreService.java | 77 +++-------
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java | 3
consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java | 47 ++++--
admin-web/src/views/stock/scrap/itemScrapping/edit.vue | 1
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java | 10
consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java | 7
consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsServiceImpl.java | 5
consum-base/src/main/java/com/consum/base/core/WhBusinessEnum.java | 73 +++++-----
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 32 +++-
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java | 9
consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java | 6
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 2
consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureCoreService.java | 2
admin-web/src/views/departmentitem/itemdis/distribution/edit.vue | 2
consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureServiceImpl.java | 48 +++++-
admin-web/src/views/stock/accessStock/outbound/edit.vue | 1
consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java | 2
consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java | 48 +++---
19 files changed, 202 insertions(+), 175 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemdis/distribution/edit.vue b/admin-web/src/views/departmentitem/itemdis/distribution/edit.vue
index 6aaf721..b5de415 100644
--- a/admin-web/src/views/departmentitem/itemdis/distribution/edit.vue
+++ b/admin-web/src/views/departmentitem/itemdis/distribution/edit.vue
@@ -238,7 +238,7 @@
import {getUploadUrl} from '@/utils/base';
import {mapGetters} from 'vuex';
import * as DateFormatter from '@/utils/DateFormatter';
-import {warehouseAllSelectNumber,warehouseSelectNumber} from "@/api/baseSetting/finsystenant";
+import {warehouseAllSelectNumber} from "@/api/baseSetting/finsystenant";
export default {
components: {MyButton, winMd, upload},
diff --git a/admin-web/src/views/stock/accessStock/outbound/edit.vue b/admin-web/src/views/stock/accessStock/outbound/edit.vue
index dc4bd7a..d2f3e6d 100644
--- a/admin-web/src/views/stock/accessStock/outbound/edit.vue
+++ b/admin-web/src/views/stock/accessStock/outbound/edit.vue
@@ -382,7 +382,6 @@
let num = await warehouseSelectNumber({
warehouseId: this.formData.warehouseId,
baseGoodsModelsId: item,
- warehouseType: 0,
states: 1,
buyType: null,
});
diff --git a/admin-web/src/views/stock/scrap/itemScrapping/edit.vue b/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
index 3f020cd..25d9e12 100644
--- a/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
+++ b/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
@@ -388,7 +388,6 @@
let num = await warehouseSelectNumber({
warehouseId: this.formData.warehouseId,
baseGoodsModelsId: item,
- warehouseType: 0,
states: 1,
buyType: null,
});
diff --git a/admin-web/src/views/stock/transfer/transferApplication/edit.vue b/admin-web/src/views/stock/transfer/transferApplication/edit.vue
index 26b8129..cc22615 100644
--- a/admin-web/src/views/stock/transfer/transferApplication/edit.vue
+++ b/admin-web/src/views/stock/transfer/transferApplication/edit.vue
@@ -177,7 +177,7 @@
</template>
<script>
import {getParentTenant, queryWarehouseGoods, transferAdd} from '@/api/stock/transfer';
-import {getCategorySelectTree, goodsModel, warehouseAllSelectNumber, warehouseSelectNumber} from '@/api/baseSetting/finsystenant';
+import {getCategorySelectTree, goodsModel, warehouseAllSelectNumber} from '@/api/baseSetting/finsystenant';
import MyButton from '@/components/myButton/myButton';
import winMd from '@/components/win/win-md';
import upload from '@/components/upload/index';
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
index 3cad491..33651bc 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
@@ -186,10 +186,9 @@
}
Long baseGoodsModelsId = warehouseQry.getBaseGoodsModelsId();
Integer warehouseType = warehouseQry.getWarehouseType();
- Integer states = warehouseQry.getStates();
Integer buyType = warehouseQry.getBuyType();
- // TODO 鍏朵粬绫诲瀷鐨勫簱瀛樻煡璇㈡槸鍚﹁鏌ラ儴闂ㄧ被鍨嬬殑搴撳瓨
+ // 鍏朵粬绫诲瀷鐨勫簱瀛樻煡璇㈡槸鍚︿篃瑕佹煡閮ㄩ棬绫诲瀷鐨勫簱瀛�
List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
int num = lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseIds, baseGoodsModelsId, 1, buyType);
return ResponseValue.success(num);
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
index 55fb56c..f485cc4 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -140,8 +140,6 @@
}
try {
Field fieldDatas = GenericPager.class.getDeclaredField("datas");
- // fieldDatas.setAccessible(true);
- // fieldDatas.set(genericPager, result);
ReflectUtil.setFieldValue(genericPager, fieldDatas, result);
} catch (Exception e) {
e.printStackTrace();
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 6508add..e03af4f 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
@@ -13,6 +13,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.compress.utils.Lists;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,6 +49,7 @@
import com.consum.base.service.LWhProcureModelUserRecordService;
import com.consum.base.service.LWhProcureModelUserService;
import com.consum.base.service.impl.LWhFormTransferCoreService;
+import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormTransfer;
import com.consum.model.po.LWhProcureModel;
@@ -88,11 +90,11 @@
@Autowired
private LWhProcureModelUserRecordService lWhProcureModelUserRecordService;
@Autowired
- private BaseWarehouseService baseWarehouseService;
- @Autowired
private LGoodsUserRecordCoreService lGoodsUserRecordCoreService;
@Autowired
private LWhGoodsService lWhGoodsService;
+ @Autowired
+ private BaseWarehouseService baseWarehouseService;
/**
* @Description 鏂板
@@ -126,10 +128,17 @@
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), null, (short)1);
+ Set<Long> wareHouseIds = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toSet());
// 閫氳繃璋冩嫧鍗曚腑鐨勫瀷鍙穒d鏌ヨ鍑鸿鍨嬪彿鐗╁搧鎵�鍦ㄧ殑浠撳簱浣嶇疆
- List<GoodsInfoDTO> goodsInfoDTOS = lWhGoodsService.queryGoodsInfo(baseModelIds);
+ List<GoodsInfoDTO> goodsInfoDTOS = lWhGoodsService.queryGoodsInfo(baseModelIds, wareHouseIds);
GoodsInfoDTO goodsInfoDTO = goodsInfoDTOS.stream().findFirst().orElse(null);
-
+ if (ObjectUtils.isEmpty(goodsInfoDTO)) {
+ return ResponseValue.error("璇ュ瀷鍙锋病鏈夊簱瀛樺彲浣跨敤");
+ }
// FinSysTenantUser sysTenantUser = this.getSysInfo();
// String agencyId = sysTenantUser.getTenantId();
// List<BaseWarehouse> baseWarehouseList =
@@ -285,9 +294,15 @@
Set<Long> baseModelIds =
modelByForm.stream().map(LWhProcureModel::getBaseGoodsModelsId).collect(Collectors.toSet());
- // TODO 涓嶅悓搴撳鐞�
+ // TODO 涓嶅悓搴撳鐞嗕笖涓烘湰鏈烘瀯鐨勪粨搴撶墿鍝�
+ FinSysTenantUser sysTenantUser = this.getSysInfo();
+ String agencyId = sysTenantUser.getTenantId();
+ List<BaseWarehouse> baseWarehouseList =
+ baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), null, (short)1);
+ Set<Long> wareHouseIds = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toSet());
+
// 閫氳繃璋冩嫧鍗曚腑鐨勫瀷鍙穒d鏌ヨ鍑鸿鍨嬪彿鐗╁搧鎵�鍦ㄧ殑浠撳簱浣嶇疆
- List<GoodsInfoDTO> goodsInfoDTOS = lWhGoodsService.queryGoodsInfo(baseModelIds);
+ List<GoodsInfoDTO> goodsInfoDTOS = lWhGoodsService.queryGoodsInfo(baseModelIds, wareHouseIds);
GoodsInfoDTO goodsInfoDTO = goodsInfoDTOS.stream().findFirst().orElse(null);
// 鍑哄簱鍓� 璁剧疆鍑哄簱浠撳簱
// FinSysTenantUser sysTenantUser = this.getSysInfo();
@@ -297,7 +312,9 @@
// if (CollectionUtils.isEmpty(baseWarehouseList)) {
// return ResponseValue.error("鏈烘瀯鏃犻粯璁や粨搴擄紒");
// }
-
+ if (ObjectUtils.isEmpty(goodsInfoDTO)) {
+ return ResponseValue.error("璇ュ瀷鍙锋病鏈夊簱瀛樺彲浣跨敤");
+ }
Long wareHouseId = goodsInfoDTO.getWarehouseId();
String warehouseName = goodsInfoDTO.getWarehouseName();
LWhFormTransfer lWhFormTransfer = new LWhFormTransfer(id);
@@ -502,6 +519,7 @@
goodsUseRecordVO.setRecordSkuDtoList(useRecordSkuList);
return goodsUseRecordVO;
+
}).sorted(Comparator.comparing(GoodsUseRecordVO::getUpdateTime, Comparator.nullsFirst(Long::compareTo))
.reversed())
.collect(Collectors.toList());
diff --git a/consum-base/src/main/java/com/consum/base/core/WhBusinessEnum.java b/consum-base/src/main/java/com/consum/base/core/WhBusinessEnum.java
index bb81992..e11aec4 100644
--- a/consum-base/src/main/java/com/consum/base/core/WhBusinessEnum.java
+++ b/consum-base/src/main/java/com/consum/base/core/WhBusinessEnum.java
@@ -13,69 +13,67 @@
/**
* 1 閲囪喘
*/
- CAIGOU((short) 1),
+ CAIGOU(1),
/**
* 2 璋冩嫧
*/
- DIAOBO((short) 2),
+ DIAOBO(2),
/**
* 3鍑哄簱
*/
- CHUKU((short) 3),
+ CHUKU(3),
/**
* 4閮ㄩ棬鍒嗗彂
*/
- BUMENFENFA((short) 4),
+ BUMENFENFA(4),
/**
* 鎶ュ簾
*/
- BAOFEI((short) 5),
+ BAOFEI(5),
/**
* 閮ㄩ棬鐗╁搧鍥為��浠撳簱
*/
- BUMENTUIHUI((short) 6),
+ BUMENTUIHUI(6),
/**
* 鐗╁搧鐩樼偣
*/
- PANDIAN((short) 7),
- ;
+ PANDIAN(7),;
- private short value;
+ private Integer value;
- WhBusinessEnum(short value) {
+ WhBusinessEnum(Integer value) {
this.value = value;
}
- public short getValue() {
+ public Integer getValue() {
return value;
}
/**
- * flowType杞负 杩涘嚭搴撴祦姘存�昏〃[L_WAREHOUSE_FLOW] 鐨� THIS_TYPE锛氭湰娆¤皟鏁寸被鍨� 鍜� BUSINESS_TYPE锛氬崟鎹被鍨�
+ * flowType杞负 杩涘嚭搴撴祦姘存�昏〃[L_WAREHOUSE_FLOW] 鐨� THIS_TYPE锛氭湰娆¤皟鏁寸被鍨� 鍜� BUSINESS_TYPE锛氬崟鎹被鍨�
*
* @param flowType 鍚岀爜琛紝1閲囪喘鍏ュ簱 2閫�杩樺叆搴� 3璋冩嫧鍏ュ簱 4鐩樼泩鍏ュ簱 5鐢抽鍑哄簱 6璋冩嫧鍑哄簱 7鐩樹簭鍑哄簱 8鎶ュ簾鍑哄簱 9鍏朵粬鍑哄簱
- * @return flowThisType锛氭湰娆¤皟鏁寸被鍨嬶紙1=璋冨锛�2=璋冨噺锛�
- * flowBusinessType锛氬崟鎹被鍨� 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂5鎶ュ簾6閮ㄩ棬鐗╁搧鍥為��浠撳簱7鐗╁搧鐩樼偣
+ * @return flowThisType锛氭湰娆¤皟鏁寸被鍨嬶紙1=璋冨锛�2=璋冨噺锛� flowBusinessType锛氬崟鎹被鍨� 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂5鎶ュ簾6閮ㄩ棬鐗╁搧鍥為��浠撳簱7鐗╁搧鐩樼偣
*/
public static Map<String, Short> getTypeByFlowType(Short flowType) {
- //鍗曟嵁绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂5鎶ュ簾6閮ㄩ棬鐗╁搧鍥為��浠撳簱7鐗╁搧鐩樼偣
+ // 鍗曟嵁绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂5鎶ュ簾6閮ㄩ棬鐗╁搧鍥為��浠撳簱7鐗╁搧鐩樼偣
Short flowBusinessType = null;
- //1=璋冨锛�2=璋冨噺
+ // 1=璋冨锛�2=璋冨噺
Short flowThisType = null;
- //鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��
+ // 鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��
Short transferBusinessType = null;
switch (flowType) {
- //1閲囪喘鍏ュ簱
+ // 1閲囪喘鍏ュ簱
case 1:
flowThisType = 1;
flowBusinessType = 1;
break;
- //2閫�杩樺叆搴�
+ // 2閫�杩樺叆搴�
case 2:
flowThisType = 1;
flowBusinessType = 2;
break;
- //3璋冩嫧鍏ュ簱
+ // 3璋冩嫧鍏ュ簱
case 3:
flowThisType = 1;
flowBusinessType = 3;
@@ -85,19 +83,19 @@
flowThisType = 1;
flowBusinessType = 7;
break;
- //5鐢抽鍑哄簱
+ // 5鐢抽鍑哄簱
case 5:
flowThisType = 2;
flowBusinessType = 4;
-// transferBusinessType = 1;
+ // transferBusinessType = 1;
break;
// 6璋冩嫧鍑哄簱
case 6:
flowThisType = 2;
flowBusinessType = 2;
-// transferBusinessType = 1;
+ // transferBusinessType = 1;
break;
- //7鐩樹簭鍑哄簱
+ // 7鐩樹簭鍑哄簱
case 7:
flowThisType = 2;
flowBusinessType = 7;
@@ -120,36 +118,35 @@
}
/**
- * flowType杞负 杩涘嚭搴撴祦姘存�昏〃[L_WAREHOUSE_FLOW] 鐨� THIS_TYPE锛氭湰娆¤皟鏁寸被鍨� 鍜� BUSINESS_TYPE锛氬崟鎹被鍨�
+ * flowType杞负 杩涘嚭搴撴祦姘存�昏〃[L_WAREHOUSE_FLOW] 鐨� THIS_TYPE锛氭湰娆¤皟鏁寸被鍨� 鍜� BUSINESS_TYPE锛氬崟鎹被鍨�
*
* @param deptFlowType // 鍚岀爜琛紝1 鐗╁搧鐢抽 2 鐗╁搧鍒嗗彂 3 鐗╁搧閫�杩� 4 鐗╁搧鎶ュ簾
- * @return flowThisType锛氭湰娆¤皟鏁寸被鍨嬶紙1=璋冨锛�2=璋冨噺锛�
- * flowBusinessType锛氬崟鎹被鍨� 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂5鎶ュ簾6閮ㄩ棬鐗╁搧鍥為��浠撳簱7鐗╁搧鐩樼偣
+ * @return flowThisType锛氭湰娆¤皟鏁寸被鍨嬶紙1=璋冨锛�2=璋冨噺锛� flowBusinessType锛氬崟鎹被鍨� 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂5鎶ュ簾6閮ㄩ棬鐗╁搧鍥為��浠撳簱7鐗╁搧鐩樼偣
*/
public static Map<String, Short> getTypeByDeptFlowType(Short deptFlowType) {
- //鍗曟嵁绫诲瀷 1 閲囪喘 2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂5鎶ュ簾6閮ㄩ棬鐗╁搧鍥為��浠撳簱7鐗╁搧鐩樼偣
+ // 鍗曟嵁绫诲瀷 1 閲囪喘 2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂5鎶ュ簾6閮ㄩ棬鐗╁搧鍥為��浠撳簱7鐗╁搧鐩樼偣
Short flowBusinessType = null;
- //1=璋冨锛�2=璋冨噺
+ // 1=璋冨锛�2=璋冨噺
Short flowThisType = null;
- //鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��
+ // 鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��
Short transferBusinessType = null;
switch (deptFlowType) {
- //鐗╁搧鐢抽
+ // 鐗╁搧鐢抽
case 1:
-// flowThisType = 2;
-// flowBusinessType = 2;
+ // flowThisType = 2;
+ // flowBusinessType = 2;
break;
- //2 鐗╁搧鍒嗗彂
+ // 2 鐗╁搧鍒嗗彂
case 2:
flowThisType = 1;
flowBusinessType = 4;
-// transferBusinessType = 1;
+ // transferBusinessType = 1;
break;
- //3 鐗╁搧閫�杩�
+ // 3 鐗╁搧閫�杩�
case 3:
flowThisType = 2;
flowBusinessType = 6;
-// transferBusinessType = 2;
+ // transferBusinessType = 2;
break;
// 4 鐗╁搧鎶ュ簾
case 4:
@@ -160,7 +157,7 @@
Map<String, Short> rtnMap = new HashMap<>();
rtnMap.put("flowBusinessType", flowBusinessType);
rtnMap.put("flowThisType", flowThisType);
-// rtnMap.put("transferBusinessType", transferBusinessType);
+ // rtnMap.put("transferBusinessType", transferBusinessType);
return rtnMap;
}
}
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 a9e5089..c7e6333 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,6 +1,17 @@
package com.consum.base.core.service;
-import cn.hutool.core.convert.Convert;
+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;
+
import com.consum.base.core.utils.IdUtil;
import com.consum.base.service.BaseGoodsModelsService;
import com.consum.base.service.BaseWarehouseService;
@@ -8,16 +19,8 @@
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.WhWarning;
-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;
+import cn.hutool.core.convert.Convert;
/**
* @ClassName LWhWarningCoreServiceImpl
@@ -44,22 +47,21 @@
* @param warehouseId
* @param baseModelIdList
*/
- public void updateKuCun(Short warehouseType, Long warehouseId, List<Long> baseModelIdList, FinSysTenantUser sysInfo, Long dealTime) {
+ public void updateKuCun(Short warehouseType, Long warehouseId, List<Long> baseModelIdList, FinSysTenantUser sysInfo,
+ Long dealTime) {
if (baseModelIdList == null) {
baseModelIdList = new ArrayList<>();
}
sysInfo = sysInfo == null ? new FinSysTenantUser() : sysInfo;
// 鑾峰彇鍒拌揪鍒伴槇鍊肩殑鐗╁搧
- List<Map<String, Object>> kuCunNotifyList = lWhWarningService.checkKuCun(warehouseType, warehouseId, baseModelIdList);
- //
-// log.info("娌℃湁杈惧埌闃堝�肩殑鐗╁搧");
+ List<Map<String, Object>> kuCunNotifyList =
+ lWhWarningService.checkKuCun(warehouseType, warehouseId, baseModelIdList);
+ // log.info("娌℃湁杈惧埌闃堝�肩殑鐗╁搧");
if (CollectionUtils.isEmpty(kuCunNotifyList)) {
kuCunNormalModel(warehouseType, warehouseId, baseModelIdList);
return;
}
- List<Long> allChangModelList = baseModelIdList.stream()
- .distinct()
- .collect(Collectors.toList());
+ List<Long> allChangModelList = baseModelIdList.stream().distinct().collect(Collectors.toList());
baseModelIdList = allChangModelList;
// 灏嗘暟鎹彃鍏ュ簱瀛橀璀︺�怶H_WARNING銆�
@@ -87,7 +89,7 @@
whWarning.setBaseGoodsTemplateId(Convert.toLong(modelInfo.get("goodsId")));
whWarning.setBaseGoodsTemplateName(Convert.toStr(modelInfo.get("goodsName")));
whWarning.setBaseGoodsModelsId(baseGoodsModelsId);
- whWarning.setBaseGoodsModelsName((String) modelInfo.get("modelName"));
+ whWarning.setBaseGoodsModelsName((String)modelInfo.get("modelName"));
whWarning.setGoodsType(2);
whWarning.setWarningType(warningType);
whWarning.setUpperLimit(upperLimit);
@@ -103,16 +105,17 @@
warningList.add(whWarning);
}
- //淇敼浠ュ墠鐨勯璀︾姸鎬�
+ // 淇敼浠ュ墠鐨勯璀︾姸鎬�
baseModelIdList.removeAll(kuCunNotifyModelIdList);
kuCunNormalModel(warehouseType, warehouseId, baseModelIdList);
- //鎵归噺鎻掑叆棰勮
+ // 鎵归噺鎻掑叆棰勮
lWhWarningService.insertBatch(warningList);
}
- private String KU_CUN_NORMAL_MODEL = "update WH_WARNING set STATES=2 where WAREHOUSE_TYPE=? and BASE_WAREHOUSE_ID=?";
+ private String KU_CUN_NORMAL_MODEL =
+ "update WH_WARNING set STATES=2 where WAREHOUSE_TYPE=? and BASE_WAREHOUSE_ID=?";
/**
* @param warehouseType
@@ -130,7 +133,8 @@
StringBuilder sql = new StringBuilder(KU_CUN_NORMAL_MODEL);
if (!org.springframework.util.CollectionUtils.isEmpty(normalBaseModelIdList)) {
- sql.append(" and BASE_GOODS_MODELS_ID in(").append(org.apache.commons.lang3.StringUtils.join(normalBaseModelIdList, ",")).append(")");
+ sql.append(" and BASE_GOODS_MODELS_ID in(")
+ .append(org.apache.commons.lang3.StringUtils.join(normalBaseModelIdList, ",")).append(")");
}
return lWhWarningService.update(sql.toString(), params.toArray());
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java b/consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java
index 38083c5..26b52b1 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java
@@ -55,5 +55,5 @@
*/
GoodsModelCountDTO queryGoodsAmount(Long baseGoodsModelsId, Integer type);
- List<GoodsInfoDTO> queryGoodsInfo(Set<Long> baseModelIds);
+ List<GoodsInfoDTO> queryGoodsInfo(Set<Long> baseModelIds, Set<Long> wareHouseIds);
}
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputCoreService.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputCoreService.java
index c9cc506..7f53a70 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputCoreService.java
@@ -94,27 +94,24 @@
return null;
}
// 鏌ヨ璇ヨ皟鎷ㄥ崟鏄惁宸茬粡鐢熸垚浜嗗嚭搴撳崟
- Long outWarehouseFormIdT = lWhFormOutputService.queyrIdByTransferId(whFormTransferId);
- if (outWarehouseFormIdT != null) {
- return outWarehouseFormIdT;
+ Long outWarehouseFormId = lWhFormOutputService.queyrIdByTransferId(whFormTransferId);
+ if (outWarehouseFormId != null) {
+ return outWarehouseFormId;
}
+ // 鍑哄簱鍗旾D
+ outWarehouseFormId = NumberGenerator.getLongSequenceNumberNano();
// 鐢宠璋冩嫧鐨勭墿鍝�
List<LWhProcureModel> goodsModelNumList = lWhProcureModelService.getModelByForm(businessEnum, whFormTransferId);
if (CollectionUtils.isEmpty(goodsModelNumList)) {
log.error("娌℃湁瑕佸叆搴撶殑鐗╁搧");
throw new RuntimeException("娌℃湁瑕佸叆搴撶殑鐗╁搧");
- // return null;
}
Long outWarehouseId = lWhFormTransfer.getOutWarehouseId();
String outWarehouseName = lWhFormTransfer.getOutWarehouseName();
- // 鍑哄簱鍗旾D
- outWarehouseFormIdT = NumberGenerator.getLongSequenceNumberNano();
- Long outWarehouseFormId = outWarehouseFormIdT;
-
// 璋冩嫧鍗曠墿鍝� 宸茬粡鎸夊瀷鍙峰垎濂戒簡
- goodsModelNumList.forEach(itemModelInfo -> {
+ for (LWhProcureModel itemModelInfo : goodsModelNumList) {
// 澶嶇敤瀵硅薄
itemModelInfo.setId(IdUtil.generateId());
itemModelInfo.setFromProcureGoodsId(null);
@@ -122,12 +119,11 @@
itemModelInfo.setBusinessId(outWarehouseFormId);
itemModelInfo.setPrice(null);
itemModelInfo.setSupplier(null);
- });
+ }
lWhProcureModelService.insertBatch(goodsModelNumList);
// //鍒涘缓鍑哄簱鍗�
LWhFormOutput whFormOutput = new LWhFormOutput();
-
whFormOutput.setId(outWarehouseFormId);
// 姝ゆ椂骞舵病鏈夊嚭搴�
whFormOutput.setWarehouseFlowId(null);
@@ -148,7 +144,7 @@
whFormOutput.setOperatorName(currentUser.getNick_name());
whFormOutput.setDealTime(dealTime);
- whFormOutput.setStates(1);
+ whFormOutput.setStates(OutPutStatesType.OUT_PENDING.getValue());
int insert = lWhFormOutputService.insert(whFormOutput);
if (insert == 0) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -196,42 +192,30 @@
// 娴佹按璁板綍鎬昏〃ID
long lWarehouseFlowId = NumberGenerator.getLongSequenceNumberNano();
- // 娴佹按璁板綍鎬昏〃涓� 涓氬姟ID 銆傝皟鎷ㄥ崟鏃� 淇濆瓨璋冩嫧鍗昳d 鍑哄簱鍗曟椂 淇濆瓨鍑哄簱鍗昳d
long lWarehouseFlowBusinessId = outWarehouseFormId;
+ Integer queryModelStatus = 1;
+ Integer buyType = null;
+ Integer modGoodsTransferStatus = null;
- // 鐗╁搧鐘舵�侊紙0=鍦ㄩ�旇皟鎷紱1=鍏ュ簱鏈垎鍙戯紱2=宸蹭笅鍙戯紱3=鎶ュ簾锛�
- Integer queryModelStatusT = 1;
- // 閲囪喘鏂瑰紡锛�1锛氶泦閲囷紱2=鑷噰锛�
- Integer buyTypeT = null;
- Integer modGoodsTransferingStatusT = null;
- short businessTypeValue = businessType.getValue();
- if (InAndOutPutType.Transfer_Output.getValue() == businessTypeValue) {
+ Integer businessTypeValue = businessType.getValue();
+ if (businessTypeValue == InAndOutPutType.Transfer_Output.getValue()) {
// 璋冩嫧鍑哄簱
- queryModelStatusT = 1;
- buyTypeT = 1;
+ queryModelStatus = 0;
+ buyType = 1;
lWarehouseFlowBusinessId = lWhFormOutput.getTransBusinessId();
- modGoodsTransferingStatusT = 0;
- } else if (InAndOutPutType.Dept_Lending_Out.getValue() == businessTypeValue) {
+ modGoodsTransferStatus = 0;
+ } else if (businessTypeValue == InAndOutPutType.Dept_Lending_Out.getValue()) {
// 閮ㄩ棬浠撳簱 鍒嗗彂鍑哄簱
- // queryModelStatusT = 2;
lWarehouseFlowBusinessId = lWhFormOutput.getTransBusinessId();
- } else if (InAndOutPutType.Fragmentary_Output.getValue() == businessTypeValue) {
- // 闆舵槦鍑哄簱
- queryModelStatusT = 1;
- buyTypeT = null;
- modGoodsTransferingStatusT = 4;
- } else if (InAndOutPutType.Inventory_Output.getValue() == businessTypeValue) {
- // 鐩樼偣鍑哄簱
- queryModelStatusT = 1;
- buyTypeT = null;
- modGoodsTransferingStatusT = 4;
+ } else if (businessTypeValue == InAndOutPutType.Fragmentary_Output.getValue()
+ || businessTypeValue == InAndOutPutType.Inventory_Output.getValue()) {
+ // 闆舵槦鍑哄簱 鎴� 鐩樼偣鍑哄簱
+ queryModelStatus = 1;
+ modGoodsTransferStatus = 4;
}
- Integer queryModelStatus = queryModelStatusT;
- Integer buyType = buyTypeT;
- Integer modGoodsTransferingStatus = modGoodsTransferingStatusT;
ArrayList<Long> allChangModelList = new ArrayList<>();
- goodsModelNumList.forEach(itemModelInfo -> {
+ for (LWhProcureModel itemModelInfo : goodsModelNumList) {
// 闇�瑕佽皟鎷ㄧ殑鐗╁搧鐨勬煇涓瀷鍙�
Long baseGoodsModelsId = itemModelInfo.getBaseGoodsModelsId();
@@ -244,17 +228,10 @@
// 鏌ヨ鍨嬪彿淇℃伅
Map<String, Object> tempGoodsInfo = baseGoodsTemplateService.queryGoodsInfoByModelId(baseGoodsModelsId);
- // 浠峰�肩被鍨�
- String classificationObj = (String)tempGoodsInfo.get("classification");
- Short classificationT = 3;
- if (classificationObj != null) {
- classificationT = (short)((classificationObj).charAt(0) - 64);
- }
- short classification = classificationT;
+
Long tempGoodsId = (Long)tempGoodsInfo.get("goodsid");
String goodsName = (String)tempGoodsInfo.get("goodsname");
String modelName = (String)tempGoodsInfo.get("modelname");
- String goodsUnit = (String)tempGoodsInfo.get("unit");
// 鎻掑叆 鍚勮鏍肩墿鍝佺殑杩涘嚭搴撹褰� L_WH_GOODS_RECORD
long whGoodsRecordId = NumberGenerator.getLongSequenceNumberNano();
@@ -292,7 +269,7 @@
outGoodsId = lWhGoodsService.queryOutGoodsId(outWarehouseType, outWarehouseId, baseGoodsModelsId,
queryModelStatus, buyType, counts);
lWhGoodsService.modGoodsTransfering(outGoodsId, inWarehouseType, inWarehouseId, inWarehouseName,
- modGoodsTransferingStatus);
+ modGoodsTransferStatus);
// 鎵归噺鎻掑叆 杩涘嚭搴撴祦姘存槑缁哰L_WH_GOODS_RECORD_DETAILS]
lWhGoodsRecordDetailsService.sameGoodsInsertMore(outGoodsId, whGoodsRecordId, (short)0);
}
@@ -302,13 +279,13 @@
lWhGoodsRecordServiceImpl.insert(whGoodsRecord);
lWhProcureModel.setTotalAmount(totalAmount);
lWhProcureModelService.update(lWhProcureModel);
- });
+ }
LWarehouseFlow warehouseFlow = new LWarehouseFlow();
warehouseFlow.setId(lWarehouseFlowId);
warehouseFlow.setWarehouseId(outWarehouseId);
warehouseFlow.setWarehouseName(warehouseName);
warehouseFlow.setThisType(2);
- warehouseFlow.setBusinessType(businessType.getValue() + 0);
+ warehouseFlow.setBusinessType(businessType.getValue());
warehouseFlow.setBusinessFormId(whFormTransferId == null ? lWarehouseFlowBusinessId : whFormTransferId);
warehouseFlow.setOperatorId(userId);
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
index 6d7034a..8b1b785 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
@@ -20,7 +20,6 @@
import com.consum.base.core.type.GoodsModelType;
import com.consum.base.core.type.InAndOutPutType;
import com.consum.base.core.type.OutPutStatesType;
-import com.consum.base.core.type.WareHouseType;
import com.consum.base.core.utils.CurrencyUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapUtils;
@@ -133,8 +132,9 @@
lWhProcureModel.setCounts(model.getCounts());
// 鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
- int goodsNum = this.lWhGoodsService.queryGoodsModelNum(WareHouseType.TENANT.getValue(), warehouseIds,
- model.getBaseGoodsModelsId(), 1, null);
+ // 鏌ヨ搴撳瓨鏃朵笉鍖哄垎鏈烘瀯鍜岄儴闂�
+ int goodsNum =
+ this.lWhGoodsService.queryGoodsModelNum(null, warehouseIds, model.getBaseGoodsModelsId(), 1, null);
lWhProcureModel.setWorehouseCount(goodsNum);
modelList.add(lWhProcureModel);
}
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureCoreService.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureCoreService.java
index f01351b..a362760 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureCoreService.java
@@ -75,7 +75,7 @@
warehouseFlow.setWarehouseId(warehouseId);
warehouseFlow.setWarehouseName(lWhFormProcure.getWarehouseName());
warehouseFlow.setThisType(1);
- warehouseFlow.setBusinessType(WhBusinessEnum.CAIGOU.getValue() + 0);
+ warehouseFlow.setBusinessType(WhBusinessEnum.CAIGOU.getValue());
warehouseFlow.setBusinessFormId(whFormProcureId);
warehouseFlow.setOperatorId(userId);
warehouseFlow.setOperatorName(nickName);
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureServiceImpl.java
index c4cc34e..46414cc 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureServiceImpl.java
@@ -1,27 +1,50 @@
package com.consum.base.service.impl;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.WhBusinessEnum;
-import com.consum.base.core.utils.*;
+import com.consum.base.core.utils.CurrencyUtil;
+import com.consum.base.core.utils.IdUtil;
+import com.consum.base.core.utils.MapUtils;
+import com.consum.base.core.utils.MapperUtil;
+import com.consum.base.core.utils.PageUtil;
import com.consum.base.pojo.LWhFormProcureGoodsInfoParam;
import com.consum.base.pojo.LWhFormProcureParam;
import com.consum.base.pojo.LWhProcureModelParam;
import com.consum.base.pojo.excel.ProcureExcelTemplate;
import com.consum.base.pojo.query.FormProcureQry;
-import com.consum.base.service.*;
-import com.consum.model.po.*;
+import com.consum.base.service.BaseGoodsTemplateService;
+import com.consum.base.service.BaseWarehouseService;
+import com.consum.base.service.LOrgSupplierServiceImpl;
+import com.consum.base.service.LWhFormProcureGoodsService;
+import com.consum.base.service.LWhFormProcureService;
+import com.consum.base.service.LWhGoodsService;
+import com.consum.base.service.LWhProcureModelService;
+import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LOrgSupplier;
+import com.consum.model.po.LWhFormProcure;
+import com.consum.model.po.LWhFormProcureGoods;
+import com.consum.model.po.LWhProcureModel;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import org.apache.commons.compress.utils.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.*;
/**
* @ClassName lWhFormProcureService
@@ -105,7 +128,7 @@
+ "LEFT JOIN l_wh_form_procure_goods fpg ON fp.id = fpg.WH_FORM_PROCURE_ID "
+ "LEFT JOIN l_wh_procure_model pm ON pm.FROM_PROCURE_GOODS_ID = fpg.id WHERE pm.BUSINESS_TYPE = 1 ");
// 鍙煡璇㈡湰鏈烘瀯鐨勯噰璐崟
- if (param.getAgencyId() != null){
+ if (param.getAgencyId() != null) {
sql.append("and fp.AGENCY_ID like :agencyId ");
paramts.put("agencyId", param.getAgencyId());
}
@@ -245,11 +268,12 @@
String modelName = (String)tempGoodsInfo.get("modelname");
// 鏌ヨ鍨嬪彿搴撳瓨
List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
- int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseIds, baseGoodsModelsId, 1, null);
+ // 搴撳瓨鏌ヨ鎵�鏈夌被鍨嬬殑鍖呮嫭鏈烘瀯鍜岄儴闂ㄧ殑绫诲瀷
+ int goodsModelNum = lWhGoodsService.queryGoodsModelNum(null, warehouseIds, baseGoodsModelsId, 1, null);
LWhProcureModel model = new LWhProcureModel();
model.setId(IdUtil.generateId());
model.setFromProcureGoodsId(fromProcureGoodsId);
- model.setBusinessType(WhBusinessEnum.CAIGOU.getValue() + 0);
+ model.setBusinessType(WhBusinessEnum.CAIGOU.getValue());
model.setBusinessId(whFormProcureId);
model.setBaseGoodsModelsId(baseGoodsModelsId);
model.setBaseGoodsModelsName(modelName);
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 1888682..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,29 +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 java.util.ArrayList;
import java.util.Arrays;
-import lombok.extern.slf4j.Slf4j;
+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
@@ -146,7 +153,8 @@
List<Long> srappedGoodsIds = null;
if (warehouseType == null || warehouseType == 0) {
List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
- goodsModelNum = lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseIds, baseGoodsModelsId, 1, null);
+ goodsModelNum =
+ lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseIds, baseGoodsModelsId, 1, null);
srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(warehouseType, warehouseId, null, null,
baseGoodsModelsId, (short)1, counts);
} else {
@@ -156,7 +164,8 @@
srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(warehouseType, warehouseId,
transBusinessId, userName, baseGoodsModelsId, (short)2, counts);
List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
- goodsModelNum = lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseIds, baseGoodsModelsId, 2, null);
+ goodsModelNum =
+ lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseIds, baseGoodsModelsId, 2, null);
}
if (goodsModelNum < counts) {
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java
index b2b22bf..27e0c1a 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java
@@ -16,6 +16,7 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
+import com.consum.base.core.type.WareHouseType;
import com.consum.base.core.utils.CurrencyUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapUtils;
@@ -105,7 +106,7 @@
long lWhFormScrappedId = IdUtil.generateId();
lWhFormScrapped.setId(lWhFormScrappedId);
lWhFormScrapped.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.Scrapped));
- lWhFormScrapped.setWarehouseType(0);
+ lWhFormScrapped.setWarehouseType(WareHouseType.TENANT.getValue());
// 鍏敤
Long warehouseId = null;
@@ -179,8 +180,8 @@
scrappedGoods.setId(IdUtil.generateId());
// 鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
- int goodsNum =
- lWhGoodsService.queryGoodsModelNum(0, warehouseIds, scrappedGoods.getBaseGoodsModelsId(), 1, null);
+ int goodsNum = lWhGoodsService.queryGoodsModelNum(WareHouseType.TENANT.getValue(), warehouseIds,
+ scrappedGoods.getBaseGoodsModelsId(), 1, null);
if (params.getCounts() > goodsNum) {
log.error("鎶ュ簾鏁伴噺澶т簬搴撳瓨鏁伴噺");
return 0;
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java
index 3722c5b..6a2114d 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java
@@ -98,14 +98,13 @@
long dealTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());
// 鍗曟嵁绫诲瀷銆�0浠撳簱璋冩嫧锛�1閮ㄩ棬鍒嗗彂锛�2閮ㄩ棬鐗╁搧鍥為��
Integer businessType = lWhFormTransfer.getBusinessType();
- businessType = businessType == null ? 0 : businessType;
- WhBusinessEnum businessEnum = WhBusinessEnum.DIAOBO;
- if (businessType == 0) {
- businessEnum = WhBusinessEnum.DIAOBO;
- } else if (businessType == 1) {
+ WhBusinessEnum businessEnum;
+ if (businessType == 1) {
businessEnum = WhBusinessEnum.BUMENFENFA;
} else if (businessType == 2) {
businessEnum = WhBusinessEnum.BUMENTUIHUI;
+ } else {
+ businessEnum = WhBusinessEnum.DIAOBO;
}
// 鍑哄簱鍗旾D
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 87450ce..4dde81b 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
@@ -20,6 +20,7 @@
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.type.CategoryType;
import com.consum.base.core.type.TransferBusinessType;
+import com.consum.base.core.type.WareHouseType;
import com.consum.base.core.utils.CurrencyUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapUtils;
@@ -114,7 +115,7 @@
// 璋冩嫧绫诲瀷鍗曟嵁
if (businessType == TransferBusinessType.STOCK_TRANSFER.getValue()) {
- // 鍏ュ簱浠撳簱涓哄綋鍓嶇敤鎴风殑榛樿浠撳簱
+ // 鍏ュ簱浠撳簱涓哄綋鍓嶇敤鎴风殑榛樿浠撳簱涓殑绗竴涓�
String tenantId = sysInfo.getTenantId();
String tenantName = sysInfo.getTenantName();
BaseWarehouse warehouse = baseWarehouseService.getDefaultWarehouseByAgencyId(Long.valueOf(tenantId));
@@ -147,13 +148,13 @@
baseWarehouse.setId(baseWarehouseId);
BaseWarehouse warehouse = baseWarehouseService.get(baseWarehouse);
- lWhFormTransfer.setInWarehouseType(1);
+ lWhFormTransfer.setInWarehouseType(WareHouseType.DEPARTMENT.getValue());
lWhFormTransfer.setInWarehouseId(param.getDepartmentId());
lWhFormTransfer.setInWarehouseName(param.getDepartmentName());
lWhFormTransfer.setInOperatorName(param.getOperatorName());
lWhFormTransfer.setInTime(param.getCreateTime());
- lWhFormTransfer.setOutWarehouseType(0);
+ lWhFormTransfer.setOutWarehouseType(WareHouseType.TENANT.getValue());
lWhFormTransfer.setOutWarehouseId(warehouse.getId());
lWhFormTransfer.setOutWarehouseName(warehouse.getWarehouseName());
@@ -219,7 +220,8 @@
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);
+ int goodsNum = lWhGoodsService.queryGoodsModelNum(WareHouseType.TENANT.getValue(), warehouseIdList,
+ baseGoodsModelsId, 1, null);
lWhProcureModel.setWorehouseCount(goodsNum);
}
if (businessType == TransferBusinessType.DEPARTMENT_PROCURE.getValue()) {
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsServiceImpl.java
index ca7e7f4..c25120e 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsServiceImpl.java
@@ -354,14 +354,15 @@
}
@Override
- public List<GoodsInfoDTO> queryGoodsInfo(Set<Long> baseModelIds) {
+ public List<GoodsInfoDTO> queryGoodsInfo(Set<Long> baseModelIds, Set<Long> wareHouseIds) {
List<GoodsInfoDTO> goodsInfoDTOS = Lists.newArrayList();
StringBuilder sql = new StringBuilder(
"SELECT distinct WAREHOUSE_ID,WAREHOUSE_NAME from L_WH_GOODS where base_goods_models_id in (:baseGoodsModelsIds) "
- + "and WAREHOUSE_TYPE =0 and BUY_TYPE =1 and states =1");
+ + "and WAREHOUSE_TYPE =0 and BUY_TYPE =1 and states =1 and WAREHOUSE_ID in (:wareHouseIds)");
Map<String, Object> param = new HashMap<>();
param.put("baseGoodsModelsIds", baseModelIds);
+ param.put("wareHouseIds", wareHouseIds);
List<Map<String, Object>> result = this.select(sql.toString(), param, new MapperUtil());
result.forEach(item -> {
GoodsInfoDTO goodsInfoDTO = MapUtils.convertMapToObj(item, GoodsInfoDTO.class);
--
Gitblit v1.9.1