From d18eb5bd8b9cf93ba7adb4ee97fdcaccd3838e79 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 24 Aug 2022 10:36:10 +0800
Subject: [PATCH] 删除回滚完善，销售损耗添加字段type、prodId、地块选择数据返回增加库存量和面积
---
src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml b/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml
index 3a2a3d9..b37715e 100644
--- a/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml
+++ b/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml
@@ -16,11 +16,15 @@
from sys_inventory inventory
LEFT JOIN sys_strain strain on inventory.strain_id = strain.id
LEFT JOIN blade_dict_biz bdb ON inventory.reason = bdb.dict_key
+ LEFT JOIN sys_land land ON land.id = inventory.land_id
where
<if test="inventory.strainId !=null and inventory.strainId != '' ">
inventory.strain_id = #{inventory.strainId} AND
</if>
- bdb.code = "lossReason" AND inventory.is_deleted = 0
+ <if test="inventory.farmId != null and inventory.farmId !='' ">
+ land.farm_id = #{inventory.farmId} AND
+ </if>
+ bdb.code = "lossReason" AND inventory.is_deleted = 0 ORDER BY inventory.create_time DESC
</select>
</mapper>
--
Gitblit v1.9.3