From 2648880bec1583ce4fe1886de65300f0a22638d0 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 26 Sep 2022 17:09:31 +0800
Subject: [PATCH] 更改种类描述的判断方式、溯源时地图详情sql调整、农资出库时删除数据回滚修复、大屏接受数据增加展示判断
---
src/main/java/org/springblade/modules/processInv/service/impl/ProcessInvServiceImpl.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 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..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,12 +44,14 @@
@Override
public Boolean insertOrUpdate(ProcessInv processInv) {
//通过strainId和productId查询对应数据
- ProcessInv processInv1 = baseMapper.selectBy2Id(processInv.getStrainId(),processInv.getProductId());
+// 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());
processInv1.setUpdateTime(new Date());
processInv1.setUpdateUser(processInv.getUpdateUser());
+ processInv1.setFpsId(processInv.getFpsId());
return baseMapper.updateById(processInv1)>0;
}else {
//不存在该数据时添加
@@ -67,8 +70,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 +79,33 @@
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);
+ }
+
+ @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