~zhangleilei/supipe.git

			@@ -163,7 +163,7 @@
			from t_raw_material
			where Piece=#{byId}
			</select>
			<insert id="mixingInsert" >
			<insert id="mixingInsert" parameterType="com.thhy.materials.modules.biz.concret.entity.TMixing">
			insert into t_mixing
			<trim prefix="(" suffix=")" suffixOverrides=",">
			<if test="mixingId != null">
			@@ -205,6 +205,9 @@
			<if test="inspectDate != null">
			inspect_date,
			</if>
			<if test="types != null">
			types,
			</if>
			</trim>
			<trim prefix="values (" suffix=")" suffixOverrides=",">
			<if test="mixingId != null">
			@@ -245,6 +248,9 @@
			</if>
			<if test="inspectDate != null">
			#{inspectDate,jdbcType=VARCHAR},
			</if>
			<if test="types != null">
			#{types},
			</if>
			</trim>
			</insert>
			@@ -432,5 +438,50 @@
			left join sys_dict sd on mc.dict_id=sd.dict_id
			where mc.mixing_signboard_id=#{mixingSignboardId} and mc.star=#{star}
			</select>
			<select id="mixingConsumePull" resultType="com.thhy.materials.modules.biz.concret.entity.TMixingSignboard">
			select
			mixing_signboard_id as mixingSignboardId,
			signboard_name as signboardName
			from t_mixing_signboard
			</select>
			<select id="siloPull" resultType="com.thhy.materials.modules.biz.concret.entity.TSilo">
			select silo_id as siloId,
			silo_name as siloName,
			types
			from t_silo
			</select>
			<update id="mixingUpdateType" parameterType="java.lang.String">
			update t_mixing set types=2 where silo_id=#{siloId}
			</update>
			<select id="siloMixingList" resultType="com.thhy.materials.modules.biz.concret.entity.TMixing">
			SELECT
			tm.mixing_id as mixingId,
			tm.material as material,
			tm.spec as spec,
			tm.producer as producer,
			tm.stove as stove,
			tm.in_num as inNum,
			tm.in_date as inDate,
			tm.inspect_state as inspectState,
			tm.report_number as reportNumber,
			tm.stata as stata,
			tm.silo_id as siloId,
			tm.percentage as percentage,
			tm.inspect_date as inspectDate,
			ts.silo_name as siloName
			FROM
			t_silo ts
			LEFT JOIN t_mixing tm ON ts.silo_id=tm.silo_id
			where tm.types=1
			<if test="types!=null and types!='' ">
			and ts.types=#{types}
			</if>
			<if test="stata!=null and stata!='' ">
			and tm.stata=#{stata}
			</if>
			<if test="strTime!=null and strTime!=null and endTime!=null and endTime!='' ">
			and tm.in_date between #{strTime} and #{endTime}
			</if>
			</select>

			</mapper>