From 65f6665b28af5912b8fbacb43cf111087fbf812d Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 06 一月 2026 16:45:03 +0800
Subject: [PATCH] 库存报表添加空数据时的默认数据
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java | 81 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 77 insertions(+), 4 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
index d5c9e2b..428f7a7 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
@@ -6,12 +6,9 @@
import com.fzzy.igds.data.ExportWordParam;
import com.fzzy.igds.data.NoticeDto;
import com.fzzy.igds.data.NoticeParam;
-import com.fzzy.igds.domain.Depot;
-import com.fzzy.igds.domain.Dept;
+import com.fzzy.igds.domain.*;
import com.fzzy.igds.mapper.InoutNoticeInMapper;
import com.fzzy.igds.mapper.InoutNoticeOutMapper;
-import com.fzzy.igds.domain.InoutNoticeIn;
-import com.fzzy.igds.domain.InoutNoticeOut;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
@@ -42,6 +39,8 @@
private DepotService depotService;
@Resource
private CoreDeptService coreDeptService;
+ @Resource
+ private PledgeContractService pledgeContractService;
/*----------------------鍏ュ簱閫氱煡鍗曚俊鎭�-------------------------*/
/**
@@ -129,6 +128,43 @@
* @return
*/
public String saveOrUpdateIn(InoutNoticeIn data) {
+ //濡傛灉鍏ュ簱閫氱煡鍗曠被鍨嬩负搴撳尯閫氱煡鍗曪紝楠岃瘉浠撳簱鏄惁鏄湭瑙ｅ帇寰椾粨搴擄紝鏄垯涓嶅厑璁镐繚瀛�
+ //鑾峰彇鎵�鏈夎川鎶煎悎鍚屾暟鎹�
+ List<PledgeContract> pledgeContracts = pledgeContractService.listAll(null);
+ if("10".equals(data.getType())){
+ //鍦ㄨ川鎶煎悎鍚屾壘鍒版湭瑙ｅ帇锛屼笖璐ㄦ娂浠撳簱鍖呭惈褰撳墠浠撳簱鐨勬暟鎹�
+ for (PledgeContract pledgeContract : pledgeContracts) {
+ if(pledgeContract.getDepotIds().contains(data.getDepotId())){
+ if(pledgeContract.getStatus().equals(Constant.YN_N)){
+ return "鍏ュ簱浠撳簱鏈В鍘嬶紝鏃犳硶淇濆瓨锛�";
+ }
+ }
+ }
+ }
+ //濡傛灉鍏ュ簱閫氱煡鍗曠被鍨嬩负鐩戠閫氱煡鍗�
+ if("20".equals(data.getType())){
+ //1.楠岃瘉閾惰鏄惁濉啓锛屾湭濉啓锛屽垯涓嶅厑璁镐繚瀛�
+ if(StringUtils.isEmpty(data.getBankId())){
+ return "鐩戠潱閾惰涓嶈兘涓虹┖锛�";
+
+ }
+ //2.楠岃瘉閾惰鍜屼粨搴撶殑瀵瑰簲鍏崇郴鏄惁姝ｇ‘锛屼笉姝ｇ‘鍒欎笉鍏佽淇濆瓨
+ //鍦ㄨ川鎶煎悎鍚屾壘鍒版湭瑙ｅ帇锛屼笖璐ㄦ娂浠撳簱鍖呭惈褰撳墠浠撳簱鐨� 閾惰-浠撳簱锛堣川鎶煎悎鍚屽叧绯伙級
+ Map<String, PledgeContract> bankDepotMap = new HashMap<>();
+ for (PledgeContract pledgeContract : pledgeContracts) {
+ if(pledgeContract.getDepotIds().contains(data.getDepotId())){
+ if(pledgeContract.getStatus().equals(Constant.YN_N)){
+ bankDepotMap.put(pledgeContract.getPledgeBank(), pledgeContract);
+ }
+ }
+ }
+ //鍦╩ap涓鎵惧尮閰嶉摱琛岀殑鏁版嵁锛屽鏋滄病鏈夊尮閰嶇殑鏁版嵁锛屽垯涓嶅厑璁镐繚瀛�
+ if(!bankDepotMap.containsKey(data.getBankId())){
+ return "鏈壘鍒板搴旂殑璐ㄦ娂鍚堝悓锛岃妫�鏌ョ洃鐫ｉ摱琛屾垨鑰呭叆搴撲粨搴撳～鍐欐槸鍚︽纭紒";
+
+ }
+ }
+
if (null == data.getUpdateBy()) {
data.setUpdateBy(ContextUtil.getLoginUserName());
data.setUpdateTime(new Date());
@@ -242,6 +278,43 @@
* @return
*/
public String saveOrUpdateOut(InoutNoticeOut data) {
+ //濡傛灉鍑哄簱閫氱煡鍗曠被鍨嬩负搴撳尯閫氱煡鍗曪紝楠岃瘉浠撳簱鏄惁鏄湭瑙ｅ帇寰椾粨搴擄紝鏄垯涓嶅厑璁镐繚瀛�
+ //鑾峰彇鎵�鏈夎川鎶煎悎鍚屾暟鎹�
+ List<PledgeContract> pledgeContracts = pledgeContractService.listAll(null);
+ if("10".equals(data.getType())){
+ //鍦ㄨ川鎶煎悎鍚屾壘鍒版湭瑙ｅ帇锛屼笖璐ㄦ娂浠撳簱鍖呭惈褰撳墠浠撳簱鐨勬暟鎹�
+ for (PledgeContract pledgeContract : pledgeContracts) {
+ if(pledgeContract.getDepotIds().contains(data.getDepotId())){
+ if(pledgeContract.getStatus().equals(Constant.YN_N)){
+ return "鍑哄簱浠撳簱鏈В鍘嬶紝鏃犳硶淇濆瓨锛�";
+ }
+ }
+ }
+ }
+ //濡傛灉鍑哄簱閫氱煡鍗曠被鍨嬩负鐩戠閫氱煡鍗�
+ if("20".equals(data.getType())){
+ //1.楠岃瘉閾惰鏄惁濉啓锛屾湭濉啓锛屽垯涓嶅厑璁镐繚瀛�
+ if(StringUtils.isEmpty(data.getBankId())){
+ return "鐩戠潱閾惰涓嶈兘涓虹┖锛�";
+
+ }
+ //2.楠岃瘉閾惰鍜屼粨搴撶殑瀵瑰簲鍏崇郴鏄惁姝ｇ‘锛屼笉姝ｇ‘鍒欎笉鍏佽淇濆瓨
+ //鍦ㄨ川鎶煎悎鍚屾壘鍒版湭瑙ｅ帇锛屼笖璐ㄦ娂浠撳簱鍖呭惈褰撳墠浠撳簱鐨� 閾惰-浠撳簱锛堣川鎶煎悎鍚屽叧绯伙級
+ Map<String, PledgeContract> bankDepotMap = new HashMap<>();
+ for (PledgeContract pledgeContract : pledgeContracts) {
+ if(pledgeContract.getDepotIds().contains(data.getDepotId())){
+ if(pledgeContract.getStatus().equals(Constant.YN_N)){
+ bankDepotMap.put(pledgeContract.getPledgeBank(), pledgeContract);
+ }
+ }
+ }
+ //鍦╩ap涓鎵惧尮閰嶉摱琛岀殑鏁版嵁锛屽鏋滄病鏈夊尮閰嶇殑鏁版嵁锛屽垯涓嶅厑璁镐繚瀛�
+ if(!bankDepotMap.containsKey(data.getBankId())){
+ return "鏈壘鍒板搴旂殑璐ㄦ娂鍚堝悓锛岃妫�鏌ョ洃鐫ｉ摱琛屾垨鑰呭嚭搴撲粨搴撳～鍐欐槸鍚︽纭紒";
+
+ }
+ }
+
if (null == data.getUpdateBy()) {
data.setUpdateBy(ContextUtil.getLoginUserName());
data.setUpdateTime(new Date());
--
Gitblit v1.9.3