From f1a2082d8b49e7483e2ef676450ae172d0ffb127 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 14 Sep 2022 15:29:52 +0800
Subject: [PATCH] 小程序查询采收列表增加溯源id
---
src/main/java/org/springblade/modules/process/controller/ProcessController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/process/controller/ProcessController.java b/src/main/java/org/springblade/modules/process/controller/ProcessController.java
index d3ff6a8..6367c02 100644
--- a/src/main/java/org/springblade/modules/process/controller/ProcessController.java
+++ b/src/main/java/org/springblade/modules/process/controller/ProcessController.java
@@ -125,6 +125,7 @@
farmProductStockService.stockReduce(process.getSaleNum(),process.getProid());
//向加工产品库存表中添加数据
ProcessInv processInv = new ProcessInv();
+ processInv.setFpsId(process.getProid());
processInv.setProductId(Long.parseLong(process.getProcessId()));
processInv.setProductInventoryNum(process.getProcessNum());
processInv.setStrainId(Long.parseLong(process.getStrainId()));
@@ -147,14 +148,14 @@
//通过strainId和landId 确定是由哪一个品种库存加工而来
FarmProductStock farmProductStock = farmProductStockService.selectBy2Id(process.getStrainId(),process.getLandId());
//通过strainId和processId(processId为产品id)确定对应的加工库存
- ProcessInv processInv = processInvService.selectBy2Id(process.getStrainId(),process.getProcessId());
+ ProcessInv processInv = processInvService.selectBySPId(process.getStrainId(),process.getProcessId(),farmProductStock.getId());
//农产品增加相应库存
Double weight = Double.parseDouble(farmProductStock.getWeight())+process.getSaleNum();
farmProductStock.setWeight(weight.toString());
farmProductStockService.updateById(farmProductStock);
//加工产品减少对应库存
Double num = processInv.getProductInventoryNum()-process.getProcessNum();
- if (num<=0){
+ if (num<0){
//删除对应库存
// processInvService.del(processInv.getId());
throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足,不能删除数据！"));
--
Gitblit v1.9.3