ERP_override.git

			@@ -148,11 +148,11 @@

			<insert id="insertDeliveryDetail" useGeneratedKeys="true" >
			insert into sd.delivery_detail (delivery_id,delivery_number,order_number,
			area,order_id,quantity,money,delivery_detail_remakes,delivery_detail_state,other_columns,create_time)
			area,order_id,quantity,money,delivery_detail_remakes,delivery_detail_state,other_columns,create_time,price)
			values (
			#{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{orderDetail.computeArea}*#{orderDetail.deliveryDetail.quantity},
			#{orderDetail.orderId},#{orderDetail.deliveryDetail.quantity},
			#{deliveryDetailMoney},'',1,#{orderDetail.otherColumns},now()
			#{deliveryDetailMoney},'',1,#{orderDetail.otherColumns},now(),#{orderDetail.price}
			)
			</insert>

			@@ -170,7 +170,7 @@
			od.building_number,
			od.product_id,
			od.product_name,
			od.price,
			dd.price,
			fgi.storage_region,
			dd.money,
			od.width,
			@@ -262,7 +262,7 @@
			</if>

			</where>
			order by dd.id desc
			order by dd.id
			limit #{offset},#{pageSize};
			</select>

			@@ -371,7 +371,8 @@
			od.compute_gross_area,
			od.processing_note,
			od.edging_type,
			od.perimeter
			od.perimeter,
			od.other_columns
			from sd.order_detail od
			left join sd.`order` o on od.order_id = o.order_id
			left join mm.finished_goods_inventory fgi
			@@ -912,7 +913,7 @@
			dd.area,
			ifnull(od.processing_note,"") as processingNote,
			ifnull(od.building_number,"") as buildingNumber,
			od.price,
			dd.price,
			od.other_columns
			from delivery_detail dd
			left join order_detail od on dd.order_id = od.order_id and dd.order_number = od.order_number