From 75a48cf624bb06044207a2bc9b1310c326469a29 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 15 Sep 2022 14:59:52 +0800
Subject: [PATCH] 返回数量不为0的已出库库存数据
---
src/main/java/org/springblade/modules/soldr/controller/SoldrController.java | 11 ++++++++---
src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml | 6 +++---
src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml | 2 +-
src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml | 2 +-
4 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
index 75a7672..b5ab481 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
@@ -75,7 +75,7 @@
ss.url,
ss.strain_name,
sfps.land_id
- ) a GROUP BY strainId
+ ) a WHERE weight !=0 GROUP BY strainId
</select>
<select id="selectFarmProductStockPages" resultType="org.springblade.modules.farmplant.vo.FarmProductStockVO">
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 fc2c821..1dfdc97 100644
--- a/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
+++ b/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
@@ -26,7 +26,7 @@
LEFT JOIN sys_strain strain ON strain.id = inv.strain_id
LEFT JOIN sys_farm_product_stock fps ON inv.fps_id = fps.id
LEFT JOIN sys_land land ON land.id = fps.land_id
- where inv.is_deleted = 0
+ where inv.is_deleted = 0 AND inv.product_inventory_num != 0
<if test="processInv.fpsId != null and processInv.fpsId != ''">
AND inv.fps_id = #{processInv.fpsId}
</if>
diff --git a/src/main/java/org/springblade/modules/soldr/controller/SoldrController.java b/src/main/java/org/springblade/modules/soldr/controller/SoldrController.java
index e922e37..6b09ddf 100644
--- a/src/main/java/org/springblade/modules/soldr/controller/SoldrController.java
+++ b/src/main/java/org/springblade/modules/soldr/controller/SoldrController.java
@@ -157,7 +157,7 @@
/**
- * 退回
+ * 后台退回
* @param num 数量
* @param id 农资id
* @param type
@@ -181,7 +181,8 @@
stock.setState("0");
stockService.Updaet(stock);
//删除
- soldrService.del(id);
+// soldrService.del(id);
+ soldrService.delLogic(id);
}
//如果小于就修改
else {//退回数量小于库存数量
@@ -278,7 +279,11 @@
return R.success("退回成功");
}
-
+ /**
+ * 小程序退回
+ * @param soldrVOs
+ * @return
+ */
@GetMapping("/outs")
public R outs(SoldrVOs soldrVOs) {
double census1 = 0;
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 7be115e..75cef4f 100644
--- a/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml
+++ b/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml
@@ -56,7 +56,7 @@
AND blade_dict_biz.tenant_id = #{soldr.codes}
</if>) a ON
a.dict_key = stf.type
- WHERE st.is_deleted = 0
+ WHERE st.is_deleted = 0 AND st.amount1 !=0
<if test="soldr.stype!=null and soldr.stype != ''">
and stf.type = #{soldr.stype}
</if>
@@ -80,7 +80,7 @@
where id = #{id}
</delete>
<update id="delLogic">
- UPDATE sys_soldr SET is_deleted = 1 WHERE sid =#{id}
+ UPDATE sys_soldr SET amount1 = 0 WHERE sid =#{id}
</update>
<!--已出农资列表-->
@@ -119,7 +119,7 @@
<select id="selectCz" resultType="java.util.Map">
SELECT census, sid, amount1
FROM `sys_soldr`
- WHERE sid = #{sid} AND dept_id = #{deptId}
+ WHERE sid = #{sid} AND dept_id = #{deptId} AND is_deleted = 0
</select>
<!-- 根据stockId、specs1、specs_val1、specs_val2、sid-->
<select id="getByServalParam" resultType="org.springblade.modules.soldr.entity.Soldr">
--
Gitblit v1.9.3