From 75a48cf624bb06044207a2bc9b1310c326469a29 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 15 Sep 2022 14:59:52 +0800
Subject: [PATCH] 返回数量不为0的已出库库存数据

---
 src/main/java/org/springblade/modules/processInv/service/impl/ProcessInvServiceImpl.java |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/processInv/service/impl/ProcessInvServiceImpl.java b/src/main/java/org/springblade/modules/processInv/service/impl/ProcessInvServiceImpl.java
index 9fe23a2..18695ec 100644
--- a/src/main/java/org/springblade/modules/processInv/service/impl/ProcessInvServiceImpl.java
+++ b/src/main/java/org/springblade/modules/processInv/service/impl/ProcessInvServiceImpl.java
@@ -25,6 +25,7 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.Date;
+import java.util.Map;
 
 /**
  * 加工库存表 服务实现类
@@ -43,12 +44,13 @@
 	@Override
 	public Boolean insertOrUpdate(ProcessInv processInv) {
 		//通过strainId和productId查询对应数据
-		ProcessInv processInv1 = baseMapper.selectBy2Id(processInv.getStrainId(),processInv.getProductId());
+		ProcessInv processInv1 = baseMapper.selectBySFId(processInv.getStrainId(),processInv.getFpsId());
 		if (processInv1 != null){
 			//当存在该数据时,修改
 			processInv1.setProductInventoryNum(processInv1.getProductInventoryNum()+processInv.getProductInventoryNum());
 			processInv1.setUpdateTime(new Date());
 			processInv1.setUpdateUser(processInv.getUpdateUser());
+			processInv1.setFpsId(processInv.getFpsId());
 			return baseMapper.updateById(processInv1)>0;
 		}else {
 			//不存在该数据时添加
@@ -67,8 +69,8 @@
 	}
 
 	@Override
-	public ProcessInv selectBy2Id(String strainId, String processId) {
-		return baseMapper.selectBy2Id(Long.parseLong(strainId),Long.parseLong(processId));
+	public ProcessInv selectBySPId(String strainId, String processId,Long fpsId) {
+		return baseMapper.selectBySPId(Long.parseLong(strainId),Long.parseLong(processId),fpsId);
 	}
 
 	@Override
@@ -76,4 +78,18 @@
 		return baseMapper.del(id);
 	}
 
+	@Override
+	public ProcessInvVO getLand(ProcessInv processInv) {
+		return baseMapper.getLand(processInv);
+	}
+
+	@Override
+	public ProcessInv findById(String prodId) {
+		return baseMapper.findById(prodId);
+	}
+
+	@Override
+	public Double statisticsStock(String year, String farmId) {
+		return baseMapper.statisticsStock(year,farmId);
+	}
 }

--
Gitblit v1.9.3