ERP_override.git

			@@ -7,6 +7,10 @@
			<!--映射成品库存-->
			<resultMap id="selectFinishedGoodsInventory" type="com.example.erp.entity.mm.FinishedGoodsInventory">
			<id column="fid" property="id"/>
			<result column="id" property="id"/>
			<result column="order_id" property="orderId"/>
			<result column="order_number" property="orderNumber"/>
			<result column="process_id" property="processId"/>
			<result column="inventory" property="inventory"/>
			<result column="area" property="area"/>
			<result column="actual_signal_area" property="actualSignalArea"/>
			@@ -88,6 +92,7 @@
			<result column="order_id" property="deliveryDetail.orderId"/>
			<result column="create_time" property="deliveryDetail.createTime"/>
			<result column="dd_quantity" property="deliveryDetail.quantity"/>
			<result column="box_no" property="deliveryDetail.boxNo"/>

			<result column="project" property="order.project"/>

			@@ -157,13 +162,13 @@
			<update id="updateInventoryInventoryInt">
			update mm.finished_goods_inventory
			set inventory=inventory+#{quantity}
			where order_number=#{orderNumber} and order_id=#{orderId}
			where order_number=#{orderNumber} and order_id=#{orderId} and trim(box_no) = trim(#{remarks})
			</update>

			<update id="updateInventoryInventoryOut">
			update mm.finished_goods_inventory
			set inventory=inventory-#{quantity}
			where order_number=#{orderNumber} and order_id=#{orderId}
			where order_number=#{orderNumber} and order_id=#{orderId} and trim(box_no) = trim(#{boxNo})
			</update>

			<select id="getSelectAllocate" resultMap="selectDeliveryFinishedGoodsInventory">
			@@ -287,7 +292,7 @@
			<update id="updateDeliveryDetailState">
			update sd.delivery_detail
			set delivery_detail_state=#{state}
			where order_number=#{orderNumber} and order_id=#{orderId} and delivery_id=#{deliveryId}
			where order_number=#{orderNumber} and order_id=#{orderId} and delivery_id=#{deliveryId} and trim(box_no) = trim(#{remarks})
			</update>

			<update id="updateInventoryquantityavailable">
			@@ -378,7 +383,8 @@
			od.building_number,
			d.creator,
			dd.delivery_detail_remakes,
			dd.create_time
			dd.create_time,
			dd.box_no
			from sd.delivery_detail dd
			left join sd.delivery d on dd.delivery_id = d.delivery_id
			left join sd.order_detail od on od.order_id = dd.order_id and dd.order_number = od.order_number
			@@ -535,6 +541,7 @@
			set inventory=inventory-${finishedOperateLog.quantity},quantity_available=quantity_available-${finishedOperateLog.quantity},
			update_time=now(),area=actual_signal_area*quantity_available
			where order_number=#{finishedOperateLog.operationNumber} and order_id=#{finishedOperateLog.orderId}
			and box_no=#{finishedOperateLog.remarks}
			</update>

			<insert id="insertFinishedGoodsInventory" useGeneratedKeys="true" >
			@@ -565,7 +572,7 @@
			<select id="findOrderNumberdcount" >
			select count(*)
			from mm.`finished_goods_inventory`
			where order_number = #{orderNumber} and order_id=#{orderId};
			where order_number = #{orderNumber} and order_id=#{orderId} and box_no=#{boxNo};

			</select>

			@@ -770,7 +777,10 @@


			<select id="defaultfinishedGoods" resultMap="selectFinishedGoodsInventory">
			select od.order_number,
			select
			fgi.id,
			fgi.process_id,
			od.order_number,
			o.order_id,
			o.project,
			o.order_type,
			@@ -883,15 +893,18 @@
			</where>
			order by fgi.update_time desc

			limit #{offset},#{pageSize};
			<!-- limit #{offset},#{pageSize}-->
			;
			</select>


			<select id="getPageTotal">
			select
			CEILING(count(fgi.id)/#{pageSize}) as 'pageTotal',
			1 as 'pageTotal',
			<!-- CEILING(count(fgi.id)/#{pageSize}) as 'pageTotal', -->

			count(fgi.id) as 'total'
			from finished_goods_inventory fgi
			from mm.finished_goods_inventory fgi
			left join sd.order_detail od on fgi.order_id = od.order_id and fgi.order_number = od.order_number
			left join sd.`order` o on fgi.order_id = o.order_id
			<where>
			@@ -977,7 +990,7 @@
			</where>

			order by fgi.update_time desc
			limit #{offset},#{pageSize}
			<!-- limit #{offset},#{pageSize} as 'pageTotal', -->
			;
			</select>

			@@ -1023,7 +1036,11 @@

			<select id="findDeliverydetail">
			select * from sd.delivery_detail
			where order_number=#{orderNumber} and order_id=#{orderId} and delivery_id=#{deliveryId} and delivery_detail_state=0
			where order_number=#{orderNumber}
			and order_id=#{orderId}
			and delivery_id=#{deliveryId}
			and delivery_detail_state=0
			and trim(#{boxNo}) =box_no
			</select>

			<select id="getSelectDeliveryDetailDeliveryId" resultMap="selectDelivery">
			@@ -1054,4 +1071,86 @@
			</select>


			<select id="getPrintTitleByBox">
			select kkk.*,
			rw.teams_groups_name as teams_groups_name2
			from(select #{orderId} as order_id,
			o.customer_name,
			o.customer_id,
			o.project,
			(select batch from sd.`order` pp1 where pp1.order_id =#{orderId} ) as batch,
			fol.box_no as 'remarks',
			SUM(fol.quantity_available) as quantity,
			ROUND( sum(od.width * od.height * fol.quantity_available) / 1000000, 2 ) as area,
			ROUND( sum(od.width * od.height * fol.quantity_availablep.total_thickness2.5) / 1000000, 2 ) as weight,
			fol.process_id,
			aaa.teams_groups_name,
			aaa.previous_process,
			date( aaa.reporting_work_time) as reporting_work_time
			from (SELECT *
			FROM mm.finished_goods_inventory aa
			where aa.box_no=#{boxNo}
			and aa.quantity_available>0
			) as fol
			left join sd.order_detail od on fol.order_id = od.order_id and fol.order_number = od.order_number
			left join sd.`order` o on o.order_id=fol.order_id
			left join sd.product p on od.product_id=p.id
			left join (select teams_groups_name,process_id,previous_process,reporting_work_time from pp.reporting_work where this_process='包装' group by process_id) aaa on aaa.process_id=fol.process_id
			where o.customer_id=#{customerId}
			and o.project=#{project}

			group by fol.box_no,o.customer_name,o.project
			) as kkk
			left join pp.reporting_work rw on rw.process_id=kkk.process_id and rw.this_process=kkk.previous_process
			group by kkk.remarks,kkk.customer_id,kkk.project

			</select>

			<select id="getorderProductByBoxNo">
			SELECT
			od.product_id,
			od.product_name,
			pro.thickness
			FROM
			( SELECT * FROM mm.finished_goods_inventory aa
			WHERE aa.order_id = #{orderId}
			AND aa.box_no = #{boxNo}
			AND aa.quantity_available > 0 ) fol

			LEFT JOIN sd.order_detail od ON fol.order_id = od.order_id
			AND fol.order_number = od.order_number
			left join sd.product as pro
			on pro.id = od.product_id
			LEFT JOIN sd.`order` o ON o.order_id = fol.order_id
			group by
			od.product_id

			</select>
			<select id="getPrintDetail">
			SELECT
			ifnull(od.building_number,ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')) as building_number,
			od.width,
			od.height,
			sum(fol.quantity_available) as quantity,
			od.product_name,
			od.product_id,
			ROUND(sum(od.width * od.height * fol.quantity_available / 1000000) , 2 ) as area,
			ROUND(sum(od.width * od.height * fol.quantity_available / 1000000) , 2 )#{thickness}2.5 as weight
			FROM
			( SELECT * FROM mm.finished_goods_inventory aa
			WHERE aa.order_id = #{orderId}
			AND aa.box_no = #{boxNo}
			AND aa.quantity_available > 0 ) fol

			LEFT JOIN sd.order_detail od
			ON fol.order_id = od.order_id
			AND fol.order_number = od.order_number
			LEFT JOIN sd.`order` o
			ON o.order_id = fol.order_id
			WHERE
			od.product_id=#{productId}
			group by od.order_id,od.order_number
			ORDER BY
			od.order_number
			</select>
			</mapper>