From 8466d217aba3abd273a7a1dd8fa6093615272a2d Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 一月 2025 09:47:48 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwStocktakingServiceImpl.java | 66 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwStocktakingServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwStocktakingServiceImpl.java
index cd0e102..b905879 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwStocktakingServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwStocktakingServiceImpl.java
@@ -14,6 +14,8 @@
import com.doumee.dao.business.YwStocktakingRecordMapper;
import com.doumee.dao.business.YwWarehouseMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.join.NoticesJoinMapper;
+import com.doumee.dao.system.model.Notices;
import com.doumee.service.business.YwStocktakingService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -56,6 +58,9 @@
private YwWarehouseMapper ywWarehouseMapper;
@Autowired
+ private NoticesJoinMapper noticesJoinMapper;
+
+ @Autowired
private RedisTemplate<String, Object> redisTemplate;
@Override
@@ -85,6 +90,20 @@
ywStocktaking.setStatus(Constants.ZERO);
ywStocktaking.setCode(getNextCode());
ywStocktakingMapper.insert(ywStocktaking);
+ //娣诲姞寰呭姙淇℃伅
+ Notices notices = new Notices();
+ notices.setCreateDate(new Date());
+ notices.setCreator(ywStocktaking.getCreator());
+ notices.setIsdeleted(Constants.ZERO);
+ notices.setParam1(DateUtil.formatDate(ywStocktaking.getPlanDate(),"yyyy-MM-dd"));
+ notices.setTitle("鐩樼偣寰呭姙");
+ notices.setContent("["+ywStocktaking.getName()+"]灏嗗湪["+notices.getParam1()+"]杩涜鐩樼偣锛岃鎸夋椂鎵ц");
+ notices.setObjId(ywStocktaking.getId());
+ notices.setObjType(Constants.ZERO);
+ notices.setType(notices.getObjType());
+ notices.setUserId(ywStocktaking.getUserId());
+ notices.setStatus(Constants.ZERO);
+ noticesJoinMapper.insert(notices);
return ywStocktaking.getId();
}
@@ -101,6 +120,12 @@
.set(YwStocktaking::getEditDate,DateUtil.getCurrDateTime())
.set(YwStocktaking::getEditor,loginUserInfo.getId())
.eq(YwStocktaking::getId,id)
+ );
+ //鏍囪寰呭姙鍒犻櫎
+ noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda().set(Notices::getIsdeleted,Constants.ONE)
+ .eq(Notices::getIsdeleted,Constants.ZERO)
+ .eq(Notices::getObjType,Constants.ZERO)
+ .eq(Notices::getObjId,id)
);
}else{
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐩樼偣鍗曠姸鎬佸凡娴佽浆锛屾棤娉曡繘琛岃鎿嶄綔");
@@ -121,6 +146,12 @@
.set(YwStocktaking::getCancelUserId,loginUserInfo.getId())
.set(YwStocktaking::getEditor,loginUserInfo.getId())
.set(YwStocktaking::getStatus,Constants.THREE).eq(YwStocktaking::getId,id));
+ //鏍囪寰呭姙鍒犻櫎
+ noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda().set(Notices::getIsdeleted,Constants.ONE)
+ .eq(Notices::getIsdeleted,Constants.ZERO)
+ .eq(Notices::getObjType,Constants.ZERO)
+ .eq(Notices::getObjId,id)
+ );
}else{
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐩樼偣鍗曠姸鎬佸凡娴佽浆锛屾棤娉曡繘琛岃鎿嶄綔");
}
@@ -144,6 +175,15 @@
.set(YwStocktaking::getEditor,loginUserInfo.getId())
.set(YwStocktaking::getStatus,Constants.ONE)
.eq(YwStocktaking::getId,model.getId()));
+
+ //鏍囪寰呭姙宸插鐞�
+ noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
+ .set(Notices::getStatus,Constants.ONE)
+ .eq(Notices::getIsdeleted,Constants.ZERO)
+ .eq(Notices::getObjType,Constants.ZERO)
+ .eq(Notices::getObjId,id)
+ );
+
//鐢熸垚褰撳墠浠撳簱涓嬫墍鏈夌殑璧勪骇淇℃伅
List<YwStock> stockList = ywStockMapper.selectList(new QueryWrapper<YwStock>().lambda().eq(YwStock::getIsdeleted,Constants.ZERO).eq(YwStock::getWarehouseId,model.getWarehouseId()));
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(stockList)){
@@ -256,6 +296,32 @@
ywStocktaking.setEditDate(new Date());
ywStocktaking.setCode(null);
ywStocktakingMapper.updateById(ywStocktaking);
+
+
+ //鏍囪寰呭姙宸插鐞�
+ noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
+ .set(Notices::getStatus,Constants.ONE)
+ .eq(Notices::getIsdeleted,Constants.ZERO)
+ .eq(Notices::getObjType,Constants.ZERO)
+ .eq(Notices::getObjId,ywStocktaking.getId())
+ );
+
+ //娣诲姞寰呭姙淇℃伅
+ Notices notices = new Notices();
+ notices.setCreateDate(new Date());
+ notices.setCreator(ywStocktaking.getCreator());
+ notices.setIsdeleted(Constants.ZERO);
+ notices.setParam1(DateUtil.formatDate(ywStocktaking.getPlanDate(),"yyyy-MM-dd"));
+ notices.setTitle("鐩樼偣寰呭姙");
+ notices.setContent("["+ywStocktaking.getName()+"]灏嗗湪["+notices.getParam1()+"]杩涜鐩樼偣锛岃鎸夋椂鎵ц");
+ notices.setObjId(ywStocktaking.getId());
+ notices.setObjType(Constants.ZERO);
+ notices.setType(notices.getObjType());
+ notices.setUserId(ywStocktaking.getUserId());
+ notices.setStatus(Constants.ZERO);
+ noticesJoinMapper.insert(notices);
+
+
}
@Override
--
Gitblit v1.9.3