From 0d704977a91adb83c3ff9c1769fe4b73fc54a565 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 21 十二月 2023 17:29:38 +0800
Subject: [PATCH] 采购单模板下载和导入
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 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 3722c5b..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
@@ -16,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;
@@ -98,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
@@ -287,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);
@@ -390,12 +390,6 @@
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());
long totalAmount = lWhGoodsService.queryGoodsPriceById(outGoodsIds);
@@ -475,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