product-inventory-management-after.git

			@@ -34,6 +34,14 @@
			else '未知'
			end as auditStatusName,
			pot.work_order_no as workOrderNo,
			ifnull(pot.plan_quantity, 0) as schedulingNum,
			cast(
			case
			when ifnull(pot.plan_quantity, 0) - ifnull(ppo.quantity, 0) < 0 then 0
			else ifnull(pot.plan_quantity, 0) - ifnull(ppo.quantity, 0)
			end
			as decimal(18,4)
			) as pendingNum,
			case pot.status
			when 1 then '待确认'
			when 2 then '待生产'
			@@ -45,13 +53,15 @@
			ifnull(ppo.quantity, 0) as quantity,
			ifnull(ppo.scrap_qty, 0) as scrapQty,
			p.product_name as productName,
			ifnull(p.standard_quantity, 0) as productStandardQuantity,
			pm.model as productModelName,
			pm.unit,
			po_sales.salesContractNo,
			date(ppm.create_time) as schedulingDate,
			su.nick_name as schedulingUserName,
			po_sales.customerName,
			poro.operation_name as process
			poro.operation_name as process,
			ppm.repair_work_hour as repairWorkHour
			from production_product_main ppm
			left join production_operation_task pot on ppm.production_operation_task_id = pot.id
			left join production_order po on pot.production_order_id = po.id
			@@ -129,28 +139,58 @@
			else '未知'
			end as auditStatusName,
			pot.work_order_no as workOrderNo,
			ifnull(pot.plan_quantity, 0) as schedulingNum,
			cast(
			case
			when ifnull(pot.plan_quantity, 0) - ifnull(ppo.quantity, 0) < 0 then 0
			else ifnull(pot.plan_quantity, 0) - ifnull(ppo.quantity, 0)
			end
			as decimal(18,4)
			) as pendingNum,
			p.product_name as productName,
			ifnull(p.standard_quantity, 0) as productStandardQuantity,
			pm.model as productModelName,
			pm.unit,
			pa.technology_operation_name as process,
			ifnull(too.standard_quantity, 0) as standardQuantity,
			ifnull(ppo.quantity, 0) as quantity,
			ifnull(ppo.scrap_qty, 0) as scrapQty,
			date(pa.scheduling_date) as schedulingDate,
			pa.scheduling_user_id as schedulingUserId,
			pa.scheduling_user_name as schedulingUserName,
			ppm.repair_work_hour as repairWorkHour,
			cast(ifnull(ppm.work_hour, 0) as decimal(18,4)) as workHour,
			cast(ifnull(pa.work_hours, 0) as decimal(18,4)) as workHours,
			cast(
			case
			when poro.type = 0 then ifnull(pa.work_hours, 0)
			else case
			when ifnull(too.standard_quantity, 0) = 0 then 0
			else ifnull(pa.finished_num, 0) / ifnull(too.standard_quantity, 0) * 8
			end
			end
			+ ifnull(ppm.repair_work_hour, 0)
			as decimal(18,4)
			) as convertedWorkHours,
			cast(ifnull(pa.adjust_amount, 0) as decimal(18,4)) as adjustAmount,
			pa.adjust_remark as adjustRemark,
			cast(
			case
			when poro.type = 0 then ifnull(pa.work_hours, 0) * (ifnull(ppm.work_hour, 0) + ifnull(ppm.repair_work_hour, 0))
			else case
			when ifnull(too.standard_quantity, 0) = 0 then 0
			else ifnull(pa.finished_num, 0) / ifnull(too.standard_quantity, 0) * 8
			end
			end
			as decimal(18,4)
			) as originalWages,
			cast(
			case
			when pa.adjust_amount is not null then ifnull(pa.adjust_amount, 0)
			when poro.type = 0 then ifnull(pa.work_hours, 0) * ifnull(ppm.work_hour, 0)
			else ifnull(pa.work_hours, 0) * ifnull(pa.finished_num, 0) *
			case
			when substring_index(pm.model, '*', -1) regexp '^[0-9]+(\\.[0-9]+)?$'
			then cast(substring_index(pm.model, '*', -1) as decimal(18,4))
			else 1
			when poro.type = 0 then ifnull(pa.work_hours, 0) * (ifnull(ppm.work_hour, 0) + ifnull(ppm.repair_work_hour, 0))
			else case
			when ifnull(too.standard_quantity, 0) = 0 then 0
			else ifnull(pa.finished_num, 0) / ifnull(too.standard_quantity, 0) * 8
			end
			end
			as decimal(18,4)
			@@ -160,6 +200,7 @@
			left join production_operation_task pot on ppm.production_operation_task_id = pot.id
			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
			left join technology_operation too on poro.technology_operation_id = too.id
			left join product_model pm on pm.id = ifnull(poro.product_model_id, po.product_model_id)
			left join product p on pm.product_id = p.id
			left join product p_parent on p_parent.id = p.parent_id
			@@ -172,6 +213,9 @@
			<if test="c.reportType != null">
			and ppm.report_type = #{c.reportType}
			</if>
			<if test="c.reportType == null">
			and ppm.report_type in (0, 1)
			</if>
			<if test="c.productCategory != null and c.productCategory != ''">
			and p_parent.product_name like concat('%', #{c.productCategory}, '%')
			</if>