From 36d430922c4a6f4c77db56e74a7ccee9a7af06a5 Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期三, 22 十一月 2023 11:12:35 +0800
Subject: [PATCH] 20231122_qiuyh_修改钢筋笼打印制作人
---
hd/pipe/materialsManage/src/main/resources/mapping/TSteelProduceMapper.xml | 90 +++++++++++++++++++++++++++-----------------
1 files changed, 55 insertions(+), 35 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/TSteelProduceMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/TSteelProduceMapper.xml
index 30dcfa3..aeef5b4 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/TSteelProduceMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/TSteelProduceMapper.xml
@@ -21,24 +21,37 @@
<result column="is_user" jdbcType="INTEGER" property="isUser" />
</resultMap>
<select id="steelProduceList" resultType="com.thhy.materials.modules.biz.rebarprint.entity.dto.ProduceDto">
- select tsp.steel_produce_id as steelProduceId,
- tsp.produce_number as produceNumber,
- tsp.pro_id as proId,sp.pro_name as proName,
- sd.dict_name as sizeName,sd1.dict_name as reinforcementName,
- sd2.dict_name as blockName,su.real_name as realName,
- sg.group_name as groupName,su1.real_name as qualityUserName,
- tsp.quality_time as qualityTime,tsp.is_qualified as isQualified,
- tsp.is_model as isModel,tsp.print_time as printTime
- from t_steel_produce tsp
- left join sys_project sp on tsp.pro_id=sp.pro_id
- left join sys_dict sd on tsp.size_id=sd.dict_id
- left join sys_dict sd1 on tsp.reinforcement_id=sd1.dict_id
- left join sys_dict sd2 on tsp.block_num=sd2.dict_id
- left join sys_users su on tsp.create_user=su.user_id
- left join sys_group_user sgu on su.plat_id=sgu.user_id
- left join sys_group sg on sgu.group_id=sg.group_id
- left join sys_users su1 on tsp.quality_user=su1.user_id
- where tsp.is_use=1
+ select
+ DISTINCT tsp.steel_produce_id as steelProduceId,
+ tsp.size_id as sizeId,
+ tsp.reinforcement_id reinforcementId,
+ tsp.block_num blockNum,
+ tsp.produce_number as produceNumber,
+ tsp.pro_id as proId,
+ sp.pro_name as proName,
+ sd.dict_name as sizeName,
+ sd1.dict_name as reinforcementName,
+ sd2.dict_name as blockName,
+ su.real_name as realName,
+ sg.group_name as groupName,
+ su1.real_name as qualityUserName,
+ tsp.quality_time as qualityTime,
+ tsp.is_qualified as isQualified,
+ tsp.is_model as isModel,
+ tsp.print_time as printTime,
+ spu.real_name as platUserName
+ from t_steel_produce tsp
+ left join sys_project sp on tsp.pro_id=sp.pro_id
+ left join sys_dict sd on tsp.size_id=sd.dict_id
+ left join sys_dict sd1 on tsp.reinforcement_id=sd1.dict_id
+ left join sys_dict sd2 on tsp.block_num=sd2.dict_id
+ left join sys_users su on tsp.create_user=su.user_id
+ left join sys_users su1 on tsp.quality_user=su1.user_id
+ left join t_steel_print stp on stp.steel_print_id = tsp.steel_print_id
+ left join sys_plat_user spu on spu.user_id = stp.plat_user_id
+ left join sys_group_user sgu on spu.user_id=sgu.user_id
+ left join sys_group sg on sgu.group_id=sg.group_id
+ where tsp.is_use=1
<if test="produceNumber!=null and produceNumber!='' ">
and tsp.produce_number like concat('%',#{produceNumber},'%')
</if>
@@ -75,26 +88,33 @@
<if test="isModel!=null and isModel!='' ">
and tsp.is_model=#{isModel}
</if>
+ <if test="isModel!=null and isModel!='' ">
+ and tsp.size_id=#{sizeId}
+ </if>
order by tsp.produce_number desc
</select>
<select id="steelProduceInfo" parameterType="java.lang.String" resultType="com.thhy.materials.modules.biz.rebarprint.entity.dto.ProduceDto">
- select tsp.steel_produce_id as steelProduceId,
- tsp.produce_number as produceNumber,
- tsp.pro_id as proId,sp.pro_name as proName,
- sd.dict_name as sizeName,sd1.dict_name as reinforcementName,
- sd2.dict_name as blockName,su.real_name as realName,
- sg.group_name as groupName,su1.real_name as qualityUserName,
- tsp.quality_time as qualityTime,tsp.is_qualified as isQualified,
- tsp.is_model as isModel,tsp.print_time as printTime
- from t_steel_produce tsp
- left join sys_project sp on tsp.pro_id=sp.pro_id
- left join sys_dict sd on tsp.size_id=sd.dict_id
- left join sys_dict sd1 on tsp.reinforcement_id=sd1.dict_id
- left join sys_dict sd2 on tsp.block_num=sd2.dict_id
- left join sys_users su on tsp.create_user=su.user_id
- left join sys_group_user sgu on su.plat_id=sgu.user_id
- left join sys_group sg on sgu.group_id=sg.group_id
- left join sys_users su1 on tsp.quality_user=su1.user_id
+ select
+ DISTINCT tsp.steel_produce_id as steelProduceId,
+ tsp.produce_number as produceNumber,
+ tsp.pro_id as proId,sp.pro_name as proName,
+ sd.dict_name as sizeName,sd1.dict_name as reinforcementName,
+ sd2.dict_name as blockName,su.real_name as realName,
+ sg.group_name as groupName,su1.real_name as qualityUserName,
+ tsp.quality_time as qualityTime,tsp.is_qualified as isQualified,
+ tsp.is_model as isModel,tsp.print_time as printTime,
+ spu.real_name as platUserName
+ from t_steel_produce tsp
+ left join sys_project sp on tsp.pro_id=sp.pro_id
+ left join sys_dict sd on tsp.size_id=sd.dict_id
+ left join sys_dict sd1 on tsp.reinforcement_id=sd1.dict_id
+ left join sys_dict sd2 on tsp.block_num=sd2.dict_id
+ left join sys_users su on tsp.create_user=su.user_id
+ left join sys_users su1 on tsp.quality_user=su1.user_id
+ left join t_steel_print stp on stp.steel_print_id = tsp.steel_print_id
+ left join sys_plat_user spu on spu.user_id = stp.plat_user_id
+ left join sys_group_user sgu on spu.user_id=sgu.user_id
+ left join sys_group sg on sgu.group_id=sg.group_id
where tsp.is_use=1 and tsp.steel_produce_id=#{steelProduceId}
</select>
<select id="produceInventory" resultType="com.thhy.materials.modules.biz.rebarprint.entity.dto.ProduceInventoryDto">
--
Gitblit v1.9.3