From cea9f0102b0855f33d62dd0de644d719352f16f3 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 15 Aug 2022 11:41:27 +0800
Subject: [PATCH] 修复不同农场的同种农产品加工后会替换掉另一个加工后产品的数据

---
 src/main/java/org/springblade/modules/processInv/service/impl/ProcessInvServiceImpl.java |    7 ++++---
 1 files changed, 4 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..5fd3850 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

--
Gitblit v1.9.3