ERP_override.git

			@@ -14,6 +14,7 @@
			<result column="batch" property="batch"/>
			</association>
			<association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
			<result column="product_id" property="productId"/>
			<result column="product_name" property="productName"/>
			<result column="compute_area" property="computeArea"/>
			<result column="quantity" property="quantity"/>
			@@ -42,7 +43,7 @@
			from order_glass_detail as a
			LEFT JOIN order_detail as b on a.order_id=b.order_id and a.order_number=b.order_number LEFT JOIN
			`order` as c on a.order_id=c.order_id
			<where>
			where isnull(a.production_id)
			<if test="orderGlassDetail.orderId != null and orderGlassDetail.orderId != ''">
			and a.order_id regexp #{orderGlassDetail.orderId}
			</if>
			@@ -55,16 +56,11 @@
			<if test="orderGlassDetail.orderDetail.productName != null and orderGlassDetail.orderDetail.productName!= ''">
			and b.product_name regexp #{orderGlassDetail.orderDetail.productName}
			</if>
			<if test="orderGlassDetail.splittingStatus=0 " >
			and a.splitting_status regexp #{state}
			</if>
			<if test="orderGlassDetail.splittingStatus=1">
			and a.splitting_status regexp #{state}
			</if>

			<if test="orderGlassDetail.createTime != ''">
			and DATE_FORMAT((a.create_time),'%Y-%m-%d') BETWEEN #{ selectTime1 } AND #{ selectTime2 }
			and DATE_FORMAT((a.create_time),'%Y-%m-%d') BETWEEN #{ selectTime1 } AND #{ selectTime2 }
			</if>
			</where>

			group by a.production_id,a.order_number
			order by a.id desc

			@@ -72,36 +68,88 @@
			;
			</select>

			<!-- <select id="getPageTotal" >-->
			<!-- select-->
			<!-- CEILING(count(a.id)/#{pageSize})-->
			<!-- from product as a-->
			<!-- left join basic_glass_type bgt on bgt.type_id = a.type_id-->
			<!-- <where>-->
			<!-- <if test="glassTypeId != null and glassTypeId != ''">-->
			<!-- and a.type_id regexp #{glassTypeId}-->
			<!-- </if>-->
			<!-- <if test="product.id != null and product.id != ''">-->
			<!-- and a.id regexp #{product.id}-->
			<!-- </if>-->
			<!-- <if test="product.productName != null and product.productName != ''">-->
			<!-- and a.product_name regexp #{product.productName}-->
			<!-- </if>-->
			<!-- <if test="product.basicGlassType.typeName != null and product.basicGlassType.typeName!= ''">-->
			<!-- and bgt.type_name regexp #{product.basicGlassType.typeName}-->
			<!-- </if>-->
			<!-- <if test="product.query != null and product.query != ''">-->
			<!-- and a.query regexp #{product.query}-->
			<!-- </if>-->
			<!-- <if test="product.creator != null and product.creator != ''">-->
			<!-- and a.creator regexp #{product.creator}-->
			<!-- </if>-->
			<!-- <if test="product.createTime != null and product.createTime != ''">-->
			<!-- and date(a.create_time) regexp #{product.createTime}-->
			<!-- </if>-->
			<!-- </where>-->
			<select id="selectWordOrderNo" resultMap="wordOrderMap">
			select
			a.order_id,
			a.production_id,
			c.batch,
			b.product_name,
			b.compute_area,
			b.quantity,
			b.compute_gross_area,
			b.perimeter,
			b.bend_radius,
			b.processing_note
			from order_glass_detail as a
			LEFT JOIN order_detail as b on a.order_id=b.order_id and a.order_number=b.order_number LEFT JOIN
			`order` as c on a.order_id=c.order_id
			where a.production_id IS NOT NULL
			<if test="orderGlassDetail.orderId != null and orderGlassDetail.orderId != ''">
			and a.order_id regexp #{orderGlassDetail.orderId}
			</if>
			<if test="orderGlassDetail.productionId != null and orderGlassDetail.productionId != ''">
			and a.production_id regexp #{orderGlassDetail.productionId}
			</if>
			<if test="orderGlassDetail.order.batch != null and orderGlassDetail.order.batch != ''">
			and c.batch regexp #{orderGlassDetail.order.batch}
			</if>
			<if test="orderGlassDetail.orderDetail.productName != null and orderGlassDetail.orderDetail.productName!= ''">
			and b.product_name regexp #{orderGlassDetail.orderDetail.productName}
			</if>

			<!-- order by a.id desc-->
			<!-- ;-->
			<!-- </select>-->
			<if test="orderGlassDetail.createTime != ''">
			and DATE_FORMAT((a.create_time),'%Y-%m-%d') BETWEEN #{ selectTime1 } AND #{ selectTime2 }
			</if>

			group by a.production_id,a.order_number
			order by a.id desc


			;
			</select>

			<select id="addWordOrder">
			select od.order_id,
			od.product_id,
			od.product_name,
			od.quantity,
			od.compute_gross_area,
			od.perimeter
			from order_detail as od
			left join sd.order_glass_detail as ogd
			on od.order_id = ogd.order_id and od.order_number = ogd.order_number
			where od.order_id = #{orderId}
			and ISNULL(ogd.production_id)
			group by od.order_id, od.product_id, od.product_name
			;
			</select>

			<select id="SelectOrderNumber">
			select count(ogd.production_id)
			from sd.order_glass_detail as ogd
			where ogd.production_id = #{productIdVl}
			</select>

			<update id="AddOrderWorkMp">
			update sd.order_detail as od left join sd.order_glass_detail as ogd
			on od.order_id = ogd.order_id and od.order_number = ogd.order_number

			set ogd.production_id=#{productIdVl},
			ogd.production_time=NOW(),
			ogd.founder=#{userName}

			where od.order_id = #{orderId}
			and od.product_id =#{productId}
			and od.product_name = #{productName}
			</update>

			<update id="DeleteOrderWorkMp">
			update sd.order_detail as od left join sd.order_glass_detail as ogd
			on od.order_id = ogd.order_id and od.order_number = ogd.order_number
			set ogd.production_id=null,
			ogd.production_time=null,
			ogd.founder=null
			where od.order_id = #{orderId}
			and od.product_name = #{productName}
			</update>
			</mapper>