From eac40b14e041a5c36bb9e3c67110ca86cd97d1ae Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 28 十一月 2023 09:32:42 +0800
Subject: [PATCH] fix(漏洞修复): 11月24日扫描
---
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
index fd99dd7..b6a158b 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
@@ -16,19 +16,22 @@
import com.consum.model.po.FinSysTenant;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormInventory;
+import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* @Description 鐩樼偣
@@ -53,6 +56,9 @@
private LWhGoodsService lWhGoodsService;
@Autowired
private FinSysTenantServiceImpl finSysTenantService;
+ @Autowired
+ @Lazy
+ private LWhFormInventoryCoreService lWhFormInventoryCoreService;
private static final String QUERY_LIST = "select * from l_wh_form_inventory where 1=1 ";
@@ -180,38 +186,48 @@
}
+
/**
* 淇濆瓨鐩樼偣淇℃伅
*
* @author 鍗㈠簡闃�
* @date 2023/10/31
*/
- public int updateInventoryInfo(LWhFormInventoryParam dto, Integer state) {
+ public int updateInventoryInfo(LWhFormInventoryParam dto, Integer state, S_user_core currentUser, FinSysTenantUser sysInfo) {
//1.鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗�
LWhFormInventory lWhFormInventory = this.get(new LWhFormInventory(dto.getId()));
if (lWhFormInventory == null) {
log.error("鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗曞け璐�");
return 0;
}
- //2.淇敼鐩樼偣鍗�
- lWhFormInventory.setStates(state);
+ //娣诲姞鐩樼偣鍗曠墿鍝�
+ List<FormInventoryGoodsVO> inventoryGoodsList = dto.getInventoryGoodsList();
+ if (CollectionUtils.isEmpty(inventoryGoodsList)) {
+ log.error("鐩樼偣鍗曠墿鍝佷负绌�");
+ return 0;
+ }
+ int i = this.inventoryGoodsService.updateInventoryGoods(inventoryGoodsList);
+ System.out.println(i);
+ //淇敼鐩樼偣鍗�
if (state == 2) {
//瀹屾垚鐩樼偣鏃惰缃畬鎴愮洏鐐规椂闂�
lWhFormInventory.setStopTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
+
+ //瀹屾垚鐩樼偣鏃惰缃畬鎴愮洏鐐规椂闂�
+ String inOutFormByInventoryId = lWhFormInventoryCoreService.createInOutFormByInventoryId(dto.getId(), currentUser, sysInfo);
+ if (!StringUtils.isEmpty(inOutFormByInventoryId)) {
+ log.error(inOutFormByInventoryId);
+ return 0;
+ }
}
+ lWhFormInventory.setStates(state);
lWhFormInventory.setInventoryDate(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
int flag1 = this.update(lWhFormInventory);
if (flag1 == 0) {
log.error("淇敼鐩樼偣鍗曞け璐�");
return 0;
}
- //3.娣诲姞鐩樼偣鍗曠墿鍝�
- List<FormInventoryGoodsVO> inventoryGoodsList = dto.getInventoryGoodsList();
- if (CollectionUtils.isEmpty(inventoryGoodsList)) {
- log.error("鐩樼偣鍗曠墿鍝佷负绌�");
- return 0;
- }
- this.inventoryGoodsService.updateInventoryGoods(inventoryGoodsList);
+
return 1;
}
@@ -330,6 +346,7 @@
formInventoryDetailVO.getInventoryResult() == null ? null : (formInventoryDetailVO.getInventoryResult() == 2 ? "鐩樼泩" : "鐩樹簭"));
formInventoryDetailVO.setInventoryType(
formInventoryDetailVO.getInventoryResult() == null ? null : (formInventoryDetailVO.getInventoryResult() == 2 ? "鐩樼泩鍏ュ簱" : "鐩樹簭鍑哄簱"));
+ formInventoryDetailVO.setWarehouseFormCode(formInventoryDetailVO.getWarehouseFormCode());
result.add(formInventoryDetailVO);
});
pageUtil.setDatas(result);
--
Gitblit v1.9.1