From bf1a1999cc8e1608e43bd07bec9ddd59544e0ccf Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 23 Sep 2022 16:29:39 +0800
Subject: [PATCH] ·

---
 src/main/java/org/springblade/modules/processInv/service/impl/ProcessInvServiceImpl.java |   28 +++++++++++++++++++++++++---
 1 files changed, 25 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 26aff7e..a7bff46 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,7 +44,8 @@
 	@Override
 	public Boolean insertOrUpdate(ProcessInv processInv) {
 		//通过strainId和productId查询对应数据
-		ProcessInv processInv1 = baseMapper.selectBySFId(processInv.getStrainId(),processInv.getFpsId());
+//		ProcessInv processInv1 = baseMapper.selectBySFId(processInv.getStrainId(),processInv.getFpsId());
+		ProcessInv processInv1 = baseMapper.selectByFarmIdProductId(processInv.getProductId(),processInv.getFpsId());
 		if (processInv1 != null){
 			//当存在该数据时,修改
 			processInv1.setProductInventoryNum(processInv1.getProductInventoryNum()+processInv.getProductInventoryNum());
@@ -68,8 +70,8 @@
 	}
 
 	@Override
-	public ProcessInv selectBySPId(String strainId, String processId) {
-		return baseMapper.selectBySPId(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
@@ -86,4 +88,24 @@
 	public ProcessInv findById(String prodId) {
 		return baseMapper.findById(prodId);
 	}
+
+	@Override
+	public Double statisticsStock(String year, String farmId) {
+		return baseMapper.statisticsStock(year,farmId);
+	}
+
+	@Override
+	public ProcessInv selectByProcessIdLandId(String processId, String landId) {
+		return baseMapper.selectByProcessIdLandId(processId,landId);
+	}
+
+	@Override
+	public ProcessInv selectByFarmIdProductId(String farmId,String processId) {
+		return baseMapper.selectByFarmIdProductId(Long.parseLong(processId),farmId);
+	}
+
+	@Override
+	public boolean stockAdd(Double saleNum, String proid) {
+		return baseMapper.stockAdd(saleNum,proid);
+	}
 }

--
Gitblit v1.9.3