From 60c9b50a2f883e8a5f22a4bc21618c509e2bb76b Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 01 Aug 2022 10:52:46 +0800
Subject: [PATCH] 更新当删除出库记录时，已出库数量和库存数量会相对应改变
---
src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java | 46 ++++++++++++++++------
src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml | 9 ++++
src/main/java/org/springblade/modules/soldr/service/impl/SoldrServiceImpl.java | 10 +++++
src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.java | 18 +++++++++
src/main/java/org/springblade/modules/soldr/service/ISoldrService.java | 17 ++++++++
src/main/java/org/springblade/modules/stockrecord/entity/Stockrecord.java | 4 ++
6 files changed, 91 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.java b/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.java
index 1def817..b6b17d4 100644
--- a/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.java
+++ b/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.soldr.mapper;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.soldr.entity.Soldr;
import org.springblade.modules.soldr.vo.SoldrVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -46,4 +47,21 @@
void dels(Long id);
List<SoldrVO> selectSol();
List<Map<String, Object>> selectCz(Long sid);
+ /**
+ * 根据stockId、specs1、specs_val1、specs_val2、sid 找到soldr表中对应的数据
+ * @param stockId1 种类id
+ * @param specs1 规格
+ * @param specsVal1 规格值（0：克 1：斤 2：公斤 3：吨 4：毫升 5：升 ）
+ * @param specsVal2 规格值2( 0:袋 1：包 2：瓶 3：盒 4：箱 5：桶 6:支)
+ * @param sid 农资库存表主键
+ * @param type 出库类型
+ */
+ Soldr getByServalParam(@Param("stockId1") String stockId1,
+ @Param("specs1") String specs1,
+ @Param("specsVal1") Integer specsVal1,
+ @Param("specsVal2") Integer specsVal2,
+ @Param("sid") Long sid,
+ @Param("type") String type);
+
+ void cancelDel(Long id);
}
diff --git a/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml b/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml
index 23166d9..9262c12 100644
--- a/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml
+++ b/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml
@@ -111,5 +111,14 @@
FROM `sys_soldr`
WHERE sid = #{sid}
</select>
+<!-- 根据stockId、specs1、specs_val1、specs_val2、sid-->
+ <select id="getByServalParam" resultType="org.springblade.modules.soldr.entity.Soldr">
+ SELECT * FROM sys_soldr WHERE
+ stock_id1 = #{stockId1} and specs1=#{specs1} and specs_val1=#{specsVal1} and specs_val2=#{specsVal2} and sid=#{sid} and type=#{type} and is_deleted=0
+ </select>
+
+ <update id="cancelDel">
+ UPDATE sys_soldr SET is_deleted = 0 WHERE id = #{id}
+ </update>
</mapper>
diff --git a/src/main/java/org/springblade/modules/soldr/service/ISoldrService.java b/src/main/java/org/springblade/modules/soldr/service/ISoldrService.java
index 9e8db02..8b3b3ab 100644
--- a/src/main/java/org/springblade/modules/soldr/service/ISoldrService.java
+++ b/src/main/java/org/springblade/modules/soldr/service/ISoldrService.java
@@ -45,4 +45,21 @@
void dels(Long id);
List<SoldrVO> selectSol();
List<Map<String, Object>> selectCz(Long sid);
+
+ /**
+ * 根据stockId、amount1、specs1、specs_val1、specs_val2、sid 找到soldr表中对应的数据
+ * @param stockId1 种类id
+ * @param specs1 规格
+ * @param specsVal1 规格值（0：克 1：斤 2：公斤 3：吨 4：毫升 5：升 ）
+ * @param specsVal2 规格值2( 0:袋 1：包 2：瓶 3：盒 4：箱 5：桶 6:支)
+ * @param sid 农资库存表主键
+ * @param type 出库类型
+ */
+ Soldr getByServalParam(String stockId1, String specs1, Integer specsVal1, Integer specsVal2, Long sid,String type);
+
+ /**
+ * 撤销逻辑删除 使is_deleted从1变0
+ * @param id
+ */
+ void cancelDel(Long id);
}
diff --git a/src/main/java/org/springblade/modules/soldr/service/impl/SoldrServiceImpl.java b/src/main/java/org/springblade/modules/soldr/service/impl/SoldrServiceImpl.java
index f82ef70..6c377c8 100644
--- a/src/main/java/org/springblade/modules/soldr/service/impl/SoldrServiceImpl.java
+++ b/src/main/java/org/springblade/modules/soldr/service/impl/SoldrServiceImpl.java
@@ -66,4 +66,14 @@
return baseMapper.selectCz(sid);
}
+ @Override
+ public Soldr getByServalParam(String stockId1, String specs1, Integer specsVal1, Integer specsVal2, Long sid,String type) {
+ return baseMapper.getByServalParam(stockId1,specs1,specsVal1,specsVal2,sid,type);
+ }
+
+ @Override
+ public void cancelDel(Long id) {
+ baseMapper.cancelDel(id);
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java b/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
index b2ea3cd..ffd0859 100644
--- a/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
+++ b/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
@@ -45,6 +45,7 @@
import org.springblade.modules.stockrecord.service.IStockrecordService;
import org.springblade.core.boot.ctrl.BladeController;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -233,6 +234,10 @@
}
//已出库农资
soldrecordService.save(soldrecord);
+ //填充stock_record表中的srId
+ stockrecord.setSrId(soldrecord.getId());
+ stockrecordService.updateById(stockrecord);
+ soldrService.cancelDel(soldr.getId());
}
}
//入库
@@ -313,19 +318,34 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-// Stockrecord stockRecord = stockrecordService.getById(ids);
-// Stock stock = stockService.getById(stockRecord.getSid());
-// //对库存表操作
-// //判断stockType1 0出库 1入库
-// if (stockRecord.getStockType1() == 0){
-// //0出库 删除记录后原库存添加
-// stock.setAmount(stock.getAmount()+stockRecord.getAmount1());
-// }else {
-// //1 入库 删除记录后原库存减少
-// stock.setAmount(stock.getAmount()-stockRecord.getAmount1());
-// }
-// stockService.UpdaeAmountc(stock);
-// //对已出库表操作 soldr出库数量记录表已出库农资减少 soldrecord出库记录表的数据也要删除
+ //根据出入库记录表找到对应的stockRecord
+ Stockrecord stockRecord = stockrecordService.getById(ids);
+ //根据stockRecord中的库存记录id找到对应的库存数据
+ Stock stock = stockService.getById(stockRecord.getSid());
+ //对库存表操作
+ //判断stockType1 0出库 1入库
+ if (stockRecord.getStockType1() == 0){
+ //0出库 删除记录后原库存添加
+ stock.setAmount(stock.getAmount()+stockRecord.getAmount1());
+ //对已出库表操作 soldr出库数量记录表已出库农资减少 soldrecord出库记录表的数据也要删除
+ //根据stockRecord中的srId找到对应的已出库记录表的对应数据
+ Soldrecord soldrecord = soldrecordService.getById(stockRecord.getSrId());
+ //对soldrecord表逻辑删除
+ soldrecordService.deleteLogic(Func.toLongList(soldrecord.getId().toString()));
+ //根据stockId、specs1、specs_val1、specs_val2、sid、type找到soldr表中对应的数据
+ Soldr soldr = soldrService.getByServalParam(soldrecord.getStockId1(),soldrecord.getSpecs1(),soldrecord.getSpecsVal1(),soldrecord.getSpecsVal2(),soldrecord.getSid(),soldrecord.getType());
+ Integer sub = soldr.getAmount1()-soldrecord.getAmount1();
+ if (sub<=0){
+ soldrService.dels(soldr.getId());
+ }else {
+ soldr.setAmount1(sub);
+ soldrService.updateById(soldr);
+ }
+ }else {
+ //1 入库 删除记录后原库存减少
+ stock.setAmount(stock.getAmount()-stockRecord.getAmount1());
+ }
+ stockService.UpdaeAmountc(stock);
return R.status(stockrecordService.deleteLogic(Func.toLongList(ids)));
}
diff --git a/src/main/java/org/springblade/modules/stockrecord/entity/Stockrecord.java b/src/main/java/org/springblade/modules/stockrecord/entity/Stockrecord.java
index 02bb6c0..84128b9 100644
--- a/src/main/java/org/springblade/modules/stockrecord/entity/Stockrecord.java
+++ b/src/main/java/org/springblade/modules/stockrecord/entity/Stockrecord.java
@@ -84,4 +84,8 @@
private String deptId;
private Long sid;
private Double census;
+ /**
+ * 已出库存记录表主键
+ */
+ private Long srId;
}
--
Gitblit v1.9.3