From 3be9cfcb6b59366b936821966d20a998a6895f9f Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期二, 30 四月 2024 14:38:13 +0800
Subject: [PATCH] bug41、42修改
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 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 f686ae5..947afe0 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,13 @@
package com.consum.base.service.impl;
+import com.consum.base.service.core.LWhFormOutputCoreService;
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,9 +18,10 @@
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.type.WareHouseType;
import com.consum.base.core.utils.CurrencyUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapUtils;
@@ -28,7 +33,6 @@
import com.consum.base.pojo.query.LWhFormOutputQry;
import com.consum.base.service.BaseGoodsModelsService;
import com.consum.base.service.BaseWarehouseService;
-import com.consum.base.service.LWhFormOutputCoreService;
import com.consum.base.service.LWhFormOutputService;
import com.consum.base.service.LWhGoodsService;
import com.consum.base.service.LWhProcureModelService;
@@ -94,7 +98,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());
@@ -102,13 +106,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) {
@@ -119,6 +124,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()));
@@ -127,14 +133,15 @@
}
lWhProcureModel.setCounts(model.getCounts());
// 鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
- int goodsNum =
- this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, model.getBaseGoodsModelsId(), 1, null);
+ List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
+ int goodsNum = this.lWhGoodsService.queryGoodsModelNum(WareHouseType.TENANT.getValue(), 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;
@@ -148,6 +155,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