product-inventory-management-after.git

			@@ -21,21 +21,29 @@
			<result column="dept_id" property="deptId" />
			</resultMap>

			<select id="pageProductionOperationTask" resultType="com.ruoyi.production.bean.vo.ProductionOperationTaskVo">
			select pot.*,
			po.nps_no as npsNo,
			po.is_end_order as endOrder,
			p.product_name as productName,
			pm.model as model,
			pm.unit as unit,
			poro.operation_name as operationName,
			poro.type as type,
			IFNULL(scrapStat.scrapQty, 0) AS scrapQty,
			ROUND(IFNULL(pot.complete_quantity, 0) / NULLIF(pot.plan_quantity, 0) * 100, 2) AS completionStatus,
			CASE
			WHEN pot.work_order_no LIKE 'FG%' THEN '返工返修'
			ELSE '正常'
			END AS work_order_type
			<sql id="groupedProductionOperationTaskSelect">
			select po.id as productionOrderId,
			po.nps_no as npsNo,
			po.is_end_order as endOrder,
			p.product_name as productName,
			pm.model as model,
			pm.unit as unit,
			group_concat(distinct poro.operation_name order by poro.drag_sort, poro.operation_name separator ',') as operationName,
			count(distinct pot.id) as productionTaskCount,
			sum(ifnull(pot.plan_quantity, 0)) as planQuantity,
			sum(ifnull(pot.complete_quantity, 0)) as completeQuantity,
			sum(ifnull(pot.complete_quantity, 0)) as goodQuantity,
			sum(ifnull(scrapStat.scrapQty, 0)) as scrapQty,
			round(sum(ifnull(pot.complete_quantity, 0)) / nullif(sum(ifnull(pot.plan_quantity, 0)), 0) * 100, 2) as completionStatus,
			max(poro.type) as type,
			case when sum(case when pot.work_order_no like 'FG%' then 1 else 0 end) > 0
			then '返工返修' else '正常' end as workOrderType,
			group_concat(distinct pot.work_order_no order by pot.work_order_no separator ',') as workOrderNo,
			min(pot.plan_start_time) as planStartTime,
			max(pot.plan_end_time) as planEndTime,
			min(pot.actual_start_time) as actualStartTime,
			max(pot.actual_end_time) as actualEndTime,
			max(pot.status) as status
			from production_operation_task pot
			left join production_order po on pot.production_order_id = po.id
			left join production_order_routing_operation poro on pot.production_order_routing_operation_id = poro.id
			@@ -48,27 +56,31 @@
			left join production_product_output ppo on ppo.production_product_main_id = ppm.id
			group by ppm.production_operation_task_id
			) scrapStat on scrapStat.taskId = pot.id
			</sql>

			<sql id="groupedProductionOperationTaskWhere">
			<where>
			<if test="c != null and c.id != null">
			and pot.id = #{c.id}
			</if>
			<if test="c != null and c.npsNo != null">
			<if test="c != null and c.npsNo != null and c.npsNo != ''">
			and po.nps_no like concat('%', #{c.npsNo}, '%')
			</if>
			<if test="c != null and c.productionOrderId != null">
			and pot.production_order_id = #{c.productionOrderId}
			</if>
			<if test="c != null and c.productionOrderRoutingOperationId != null">
			and pot.production_order_routing_operation_id = #{c.productionOrderRoutingOperationId}
			</if>
			<if test="c != null and c.status != null">
			and pot.status = #{c.status}
			</if>
			<if test="c != null and c.workOrderNo != null and c.workOrderNo != ''">
			and pot.work_order_no like concat('%', #{c.workOrderNo}, '%')
			</if>
			</where>
			order by pot.id desc
			</sql>

			<select id="pageProductionOperationTask" resultType="com.ruoyi.production.bean.vo.ProductionOperationTaskVo">
			<include refid="groupedProductionOperationTaskSelect"/>
			<include refid="groupedProductionOperationTaskWhere"/>
			group by po.id
			order by po.id desc
			</select>

			<select id="listGroupedProductionOperationTask" resultType="com.ruoyi.production.bean.vo.ProductionOperationTaskVo">
			<include refid="groupedProductionOperationTaskSelect"/>
			<include refid="groupedProductionOperationTaskWhere"/>
			group by po.id, po.nps_no, po.is_end_order, p.product_name, pm.model, pm.unit
			order by po.id desc
			</select>

			<select id="selectTaskStatisticsByDate" resultType="com.ruoyi.home.dto.ProductionTaskStatisticsDto">
			@@ -107,7 +119,7 @@
			select poro.operation_name as processName,
			sum(ifnull(ppi.input_quantity, 0)) as totalInput,
			sum(ifnull(ppo.scrap_qty, 0)) as totalScrap,
			sum(ifnull(ppo.quantity, 0) - ifnull(ppo.scrap_qty, 0)) as totalOutput
			sum(greatest(ifnull(ppo.quantity, 0) - ifnull(ppo.scrap_qty, 0), 0)) as totalOutput
			from production_product_output ppo
			inner join production_product_main ppm on ppo.production_product_main_id = ppm.id
			inner join production_operation_task pot on ppm.production_operation_task_id = pot.id