From d3767d594de66cb5f9d1294931acefea1866f783 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 24 一月 2025 18:24:25 +0800
Subject: [PATCH] 客户资料 巡检任务业务
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwOutinboundServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwOutinboundServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwOutinboundServiceImpl.java
index 21d53b2..203c692 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwOutinboundServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwOutinboundServiceImpl.java
@@ -80,6 +80,7 @@
ywOutinbound.setOrigin(Constants.ZERO);
ywOutinboundMapper.insert(ywOutinbound);
for (YwOutinboundRecord ywOutinboundRecord:recordList) {
+ ywOutinboundRecord.setOutInBoundId(ywOutinbound.getId());
ywOutinboundRecord.setCreator(loginUserInfo.getId());
ywOutinboundRecord.setCreateDate(new Date());
ywOutinboundRecord.setIsdeleted(Constants.ZERO);
@@ -94,7 +95,7 @@
public List<YwOutinboundRecord> verifyData(YwOutinbound ywOutinbound){
if(Objects.isNull(ywOutinbound)
|| Objects.isNull(ywOutinbound.getType())
- || (Objects.nonNull(ywOutinbound.getType()) && (!(ywOutinbound.getType() == Constants.ZERO || ywOutinbound.getType() == Constants.ONE)))
+// || (Objects.nonNull(ywOutinbound.getType()) && (!(ywOutinbound.getType() == Constants.ZERO || ywOutinbound.getType() == Constants.ONE)))
|| Objects.isNull(ywOutinbound.getWarehouseId())
|| Objects.isNull(ywOutinbound.getDoneDate())
|| com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(ywOutinbound.getRecordList())
@@ -110,6 +111,7 @@
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ ywOutinboundRecord.setId(null);
}
//鍒ゆ柇褰撳墠鏄惁瀛樺湪杩涜涓殑鐩樼偣鍗�
if(ywStocktakingMapper.selectCount(new QueryWrapper<YwStocktaking>().lambda().eq(YwStocktaking::getIsdeleted,Constants.ZERO)
@@ -130,10 +132,13 @@
public void dealStockData(YwOutinbound ywOutinbound,List<YwOutinboundRecord> recordList,Integer inOut){
for (YwOutinboundRecord ywOutinboundRecord:recordList) {
- YwStock ywStock = ywStockMapper.selectOne(new QueryWrapper<YwStock>().lambda().eq(YwStock::getIsdeleted,Constants.ZERO).eq(YwStock::getWarehouseId,ywOutinbound.getWarehouseId()).eq(YwStock::getMaterialId,ywOutinboundRecord.getMaterialId()));
+ YwStock ywStock = ywStockMapper.selectOne(new QueryWrapper<YwStock>().lambda().eq(YwStock::getIsdeleted,Constants.ZERO)
+ .eq(YwStock::getWarehouseId,ywOutinbound.getWarehouseId()).eq(YwStock::getMaterialId,ywOutinboundRecord.getMaterialId()));
if(Constants.equalsInteger(inOut,Constants.ZERO)){
//鍏ュ簱
if(Objects.isNull(ywStock)){
+ ywStock = new YwStock();
+ ywStock.setIsdeleted(Constants.ZERO);
ywStock.setStock(ywOutinboundRecord.getStock());
ywStock.setWarehouseId(ywOutinbound.getWarehouseId());
ywStock.setMaterialId(ywOutinboundRecord.getMaterialId());
@@ -142,7 +147,7 @@
ywStockMapper.insert(ywStock);
}else{
ywStockMapper.update(new UpdateWrapper<YwStock>().lambda()
- .set(YwStock::getStock," ( stock + " + ywStock.getStock() + " )")
+ .setSql(" stock = ( stock + "+ywOutinboundRecord.getStock()+") ")
.set(YwStock::getEditDate, DateUtil.getCurrDateTime())
.set(YwStock::getEditor, ywOutinbound.getCreator())
.eq(YwStock::getId,ywStock.getId())
@@ -157,7 +162,7 @@
ywStockMapper.deleteById(ywStock.getId());
}else{
ywStockMapper.update(new UpdateWrapper<YwStock>().lambda()
- .set(YwStock::getStock," ( stock - " + ywStock.getStock() + " )")
+ .setSql(" stock = ( stock - "+ywOutinboundRecord.getStock()+") ")
.set(YwStock::getEditDate, DateUtil.getCurrDateTime())
.set(YwStock::getEditor, ywOutinbound.getCreator())
.eq(YwStock::getId,ywStock.getId())
@@ -376,7 +381,7 @@
public synchronized String getNextInOutCode(Integer inOut){
- String prefix = Constants.equalsInteger(inOut,0)?"RK-":"CK-" + DateUtil.getDate(new Date(),"yyyyMMdd") +"-";
+ String prefix = (Constants.equalsInteger(inOut,0)?"RK-":"CK-") + DateUtil.getDate(new Date(),"yyyyMMdd") +"-";
Integer countNum = RedisUtil.getObject(redisTemplate,
Constants.equalsInteger(inOut,0)?Constants.RedisKeys.COM_OUTBOUND_OUT_KEY:Constants.RedisKeys.COM_OUTBOUND_IN_KEY,
Integer.class);
--
Gitblit v1.9.3