From d80f3300905b7c4fffed59d8fa78491065aa181b Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 21 十二月 2023 16:26:15 +0800
Subject: [PATCH] 用户编号搜索和调拨明细只显示本机构及下级
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
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 2eccb93..359084a 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
@@ -1,6 +1,7 @@
package com.consum.base.service.impl;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -15,6 +16,7 @@
import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.service.LWhWarningCoreServiceImpl;
+import com.consum.base.core.type.TransferStatesType;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.LockManage;
import com.consum.base.service.BaseGoodsTemplateService;
@@ -97,14 +99,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
@@ -227,7 +228,8 @@
List<Long> outGoodsId = null;
synchronized (warehouseModelLockObj) {
// 鑾峰緱閿佸悗鏌ヨ璇ュ瀷鍙风殑鏈熷垵鏁伴噺
- int goodsModelNum = lWhGoodsService.queryGoodsModelNum(outWarehouseType, outWarehouseId,
+ List<Long> warehouseIds = new ArrayList<>(Arrays.asList(outWarehouseId));
+ int goodsModelNum = lWhGoodsService.queryGoodsModelNum(outWarehouseType, warehouseIds,
baseGoodsModelsId, queryModelStatus, buyType);
if (goodsModelNum < counts) {
log.error("鍑哄簱澶辫触锛佸瀷鍙穥} 鐨勬暟閲忎笉瓒筹紝闇�瑕佽皟鎷▄}涓紝浠撳簱涓幇瀛榹}涓�", baseGoodsModelsId, counts, goodsModelNum);
@@ -285,7 +287,7 @@
lWhFormTransfer = new LWhFormTransfer(whFormTransferId);
// 璋冩嫧鍗曚笉鍐嶅叧鑱斿嚭鍏ュ簱鍗�
// lWhFormTransfer.setOutWarehouseFormId(outWarehouseFormId);
- lWhFormTransfer.setStates(1);
+ lWhFormTransfer.setStates(TransferStatesType.RECEIVE_ING.getValue());
lWhFormTransfer.setOutOperatorId(userId);
lWhFormTransfer.setOutOperatorName(nickName);
lWhFormTransfer.setOutputTime(dealTime);
@@ -380,18 +382,13 @@
throw new RuntimeException("鍏ュ簱鍗曞け璐ワ紝鏈煡璇㈠埌鐗╁搧锛�");
}
// 鑾峰緱閿佸悗鏌ヨ璇ュ瀷鍙风殑鏈熷垵鏁伴噺
+ List<Long> warehouseIds = new ArrayList<>(Arrays.asList(inWarehouseId));
int goodsModelNum =
- lWhGoodsService.queryGoodsModelNum(inWarehouseType, inWarehouseId, baseGoodsModelsId, 1, null);
+ lWhGoodsService.queryGoodsModelNum(inWarehouseType, warehouseIds, baseGoodsModelsId, 1, null);
// 搴撳瓨鐗╁搧璇︽儏锛圠_WH_GOODS锛変腑 鐘舵�佽缃负1
lWhGoodsService.modGoodsTransfering(outGoodsIds, inWarehouseType, inWarehouseId, inWarehouseName,
goodsStatus);
-
- // 閫氳繃鐗╁搧id鏌ヨ鎵�鏈夊晢鍝佺殑鎬婚噾棰�
- // long amount = lWhGoodsService.queryGoodsPriceById(outGoodsIds);
- // LWhProcureModel lWhFormScrappedGoods = new LWhProcureModel(formScrappedGood.getId());
- // lWhFormScrappedGoods.setTotalAmount(amount);
- // lWhFormTransferService.update(lWhFormScrappedGoods);
whGoodsRecord.setInitialCount(goodsModelNum);
whGoodsRecord.setEndCount(goodsModelNum + whGoodsRecord.getThisCount());
@@ -472,7 +469,7 @@
lWhFormTransfer = new LWhFormTransfer(whFormTransferId);
lWhFormTransfer.setInWarehouseFlowId(inWarehouseFlowId);
lWhFormTransfer.setInWarehouseFormId(null);
- lWhFormTransfer.setStates(2);
+ lWhFormTransfer.setStates(TransferStatesType.SUCCESS.getValue());
if (StringUtils.isEmpty(inOperatorName)) {
lWhFormTransfer.setInOperatorId(userId);
lWhFormTransfer.setInOperatorName(nickName);
--
Gitblit v1.9.1