From 680b380e3d9189f2bfd79fb33a6428d82219e4bc Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 17 Sep 2022 10:29:44 +0800
Subject: [PATCH] 新增加工产品出库，修改加工产品数据存储逻辑
---
src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 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 56ac5ee..8c1aa58 100644
--- a/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml
+++ b/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml
@@ -12,32 +12,21 @@
<select id="selectSalePage" resultMap="inventoryResultMap">
select inventory.*,
- strain.strain_name,bdb.dict_value,
- CASE WHEN inventory.type = 1 THEN
- (
- SELECT m.machining_type FROM sys_process_inv inv
- LEFT JOIN sys_machining m ON m.id = inv.product_id
- WHERE inventory.prod_id = inv.id
- )
- ELSE
- (
- SELECT strain.strain_name FROM sys_farm_product_stock sfps
- LEFT JOIN sys_strain strain ON strain.id = sfps.strain_id
- WHERE inventory.prod_id = sfps.id
- )
- END AS proName
+ strain.strain_name,mach.machining_type AS proName,bdb.dict_value
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
+ LEFT JOIN sys_process_inv inv ON inv.id = inventory.prod_id
+ LEFT JOIN sys_machining mach ON mach.id = inv.product_id
where
- <if test="inventory.strainId !=null and inventory.strainId != '' ">
- inventory.strain_id = #{inventory.strainId} AND
+ 1=1
+ <if test="inventory.farmId != null and inventory.farmId !=''">
+ AND (land.farm_id = #{inventory.farmId} OR inv.fps_id = #{inventory.farmId})
</if>
- <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
+ AND bdb.code = "lossReason"
+ AND inventory.is_deleted = 0
+ ORDER BY inventory.create_time DESC
</select>
</mapper>
--
Gitblit v1.9.3