From 4ee56e307915e4e71baab476be819e7642e78269 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 08 十一月 2023 18:19:34 +0800
Subject: [PATCH] --部门物品分发与明细 --采购fix
---
consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java | 80 ++++++++++++++++++++++-----------------
1 files changed, 45 insertions(+), 35 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
index bda721f..e79b9e0 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
@@ -1,7 +1,9 @@
package com.consum.base.service;
+import com.consum.base.core.CodeGeneratorEnum;
+import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.param.BaseWarehouseParam1;
-import com.consum.base.pojo.LWhFormOutputParam;
+import com.consum.base.pojo.*;
import com.consum.base.util.IdUtil;
import com.consum.model.po.*;
import com.iplatform.model.po.S_user_core;
@@ -15,6 +17,7 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -28,6 +31,8 @@
public class LWhFormOutputServiceImpl extends BaseServiceImpl {
@Autowired
+ private CodeGeneratorService codeGeneratorService;
+ @Autowired
private BaseWarehouseServiceImpl baseWarehouseService;
@Autowired
private LWhGoodsService lWhGoodsService;
@@ -35,6 +40,8 @@
private LWhProcureModelService lWhProcureModelService;
@Autowired
private LWhFormOutputCoreService lWhFormOutputCoreService;
+ @Autowired
+ private BaseGoodsModelsServiceImpl baseGoodsModelsService;
private static String QUERY_FORM_OUTPUT_LIST = "SELECT * FROM l_wh_form_output WHERE 1 = 1";
@@ -140,12 +147,13 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/27
*/
- public int add(LWhFormOutputParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
+ public int add(LWhFormOutputInsertParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
//1.鏂板鍑哄簱鍗曡褰�
LWhFormOutput lWhFormOutput = new LWhFormOutput();
//鍑哄叆搴搃d
long lWhFormOutputId = IdUtil.generateId();
lWhFormOutput.setId(lWhFormOutputId);
+ lWhFormOutput.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.OutPut_Warehouse));
Long warehouseId = param.getWarehouseId();
lWhFormOutput.setWarehouseId(warehouseId);
//鏍规嵁浠撳簱id鏌ヨ浠撳簱
@@ -161,45 +169,47 @@
lWhFormOutput.setAgencyName(sysInfo.getTenantName());
lWhFormOutput.setOperatorId(sysInfo.getId());
lWhFormOutput.setOperatorName(sysInfo.getUserName());
- long dateTimeNumber = DateUtils.getDateTimeNumber(System.currentTimeMillis());
- lWhFormOutput.setDealTime(dateTimeNumber);
+ lWhFormOutput.setDealTime(param.getDealTime());
lWhFormOutput.setStates(1);
int flag1 = this.insert(lWhFormOutput);
-
- //4.鏂板l_wh_goods_record璁板綍
- List<LWhGoodsRecord> recordList = param.getList();
- if (CollectionUtils.isEmpty(recordList)) {
- log.error("瑙勬牸鍨嬪彿涓虹┖");
+ if (flag1 == 0) {
+ log.error("鏂板鍑哄簱鍗曡褰�");
return 0;
}
- int flag5 = 0;
- for (LWhGoodsRecord record : recordList) {
- //鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
- int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0,warehouseId, record.getBaseGoodsModelsId(), (short) 1, null);
-
- //5.鏂板L_WH_PROCURE_MODEL璁板綍
- LWhProcureModel lWhProcureModel = new LWhProcureModel();
- lWhProcureModel.setId(IdUtil.generateId());
- lWhProcureModel.setBusinessType(3);
- lWhProcureModel.setBaseGoodsModelsId(record.getBaseGoodsModelsId());
- lWhProcureModel.setCounts(record.getThisCount());
- lWhProcureModel.setWorehouseCount(goodsNum);
- int res = this.lWhProcureModelService.insert(lWhProcureModel);
- flag5 += res;
+ //2.鏂板鐗╁搧鍨嬪彿璁板綍
+ List<LWhFormOutputGoodsParams> goodsList = param.getGoods();
+ List<LWhProcureModel> modelList = new ArrayList<>();
+ for (LWhFormOutputGoodsParams goods : goodsList) {
+ List<LWhProcureModelParams> models = goods.getModels();
+ for (LWhProcureModelParams model : models) {
+ LWhProcureModel lWhProcureModel = new LWhProcureModel();
+ lWhProcureModel.setId(IdUtil.generateId());
+ lWhProcureModel.setBusinessType(3);
+ lWhProcureModel.setBusinessId(lWhFormOutputId);
+ lWhProcureModel.setBaseGoodsModelsId(model.getBaseGoodsModelsId());
+ //鏍规嵁鍨嬪彿id鏌ヨ鍨嬪彿
+ BaseGoodsModels baseGoodsModels = this.baseGoodsModelsService.get(new BaseGoodsModels(model.getBaseGoodsModelsId()));
+ if (baseGoodsModels != null) {
+ lWhProcureModel.setBaseGoodsModelsName(baseGoodsModels.getModelName());
+ }
+ lWhProcureModel.setCounts(model.getCounts());
+ //鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
+ int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0,warehouseId, model.getBaseGoodsModelsId(), (short) 1, null);
+ lWhProcureModel.setWorehouseCount(goodsNum);
+ modelList.add(lWhProcureModel);
+ }
+ }
+ int flag2 = this.lWhProcureModelService.insert(modelList);
+ if (flag2 != modelList.size()) {
+ log.error("鏂板鐗╁搧鍨嬪彿澶辫触");
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return 0;
}
- //2.鏍规嵁鍑哄簱鍗曞嚭搴�
- Long lWarehouseFlowId = this.lWhFormOutputCoreService.outFormByTransId(lWhFormOutput.getId(), currentUser, dateTimeNumber);
- //3.鍚戝嚭搴撳崟 鎻掑叆 杩涘嚭搴撴祦姘存�昏〃ID
- int flag3 = 0;
- if (flag1 > 0) {
- LWhFormOutput lWhFormOutput1 = new LWhFormOutput(lWhFormOutputId);
- lWhFormOutput1.setWarehouseFlowId(lWarehouseFlowId);
- flag3 = this.update(lWhFormOutput1);
- }
-
- //濡傛灉鏈変竴鏉¤褰曟柊澧炲け璐ワ紝鍒欏洖婊�
- if (flag1 == 0 || flag3 == 0 || flag5 != recordList.size()) {
+ //3.鏍规嵁鍑哄簱鍗曞嚭搴�
+ Long lWarehouseFlowId = this.lWhFormOutputCoreService.outFormByTransId(lWhFormOutputId, currentUser, param.getDealTime());
+ if (lWarehouseFlowId == null) {
+ log.error("鏍规嵁鍑哄簱鍗曞嚭搴撳け璐�");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return 0;
}
--
Gitblit v1.9.1