hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/entity/TSteelPrint.java
@@ -78,6 +78,8 @@ //班组 private String groupName; private String platUserId; private String platUserName; /** * This field was generated by MyBatis Generator. * This field corresponds to the database table t_steel_print hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/entity/dto/ProduceDto.java
@@ -81,4 +81,6 @@ //打印时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String printTime; private String platUserName; } hd/pipe/materialsManage/src/main/resources/mapping/TSteelPrintMapper.xml
@@ -57,6 +57,9 @@ <if test="isUse != null"> is_use, </if> <if test="platUserId != null"> plat_user_id, </if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="steelPrintId != null"> @@ -92,10 +95,14 @@ <if test="isUse != null"> #{isUse,jdbcType=INTEGER}, </if> <if test="platUserId != null"> #{platUserId,jdbcType=VARCHAR}, </if> </trim> </insert> <select id="steelPrintList" resultType="com.thhy.materials.modules.biz.rebarprint.entity.TSteelPrint"> select tsp.steel_print_id as steelPrintId, select tsp.steel_print_id as steelPrintId, tsp.pro_id as proId, tsp.size_id as sizeId, tsp.reinforcement_id as reinforcementId, @@ -106,8 +113,10 @@ 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 su.real_name as realName, spu.real_name as platUserName from t_steel_print tsp left join sys_plat_user spu on spu.user_id = tsp.plat_user_id 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 hd/pipe/materialsManage/src/main/resources/mapping/TSteelProduceMapper.xml
@@ -21,23 +21,36 @@ <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, 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 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_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 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},'%') @@ -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, 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 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_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 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"> hd/pipe/mobile/src/main/resources/mapping/PipeInfoMapper.xml
@@ -246,10 +246,15 @@ </select> <select id="queryPipeInfoByPipeId" resultType="com.thhy.mobile.modules.biz.pipeinfo.entity.PipeInfoVo"> select tsp.produce_number as produceNumber,sp.pro_name as proName,su1.real_name as createUserName,su2.real_name as steelCheckUserName,tsp.quality_time as steelCheckTime,tsp.is_qualified as steelCheckResult,tsp.print_time as printTime, select tsp.produce_number as produceNumber, sp.pro_name as proName, spu.real_name as createUserName, su2.real_name as steelCheckUserName, tsp.quality_time as steelCheckTime, tsp.is_qualified as steelCheckResult, tsp.print_time as printTime, sm.mould_num as mouldNum,sm.current_cycle_time as currentCycleTime,sm.max_cycle_time as maxCycleTime,sm.mould_code as mouldCode, tpi.ring_num as ringNum,tpi.pipe_num as pipeNum,tpi.into_mod_time as intoModTime, tpi.check_user as checkUser,su.real_name as pipeCheckUserName,tpi.check_time as pipeCheckTime, sd1.dict_name as turnName, @@ -272,6 +277,8 @@ left join sys_users su on su.user_id = tpi.check_user left join sys_users su1 on su1.user_id = tsp.create_user left join sys_users su2 on su2.user_id = tsp.quality_user 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 where 1=1 <if test="pipeId != null"> and tpi.pipe_id = #{pipeId} hd/pipe/mobile/src/main/resources/mapping/SteelProduceMapper.xml
@@ -353,13 +353,13 @@ sd5.dict_name AS sizeName, sd2.dict_name AS reinforcementName, sd4.dict_name AS blockNumName, su1.real_name AS createUserName, spu.real_name AS createUserName, su2.real_name AS steelCheckUserName, tsp.quality_time AS pipeCheckTime, tsp.print_time AS printTime, tpi.into_mod_time AS intoModTime, su.real_name AS pipeCheckUserName su.real_name AS pipeCheckUserName, tsp.steel_print_id steelPrintId FROM t_steel_produce tsp LEFT JOIN t_pipe_info tpi ON tsp.produce_number = tpi.produce_number @@ -370,6 +370,8 @@ LEFT JOIN sys_users su ON su.user_id = tpi.check_user LEFT JOIN sys_users su1 ON su1.user_id = tsp.create_user LEFT JOIN sys_users su2 ON su2.user_id = tsp.quality_user 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 where tsp.produce_number =#{num} </select>
