ERP_override.git

			@@ -35,6 +35,7 @@
			<result column="delivery_address" property="order.deliveryAddress"/>
			<result column="project" property="order.project"/>
			<result column="customer_name" property="order.customerName"/>
			<result column="customer_Id" property="order.customerId"/>

			</resultMap>

			@@ -621,7 +622,15 @@
			)
			values (
			#{oddNumber} ,#{flowCard.order.orderId},#{flowCard.processId},#{flowCard.orderNumber},"入库",#{userName},
			#{flowCard.inventoryQuantity},now(),"未审核",#{container},#{deliveryDetailMoney},#{deliveryDetailArea}
			#{flowCard.inventoryQuantity},
			<if test="createTime != null">
			#{createTime}
			</if>
			<if test="createTime == null">
			now()
			</if>
			,"未审核",#{container},#{deliveryDetailMoney},#{deliveryDetailArea}

			)
			</insert>

			@@ -760,6 +769,7 @@
			od.height,
			o.project,
			o.customer_name,
			o.customer_Id,
			o.delivery_address,
			fol.operate_time,
			fol.`status`,