From 7c40b902af2ae09b353525f913056d66af12caf1 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期六, 09 十二月 2023 17:02:43 +0800
Subject: [PATCH] feat: 1.新增人员机构错误 2.修改使用人时设置可用数量 3.重复预警 4.部门物品退回时设置调拨单信息 5.统计报表删除一列
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java | 44 +++++++++++++++++++-------------------------
1 files changed, 19 insertions(+), 25 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..c0c7a02 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,20 +1,10 @@
package com.consum.base.service.impl;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.compress.utils.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
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.service.LWhWarningCoreServiceImpl;
import com.consum.base.core.type.GoodsModelType;
import com.consum.base.core.type.OutPutStatesType;
import com.consum.base.core.utils.CurrencyUtil;
@@ -26,25 +16,22 @@
import com.consum.base.pojo.LWhFormOutputParam;
import com.consum.base.pojo.excel.OutputExcelTemplate;
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;
-import com.consum.model.po.BaseGoodsModels;
-import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.LWhFormOutput;
-import com.consum.model.po.LWhProcureModel;
-import com.consum.model.po.WhFormOutput;
+import com.consum.base.service.*;
+import com.consum.model.po.*;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import javax.annotation.Resource;
+import java.util.*;
/**
* @Description 鍑哄簱鍗�
@@ -68,7 +55,8 @@
private LWhFormOutputCoreService lWhFormOutputCoreService;
@Autowired
private BaseGoodsModelsService baseGoodsModelsService;
-
+ @Resource
+ private LWhWarningCoreServiceImpl lWhWarningCoreService;
private static String QUERY_FORM_OUTPUT_LIST = "SELECT * FROM l_wh_form_output WHERE 1 = 1";
/**
@@ -109,6 +97,7 @@
return 0;
}
// 2.鏂板鐗╁搧鍨嬪彿璁板綍
+ Set<Long> allChangModelList = new HashSet<>();
List<LWFormsOutputGoodsInfoParam> goodsList = param.getGoods();
List<LWhProcureModel> modelList = new ArrayList<>();
for (LWFormsOutputGoodsInfoParam goods : goodsList) {
@@ -119,6 +108,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()));
@@ -148,6 +138,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