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/InventoryLoss/controller/InventoryController.java | 3 +++
src/main/java/org/springblade/modules/processInv/service/impl/ProcessInvServiceImpl.java | 4 ++++
src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.java | 2 ++
src/main/java/org/springblade/modules/processInv/service/IProcessInvService.java | 2 ++
src/main/java/org/springblade/modules/processInv/vo/ProcessInvVO.java | 4 ++++
src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml | 10 ++++++++++
src/main/java/org/springblade/modules/sale/controller/SaleController.java | 3 +++
7 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java b/src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java
index ebd86c8..86bc7fd 100644
--- a/src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java
+++ b/src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java
@@ -35,6 +35,7 @@
import org.springblade.modules.process.service.IProcessService;
import org.springblade.modules.processInv.entity.ProcessInv;
import org.springblade.modules.processInv.service.IProcessInvService;
+import org.springblade.modules.processInv.vo.ProcessInvVO;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -152,6 +153,8 @@
processInv.setUpdateUser(inventory.getCreateUser());
processInv.setUpdateTime(new Date());
processInv.setId(Long.parseLong(inventory.getProid()));
+ ProcessInvVO processInvVO = processInvService.getLand(processInv);
+ inventory.setLandId(processInvVO.getLandId());
processInvService.updateById(processInv);
}
return R.status(inventoryService.saveOrUpdate(inventory));
diff --git a/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.java b/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.java
index ec7f615..62fbf16 100644
--- a/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.java
+++ b/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.java
@@ -51,4 +51,6 @@
Boolean stockReduce(@Param("saleNum") Double saleNum, @Param("proid") String proid);
Boolean del(Long id);
+
+ ProcessInvVO getLand(@Param("processInv") ProcessInv processInv);
}
diff --git a/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml b/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
index f67f9c9..f7f3e9b 100644
--- a/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
+++ b/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
@@ -74,4 +74,14 @@
<delete id="del">
DELETE FROM sys_process_inv WHERE id = #{id}
</delete>
+
+ <select id="getLand" resultType="org.springblade.modules.processInv.vo.ProcessInvVO">
+ SELECT inv.id,inv.fps_id,fps.land_id
+ FROM sys_process_inv inv
+ LEFT JOIN sys_farm_product_stock fps ON inv.fps_id = fps.id
+ WHERE inv.is_deleted = 0
+ <if test="processInv.id != null and processInv.id != ''">
+ AND inv.id = #{processInv.id}
+ </if>
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/processInv/service/IProcessInvService.java b/src/main/java/org/springblade/modules/processInv/service/IProcessInvService.java
index e453c4a..e1acd85 100644
--- a/src/main/java/org/springblade/modules/processInv/service/IProcessInvService.java
+++ b/src/main/java/org/springblade/modules/processInv/service/IProcessInvService.java
@@ -58,4 +58,6 @@
* @return
*/
Boolean del(Long id);
+
+ ProcessInvVO getLand(ProcessInv processInv);
}
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 5fd3850..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
@@ -77,4 +77,8 @@
return baseMapper.del(id);
}
+ @Override
+ public ProcessInvVO getLand(ProcessInv processInv) {
+ return baseMapper.getLand(processInv);
+ }
}
diff --git a/src/main/java/org/springblade/modules/processInv/vo/ProcessInvVO.java b/src/main/java/org/springblade/modules/processInv/vo/ProcessInvVO.java
index dc1e24b..e012b3e 100644
--- a/src/main/java/org/springblade/modules/processInv/vo/ProcessInvVO.java
+++ b/src/main/java/org/springblade/modules/processInv/vo/ProcessInvVO.java
@@ -47,4 +47,8 @@
* 农场id
*/
private String farmId;
+ /**
+ * 地块id
+ */
+ private String landId;
}
diff --git a/src/main/java/org/springblade/modules/sale/controller/SaleController.java b/src/main/java/org/springblade/modules/sale/controller/SaleController.java
index 13e1f1f..6c0b34f 100644
--- a/src/main/java/org/springblade/modules/sale/controller/SaleController.java
+++ b/src/main/java/org/springblade/modules/sale/controller/SaleController.java
@@ -33,6 +33,7 @@
import org.springblade.modules.process.service.IProcessService;
import org.springblade.modules.processInv.entity.ProcessInv;
import org.springblade.modules.processInv.service.IProcessInvService;
+import org.springblade.modules.processInv.vo.ProcessInvVO;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestParam;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -157,6 +158,8 @@
processInv.setUpdateUser(sale.getCreateUser());
processInv.setUpdateTime(new Date());
processInv.setId(Long.parseLong(sale.getProid()));
+ ProcessInvVO processInvVO = processInvService.getLand(processInv);
+ sale.setLandId(processInvVO.getLandId());
processInvService.updateById(processInv);
}
return R.status(saleService.saveOrUpdate(sale));
--
Gitblit v1.9.3