From f6017e317b02301e0c0f811d6674ccd6271f6a22 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 18 十二月 2023 17:20:48 +0800
Subject: [PATCH] 删除仓库时物品检查
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
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 f7ea0eb..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
@@ -1,9 +1,12 @@
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 org.apache.commons.compress.utils.Lists;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,8 +17,8 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.WhBusinessEnum;
-import com.consum.base.core.param.BaseWarehouseParam1;
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.utils.CurrencyUtil;
import com.consum.base.core.utils.IdUtil;
@@ -93,7 +96,7 @@
return 0;
}
lWhFormOutput.setWarehouseName(warehouse.getWarehouseName());
- lWhFormOutput.setOutputCode(BaseWarehouseParam1.In_OutPutTypeEnum.Fragmentary_Output.getValue() + "");
+ lWhFormOutput.setOutputCode(InAndOutPutType.Fragmentary_Output.getValue() + "");
lWhFormOutput.setOutputName("闆舵槦鍑哄簱");
lWhFormOutput.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
lWhFormOutput.setAgencyName(sysInfo.getTenantName());
@@ -101,13 +104,14 @@
lWhFormOutput.setOperatorName(sysInfo.getUserName());
lWhFormOutput.setDealTime(param.getDealTime());
lWhFormOutput.setStates(OutPutStatesType.OUT_PENDING.getValue());
- lWhFormOutput.setOutputDoc(param.getProcureDoc());
- int flag1 = this.insert(lWhFormOutput);
- if (flag1 == 0) {
- log.error("鏂板鍑哄簱鍗曡褰�");
+ lWhFormOutput.setOutputDoc(param.getDoc());
+ int outputInsertNum = this.insert(lWhFormOutput);
+ if (outputInsertNum == 0) {
+ log.error("鏂板鍑哄簱鍗曡褰曞け璐�");
return 0;
}
// 2.鏂板鐗╁搧鍨嬪彿璁板綍
+ Set<Long> allChangModelList = new HashSet<>();
List<LWFormsOutputGoodsInfoParam> goodsList = param.getGoods();
List<LWhProcureModel> modelList = new ArrayList<>();
for (LWFormsOutputGoodsInfoParam goods : goodsList) {
@@ -118,6 +122,7 @@
lWhProcureModel.setBusinessType(GoodsModelType.OUT_PUT.getValue());
lWhProcureModel.setBusinessId(lWhFormOutputId);
lWhProcureModel.setBaseGoodsModelsId(model.getBaseGoodsModelsId());
+ allChangModelList.add(model.getBaseGoodsModelsId());
// 鏍规嵁鍨嬪彿id鏌ヨ鍨嬪彿
BaseGoodsModels baseGoodsModels =
this.baseGoodsModelsService.get(new BaseGoodsModels(model.getBaseGoodsModelsId()));
@@ -126,14 +131,16 @@
}
lWhProcureModel.setCounts(model.getCounts());
// 鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
+ List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
+ // 鏌ヨ搴撳瓨鏃朵笉鍖哄垎鏈烘瀯鍜岄儴闂�
int goodsNum =
- this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, model.getBaseGoodsModelsId(), 1, null);
+ this.lWhGoodsService.queryGoodsModelNum(null, warehouseIds, model.getBaseGoodsModelsId(), 1, null);
lWhProcureModel.setWorehouseCount(goodsNum);
modelList.add(lWhProcureModel);
}
}
- int flag2 = this.lWhProcureModelService.insert(modelList);
- if (flag2 != modelList.size()) {
+ int modelInsertNum = this.lWhProcureModelService.insert(modelList);
+ if (modelInsertNum != modelList.size()) {
log.error("鏂板鐗╁搧鍨嬪彿澶辫触");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return 0;
@@ -147,6 +154,10 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return 0;
}
+ // 4 棰勮
+ // 褰撳簱瀛樺彉鍔ㄦ椂璋冪敤璇ユ柟娉�
+ // lWhWarningCoreService.updateKuCun((short) 0, warehouseId, new ArrayList<>(allChangModelList), null,
+ // DateUtils.getDateTimeNumber(System.currentTimeMillis()));
return 1;
}
--
Gitblit v1.9.1