From 4d60a2ee6bbfe76e2740307c832c8f309090a41e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 19 Aug 2022 10:42:06 +0800
Subject: [PATCH] 加工产品在销售记录表和损耗记录表中加上相应的地块

---
 src/main/java/org/springblade/modules/processInv/service/impl/ProcessInvServiceImpl.java |   11 ++++++++---
 1 files changed, 8 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..ccd58ab 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
@@ -43,12 +43,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 +68,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) {
+		return baseMapper.selectBySPId(Long.parseLong(strainId),Long.parseLong(processId));
 	}
 
 	@Override
@@ -76,4 +77,8 @@
 		return baseMapper.del(id);
 	}
 
+	@Override
+	public ProcessInvVO getLand(ProcessInv processInv) {
+		return baseMapper.getLand(processInv);
+	}
 }

--
Gitblit v1.9.3