product-inventory-management-after.git

			@@ -43,23 +43,26 @@
			group_concat(distinct p_parent.product_name order by p_parent.product_name separator ',') as productCategory,
			group_concat(distinct pm.model order by pm.model separator ',') as specificationModel,
			group_concat(distinct pm.unit order by pm.unit separator ',') as unit,
			ifnull(p.standard_quantity, 0) as productStandardQuantity,
			pa.scheduling_user_id as schedulingUserId,
			pa.scheduling_user_name as schedulingUserName,
			group_concat(distinct pot.work_order_no order by pot.work_order_no separator ',') as workOrderNo,
			cast(sum(
			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) + ifnull(ppm.repair_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
			end
			when ifnull(too.standard_quantity, 0) = 0 then 0
			else ifnull(pa.finished_num, 0) / ifnull(too.standard_quantity, 0) * 8 + ifnull(ppm.repair_work_hour, 0)
			end
			) as decimal(18,4)) as wages,
			cast(sum(ifnull(pa.finished_num, 0)) as decimal(18,4)) as finishedNum,
			cast(sum(ifnull(pa.work_hours, 0)) as decimal(18,4)) as workHours,
			cast(sum(
			case
			when poro.type = 0 then ifnull(pa.work_hours, 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 + ifnull(ppm.repair_work_hour, 0)
			end
			end
			) as decimal(18,4)) as workHours,
			cast(sum(ifnull(pa.adjust_amount, 0)) as decimal(18,4)) as adjustAmount,
			cast(sum(ifnull(ppm.work_hour, 0)) as decimal(18,4)) as workHour,
			case
			@@ -89,6 +92,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
			@@ -137,22 +141,15 @@

			<select id="selectUserAccount" resultType="com.ruoyi.production.bean.dto.UserAccountDto">
			select cast(ifnull(sum(
			case
			when pa.adjust_amount is not null then 0
			when poro.type = 0 then 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
			end
			end
			), 0) as decimal(18,2)) as accountBalance,
			case
			when ifnull(too.standard_quantity, 0) = 0 then 0
			else ifnull(pa.finished_num, 0) / ifnull(too.standard_quantity, 0) * 8 + ifnull(ppm.repair_work_hour, 0)
			end
			), 0) as decimal(18,2)) as accountBalance,
			cast(ifnull(sum(
			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) + ifnull(ppm.repair_work_hour, 0))
			else 0
			when ifnull(too.standard_quantity, 0) = 0 then 0
			else ifnull(pa.finished_num, 0) / ifnull(too.standard_quantity, 0) * 8 + ifnull(ppm.repair_work_hour, 0)
			end
			), 0) as decimal(18,2)) as account
			from production_account pa
			@@ -160,7 +157,9 @@
			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
			where pa.scheduling_user_id = #{userId}
			and date_format(pa.scheduling_date, '%Y-%m') = #{date}
			and (
			@@ -179,12 +178,20 @@
			ifnull(ppm.work_hour, 0) as workHour,
			ifnull(ppm.repair_work_hour, 0) as repairWorkHour,
			ifnull(too.standard_quantity, 0) as standardQuantity,
			ifnull(too.conversion_factor, 1) as conversionFactor
			ifnull(p.standard_quantity, 0) as productStandardQuantity,
			ifnull(too.violin_factor, 0) as violinFactor,
			ifnull(too.viola_factor, 0) as violaFactor,
			ifnull(too.bass_factor, 0) as bassFactor,
			p.product_name as productName
			from production_account pa
			left join production_product_main ppm on ppm.id = pa.production_product_main_id
			left join production_operation_task pot on ppm.production_operation_task_id = pot.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 production_order po on pot.production_order_id = po.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
			where pa.scheduling_user_id = #{userId}
			and date_format(pa.scheduling_date, '%Y-%m') = #{date}
			and (
			@@ -211,4 +218,13 @@
			order by date_format(scheduling_date, '%m-%d')
			</select>

			<select id="selectAccountingMonths" resultType="java.lang.String">
			select distinct date_format(pa.scheduling_date, '%Y-%m') as monthValue
			from production_account pa
			inner join production_product_main ppm on ppm.id = pa.production_product_main_id
			where ppm.audit_status = 1
			and ppm.report_type in (0, 1)
			order by monthValue
			</select>

			</mapper>