product-inventory-management-after.git

			@@ -7,6 +7,9 @@
			<id column="id" property="id" />
			<result column="product_no" property="productNo" />
			<result column="production_operation_task_id" property="productionOperationTaskId" />
			<result column="report_type" property="reportType" />
			<result column="audit_status" property="auditStatus" />
			<result column="audit_remark" property="auditRemark" />
			<result column="dept_id" property="deptId" />
			<result column="update_time" property="updateTime" />
			<result column="create_user" property="createUser" />
			@@ -16,7 +19,29 @@

			<select id="listPageProductionProductMainDto" resultType="com.ruoyi.production.bean.dto.ProductionProductMainDto">
			select ppm.*,
			ppm.product_no as reportNo,
			case ppm.report_type
			when 0 then '合格'
			when 1 then '轻微返工'
			when 2 then '严重返工'
			when 3 then '报废'
			else '未知'
			end as reportTypeName,
			case ppm.audit_status
			when 0 then '待审核'
			when 1 then '审核通过'
			when 2 then '审核不通过'
			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 '待生产'
			@@ -28,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
			@@ -56,6 +83,12 @@
			<where>
			<if test="c.productNo != null and c.productNo != ''">
			and ppm.product_no like concat('%', #{c.productNo}, '%')
			</if>
			<if test="c.auditStatus != null">
			and ppm.audit_status = #{c.auditStatus}
			</if>
			<if test="c.reportType != null">
			and ppm.report_type = #{c.reportType}
			</if>
			<if test="c.workOrderNo != null and c.workOrderNo != ''">
			and pot.work_order_no like concat('%', #{c.workOrderNo}, '%')
			@@ -91,21 +124,125 @@

			<select id="listProductionDetails" resultType="com.ruoyi.production.bean.dto.ProductionProductMainDto">
			select ppm.*,
			ppm.product_no as reportNo,
			case ppm.report_type
			when 0 then '合格'
			when 1 then '轻微返工'
			when 2 then '严重返工'
			when 3 then '报废'
			else '未知'
			end as reportTypeName,
			case ppm.audit_status
			when 0 then '待审核'
			when 1 then '审核通过'
			when 2 then '审核不通过'
			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,
			poro.operation_name as process,
			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
			from production_product_main ppm
			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) + 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 wages
			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 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
			left join production_product_output ppo on ppo.production_product_main_id = ppm.id
			order by ppm.create_time desc
			<where>
			<if test="c != null">
			<if test="c.auditStatus != null">
			and ppm.audit_status = #{c.auditStatus}
			</if>
			<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>
			<if test="c.specificationModel != null and c.specificationModel != ''">
			and pm.model like concat('%', #{c.specificationModel}, '%')
			</if>
			<if test="c.schedulingUserId != null">
			and pa.scheduling_user_id = #{c.schedulingUserId}
			</if>
			<if test="c.schedulingUserName != null and c.schedulingUserName != ''">
			and pa.scheduling_user_name like concat('%', #{c.schedulingUserName}, '%')
			</if>
			<if test="c.process != null and c.process != ''">
			and pa.technology_operation_name like concat('%', #{c.process}, '%')
			</if>
			<if test="c.entryDate != null">
			and date(pa.scheduling_date) = #{c.entryDate}
			</if>
			<if test="c.entryDateStart != null">
			and date(pa.scheduling_date) >= #{c.entryDateStart}
			</if>
			<if test="c.entryDateEnd != null">
			and date(pa.scheduling_date) <= #{c.entryDateEnd}
			</if>
			</if>
			</where>
			order by pa.scheduling_date desc, pa.id desc
			</select>

			<select id="listMain" resultType="java.lang.Long">