~zhangleilei/supipe.git

			@@ -147,10 +147,16 @@
			where material_release_id=#{materialReleaseId}
			</update>
			<select id="pieceList" resultType="com.thhy.materials.modules.biz.concret.entity.dto.PieceDto">
			select by_id as byId from t_piece
			select by_id as byId,
			BldTim as bldTim,
			types as types
			from t_piece
			where 1=1
			<if test="byId!=null and byId!='' ">
			and by_id=#{byId}
			</if>
			<if test="types!=null and types!=''">
			and types=#{types}
			</if>
			ORDER BY by_id desc
			</select>
			@@ -161,7 +167,7 @@
			PlanAmnt as planamnt,
			FactAmnt as factamnt
			from t_raw_material
			where Piece=#{byId}
			where Piece=#{byId} and types=#{types}
			</select>
			<insert id="mixingInsert" >
			insert into t_mixing
			@@ -285,9 +291,10 @@
			report_number as reportNumber,
			stata as stata,
			silo_id as siloId,
			percentage as percentage
			percentage as percentage,
			inspect_date as inspectDate
			from t_mixing where silo_id=#{siloId}
			order by in_date desc limit 0,1
			and types=1
			</select>
			<select id="siloList" resultType="com.thhy.materials.modules.biz.concret.entity.TSilo">
			select
			@@ -330,9 +337,7 @@
			<insert id="mixingConsumeInTwo" >
			insert into t_mixing_consume
			<trim prefix="(" suffix=")" suffixOverrides=",">
			<if test="mixingConsumeId != null">
			mixing_consume_id,
			</if>
			<if test="dictId != null">
			dict_id,
			</if>
			@@ -363,11 +368,15 @@
			<if test="star != null">
			star,
			</if>
			<if test="constructionUnit != null">
			construction_unit,
			</if>
			</trim>
			<trim prefix="values (" suffix=")" suffixOverrides=",">
			<if test="mixingConsumeId != null">
			#{mixingConsumeId,jdbcType=VARCHAR},
			</if>
			<!-- <if test="mixingConsumeId != null">-->
			<!-- #{mixingConsumeId,jdbcType=VARCHAR},-->
			<!-- </if>-->
			REPLACE(UUID(),'-',''),
			<if test="dictId != null">
			#{dictId,jdbcType=VARCHAR},
			</if>
			@@ -398,6 +407,9 @@
			<if test="star != null">
			#{star},
			</if>
			<if test="constructionUnit != null">
			#{constructionUnit},
			</if>
			</trim>
			</insert>
			<select id="starInt" resultType="java.lang.Integer">
			@@ -419,12 +431,16 @@
			<if test="signboardName!=null and signboardName!='' ">
			and tms.signboard_name like concat('%',#{signboardName},'%')
			</if>
			<if test="mixingSignboardId !=null and mixingSignboardId !='' ">
			and tms.mixing_signboard_id=#{mixingSignboardId}
			</if>
			</select>

			<select id="mixingConsumes" resultType="com.thhy.materials.modules.biz.concret.entity.TMixingConsume">
			select
			mc.mixing_consume_id as mixingConsumeId,
			sd.dict_name as dictName,
			-- sd.dict_name as dictName,
			mc.dict_id as dictId,
			mc.spec as spec,
			mc.manufacturer as manufacturer,
			mc.wat_full as watFull,
			@@ -433,16 +449,22 @@
			mc.save_stamp as saveStamp,
			mc.construction as construction,
			mc.mixing_signboard_id as mixingSignboardId,
			mc.star as star
			mc.star as star,
			mc.create_time as createTime,
			mc.construction_unit as constructionUnit
			from t_mixing_consume mc
			left join sys_dict sd on mc.dict_id=sd.dict_id
			-- left join sys_dict sd on mc.dict_id=sd.dict_id
			where mc.mixing_signboard_id=#{mixingSignboardId} and mc.star=#{star}
			<!-- <if test="strTime!=null and strTime!='' and endTime !=null and endTime!=''">-->
			<!-- and mc.create_time between #{strTime} and #{endTime}-->
			<!-- </if>-->
			</select>
			<select id="mixingConsumePull" resultType="com.thhy.materials.modules.biz.concret.entity.TMixingSignboard">
			select
			tms.mixing_signboard_id as mixingSignboardId,
			tms.signboard_name as signboardName,
			sp.pro_name as proName
			sp.pro_name as proName,
			sp.construction_unit as constructionUnit
			from t_mixing_signboard tms left join sys_project sp
			on tms.pro_id=sp.pro_id
			</select>
			@@ -531,4 +553,46 @@
			<delete id="mixingDel" parameterType="java.lang.String">
			delete from t_mixing where mixing_id=#{mixingId}
			</delete>
			<update id="mixingConsumeUpTwo" >
			update t_mixing_consume
			<set>
			<if test="dictId != null">
			dict_id = #{dictId,jdbcType=VARCHAR},
			</if>
			<if test="spec != null">
			spec = #{spec,jdbcType=VARCHAR},
			</if>
			<if test="manufacturer != null">
			manufacturer = #{manufacturer,jdbcType=VARCHAR},
			</if>
			<if test="watFull != null">
			wat_full = #{watFull,jdbcType=VARCHAR},
			</if>
			<if test="planAmnt != null">
			plan_amnt = #{planAmnt,jdbcType=VARCHAR},
			</if>
			<if test="factAmnt != null">
			fact_amnt = #{factAmnt,jdbcType=VARCHAR},
			</if>
			<if test="saveStamp != null">
			save_stamp = #{saveStamp,jdbcType=VARCHAR},
			</if>
			<if test="construction != null">
			construction = #{construction,jdbcType=VARCHAR},
			</if>
			<if test="mixingSignboardId != null">
			mixing_signboard_id = #{mixingSignboardId,jdbcType=VARCHAR},
			</if>
			<if test="star != null">
			star = #{star},
			</if>
			</set>
			where mixing_consume_id = #{mixingConsumeId,jdbcType=VARCHAR}
			</update>
			<delete id="mixingConsumeDel" >
			delete from t_mixing_consume where mixing_consume_id=#{mixingConsumeId} and star=#{star}
			</delete>
			<delete id="mixingConsumeDelSign" >
			delete from t_mixing_consume where mixing_signboard_id=#{mixingSignboardId} and star=#{star}
			</delete>
			</mapper>