product-inventory-management-after.git

			@@ -54,6 +54,15 @@
			<if test="qualityInspect.entryDateEnd != null and qualityInspect.entryDateEnd != '' ">
			AND qi.check_time <= DATE_FORMAT(#{qualityInspect.entryDateEnd},'%Y-%m-%d')
			</if>
			<if test="qualityInspect.purchaseContractNo != null and qualityInspect.purchaseContractNo != '' ">
			AND pl.purchase_contract_number like concat('%',#{qualityInspect.purchaseContractNo},'%')
			</if>
			<if test="qualityInspect.workOrderNo != null and qualityInspect.workOrderNo != '' ">
			AND pot.work_order_no like concat('%',#{qualityInspect.workOrderNo},'%')
			</if>
			<if test="qualityInspect.salesContractNo != null and qualityInspect.salesContractNo != '' ">
			AND po_sales.sales_contract_no like concat('%',#{qualityInspect.salesContractNo},'%')
			</if>
			ORDER BY qi.check_time DESC
			</select>

			@@ -128,8 +137,7 @@
			COALESCE(SUM(
			CASE
			WHEN qi.inspect_state = 1
			AND qi.check_result = '合格'
			THEN qi.quantity
			THEN qi.qualified_quantity
			ELSE 0
			END
			), 0) AS qualifiedCount,
			@@ -137,8 +145,7 @@
			COALESCE(SUM(
			CASE
			WHEN qi.inspect_state = 1
			AND qi.check_result = '不合格'
			THEN qi.quantity
			THEN qi.unqualified_quantity
			ELSE 0
			END
			), 0) AS unqualifiedCount,
			@@ -166,8 +173,7 @@
			COALESCE(SUM(
			CASE
			WHEN qi.inspect_state = 1
			AND qi.check_result = '合格'
			THEN qi.quantity
			THEN qi.qualified_quantity
			ELSE 0
			END
			), 0)
			@@ -248,8 +254,8 @@
			/* 合格 */
			COALESCE(SUM(
			CASE
			WHEN qi.inspect_state = 1 AND qi.check_result = '合格'
			THEN qi.quantity
			WHEN qi.inspect_state = 1
			THEN qi.qualified_quantity
			ELSE 0
			END
			), 0) AS qualifiedCount,
			@@ -257,8 +263,8 @@
			/* 不合格 */
			COALESCE(SUM(
			CASE
			WHEN qi.inspect_state = 1 AND qi.check_result = '不合格'
			THEN qi.quantity
			WHEN qi.inspect_state = 1
			THEN qi.unqualified_quantity
			ELSE 0
			END
			), 0) AS unqualifiedCount,
			@@ -279,8 +285,8 @@
			ROUND(
			COALESCE(SUM(
			CASE
			WHEN qi.inspect_state = 1 AND qi.check_result = '合格'
			THEN qi.quantity
			WHEN qi.inspect_state = 1
			THEN qi.qualified_quantity
			ELSE 0
			END
			), 0)
			@@ -312,7 +318,6 @@

			<select id="getYearlyPassRateStatistics" resultType="com.ruoyi.quality.dto.QualityPassRateDto">
			SELECT t.modelType,

			COALESCE(SUM(
			CASE
			WHEN pp.product_name = '原材料' AND t.modelType = 0 THEN qi.quantity
			@@ -320,8 +325,23 @@
			WHEN pp.product_name = '成品' AND t.modelType = 2 THEN qi.quantity
			ELSE 0
			END
			), 0) AS totalCount

			), 0) AS totalCount,
			COALESCE(SUM(
			CASE
			WHEN pp.product_name = '原材料' AND t.modelType = 0 THEN qi.qualified_quantity
			WHEN pp.product_name = '半成品' AND t.modelType = 1 THEN qi.qualified_quantity
			WHEN pp.product_name = '成品' AND t.modelType = 2 THEN qi.qualified_quantity
			ELSE 0
			END
			), 0) AS qualifiedCount,
			COALESCE(SUM(
			CASE
			WHEN pp.product_name = '原材料' AND t.modelType = 0 THEN qi.unqualified_quantity
			WHEN pp.product_name = '半成品' AND t.modelType = 1 THEN qi.unqualified_quantity
			WHEN pp.product_name = '成品' AND t.modelType = 2 THEN qi.unqualified_quantity
			ELSE 0
			END
			), 0) AS unqualifiedCount
			FROM (SELECT 0 AS modelType
			UNION ALL
			SELECT 1
			@@ -334,8 +354,6 @@
			ON qi.product_model_id = pm.id
			AND YEAR(qi.check_time) = #{year}
			AND qi.inspect_state = 1
			AND qi.check_result = '合格'

			GROUP BY t.modelType
			ORDER BY t.modelType;
			</select>