From 9ca45195f78b74e9181cbbe7e82eb683ee49fabf Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 30 十月 2026 17:54:15 +0800
Subject: [PATCH] 质量管理模块:指标按产品/类别/工序维护与绑定、不合格处理方式、检验提交入库判定
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 179 +++--
src/test/java/com/ruoyi/quality/controller/QualityUnqualifiedControllerTest.java | 117 +++
src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java | 6
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 11
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 22
doc/20261030_quality_demo_data_extra.sql | 108 +++
src/test/java/com/ruoyi/quality/service/QualityInspectServiceImplTest.java | 112 +++
doc/20261029_quality_demo_data.sql | 331 ++++++++++
src/test/java/com/ruoyi/quality/controller/QualityInspectControllerTest.java | 140 ++++
src/main/java/com/ruoyi/quality/mapper/QualityTestStandardParamMapper.java | 11
src/main/java/com/ruoyi/quality/controller/QualityInspectController.java | 55 +
src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java | 66 ++
src/main/java/com/ruoyi/quality/dto/QualityMetricBindingDto.java | 41 +
src/test/java/com/ruoyi/quality/controller/QualityMetricControllerTest.java | 198 ++++++
doc/20261029_disable_process_maintenance_menu.sql | 12
src/main/resources/mapper/quality/QualityTestStandardParamMapper.xml | 28
src/main/java/com/ruoyi/quality/dto/QualityMetricDto.java | 24
src/main/java/com/ruoyi/quality/controller/QualityMetricController.java | 294 +++++++++
doc/20261029_quality_unqualified_deal_type.sql | 51 +
src/main/java/com/ruoyi/quality/mapper/QualityTestStandardBindingMapper.java | 3
src/main/resources/application-tide.yml | 4
src/main/resources/mapper/quality/QualityTestStandardBindingMapper.xml | 17
22 files changed, 1,727 insertions(+), 103 deletions(-)
diff --git a/doc/20261029_disable_process_maintenance_menu.sql b/doc/20261029_disable_process_maintenance_menu.sql
new file mode 100644
index 0000000..c0482da
--- /dev/null
+++ b/doc/20261029_disable_process_maintenance_menu.sql
@@ -0,0 +1,12 @@
+-- 闅愯棌骞跺仠鐢ㄢ�滃伐搴忕淮鎶も�濊彍鍗曪紙MySQL锛屽彲閲嶅鎵ц锛夈��
+-- 宸ュ簭鏁版嵁鍙� /productProcess/list 鎺ュ彛缁х画淇濈暀锛屼緵杩囩▼妫�楠屽拰鎸囨爣缁戝畾閫夋嫨宸ュ簭銆�
+
+UPDATE sys_menu
+SET visible = '1',
+ status = '1',
+ update_by = 'admin',
+ update_time = NOW(),
+ remark = CONCAT(IFNULL(remark, ''), IF(IFNULL(remark, '') = '', '', '锛�'), '宸插彇娑堢嫭绔嬪伐搴忕淮鎶よ彍鍗�')
+WHERE menu_name = '宸ュ簭缁存姢'
+ AND (visible <> '1' OR status <> '1');
+
diff --git a/doc/20261029_quality_demo_data.sql b/doc/20261029_quality_demo_data.sql
new file mode 100644
index 0000000..9b8cd38
--- /dev/null
+++ b/doc/20261029_quality_demo_data.sql
@@ -0,0 +1,331 @@
+-- 璐ㄩ噺绠$悊婕旂ず鏁版嵁锛圡ySQL 5.7+/8.0锛屽彲閲嶅鎵ц锛�
+-- 瑕嗙洊锛氭寚鏍囩淮鎶ゃ�佸師鏉愭枡妫�楠屻�佽繃绋嬫楠屻�佸嚭鍘傛楠屻�佷笉鍚堟牸绠$悊銆�
+-- 鎵ц鍓嶈鍏堟墽琛� 20261029_quality_unqualified_deal_type.sql銆�
+-- 榛樿浣跨敤 admin 鐢ㄦ埛鎵�灞炵鎴凤紱濡備笉瀛樺湪 admin锛屽垯浣跨敤鏈�灏忕鎴� ID锛屾渶鍚庡洖閫�鍒� 0銆�
+
+SET @demo_tenant_id = COALESCE(
+ (SELECT tenant_id FROM sys_user WHERE user_name = 'admin' LIMIT 1),
+ (SELECT MIN(tenant_id) FROM sys_user WHERE tenant_id IS NOT NULL),
+ 0
+);
+
+-- 涓�銆佸熀纭�婕旂ず浜у搧鍜屽伐搴�
+INSERT INTO product (parent_id, product_name, tenant_id)
+SELECT NULL, '宸ヤ笟閾濇澘锛堟紨绀猴級', @demo_tenant_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM product WHERE product_name = '宸ヤ笟閾濇澘锛堟紨绀猴級' AND tenant_id = @demo_tenant_id
+);
+
+INSERT INTO product (parent_id, product_name, tenant_id)
+SELECT NULL, '绮惧瘑杞存壙锛堟紨绀猴級', @demo_tenant_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM product WHERE product_name = '绮惧瘑杞存壙锛堟紨绀猴級' AND tenant_id = @demo_tenant_id
+);
+
+INSERT INTO product (parent_id, product_name, tenant_id)
+SELECT NULL, '鎺у埗鍣ㄦ�绘垚锛堟紨绀猴級', @demo_tenant_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM product WHERE product_name = '鎺у埗鍣ㄦ�绘垚锛堟紨绀猴級' AND tenant_id = @demo_tenant_id
+);
+
+INSERT INTO product_process (name, no, remark, create_time, update_time, tenant_id)
+SELECT '绮惧姞宸ワ紙婕旂ず锛�', 'DEMO-P-001', '璐ㄩ噺绠$悊婕旂ず宸ュ簭', NOW(), NOW(), @demo_tenant_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM product_process WHERE no = 'DEMO-P-001' AND tenant_id = @demo_tenant_id
+);
+
+SET @raw_product_id = (
+ SELECT id FROM product WHERE product_name = '宸ヤ笟閾濇澘锛堟紨绀猴級' AND tenant_id = @demo_tenant_id ORDER BY id LIMIT 1
+);
+SET @process_product_id = (
+ SELECT id FROM product WHERE product_name = '绮惧瘑杞存壙锛堟紨绀猴級' AND tenant_id = @demo_tenant_id ORDER BY id LIMIT 1
+);
+SET @final_product_id = (
+ SELECT id FROM product WHERE product_name = '鎺у埗鍣ㄦ�绘垚锛堟紨绀猴級' AND tenant_id = @demo_tenant_id ORDER BY id LIMIT 1
+);
+SET @demo_process_id = (
+ SELECT id FROM product_process WHERE no = 'DEMO-P-001' AND tenant_id = @demo_tenant_id ORDER BY id LIMIT 1
+);
+
+-- 浜屻�佷笁绫绘楠屾爣鍑�
+INSERT INTO quality_test_standard
+ (standard_no, standard_name, remark, create_time, create_user, update_time, update_user,
+ tenant_id, state, inspect_type, process_id)
+SELECT 'QM-DEMO-RAW-001', '宸ヤ笟閾濇澘鏉ユ枡妫�楠屾爣鍑�', '婕旂ず鏁版嵁', NOW(), 1, NOW(), 1,
+ @demo_tenant_id, '0', 0, NULL
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_test_standard
+ WHERE standard_no = 'QM-DEMO-RAW-001' AND tenant_id = @demo_tenant_id
+);
+
+INSERT INTO quality_test_standard
+ (standard_no, standard_name, remark, create_time, create_user, update_time, update_user,
+ tenant_id, state, inspect_type, process_id)
+SELECT 'QM-DEMO-PROCESS-001', '绮惧瘑杞存壙绮惧姞宸ユ楠屾爣鍑�', '婕旂ず鏁版嵁', NOW(), 1, NOW(), 1,
+ @demo_tenant_id, '0', 1, @demo_process_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_test_standard
+ WHERE standard_no = 'QM-DEMO-PROCESS-001' AND tenant_id = @demo_tenant_id
+);
+
+INSERT INTO quality_test_standard
+ (standard_no, standard_name, remark, create_time, create_user, update_time, update_user,
+ tenant_id, state, inspect_type, process_id)
+SELECT 'QM-DEMO-FINAL-001', '鎺у埗鍣ㄦ�绘垚鍑哄巶妫�楠屾爣鍑�', '婕旂ず鏁版嵁', NOW(), 1, NOW(), 1,
+ @demo_tenant_id, '0', 2, NULL
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_test_standard
+ WHERE standard_no = 'QM-DEMO-FINAL-001' AND tenant_id = @demo_tenant_id
+);
+
+SET @raw_standard_id = (
+ SELECT id FROM quality_test_standard
+ WHERE standard_no = 'QM-DEMO-RAW-001' AND tenant_id = @demo_tenant_id ORDER BY id LIMIT 1
+);
+SET @process_standard_id = (
+ SELECT id FROM quality_test_standard
+ WHERE standard_no = 'QM-DEMO-PROCESS-001' AND tenant_id = @demo_tenant_id ORDER BY id LIMIT 1
+);
+SET @final_standard_id = (
+ SELECT id FROM quality_test_standard
+ WHERE standard_no = 'QM-DEMO-FINAL-001' AND tenant_id = @demo_tenant_id ORDER BY id LIMIT 1
+);
+
+-- 涓夈�佹爣鍑嗘寚鏍囧弬鏁�
+INSERT INTO quality_test_standard_param
+ (parameter_item, unit, standard_value, control_value, default_value,
+ create_time, create_user, update_time, update_user, tenant_id, test_standard_id)
+SELECT '鍘氬害', 'mm', '2.00卤0.10', '1.95~2.05', '2.00', NOW(), 1, NOW(), 1, @demo_tenant_id, @raw_standard_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_test_standard_param
+ WHERE test_standard_id = @raw_standard_id AND parameter_item = '鍘氬害'
+);
+
+INSERT INTO quality_test_standard_param
+ (parameter_item, unit, standard_value, control_value, default_value,
+ create_time, create_user, update_time, update_user, tenant_id, test_standard_id)
+SELECT '琛ㄩ潰璐ㄩ噺', '/', '鏃犲垝浼ゃ�佹棤姘у寲鏂�', '鏃犲彲瑙佺己闄�', '姝e父', NOW(), 1, NOW(), 1, @demo_tenant_id, @raw_standard_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_test_standard_param
+ WHERE test_standard_id = @raw_standard_id AND parameter_item = '琛ㄩ潰璐ㄩ噺'
+);
+
+INSERT INTO quality_test_standard_param
+ (parameter_item, unit, standard_value, control_value, default_value,
+ create_time, create_user, update_time, update_user, tenant_id, test_standard_id)
+SELECT '澶栧緞', 'mm', '20.00卤0.05', '19.98~20.02', '20.00', NOW(), 1, NOW(), 1, @demo_tenant_id, @process_standard_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_test_standard_param
+ WHERE test_standard_id = @process_standard_id AND parameter_item = '澶栧緞'
+);
+
+INSERT INTO quality_test_standard_param
+ (parameter_item, unit, standard_value, control_value, default_value,
+ create_time, create_user, update_time, update_user, tenant_id, test_standard_id)
+SELECT '鍦嗗害', 'mm', '鈮�0.02', '鈮�0.015', '0.01', NOW(), 1, NOW(), 1, @demo_tenant_id, @process_standard_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_test_standard_param
+ WHERE test_standard_id = @process_standard_id AND parameter_item = '鍦嗗害'
+);
+
+INSERT INTO quality_test_standard_param
+ (parameter_item, unit, standard_value, control_value, default_value,
+ create_time, create_user, update_time, update_user, tenant_id, test_standard_id)
+SELECT '缁濈紭鐢甸樆', 'M惟', '鈮�100', '鈮�120', '150', NOW(), 1, NOW(), 1, @demo_tenant_id, @final_standard_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_test_standard_param
+ WHERE test_standard_id = @final_standard_id AND parameter_item = '缁濈紭鐢甸樆'
+);
+
+INSERT INTO quality_test_standard_param
+ (parameter_item, unit, standard_value, control_value, default_value,
+ create_time, create_user, update_time, update_user, tenant_id, test_standard_id)
+SELECT '鍔熻兘娴嬭瘯', '/', '鍏ㄩ儴鍔熻兘閫氳繃', '杩炵画杩愯30鍒嗛挓鏃犲紓甯�', '閫氳繃', NOW(), 1, NOW(), 1, @demo_tenant_id, @final_standard_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_test_standard_param
+ WHERE test_standard_id = @final_standard_id AND parameter_item = '鍔熻兘娴嬭瘯'
+);
+
+-- 鍥涖�佷骇鍝佷笌鏍囧噯缁戝畾
+INSERT INTO quality_test_standard_binding
+ (product_id, test_standard_id, create_time, create_user, update_time, update_user, tenant_id)
+SELECT @raw_product_id, @raw_standard_id, NOW(), 1, NOW(), 1, @demo_tenant_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_test_standard_binding
+ WHERE product_id = @raw_product_id AND test_standard_id = @raw_standard_id
+);
+
+INSERT INTO quality_test_standard_binding
+ (product_id, test_standard_id, create_time, create_user, update_time, update_user, tenant_id)
+SELECT @process_product_id, @process_standard_id, NOW(), 1, NOW(), 1, @demo_tenant_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_test_standard_binding
+ WHERE product_id = @process_product_id AND test_standard_id = @process_standard_id
+);
+
+INSERT INTO quality_test_standard_binding
+ (product_id, test_standard_id, create_time, create_user, update_time, update_user, tenant_id)
+SELECT @final_product_id, @final_standard_id, NOW(), 1, NOW(), 1, @demo_tenant_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_test_standard_binding
+ WHERE product_id = @final_product_id AND test_standard_id = @final_standard_id
+);
+
+-- 浜斻�佸師鏉愭枡銆佽繃绋嬨�佸嚭鍘傛楠岃褰曪紙姣忕被鍖呭惈鍚堟牸涓庝笉鍚堟牸锛�
+INSERT INTO quality_inspect
+ (inspect_type, check_time, supplier, customer, process, check_name, product_id, product_name,
+ model, unit, quantity, check_company, check_result, create_time, create_user, update_time,
+ update_user, tenant_id, inspect_state, defective_phenomena, test_standard_id)
+SELECT 0, DATE_SUB(CURDATE(), INTERVAL 5 DAY), '鍗庝笢閲戝睘鏉愭枡鏈夐檺鍏徃', NULL, NULL, '寮犺川妫�',
+ @raw_product_id, '宸ヤ笟閾濇澘锛堟紨绀猴級', 'AL-2.0', '寮�', 120, '璐ㄩ噺绠$悊婕旂ず鏁版嵁', '鍚堟牸',
+ NOW(), 1, NOW(), 1, @demo_tenant_id, 1, NULL, @raw_standard_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_inspect
+ WHERE inspect_type = 0 AND product_id = @raw_product_id AND check_result = '鍚堟牸'
+ AND check_company = '璐ㄩ噺绠$悊婕旂ず鏁版嵁' AND tenant_id = @demo_tenant_id
+);
+
+INSERT INTO quality_inspect
+ (inspect_type, check_time, supplier, customer, process, check_name, product_id, product_name,
+ model, unit, quantity, check_company, check_result, create_time, create_user, update_time,
+ update_user, tenant_id, inspect_state, defective_phenomena, test_standard_id)
+SELECT 0, DATE_SUB(CURDATE(), INTERVAL 4 DAY), '鍖楁柟杞诲悎閲戞湁闄愬叕鍙�', NULL, NULL, '鏉庤川妫�',
+ @raw_product_id, '宸ヤ笟閾濇澘锛堟紨绀猴級', 'AL-2.0', '寮�', 80, '璐ㄩ噺绠$悊婕旂ず鏁版嵁', '涓嶅悎鏍�',
+ NOW(), 1, NOW(), 1, @demo_tenant_id, 1, '鍘氬害鍋忚杽锛岃竟缂樺瓨鍦ㄥ垝浼�', @raw_standard_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_inspect
+ WHERE inspect_type = 0 AND product_id = @raw_product_id AND check_result = '涓嶅悎鏍�'
+ AND check_company = '璐ㄩ噺绠$悊婕旂ず鏁版嵁' AND tenant_id = @demo_tenant_id
+);
+
+INSERT INTO quality_inspect
+ (inspect_type, check_time, supplier, customer, process, check_name, product_id, product_name,
+ model, unit, quantity, check_company, check_result, create_time, create_user, update_time,
+ update_user, tenant_id, inspect_state, defective_phenomena, test_standard_id)
+SELECT 1, DATE_SUB(CURDATE(), INTERVAL 3 DAY), NULL, '鍐呴儴鐢熶骇', '绮惧姞宸ワ紙婕旂ず锛�', '鐜嬭川妫�',
+ @process_product_id, '绮惧瘑杞存壙锛堟紨绀猴級', 'BR-6204', '濂�', 300, '璐ㄩ噺绠$悊婕旂ず鏁版嵁', '鍚堟牸',
+ NOW(), 1, NOW(), 1, @demo_tenant_id, 1, NULL, @process_standard_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_inspect
+ WHERE inspect_type = 1 AND product_id = @process_product_id AND check_result = '鍚堟牸'
+ AND check_company = '璐ㄩ噺绠$悊婕旂ず鏁版嵁' AND tenant_id = @demo_tenant_id
+);
+
+INSERT INTO quality_inspect
+ (inspect_type, check_time, supplier, customer, process, check_name, product_id, product_name,
+ model, unit, quantity, check_company, check_result, create_time, create_user, update_time,
+ update_user, tenant_id, inspect_state, defective_phenomena, test_standard_id)
+SELECT 1, DATE_SUB(CURDATE(), INTERVAL 2 DAY), NULL, '鍐呴儴鐢熶骇', '绮惧姞宸ワ紙婕旂ず锛�', '璧佃川妫�',
+ @process_product_id, '绮惧瘑杞存壙锛堟紨绀猴級', 'BR-6204', '濂�', 35, '璐ㄩ噺绠$悊婕旂ず鏁版嵁', '涓嶅悎鏍�',
+ NOW(), 1, NOW(), 1, @demo_tenant_id, 1, '澶栧緞瓒呭樊锛屽渾搴︿笉婊¤冻瑕佹眰', @process_standard_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_inspect
+ WHERE inspect_type = 1 AND product_id = @process_product_id AND check_result = '涓嶅悎鏍�'
+ AND check_company = '璐ㄩ噺绠$悊婕旂ず鏁版嵁' AND tenant_id = @demo_tenant_id
+);
+
+INSERT INTO quality_inspect
+ (inspect_type, check_time, supplier, customer, process, check_name, product_id, product_name,
+ model, unit, quantity, check_company, check_result, create_time, create_user, update_time,
+ update_user, tenant_id, inspect_state, defective_phenomena, test_standard_id)
+SELECT 2, DATE_SUB(CURDATE(), INTERVAL 1 DAY), NULL, '鍗庡崡鑷姩鍖栫鎶�鏈夐檺鍏徃', NULL, '闄堣川妫�',
+ @final_product_id, '鎺у埗鍣ㄦ�绘垚锛堟紨绀猴級', 'CTRL-A8', '鍙�', 60, '璐ㄩ噺绠$悊婕旂ず鏁版嵁', '鍚堟牸',
+ NOW(), 1, NOW(), 1, @demo_tenant_id, 1, NULL, @final_standard_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_inspect
+ WHERE inspect_type = 2 AND product_id = @final_product_id AND check_result = '鍚堟牸'
+ AND check_company = '璐ㄩ噺绠$悊婕旂ず鏁版嵁' AND tenant_id = @demo_tenant_id
+);
+
+INSERT INTO quality_inspect
+ (inspect_type, check_time, supplier, customer, process, check_name, product_id, product_name,
+ model, unit, quantity, check_company, check_result, create_time, create_user, update_time,
+ update_user, tenant_id, inspect_state, defective_phenomena, test_standard_id)
+SELECT 2, CURDATE(), NULL, '鍗庝笢鏅鸿兘瑁呭鏈夐檺鍏徃', NULL, '鍛ㄨ川妫�',
+ @final_product_id, '鎺у埗鍣ㄦ�绘垚锛堟紨绀猴級', 'CTRL-A8', '鍙�', 12, '璐ㄩ噺绠$悊婕旂ず鏁版嵁', '涓嶅悎鏍�',
+ NOW(), 1, NOW(), 1, @demo_tenant_id, 1, '缁濈紭鐢甸樆鍋忎綆锛屽姛鑳芥祴璇曢棿姝囨�уけ鏁�', @final_standard_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_inspect
+ WHERE inspect_type = 2 AND product_id = @final_product_id AND check_result = '涓嶅悎鏍�'
+ AND check_company = '璐ㄩ噺绠$悊婕旂ず鏁版嵁' AND tenant_id = @demo_tenant_id
+);
+
+SET @raw_ok_id = (SELECT id FROM quality_inspect WHERE inspect_type = 0 AND product_id = @raw_product_id AND check_result = '鍚堟牸' AND check_company = '璐ㄩ噺绠$悊婕旂ず鏁版嵁' AND tenant_id = @demo_tenant_id ORDER BY id LIMIT 1);
+SET @raw_ng_id = (SELECT id FROM quality_inspect WHERE inspect_type = 0 AND product_id = @raw_product_id AND check_result = '涓嶅悎鏍�' AND check_company = '璐ㄩ噺绠$悊婕旂ず鏁版嵁' AND tenant_id = @demo_tenant_id ORDER BY id LIMIT 1);
+SET @process_ok_id = (SELECT id FROM quality_inspect WHERE inspect_type = 1 AND product_id = @process_product_id AND check_result = '鍚堟牸' AND check_company = '璐ㄩ噺绠$悊婕旂ず鏁版嵁' AND tenant_id = @demo_tenant_id ORDER BY id LIMIT 1);
+SET @process_ng_id = (SELECT id FROM quality_inspect WHERE inspect_type = 1 AND product_id = @process_product_id AND check_result = '涓嶅悎鏍�' AND check_company = '璐ㄩ噺绠$悊婕旂ず鏁版嵁' AND tenant_id = @demo_tenant_id ORDER BY id LIMIT 1);
+SET @final_ok_id = (SELECT id FROM quality_inspect WHERE inspect_type = 2 AND product_id = @final_product_id AND check_result = '鍚堟牸' AND check_company = '璐ㄩ噺绠$悊婕旂ず鏁版嵁' AND tenant_id = @demo_tenant_id ORDER BY id LIMIT 1);
+SET @final_ng_id = (SELECT id FROM quality_inspect WHERE inspect_type = 2 AND product_id = @final_product_id AND check_result = '涓嶅悎鏍�' AND check_company = '璐ㄩ噺绠$悊婕旂ず鏁版嵁' AND tenant_id = @demo_tenant_id ORDER BY id LIMIT 1);
+
+-- 鍏�佹楠屾槑缁嗐�備娇鐢� UNION ALL 鍚庣粺涓�鎺掗櫎宸插瓨鍦ㄩ」銆�
+INSERT INTO quality_inspect_param
+ (parameter_item, unit, standard_value, control_value, test_value, inspect_id,
+ create_time, create_user, update_time, update_user, tenant_id)
+SELECT d.parameter_item, d.unit, d.standard_value, d.control_value, d.test_value, d.inspect_id,
+ NOW(), 1, NOW(), 1, @demo_tenant_id
+FROM (
+ SELECT '鍘氬害' parameter_item, 'mm' unit, '2.00卤0.10' standard_value, '1.95~2.05' control_value, '2.01' test_value, @raw_ok_id inspect_id
+ UNION ALL SELECT '琛ㄩ潰璐ㄩ噺', '/', '鏃犲垝浼ゃ�佹棤姘у寲鏂�', '鏃犲彲瑙佺己闄�', '姝e父', @raw_ok_id
+ UNION ALL SELECT '鍘氬害', 'mm', '2.00卤0.10', '1.95~2.05', '1.86', @raw_ng_id
+ UNION ALL SELECT '琛ㄩ潰璐ㄩ噺', '/', '鏃犲垝浼ゃ�佹棤姘у寲鏂�', '鏃犲彲瑙佺己闄�', '杈圭紭鍒掍激', @raw_ng_id
+ UNION ALL SELECT '澶栧緞', 'mm', '20.00卤0.05', '19.98~20.02', '20.01', @process_ok_id
+ UNION ALL SELECT '鍦嗗害', 'mm', '鈮�0.02', '鈮�0.015', '0.01', @process_ok_id
+ UNION ALL SELECT '澶栧緞', 'mm', '20.00卤0.05', '19.98~20.02', '20.18', @process_ng_id
+ UNION ALL SELECT '鍦嗗害', 'mm', '鈮�0.02', '鈮�0.015', '0.05', @process_ng_id
+ UNION ALL SELECT '缁濈紭鐢甸樆', 'M惟', '鈮�100', '鈮�120', '156', @final_ok_id
+ UNION ALL SELECT '鍔熻兘娴嬭瘯', '/', '鍏ㄩ儴鍔熻兘閫氳繃', '杩炵画杩愯30鍒嗛挓鏃犲紓甯�', '閫氳繃', @final_ok_id
+ UNION ALL SELECT '缁濈紭鐢甸樆', 'M惟', '鈮�100', '鈮�120', '62', @final_ng_id
+ UNION ALL SELECT '鍔熻兘娴嬭瘯', '/', '鍏ㄩ儴鍔熻兘閫氳繃', '杩炵画杩愯30鍒嗛挓鏃犲紓甯�', '闂存瓏鎬уけ鏁�', @final_ng_id
+) d
+WHERE d.inspect_id IS NOT NULL
+ AND NOT EXISTS (
+ SELECT 1 FROM quality_inspect_param p
+ WHERE p.inspect_id = d.inspect_id AND p.parameter_item = d.parameter_item
+ );
+
+-- 涓冦�佷笉鍚堟牸鍝佽褰曪細鍖呭惈寰呭鐞嗐�佽繑宸ュ畬鎴愬拰鎶ュ簾瀹屾垚涓夌灞曠ず鐘舵�併��
+INSERT INTO quality_unqualified
+ (inspect_type, inspect_state, check_time, check_name, product_id, product_name, model, unit,
+ quantity, defective_phenomena, deal_type, deal_result, deal_name, deal_time,
+ create_time, create_user, update_time, update_user, tenant_id)
+SELECT 0, 0, DATE_SUB(CURDATE(), INTERVAL 4 DAY), '鏉庤川妫�', @raw_product_id, '宸ヤ笟閾濇澘锛堟紨绀猴級',
+ 'AL-2.0', '寮�', 80, '鍘氬害鍋忚杽锛岃竟缂樺瓨鍦ㄥ垝浼�', NULL, NULL, NULL, NULL,
+ NOW(), 1, NOW(), 1, @demo_tenant_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_unqualified
+ WHERE inspect_type = 0 AND product_id = @raw_product_id
+ AND defective_phenomena = '鍘氬害鍋忚杽锛岃竟缂樺瓨鍦ㄥ垝浼�' AND tenant_id = @demo_tenant_id
+);
+
+INSERT INTO quality_unqualified
+ (inspect_type, inspect_state, check_time, check_name, product_id, product_name, model, unit,
+ quantity, defective_phenomena, deal_type, deal_result, deal_name, deal_time,
+ create_time, create_user, update_time, update_user, tenant_id)
+SELECT 1, 1, DATE_SUB(CURDATE(), INTERVAL 2 DAY), '璧佃川妫�', @process_product_id, '绮惧瘑杞存壙锛堟紨绀猴級',
+ 'BR-6204', '濂�', 35, '澶栧緞瓒呭樊锛屽渾搴︿笉婊¤冻瑕佹眰', 'rework', '宸茶繑宸ュ苟澶嶆鍚堟牸', '閽变富绠�', DATE_SUB(CURDATE(), INTERVAL 1 DAY),
+ NOW(), 1, NOW(), 1, @demo_tenant_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_unqualified
+ WHERE inspect_type = 1 AND product_id = @process_product_id
+ AND defective_phenomena = '澶栧緞瓒呭樊锛屽渾搴︿笉婊¤冻瑕佹眰' AND tenant_id = @demo_tenant_id
+);
+
+INSERT INTO quality_unqualified
+ (inspect_type, inspect_state, check_time, check_name, product_id, product_name, model, unit,
+ quantity, defective_phenomena, deal_type, deal_result, deal_name, deal_time,
+ create_time, create_user, update_time, update_user, tenant_id)
+SELECT 2, 1, CURDATE(), '鍛ㄨ川妫�', @final_product_id, '鎺у埗鍣ㄦ�绘垚锛堟紨绀猴級',
+ 'CTRL-A8', '鍙�', 12, '缁濈紭鐢甸樆鍋忎綆锛屽姛鑳芥祴璇曢棿姝囨�уけ鏁�', 'scrap', '纭鏃犳硶杩斾慨锛屽凡闅旂鎶ュ簾', '瀛欎富绠�', CURDATE(),
+ NOW(), 1, NOW(), 1, @demo_tenant_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_unqualified
+ WHERE inspect_type = 2 AND product_id = @final_product_id
+ AND defective_phenomena = '缁濈紭鐢甸樆鍋忎綆锛屽姛鑳芥祴璇曢棿姝囨�уけ鏁�' AND tenant_id = @demo_tenant_id
+);
+
+-- 鎵ц缁撴灉鎽樿
+SELECT @demo_tenant_id AS tenant_id,
+ (SELECT COUNT(*) FROM quality_test_standard WHERE standard_no LIKE 'QM-DEMO-%' AND tenant_id = @demo_tenant_id) AS demo_standards,
+ (SELECT COUNT(*) FROM quality_inspect WHERE check_company = '璐ㄩ噺绠$悊婕旂ず鏁版嵁' AND tenant_id = @demo_tenant_id) AS demo_inspections,
+ (SELECT COUNT(*) FROM quality_unqualified WHERE product_name LIKE '%锛堟紨绀猴級' AND tenant_id = @demo_tenant_id) AS demo_unqualified;
+
diff --git a/doc/20261029_quality_unqualified_deal_type.sql b/doc/20261029_quality_unqualified_deal_type.sql
new file mode 100644
index 0000000..20880ec
--- /dev/null
+++ b/doc/20261029_quality_unqualified_deal_type.sql
@@ -0,0 +1,51 @@
+-- 涓嶅悎鏍煎搧澶勭悊鏂瑰紡瀛楁鍙婂瓧鍏告暟鎹紙MySQL锛�
+-- 鍙噸澶嶆墽琛岋細浠呭湪瀛楁/瀛楀吀涓嶅瓨鍦ㄦ椂鍒涘缓銆�
+
+SET @deal_type_column_exists = (
+ SELECT COUNT(*)
+ FROM information_schema.COLUMNS
+ WHERE TABLE_SCHEMA = DATABASE()
+ AND TABLE_NAME = 'quality_unqualified'
+ AND COLUMN_NAME = 'deal_type'
+);
+SET @deal_type_column_sql = IF(
+ @deal_type_column_exists = 0,
+ 'ALTER TABLE quality_unqualified ADD COLUMN deal_type VARCHAR(32) NULL COMMENT ''澶勭悊鏂瑰紡锛歳ework杩斿伐銆乻crap鎶ュ簾銆乧oncession璁╂鎺ユ敹'' AFTER defective_phenomena',
+ 'SELECT 1'
+);
+PREPARE deal_type_column_stmt FROM @deal_type_column_sql;
+EXECUTE deal_type_column_stmt;
+DEALLOCATE PREPARE deal_type_column_stmt;
+
+INSERT INTO sys_dict_type (dict_name, dict_type, status, create_by, create_time, remark)
+SELECT '璐ㄩ噺澶勭悊鏂瑰紡', 'quality_deal_type', '0', 'admin', NOW(), '涓嶅悎鏍煎搧澶勭悊鏂瑰紡'
+WHERE NOT EXISTS (
+ SELECT 1 FROM sys_dict_type WHERE dict_type = 'quality_deal_type'
+);
+
+INSERT INTO sys_dict_data
+ (dict_sort, dict_label, dict_value, dict_type, css_class, list_class,
+ is_default, status, create_by, create_time, remark)
+SELECT 1, '杩斿伐', 'rework', 'quality_deal_type', '', 'warning', 'N', '0', 'admin', NOW(), '杩斿伐澶勭悊'
+WHERE NOT EXISTS (
+ SELECT 1 FROM sys_dict_data
+ WHERE dict_type = 'quality_deal_type' AND dict_value = 'rework'
+);
+
+INSERT INTO sys_dict_data
+ (dict_sort, dict_label, dict_value, dict_type, css_class, list_class,
+ is_default, status, create_by, create_time, remark)
+SELECT 2, '鎶ュ簾', 'scrap', 'quality_deal_type', '', 'danger', 'N', '0', 'admin', NOW(), '鎶ュ簾澶勭悊'
+WHERE NOT EXISTS (
+ SELECT 1 FROM sys_dict_data
+ WHERE dict_type = 'quality_deal_type' AND dict_value = 'scrap'
+);
+
+INSERT INTO sys_dict_data
+ (dict_sort, dict_label, dict_value, dict_type, css_class, list_class,
+ is_default, status, create_by, create_time, remark)
+SELECT 3, '璁╂鎺ユ敹', 'concession', 'quality_deal_type', '', 'info', 'N', '0', 'admin', NOW(), '璁╂鎺ユ敹'
+WHERE NOT EXISTS (
+ SELECT 1 FROM sys_dict_data
+ WHERE dict_type = 'quality_deal_type' AND dict_value = 'concession'
+);
diff --git a/doc/20261030_quality_demo_data_extra.sql b/doc/20261030_quality_demo_data_extra.sql
new file mode 100644
index 0000000..f1504dc
--- /dev/null
+++ b/doc/20261030_quality_demo_data_extra.sql
@@ -0,0 +1,108 @@
+-- 璐ㄩ噺绠$悊婕旂ず鏁版嵁琛ュ厖锛圡ySQL 5.7+/8.0锛屽彲閲嶅鎵ц锛�
+-- 鍦� 20261029_quality_demo_data.sql 鍩虹涓婅ˉ鍏咃細
+-- 1) 璁╂鎺ユ敹澶勭悊鏂瑰紡鐨勪笉鍚堟牸璁板綍
+-- 2) 寰呭鐞嗙姸鎬佺殑涓嶅悎鏍艰褰�
+-- 3) 鏈彁浜わ紙鑽夌锛夌殑妫�楠屽崟锛屼究浜庨獙璇佹彁浜ゆ牎楠屼笌鍒楄〃鐘舵��
+
+SET @demo_tenant_id = COALESCE(
+ (SELECT tenant_id FROM sys_user WHERE user_name = 'admin' LIMIT 1),
+ (SELECT MIN(tenant_id) FROM sys_user WHERE tenant_id IS NOT NULL),
+ 0
+);
+
+SET @raw_product_id = (
+ SELECT id FROM product WHERE product_name = '宸ヤ笟閾濇澘锛堟紨绀猴級' AND tenant_id = @demo_tenant_id ORDER BY id LIMIT 1
+);
+SET @process_product_id = (
+ SELECT id FROM product WHERE product_name = '绮惧瘑杞存壙锛堟紨绀猴級' AND tenant_id = @demo_tenant_id ORDER BY id LIMIT 1
+);
+SET @raw_standard_id = (
+ SELECT id FROM quality_test_standard WHERE standard_no = 'QM-DEMO-RAW-001' AND tenant_id = @demo_tenant_id ORDER BY id LIMIT 1
+);
+SET @process_standard_id = (
+ SELECT id FROM quality_test_standard WHERE standard_no = 'QM-DEMO-PROCESS-001' AND tenant_id = @demo_tenant_id ORDER BY id LIMIT 1
+);
+
+-- 涓�銆佷笉鍚堟牸璁板綍锛氳姝ユ帴鏀讹紙宸插鐞嗭級
+INSERT INTO quality_unqualified
+ (inspect_type, inspect_state, check_time, check_name, product_id, product_name, model, unit,
+ quantity, defective_phenomena, deal_type, deal_result, deal_name, deal_time,
+ create_time, create_user, update_time, update_user, tenant_id)
+SELECT 0, 1, DATE_SUB(CURDATE(), INTERVAL 3 DAY), '鏉庤川妫�', @raw_product_id, '宸ヤ笟閾濇澘锛堟紨绀猴級',
+ 'AL-2.0', '寮�', 15, '琛ㄩ潰杞诲井鍒掍激锛屼笉褰卞搷瑁呴厤浣跨敤', 'concession', '缁忔妧鏈瘎瀹¤姝ユ帴鏀讹紝闄愬畾鐢ㄩ��', '閽变富绠�', DATE_SUB(CURDATE(), INTERVAL 2 DAY),
+ NOW(), 1, NOW(), 1, @demo_tenant_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_unqualified
+ WHERE tenant_id = @demo_tenant_id AND defective_phenomena = '琛ㄩ潰杞诲井鍒掍激锛屼笉褰卞搷瑁呴厤浣跨敤'
+);
+
+-- 浜屻�佷笉鍚堟牸璁板綍锛氳繃绋嬫楠屽緟澶勭悊
+INSERT INTO quality_unqualified
+ (inspect_type, inspect_state, check_time, check_name, product_id, product_name, model, unit,
+ quantity, defective_phenomena, deal_type, deal_result, deal_name, deal_time,
+ create_time, create_user, update_time, update_user, tenant_id)
+SELECT 1, 0, CURDATE(), '璧佃川妫�', @process_product_id, '绮惧瘑杞存壙锛堟紨绀猴級',
+ 'BR-6204', '濂�', 20, '鍦嗗害瓒呭樊锛岄渶璇勫澶勭悊', NULL, NULL, NULL, NULL,
+ NOW(), 1, NOW(), 1, @demo_tenant_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_unqualified
+ WHERE tenant_id = @demo_tenant_id AND defective_phenomena = '鍦嗗害瓒呭樊锛岄渶璇勫澶勭悊'
+);
+
+-- 涓夈�佽崏绋挎楠屽崟锛堟湭鎻愪氦锛屽緟鍒ゅ畾锛�
+INSERT INTO quality_inspect
+ (inspect_type, check_time, supplier, customer, process, check_name, product_id, product_name,
+ model, unit, quantity, check_company, check_result, create_time, create_user, update_time,
+ update_user, tenant_id, inspect_state, defective_phenomena, test_standard_id)
+SELECT 0, CURDATE(), '鍗庝笢閲戝睘鏉愭枡鏈夐檺鍏徃', NULL, NULL, '寮犺川妫�',
+ @raw_product_id, '宸ヤ笟閾濇澘锛堟紨绀猴級', 'AL-2.0', '寮�', 50, '璐ㄩ噺绠$悊婕旂ず鏁版嵁-鑽夌', NULL,
+ NOW(), 1, NOW(), 1, @demo_tenant_id, 0, NULL, @raw_standard_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_inspect
+ WHERE tenant_id = @demo_tenant_id AND check_company = '璐ㄩ噺绠$悊婕旂ず鏁版嵁-鑽夌' AND inspect_type = 0
+);
+
+INSERT INTO quality_inspect
+ (inspect_type, check_time, supplier, customer, process, check_name, product_id, product_name,
+ model, unit, quantity, check_company, check_result, create_time, create_user, update_time,
+ update_user, tenant_id, inspect_state, defective_phenomena, test_standard_id)
+SELECT 1, CURDATE(), NULL, '鍐呴儴鐢熶骇', '绮惧姞宸ワ紙婕旂ず锛�', '鐜嬭川妫�',
+ @process_product_id, '绮惧瘑杞存壙锛堟紨绀猴級', 'BR-6204', '濂�', 100, '璐ㄩ噺绠$悊婕旂ず鏁版嵁-鑽夌', NULL,
+ NOW(), 1, NOW(), 1, @demo_tenant_id, 0, NULL, @process_standard_id
+WHERE NOT EXISTS (
+ SELECT 1 FROM quality_inspect
+ WHERE tenant_id = @demo_tenant_id AND check_company = '璐ㄩ噺绠$悊婕旂ず鏁版嵁-鑽夌' AND inspect_type = 1
+);
+
+SET @raw_draft_id = (
+ SELECT id FROM quality_inspect
+ WHERE tenant_id = @demo_tenant_id AND check_company = '璐ㄩ噺绠$悊婕旂ず鏁版嵁-鑽夌' AND inspect_type = 0 ORDER BY id LIMIT 1
+);
+SET @process_draft_id = (
+ SELECT id FROM quality_inspect
+ WHERE tenant_id = @demo_tenant_id AND check_company = '璐ㄩ噺绠$悊婕旂ず鏁版嵁-鑽夌' AND inspect_type = 1 ORDER BY id LIMIT 1
+);
+
+-- 鍥涖�佽崏绋挎楠屽崟鐨勬楠岄」鐩紙妫�楠屽�肩暀绌猴紝鐢ㄤ簬楠岃瘉鎻愪氦鍓嶆牎楠岋級
+INSERT INTO quality_inspect_param
+ (parameter_item, unit, standard_value, control_value, test_value, inspect_id,
+ create_time, create_user, update_time, update_user, tenant_id)
+SELECT d.parameter_item, d.unit, d.standard_value, d.control_value, NULL, d.inspect_id,
+ NOW(), 1, NOW(), 1, @demo_tenant_id
+FROM (
+ SELECT '鍘氬害' parameter_item, 'mm' unit, '2.00卤0.10' standard_value, '1.95~2.05' control_value, @raw_draft_id inspect_id
+ UNION ALL SELECT '琛ㄩ潰璐ㄩ噺', '/', '鏃犲垝浼ゃ�佹棤姘у寲鏂�', '鏃犲彲瑙佺己闄�', @raw_draft_id
+ UNION ALL SELECT '澶栧緞', 'mm', '20.00卤0.05', '19.98~20.02', @process_draft_id
+ UNION ALL SELECT '鍦嗗害', 'mm', '鈮�0.02', '鈮�0.015', @process_draft_id
+) d
+WHERE d.inspect_id IS NOT NULL
+ AND NOT EXISTS (
+ SELECT 1 FROM quality_inspect_param p
+ WHERE p.inspect_id = d.inspect_id AND p.parameter_item = d.parameter_item
+ );
+
+-- 缁撴灉鎽樿
+SELECT @demo_tenant_id AS tenant_id,
+ (SELECT COUNT(*) FROM quality_inspect WHERE tenant_id = @demo_tenant_id AND check_company LIKE '璐ㄩ噺绠$悊婕旂ず鏁版嵁%') AS inspections,
+ (SELECT COUNT(*) FROM quality_unqualified WHERE tenant_id = @demo_tenant_id) AS unqualified,
+ (SELECT COUNT(*) FROM quality_unqualified WHERE tenant_id = @demo_tenant_id AND deal_type = 'concession') AS concession_count;
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index 67d8bba..a2f692b 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -209,20 +209,15 @@
qualityInspect.setProductMainId(productionProductMain.getId());
qualityInspect.setProductModelId(productModel.getId());
qualityInspectMapper.insert(qualityInspect);
- List<QualityTestStandardBinding> qualityTestStandardBindings = qualityTestStandardBindingMapper.selectList(
- new LambdaQueryWrapper<QualityTestStandardBinding>()
- .eq(QualityTestStandardBinding::getProductId, product.getId()));
- if (qualityTestStandardBindings.size()>0){
- qualityTestStandardParamMapper.selectList(Wrappers.<QualityTestStandardParam>lambdaQuery()
- .eq(QualityTestStandardParam::getTestStandardId,qualityTestStandardBindings.get(0).getTestStandardId()))
- .forEach(qualityTestStandardParam -> {
+ qualityTestStandardParamMapper.selectListByProductId(
+ product.getId(), inspectType, inspectType == 1 ? productProcess.getName() : null)
+ .forEach(qualityTestStandardParam -> {
QualityInspectParam param = new QualityInspectParam();
BeanUtils.copyProperties(qualityTestStandardParam, param);
param.setId(null);
param.setInspectId(qualityInspect.getId());
qualityInspectParamMapper.insert(param);
});
- }
/*鏇存柊宸ュ崟鍜岀敓浜ц鍗�*/
ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(dto.getWorkOrderId());
productWorkOrder.setCompleteQuantity(productWorkOrder.getCompleteQuantity().add(dto.getQuantity()));
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index 3c6c2f6..c9d254f 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -229,20 +229,14 @@
qualityInspect.setUnit(saleProduct.getUnit());
qualityInspect.setQuantity(saleProduct.getQuantity());
qualityInspectMapper.insert(qualityInspect);
- List<QualityTestStandardBinding> qualityTestStandardBindings = qualityTestStandardBindingMapper.selectList(
- new LambdaQueryWrapper<QualityTestStandardBinding>()
- .eq(QualityTestStandardBinding::getProductId, saleProduct.getProductId()));
- if (qualityTestStandardBindings.size()>0){
- qualityTestStandardParamMapper.selectList(Wrappers.<QualityTestStandardParam>lambdaQuery()
- .eq(QualityTestStandardParam::getTestStandardId,qualityTestStandardBindings.get(0).getTestStandardId()))
- .forEach(qualityTestStandardParam -> {
- QualityInspectParam param = new QualityInspectParam();
- com.ruoyi.common.utils.bean.BeanUtils.copyProperties(qualityTestStandardParam, param);
- param.setId(null);
- param.setInspectId(qualityInspect.getId());
- qualityInspectParamMapper.insert(param);
- });
- }
+ qualityTestStandardParamMapper.selectListByProductId(saleProduct.getProductId(), 0, null)
+ .forEach(qualityTestStandardParam -> {
+ QualityInspectParam param = new QualityInspectParam();
+ com.ruoyi.common.utils.bean.BeanUtils.copyProperties(qualityTestStandardParam, param);
+ param.setId(null);
+ param.setInspectId(qualityInspect.getId());
+ qualityInspectParamMapper.insert(param);
+ });
}
private void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, Integer type) {
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
index 1555082..1702c2a 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
@@ -15,6 +15,7 @@
import com.ruoyi.quality.service.IQualityInspectParamService;
import com.ruoyi.quality.service.IQualityInspectService;
import com.ruoyi.quality.service.IQualityUnqualifiedService;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -49,6 +50,10 @@
*/
@PostMapping("/add")
public AjaxResult add(@RequestBody QualityInspectDto qualityInspectDto) {
+ String validationMessage = validateInspect(qualityInspectDto, false);
+ if (validationMessage != null) {
+ return AjaxResult.error(validationMessage);
+ }
return AjaxResult.success(qualityInspectService.add(qualityInspectDto));
}
@@ -91,6 +96,17 @@
*/
@PostMapping("/update")
public AjaxResult update(@RequestBody QualityInspectDto qualityInspectDto) {
+ String validationMessage = validateInspect(qualityInspectDto, true);
+ if (validationMessage != null) {
+ return AjaxResult.error(validationMessage);
+ }
+ QualityInspect stored = qualityInspectService.getById(qualityInspectDto.getId());
+ if (stored == null) {
+ return AjaxResult.error("妫�楠岃褰曚笉瀛樺湪");
+ }
+ if (Integer.valueOf(1).equals(stored.getInspectState())) {
+ return AjaxResult.error("宸叉彁浜ょ殑妫�楠岃褰曚笉鑳戒慨鏀�");
+ }
return AjaxResult.success(qualityInspectService.updateQualityInspect(qualityInspectDto));
}
@@ -134,4 +150,43 @@
public void down(HttpServletResponse response,@RequestBody QualityInspect qualityInspect) {
qualityInspectService.down(response, qualityInspect);
}
+
+ private String validateInspect(QualityInspectDto inspect, boolean requireId) {
+ if (inspect == null) {
+ return "妫�楠屾暟鎹笉鑳戒负绌�";
+ }
+ if (requireId && inspect.getId() == null) {
+ return "妫�楠岃褰旾D涓嶈兘涓虹┖";
+ }
+ if (inspect.getInspectType() == null || inspect.getInspectType() < 0 || inspect.getInspectType() > 2) {
+ return "妫�楠岀被鍒笉姝g‘";
+ }
+ if (inspect.getProductId() == null) {
+ return "璇烽�夋嫨浜у搧";
+ }
+ if (inspect.getCheckTime() == null) {
+ return "璇烽�夋嫨妫�娴嬫棩鏈�";
+ }
+ if (inspect.getQuantity() == null || inspect.getQuantity().signum() <= 0) {
+ return "妫�楠屾暟閲忓繀椤诲ぇ浜�0";
+ }
+ if (!"鍚堟牸".equals(inspect.getCheckResult()) && !"涓嶅悎鏍�".equals(inspect.getCheckResult())) {
+ return "璇烽�夋嫨鏈夋晥鐨勬娴嬬粨鏋�";
+ }
+ if (inspect.getInspectType() == 1 && StringUtils.isBlank(inspect.getProcess())) {
+ return "杩囩▼妫�楠屽繀椤婚�夋嫨宸ュ簭";
+ }
+ if (CollectionUtils.isEmpty(inspect.getQualityInspectParams())) {
+ return "褰撳墠浜у搧鏈厤缃楠屾寚鏍囷紝璇峰厛缁存姢鎸囨爣";
+ }
+ for (QualityInspectParam parameter : inspect.getQualityInspectParams()) {
+ if (StringUtils.isBlank(parameter.getParameterItem())) {
+ return "妫�楠岄」鐩笉鑳戒负绌�";
+ }
+ if (StringUtils.isBlank(parameter.getTestValue())) {
+ return "璇峰~鍐欌��" + parameter.getParameterItem() + "鈥濈殑妫�楠屽��";
+ }
+ }
+ return null;
+ }
}
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityMetricController.java b/src/main/java/com/ruoyi/quality/controller/QualityMetricController.java
new file mode 100644
index 0000000..18b5a28
--- /dev/null
+++ b/src/main/java/com/ruoyi/quality/controller/QualityMetricController.java
@@ -0,0 +1,294 @@
+package com.ruoyi.quality.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.quality.dto.QualityMetricBindingDto;
+import com.ruoyi.quality.dto.QualityMetricDto;
+import com.ruoyi.quality.mapper.QualityTestStandardBindingMapper;
+import com.ruoyi.quality.mapper.QualityTestStandardParamMapper;
+import com.ruoyi.quality.pojo.QualityTestStandard;
+import com.ruoyi.quality.pojo.QualityTestStandardBinding;
+import com.ruoyi.quality.pojo.QualityTestStandardParam;
+import com.ruoyi.quality.service.IQualityTestStandardService;
+import com.ruoyi.quality.service.QualityTestStandardBindingService;
+import com.ruoyi.quality.service.QualityTestStandardParamService;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 鎸変骇鍝佺淮鎶ゆ娴嬫寚鏍囥��
+ *
+ * 鍓嶇鐨勨�滄寚鏍囩淮鎶も�濋〉闈互浜у搧涓哄叆鍙o紝鏈帴鍙e皢浜у搧銆佹娴嬫爣鍑嗕笌鏍囧噯鍙傛暟鐨�
+ * 涓夊眰鏁版嵁缁撴瀯灏佽涓洪〉闈㈡墍闇�鐨勫崟灞傛寚鏍囨搷浣滐紝骞舵寜妫�楠岀被鍒�/宸ュ簭闅旂鎸囨爣姹犮��
+ */
+@RestController
+@RequestMapping("/quality/qualityMetric")
+@RequiredArgsConstructor
+public class QualityMetricController {
+
+ private static final int INSPECT_TYPE_PROCESS = 1;
+
+ private final QualityTestStandardParamMapper qualityTestStandardParamMapper;
+ private final QualityTestStandardParamService qualityTestStandardParamService;
+ private final QualityTestStandardBindingService qualityTestStandardBindingService;
+ private final IQualityTestStandardService qualityTestStandardService;
+ private final QualityTestStandardBindingMapper qualityTestStandardBindingMapper;
+
+ @GetMapping("/listPage")
+ public AjaxResult listPage(Page<QualityTestStandardParam> page,
+ @RequestParam("productId") Long productId,
+ @RequestParam(value = "inspectType", required = false) Integer inspectType,
+ @RequestParam(value = "processId", required = false) Long processId) {
+ IPage<QualityTestStandardParam> result = qualityTestStandardParamMapper
+ .selectPageByProductId(page, productId, inspectType, processId);
+ return AjaxResult.success(result);
+ }
+
+ @GetMapping("/product/{productId}")
+ public AjaxResult listByProduct(@PathVariable("productId") Long productId,
+ @RequestParam(value = "inspectType", required = false) Integer inspectType,
+ @RequestParam(value = "process", required = false) String process) {
+ return AjaxResult.success(qualityTestStandardParamMapper
+ .selectListByProductId(productId, inspectType, process));
+ }
+
+ @PostMapping("/add")
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult add(@RequestBody QualityMetricDto metric) {
+ normalizeInspectType(metric);
+ String validationMessage = validateMetric(metric, true);
+ if (validationMessage != null) {
+ return AjaxResult.error(validationMessage);
+ }
+
+ Long testStandardId = getOrCreateTestStandard(metric.getProductId(),
+ metric.getInspectType(), metric.getProcessId());
+ QualityTestStandardParam parameter = copyEditableFields(metric, new QualityTestStandardParam());
+ parameter.setTestStandardId(testStandardId);
+ if (!qualityTestStandardParamService.save(parameter)) {
+ throw new ServiceException("淇濆瓨妫�娴嬫寚鏍囧け璐�");
+ }
+ return AjaxResult.success(true);
+ }
+
+ @PostMapping("/update")
+ public AjaxResult update(@RequestBody QualityMetricDto metric) {
+ String validationMessage = validateMetric(metric, false);
+ if (validationMessage != null) {
+ return AjaxResult.error(validationMessage);
+ }
+ if (metric.getId() == null) {
+ return AjaxResult.error("鎸囨爣ID涓嶈兘涓虹┖");
+ }
+
+ QualityTestStandardParam parameter = qualityTestStandardParamService.getById(metric.getId());
+ if (parameter == null) {
+ return AjaxResult.error("妫�娴嬫寚鏍囦笉瀛樺湪");
+ }
+ copyEditableFields(metric, parameter);
+ if (!qualityTestStandardParamService.updateById(parameter)) {
+ throw new ServiceException("淇敼妫�娴嬫寚鏍囧け璐�");
+ }
+ return AjaxResult.success(true);
+ }
+
+ @DeleteMapping("/del")
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) {
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ }
+ if (!qualityTestStandardParamService.removeBatchByIds(ids)) {
+ throw new ServiceException("鍒犻櫎妫�娴嬫寚鏍囧け璐�");
+ }
+ return AjaxResult.success(true);
+ }
+
+ @PostMapping("/export")
+ public void export(HttpServletResponse response,
+ @RequestParam("productId") Long productId,
+ @RequestParam(value = "inspectType", required = false) Integer inspectType,
+ @RequestParam(value = "process", required = false) String process) {
+ List<QualityTestStandardParam> list = qualityTestStandardParamMapper
+ .selectListByProductId(productId, inspectType, process);
+ ExcelUtil<QualityTestStandardParam> util = new ExcelUtil<>(QualityTestStandardParam.class);
+ util.exportExcel(response, list, "妫�娴嬫寚鏍�");
+ }
+
+ /**
+ * 鏌ヨ鍏ㄩ儴妫�娴嬫爣鍑嗭紝渚涒�滄寚鏍囩粦瀹氣�濋〉闈㈤�夋嫨銆�
+ */
+ @GetMapping("/standardList")
+ public AjaxResult standardList() {
+ return AjaxResult.success(qualityTestStandardService.list(
+ Wrappers.<QualityTestStandard>lambdaQuery()
+ .orderByDesc(QualityTestStandard::getId)));
+ }
+
+ /**
+ * 鏌ヨ浜у搧宸茬粦瀹氱殑妫�娴嬫爣鍑嗐��
+ */
+ @GetMapping("/bindingList")
+ public AjaxResult bindingList(@RequestParam("productId") Long productId) {
+ return AjaxResult.success(qualityTestStandardBindingMapper.selectBindingByProductId(productId));
+ }
+
+ /**
+ * 缁戝畾浜у搧涓庢娴嬫爣鍑嗐��
+ */
+ @PostMapping("/binding")
+ public AjaxResult bind(@RequestBody QualityMetricBindingDto binding) {
+ if (binding.getProductId() == null) {
+ return AjaxResult.error("璇峰厛閫夋嫨浜у搧");
+ }
+ if (binding.getTestStandardId() == null) {
+ return AjaxResult.error("璇烽�夋嫨妫�娴嬫爣鍑�");
+ }
+ long exists = qualityTestStandardBindingService.count(
+ Wrappers.<QualityTestStandardBinding>lambdaQuery()
+ .eq(QualityTestStandardBinding::getProductId, binding.getProductId())
+ .eq(QualityTestStandardBinding::getTestStandardId, binding.getTestStandardId()));
+ if (exists > 0) {
+ return AjaxResult.error("璇ユ爣鍑嗗凡缁戝畾鍒版浜у搧");
+ }
+ QualityTestStandardBinding entity = new QualityTestStandardBinding();
+ entity.setProductId(binding.getProductId());
+ entity.setTestStandardId(binding.getTestStandardId());
+ if (!qualityTestStandardBindingService.save(entity)) {
+ throw new ServiceException("缁戝畾妫�娴嬫爣鍑嗗け璐�");
+ }
+ return AjaxResult.success(true);
+ }
+
+ /**
+ * 瑙i櫎浜у搧涓庢娴嬫爣鍑嗙殑缁戝畾銆�
+ */
+ @DeleteMapping("/binding")
+ public AjaxResult unbind(@RequestBody List<Integer> ids) {
+ if (CollectionUtils.isEmpty(ids)) {
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ }
+ if (!qualityTestStandardBindingService.removeBatchByIds(ids)) {
+ throw new ServiceException("瑙i櫎缁戝畾澶辫触");
+ }
+ return AjaxResult.success(true);
+ }
+
+ private void normalizeInspectType(QualityMetricDto metric) {
+ if (metric != null && metric.getInspectType() == null) {
+ metric.setInspectType(0);
+ }
+ }
+
+ /**
+ * 鏌ユ壘鎴栧垱寤轰笌鈥滀骇鍝� + 妫�楠岀被鍒� + 宸ュ簭鈥濆尮閰嶇殑妫�娴嬫爣鍑嗭紝骞跺缓绔嬩骇鍝佺粦瀹氥��
+ */
+ private Long getOrCreateTestStandard(Long productId, Integer inspectType, Long processId) {
+ int type = inspectType == null ? 0 : inspectType;
+ List<QualityTestStandardBinding> bindings = qualityTestStandardBindingService.list(
+ Wrappers.<QualityTestStandardBinding>lambdaQuery()
+ .eq(QualityTestStandardBinding::getProductId, productId)
+ .orderByAsc(QualityTestStandardBinding::getId));
+ if (!bindings.isEmpty()) {
+ List<Integer> standardIds = bindings.stream()
+ .map(QualityTestStandardBinding::getTestStandardId)
+ .collect(Collectors.toList());
+ com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<QualityTestStandard> wrapper =
+ Wrappers.<QualityTestStandard>lambdaQuery()
+ .in(QualityTestStandard::getId, standardIds)
+ .eq(QualityTestStandard::getInspectType, type);
+ // 浠呰繃绋嬫楠屾寜宸ュ簭鍖哄垎鏍囧噯锛屽師鏉愭枡/鍑哄巶妫�楠屽拷鐣ュ伐搴�
+ if (type == INSPECT_TYPE_PROCESS && processId != null) {
+ wrapper.eq(QualityTestStandard::getProcessId, processId.intValue());
+ }
+ QualityTestStandard matched = qualityTestStandardService.getOne(
+ wrapper.orderByAsc(QualityTestStandard::getId).last("limit 1"));
+ if (matched != null) {
+ return matched.getId();
+ }
+ }
+
+ QualityTestStandard standard = new QualityTestStandard();
+ String suffix = inspectTypeSuffix(type) + (processId == null ? "" : "-" + processId);
+ standard.setStandardNo("AUTO-" + productId + "-" + suffix);
+ standard.setStandardName("浜у搧妫�娴嬫寚鏍�-" + productId + "-" + suffix);
+ standard.setState("1");
+ standard.setInspectType(type);
+ if (processId != null) {
+ standard.setProcessId(processId.intValue());
+ }
+ if (!qualityTestStandardService.save(standard) || standard.getId() == null) {
+ throw new ServiceException("鍒涘缓浜у搧妫�娴嬫爣鍑嗗け璐�");
+ }
+
+ QualityTestStandardBinding binding = new QualityTestStandardBinding();
+ binding.setProductId(productId);
+ binding.setTestStandardId(Math.toIntExact(standard.getId()));
+ if (!qualityTestStandardBindingService.save(binding)) {
+ throw new ServiceException("寤虹珛浜у搧涓庢娴嬫爣鍑嗗叧鑱斿け璐�");
+ }
+ return standard.getId();
+ }
+
+ private String inspectTypeSuffix(int inspectType) {
+ switch (inspectType) {
+ case 1:
+ return "PROCESS";
+ case 2:
+ return "FINAL";
+ default:
+ return "RAW";
+ }
+ }
+
+ private String validateMetric(QualityMetricDto metric, boolean requireProduct) {
+ if (metric == null) {
+ return "鎸囨爣鏁版嵁涓嶈兘涓虹┖";
+ }
+ if (requireProduct && metric.getProductId() == null) {
+ return "璇峰厛閫夋嫨浜у搧";
+ }
+ if (metric.getInspectType() != null
+ && metric.getInspectType() == INSPECT_TYPE_PROCESS
+ && metric.getProcessId() == null) {
+ return "杩囩▼妫�楠岃鍏堥�夋嫨宸ュ簭";
+ }
+ if (StringUtils.isBlank(metric.getParameterItem())) {
+ return "鎸囨爣鍚嶇О涓嶈兘涓虹┖";
+ }
+ if (StringUtils.isBlank(metric.getUnit())) {
+ return "鍗曚綅涓嶈兘涓虹┖";
+ }
+ if (StringUtils.isBlank(metric.getStandardValue())) {
+ return "鏍囧噯鍊间笉鑳戒负绌�";
+ }
+ return null;
+ }
+
+ private QualityTestStandardParam copyEditableFields(QualityMetricDto source,
+ QualityTestStandardParam target) {
+ target.setParameterItem(source.getParameterItem());
+ target.setUnit(source.getUnit());
+ target.setStandardValue(source.getStandardValue());
+ target.setControlValue(source.getControlValue());
+ target.setDefaultValue(source.getDefaultValue());
+ return target;
+ }
+}
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
index 7a42873..32933af 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
@@ -2,9 +2,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.quality.pojo.QualityUnqualified;
import com.ruoyi.quality.service.IQualityUnqualifiedService;
import org.springframework.util.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -29,7 +31,17 @@
*/
@PostMapping("/add")
public AjaxResult add(@RequestBody QualityUnqualified qualityUnqualified) {
- return AjaxResult.success(qualityUnqualifiedService.save(qualityUnqualified));
+ if (qualityUnqualified != null && qualityUnqualified.getInspectState() == null) {
+ qualityUnqualified.setInspectState(0);
+ }
+ String validationMessage = validateUnqualified(qualityUnqualified, false);
+ if (validationMessage != null) {
+ return AjaxResult.error(validationMessage);
+ }
+ if (!qualityUnqualifiedService.save(qualityUnqualified)) {
+ throw new ServiceException("鏂板涓嶅悎鏍艰褰曞け璐�");
+ }
+ return AjaxResult.success(true);
}
/**
@@ -62,7 +74,17 @@
*/
@PostMapping("/update")
public AjaxResult update(@RequestBody QualityUnqualified qualityUnqualified) {
- return AjaxResult.success(qualityUnqualifiedService.updateById(qualityUnqualified));
+ String validationMessage = validateUnqualified(qualityUnqualified, true);
+ if (validationMessage != null) {
+ return AjaxResult.error(validationMessage);
+ }
+ if (qualityUnqualifiedService.getById(qualityUnqualified.getId()) == null) {
+ return AjaxResult.error("涓嶅悎鏍艰褰曚笉瀛樺湪");
+ }
+ if (!qualityUnqualifiedService.updateById(qualityUnqualified)) {
+ throw new ServiceException("淇敼涓嶅悎鏍艰褰曞け璐�");
+ }
+ return AjaxResult.success(true);
}
/**
@@ -86,5 +108,45 @@
qualityUnqualifiedService.qualityUnqualifiedExport(response, qualityUnqualified);
}
+ private String validateUnqualified(QualityUnqualified record, boolean requireId) {
+ if (record == null) {
+ return "涓嶅悎鏍兼暟鎹笉鑳戒负绌�";
+ }
+ if (requireId && record.getId() == null) {
+ return "涓嶅悎鏍艰褰旾D涓嶈兘涓虹┖";
+ }
+ if (record.getInspectType() == null || record.getInspectType() < 0 || record.getInspectType() > 2) {
+ return "妫�楠岀被鍒笉姝g‘";
+ }
+ if (record.getInspectState() == null
+ || (record.getInspectState() != 0 && record.getInspectState() != 1)) {
+ return "澶勭悊鐘舵�佷笉姝g‘";
+ }
+ if (record.getProductId() == null) {
+ return "璇烽�夋嫨浜у搧";
+ }
+ if (record.getQuantity() == null || record.getQuantity().signum() <= 0) {
+ return "涓嶅悎鏍兼暟閲忓繀椤诲ぇ浜�0";
+ }
+ if (StringUtils.isBlank(record.getDefectivePhenomena())) {
+ return "璇峰~鍐欎笉鍚堟牸鍘熷洜鎴栫幇璞�";
+ }
+ if (Integer.valueOf(1).equals(record.getInspectState())) {
+ if (StringUtils.isBlank(record.getDealType())) {
+ return "璇烽�夋嫨澶勭悊鏂瑰紡";
+ }
+ if (StringUtils.isBlank(record.getDealResult())) {
+ return "璇峰~鍐欏鐞嗙粨鏋�";
+ }
+ if (StringUtils.isBlank(record.getDealName())) {
+ return "璇峰~鍐欏鐞嗕汉";
+ }
+ if (record.getDealTime() == null) {
+ return "璇烽�夋嫨澶勭悊鏃ユ湡";
+ }
+ }
+ return null;
+ }
+
}
diff --git a/src/main/java/com/ruoyi/quality/dto/QualityMetricBindingDto.java b/src/main/java/com/ruoyi/quality/dto/QualityMetricBindingDto.java
new file mode 100644
index 0000000..32ac66a
--- /dev/null
+++ b/src/main/java/com/ruoyi/quality/dto/QualityMetricBindingDto.java
@@ -0,0 +1,41 @@
+package com.ruoyi.quality.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 鎸囨爣缁戝畾鍒楄〃灞曠ず瀵硅薄锛氫骇鍝佷笌妫�娴嬫爣鍑嗙殑鍏宠仈淇℃伅銆�
+ */
+@Data
+public class QualityMetricBindingDto implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /** 缁戝畾鍏崇郴ID */
+ private Integer id;
+
+ /** 浜у搧ID */
+ private Long productId;
+
+ /** 妫�娴嬫爣鍑咺D */
+ private Integer testStandardId;
+
+ /** 鏍囧噯缂栧彿 */
+ private String standardNo;
+
+ /** 鏍囧噯鍚嶇О */
+ private String standardName;
+
+ /** 妫�楠岀被鍒�(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�) */
+ private Integer inspectType;
+
+ /** 宸ュ簭ID */
+ private Integer processId;
+
+ /** 宸ュ簭鍚嶇О */
+ private String processName;
+
+ /** 鐘舵�� */
+ private String state;
+}
diff --git a/src/main/java/com/ruoyi/quality/dto/QualityMetricDto.java b/src/main/java/com/ruoyi/quality/dto/QualityMetricDto.java
new file mode 100644
index 0000000..b1720aa
--- /dev/null
+++ b/src/main/java/com/ruoyi/quality/dto/QualityMetricDto.java
@@ -0,0 +1,24 @@
+package com.ruoyi.quality.dto;
+
+import com.ruoyi.quality.pojo.QualityTestStandardParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 鎸変骇鍝佺淮鎶ゆ娴嬫寚鏍囩殑鍓嶇浜や簰瀵硅薄銆�
+ */
+@Data
+public class QualityMetricDto extends QualityTestStandardParam implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /** 鎸囨爣鎵�灞炰骇鍝両D */
+ private Long productId;
+
+ /** 妫�楠岀被鍒�(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�) */
+ private Integer inspectType;
+
+ /** 宸ュ簭ID(杩囩▼妫�楠屾椂浣跨敤) */
+ private Long processId;
+}
diff --git a/src/main/java/com/ruoyi/quality/mapper/QualityTestStandardBindingMapper.java b/src/main/java/com/ruoyi/quality/mapper/QualityTestStandardBindingMapper.java
index 6754c4c..06dd862 100644
--- a/src/main/java/com/ruoyi/quality/mapper/QualityTestStandardBindingMapper.java
+++ b/src/main/java/com/ruoyi/quality/mapper/QualityTestStandardBindingMapper.java
@@ -1,5 +1,6 @@
package com.ruoyi.quality.mapper;
+import com.ruoyi.quality.dto.QualityMetricBindingDto;
import com.ruoyi.quality.dto.QualityTestStandardBindingDto;
import com.ruoyi.quality.pojo.QualityTestStandardBinding;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -20,4 +21,6 @@
public interface QualityTestStandardBindingMapper extends BaseMapper<QualityTestStandardBinding> {
List<QualityTestStandardBindingDto> listBinding(@Param("testStandardId") Long testStandardId);
+
+ List<QualityMetricBindingDto> selectBindingByProductId(@Param("productId") Long productId);
}
diff --git a/src/main/java/com/ruoyi/quality/mapper/QualityTestStandardParamMapper.java b/src/main/java/com/ruoyi/quality/mapper/QualityTestStandardParamMapper.java
index 2823c49..5fbc165 100644
--- a/src/main/java/com/ruoyi/quality/mapper/QualityTestStandardParamMapper.java
+++ b/src/main/java/com/ruoyi/quality/mapper/QualityTestStandardParamMapper.java
@@ -1,5 +1,7 @@
package com.ruoyi.quality.mapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@@ -19,5 +21,12 @@
@Mapper
public interface QualityTestStandardParamMapper extends BaseMapper<QualityTestStandardParam> {
- List<QualityTestStandardParam> selectListByProductId(@Param("productId") Long productId);
+ List<QualityTestStandardParam> selectListByProductId(@Param("productId") Long productId,
+ @Param("inspectType") Integer inspectType,
+ @Param("process") String process);
+
+ IPage<QualityTestStandardParam> selectPageByProductId(Page<QualityTestStandardParam> page,
+ @Param("productId") Long productId,
+ @Param("inspectType") Integer inspectType,
+ @Param("processId") Long processId);
}
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
index 5636c2f..bbb9f29 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
@@ -93,6 +93,12 @@
private String defectivePhenomena;
/**
+ * 澶勭悊鏂瑰紡(瀛楀吀 quality_deal_type锛氳繑宸�/鎶ュ簾/璁╂鎺ユ敹绛�)
+ */
+ @Excel(name = "澶勭悊鏂瑰紡", readConverterExp = "rework=杩斿伐,scrap=鎶ュ簾,concession=璁╂鎺ユ敹")
+ private String dealType;
+
+ /**
* 澶勭悊缁撴灉
*/
@Excel(name = "澶勭悊缁撴灉")
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
index 48b055b..e8bfb84 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -9,6 +9,7 @@
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -29,6 +30,7 @@
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -66,17 +68,25 @@
QualityInspect qualityInspect = new QualityInspect();
BeanUtils.copyProperties(qualityInspectDto,qualityInspect);
qualityInspect.setInspectState(0);//榛樿鏈彁浜�
- qualityInspectMapper.insert(qualityInspect);
+ int inserted = qualityInspectMapper.insert(qualityInspect);
+ if (inserted <= 0 || qualityInspect.getId() == null) {
+ throw new ServiceException("鏂板妫�楠岃褰曞け璐�");
+ }
for (QualityInspectParam qualityInspectParam : qualityInspectDto.getQualityInspectParams()) {
qualityInspectParam.setInspectId(qualityInspect.getId());
}
- qualityInspectParamService.saveBatch(qualityInspectDto.getQualityInspectParams());
- return 0;
+ if (!qualityInspectParamService.saveBatch(qualityInspectDto.getQualityInspectParams())) {
+ throw new ServiceException("淇濆瓨妫�楠岄」鐩け璐�");
+ }
+ return inserted;
}
@Override
public QualityInspectDto getDetailById(Integer id) {
QualityInspect qualityInspect = qualityInspectMapper.selectById(id);
+ if (qualityInspect == null) {
+ throw new ServiceException("妫�楠岃褰曚笉瀛樺湪");
+ }
List<QualityInspectParam> qualityInspectParams = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, id));
QualityInspectDto qualityInspectDto = new QualityInspectDto();
BeanUtils.copyProperties(qualityInspect,qualityInspectDto);
@@ -87,13 +97,36 @@
//鎻愪氦
@Override
public int submit(QualityInspect inspect) {
+ if (inspect == null || inspect.getId() == null) {
+ throw new ServiceException("妫�楠岃褰旾D涓嶈兘涓虹┖");
+ }
QualityInspect qualityInspect = qualityInspectMapper.selectById(inspect.getId());
+ if (qualityInspect == null) {
+ throw new ServiceException("妫�楠岃褰曚笉瀛樺湪");
+ }
+ if (Integer.valueOf(1).equals(qualityInspect.getInspectState())) {
+ throw new ServiceException("妫�楠岃褰曞凡鎻愪氦锛岃鍕块噸澶嶆搷浣�");
+ }
+ if (!"鍚堟牸".equals(qualityInspect.getCheckResult())
+ && !"涓嶅悎鏍�".equals(qualityInspect.getCheckResult())) {
+ throw new ServiceException("璇峰厛瀹屾垚妫�楠岀粨鏋滃垽瀹�");
+ }
+ List<QualityInspectParam> inspectParams = qualityInspectParamService.list(
+ Wrappers.<QualityInspectParam>lambdaQuery()
+ .eq(QualityInspectParam::getInspectId, inspect.getId()));
+ if (inspectParams.isEmpty()) {
+ throw new ServiceException("妫�楠岄」鐩负绌猴紝涓嶈兘鎻愪氦");
+ }
+ for (QualityInspectParam parameter : inspectParams) {
+ if (StringUtils.isBlank(parameter.getTestValue())) {
+ throw new ServiceException("妫�楠岄」鐩��" + parameter.getParameterItem() + "鈥濆皻鏈~鍐欐楠屽��");
+ }
+ }
/*鍒ゆ柇涓嶅悎鏍�*/
if (ObjectUtils.isNotNull(qualityInspect.getCheckResult()) && qualityInspect.getCheckResult().equals("涓嶅悎鏍�")){
QualityUnqualified qualityUnqualified = new QualityUnqualified();
BeanUtils.copyProperties(qualityInspect,qualityUnqualified);
qualityUnqualified.setInspectState(0);//寰呭鐞�
- List<QualityInspectParam> inspectParams = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, inspect.getId()));
String text = inspectParams.stream().map(QualityInspectParam::getParameterItem).collect(Collectors.joining(","));
qualityUnqualified.setDefectivePhenomena(text+"杩欎簺鎸囨爣涓瓨鍦ㄤ笉鍚堟牸");//涓嶅悎鏍肩幇璞�
qualityUnqualifiedMapper.insert(qualityUnqualified);
@@ -101,79 +134,83 @@
LoginUser loginUser = SecurityUtils.getLoginUser();
if (qualityInspect.getInspectType() == 0) {
- if ("鍚堟牸".equals(qualityInspect.getCheckResult())) {
- ProcurementAddDto procurementRecordOutAdd = new ProcurementAddDto();
- procurementRecordOutAdd.setType(1);
- procurementRecordOutAdd.setTypeName("閲囪喘鍘熸潗鏂欐楠屽悎鏍煎叆搴�");
- procurementRecordOutAdd.setNickName(loginUser.getNickName());
- procurementRecordOutAdd.setPurchaseLedgerId(Math.toIntExact(qualityInspect.getPurchaseLedgerId()));
- if (qualityInspect.getPurchaseLedgerId() == null) {
- throw new BaseException("璇烽�夋嫨閲囪喘鍗�");
- }
+ // 鍚堟牸涓斿叧鑱斾簡閲囪喘鍗�/浜у搧淇℃伅鏃舵墠鑷姩鍏ュ簱锛屼俊鎭笉鍏ㄦ椂璺宠繃鍏ュ簱浣嗘甯告彁浜�
+ if ("鍚堟牸".equals(qualityInspect.getCheckResult())
+ && qualityInspect.getPurchaseLedgerId() != null) {
SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(qualityInspect.getProductId());
+ if (salesLedgerProduct != null) {
+ ProcurementAddDto procurementRecordOutAdd = new ProcurementAddDto();
+ procurementRecordOutAdd.setType(1);
+ procurementRecordOutAdd.setTypeName("閲囪喘鍘熸潗鏂欐楠屽悎鏍煎叆搴�");
+ procurementRecordOutAdd.setNickName(loginUser.getNickName());
+ procurementRecordOutAdd.setPurchaseLedgerId(Math.toIntExact(qualityInspect.getPurchaseLedgerId()));
- ArrayList<Details> detailss = new ArrayList<>();
- Details details = new Details();
- details.setId(Math.toIntExact(salesLedgerProduct.getId()));
- details.setInboundQuantity(qualityInspect.getQuantity());
- details.setWarnNum(salesLedgerProduct.getWarnNum());
- details.setUnitPrice(salesLedgerProduct.getTaxInclusiveUnitPrice());
- details.setTotalPrice(salesLedgerProduct.getTaxInclusiveTotalPrice());
- details.setProductModelId(qualityInspect.getProductModelId());
- detailss.add( details);
- procurementRecordOutAdd.setDetails(detailss);
- procurementRecordOutAdd.setQualityInspectId(qualityInspect.getId());
- procurementRecordService.add(procurementRecordOutAdd);
+ ArrayList<Details> detailss = new ArrayList<>();
+ Details details = new Details();
+ details.setId(Math.toIntExact(salesLedgerProduct.getId()));
+ details.setInboundQuantity(qualityInspect.getQuantity());
+ details.setWarnNum(salesLedgerProduct.getWarnNum());
+ details.setUnitPrice(salesLedgerProduct.getTaxInclusiveUnitPrice());
+ details.setTotalPrice(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ details.setProductModelId(qualityInspect.getProductModelId());
+ detailss.add( details);
+ procurementRecordOutAdd.setDetails(detailss);
+ procurementRecordOutAdd.setQualityInspectId(qualityInspect.getId());
+ procurementRecordService.add(procurementRecordOutAdd);
+ }
}
}else if (qualityInspect.getInspectType() == 1) {
- //鏌ヨUnitPrice/TotalPrice
- ProcurementAddDto procurementRecordOutAdd = new ProcurementAddDto();
- procurementRecordOutAdd.setType(2);
- procurementRecordOutAdd.setTypeName("鐢熶骇杩囩▼妫�楠屽悎鏍煎叆搴�");
- procurementRecordOutAdd.setNickName(loginUser.getNickName());
- List<Details> details = new ArrayList<>();
- Details details1 = new Details();
- details1.setInboundQuantity(qualityInspect.getQuantity());
- details1.setProductModelId(qualityInspect.getProductModelId());
- procurementRecordOutAdd.setDetails(details);
+ // 杩囩▼妫�楠屼粎鍚堟牸鏃跺叆搴擄紝涓嶅悎鏍煎搧鐢变笂闈㈢殑涓嶅悎鏍肩鐞嗘祦绋嬪鐞�
+ if ("鍚堟牸".equals(qualityInspect.getCheckResult())) {
+ ProcurementAddDto procurementRecordOutAdd = new ProcurementAddDto();
+ procurementRecordOutAdd.setType(2);
+ procurementRecordOutAdd.setTypeName("鐢熶骇杩囩▼妫�楠屽悎鏍煎叆搴�");
+ procurementRecordOutAdd.setNickName(loginUser.getNickName());
+ List<Details> details = new ArrayList<>();
+ Details details1 = new Details();
+ details1.setInboundQuantity(qualityInspect.getQuantity());
+ details1.setProductModelId(qualityInspect.getProductModelId());
+ procurementRecordOutAdd.setDetails(details);
- ProcurementRecordStorage.ProcurementRecordStorageBuilder procurementRecordBuilder = ProcurementRecordStorage.builder()
- .salesLedgerProductId(0)
- .inboundBatches( "鐢熶骇鍗婃垚鍝佸叆搴�")
- .inboundNum(details1.getInboundQuantity())
- .type(2)
- .warnNum(new BigDecimal(0))
- .unitPrice(new BigDecimal(0))
- .totalPrice(new BigDecimal(0))
- .createTime(LocalDateTime.now())
- .createUser(loginUser.getUserId())
- .updateTime(LocalDateTime.now())
- .updateUser(loginUser.getUserId())
- .createBy(procurementRecordOutAdd.getNickName())
- .productModelId(details1.getProductModelId())
- .qualityInspectId(qualityInspect.getId());
- procurementRecordService.save(procurementRecordBuilder.build());
-
-
-
+ ProcurementRecordStorage.ProcurementRecordStorageBuilder procurementRecordBuilder = ProcurementRecordStorage.builder()
+ .salesLedgerProductId(0)
+ .inboundBatches( "鐢熶骇鍗婃垚鍝佸叆搴�")
+ .inboundNum(details1.getInboundQuantity())
+ .type(2)
+ .warnNum(new BigDecimal(0))
+ .unitPrice(new BigDecimal(0))
+ .totalPrice(new BigDecimal(0))
+ .createTime(LocalDateTime.now())
+ .createUser(loginUser.getUserId())
+ .updateTime(LocalDateTime.now())
+ .updateUser(loginUser.getUserId())
+ .createBy(procurementRecordOutAdd.getNickName())
+ .productModelId(details1.getProductModelId())
+ .qualityInspectId(qualityInspect.getId());
+ procurementRecordService.save(procurementRecordBuilder.build());
+ }
}else if (qualityInspect.getInspectType() == 2) {
- //鏌ヨUnitPrice/TotalPrice
- SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectSalesLedgerProductByMainId(qualityInspect.getProductMainId());
- ProcurementAddDto procurementRecordOutAdd = new ProcurementAddDto();
- procurementRecordOutAdd.setType(2);
- procurementRecordOutAdd.setTypeName("鐢熶骇鍑哄巶妫�楠屽悎鏍煎叆搴�");
- procurementRecordOutAdd.setNickName(loginUser.getNickName());
- List<Details> details = new ArrayList<>();
- Details details1 = new Details();
- details1.setInboundQuantity(qualityInspect.getQuantity());
- details1.setId(Math.toIntExact(salesLedgerProduct.getId()));
- details1.setUnitPrice(salesLedgerProduct.getTaxInclusiveUnitPrice());
- details1.setTotalPrice(salesLedgerProduct.getTaxInclusiveTotalPrice());
- details1.setProductModelId(salesLedgerProduct.getProductModelId());
- details.add(details1);
- procurementRecordOutAdd.setDetails(details);
- procurementRecordOutAdd.setQualityInspectId(qualityInspect.getId());
- procurementRecordService.add(procurementRecordOutAdd);
+ // 鍑哄巶妫�楠屼粎鍚堟牸鏃跺叆搴擄紝缂哄皯浜у搧淇℃伅鏃惰烦杩囧叆搴撲絾姝e父鎻愪氦
+ if ("鍚堟牸".equals(qualityInspect.getCheckResult())) {
+ SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectSalesLedgerProductByMainId(qualityInspect.getProductMainId());
+ if (salesLedgerProduct != null) {
+ ProcurementAddDto procurementRecordOutAdd = new ProcurementAddDto();
+ procurementRecordOutAdd.setType(2);
+ procurementRecordOutAdd.setTypeName("鐢熶骇鍑哄巶妫�楠屽悎鏍煎叆搴�");
+ procurementRecordOutAdd.setNickName(loginUser.getNickName());
+ List<Details> details = new ArrayList<>();
+ Details details1 = new Details();
+ details1.setInboundQuantity(qualityInspect.getQuantity());
+ details1.setId(Math.toIntExact(salesLedgerProduct.getId()));
+ details1.setUnitPrice(salesLedgerProduct.getTaxInclusiveUnitPrice());
+ details1.setTotalPrice(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ details1.setProductModelId(salesLedgerProduct.getProductModelId());
+ details.add(details1);
+ procurementRecordOutAdd.setDetails(details);
+ procurementRecordOutAdd.setQualityInspectId(qualityInspect.getId());
+ procurementRecordService.add(procurementRecordOutAdd);
+ }
+ }
}
qualityInspect.setInspectState(1);//宸叉彁浜�
return qualityInspectMapper.updateById(qualityInspect);
diff --git a/src/main/resources/application-tide.yml b/src/main/resources/application-tide.yml
index 447372f..fc862e8 100644
--- a/src/main/resources/application-tide.yml
+++ b/src/main/resources/application-tide.yml
@@ -216,7 +216,3 @@
tablePrefix: sys_
# 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
allowOverwrite: false
-
-file:
- temp-dir: /center-lims/mis/file/temp/uploads
- upload-dir: /center-lims/mis/file/prod/uploads
\ No newline at end of file
diff --git a/src/main/resources/mapper/quality/QualityTestStandardBindingMapper.xml b/src/main/resources/mapper/quality/QualityTestStandardBindingMapper.xml
index 0cdda33..7b7c7cb 100644
--- a/src/main/resources/mapper/quality/QualityTestStandardBindingMapper.xml
+++ b/src/main/resources/mapper/quality/QualityTestStandardBindingMapper.xml
@@ -13,6 +13,23 @@
<result column="update_user" property="updateUser"/>
<result column="tenant_id" property="tenantId"/>
</resultMap>
+ <select id="selectBindingByProductId" resultType="com.ruoyi.quality.dto.QualityMetricBindingDto">
+ select t1.id,
+ t1.product_id,
+ t1.test_standard_id,
+ t2.standard_no,
+ t2.standard_name,
+ t2.inspect_type,
+ t2.process_id,
+ pp.name as process_name,
+ t2.state
+ from quality_test_standard_binding t1
+ left join quality_test_standard t2 on t1.test_standard_id = t2.id
+ left join product_process pp on t2.process_id = pp.id
+ where t1.product_id = #{productId}
+ order by t1.id desc
+ </select>
+
<select id="listBinding" resultType="com.ruoyi.quality.dto.QualityTestStandardBindingDto">
select t2.product_name,
t1.id qualityTestStandardBindingId
diff --git a/src/main/resources/mapper/quality/QualityTestStandardParamMapper.xml b/src/main/resources/mapper/quality/QualityTestStandardParamMapper.xml
index 837bc26..31245c6 100644
--- a/src/main/resources/mapper/quality/QualityTestStandardParamMapper.xml
+++ b/src/main/resources/mapper/quality/QualityTestStandardParamMapper.xml
@@ -18,10 +18,32 @@
<result column="default_value" property="defaultValue" />
</resultMap>
<select id="selectListByProductId" resultType="com.ruoyi.quality.pojo.QualityTestStandardParam">
- select t1.* from quality_test_standard_param t1
- left join quality_test_standard t2 on t1.test_standard_id = t2.id
- left join quality_test_standard_binding t3 on t2.id = t3.test_standard_id
+ select distinct t1.* from quality_test_standard_param t1
+ inner join quality_test_standard t2 on t1.test_standard_id = t2.id
+ inner join quality_test_standard_binding t3 on t2.id = t3.test_standard_id
+ left join product_process pp on t2.process_id = pp.id
where t3.product_id = #{productId}
+ <if test="inspectType != null">
+ and t2.inspect_type = #{inspectType}
+ </if>
+ <if test="process != null and process != ''">
+ and pp.name = #{process}
+ </if>
+ order by t1.id desc
+ </select>
+
+ <select id="selectPageByProductId" resultType="com.ruoyi.quality.pojo.QualityTestStandardParam">
+ select distinct t1.* from quality_test_standard_param t1
+ inner join quality_test_standard t2 on t1.test_standard_id = t2.id
+ inner join quality_test_standard_binding t3 on t1.test_standard_id = t3.test_standard_id
+ where t3.product_id = #{productId}
+ <if test="inspectType != null">
+ and t2.inspect_type = #{inspectType}
+ </if>
+ <if test="processId != null">
+ and t2.process_id = #{processId}
+ </if>
+ order by t1.id desc
</select>
</mapper>
diff --git a/src/test/java/com/ruoyi/quality/controller/QualityInspectControllerTest.java b/src/test/java/com/ruoyi/quality/controller/QualityInspectControllerTest.java
new file mode 100644
index 0000000..9b781b4
--- /dev/null
+++ b/src/test/java/com/ruoyi/quality/controller/QualityInspectControllerTest.java
@@ -0,0 +1,140 @@
+package com.ruoyi.quality.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.procurementrecord.service.ProcurementRecordService;
+import com.ruoyi.quality.dto.QualityInspectDto;
+import com.ruoyi.quality.pojo.QualityInspect;
+import com.ruoyi.quality.pojo.QualityInspectParam;
+import com.ruoyi.quality.service.IQualityInspectFileService;
+import com.ruoyi.quality.service.IQualityInspectParamService;
+import com.ruoyi.quality.service.IQualityInspectService;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.math.BigDecimal;
+import java.util.Collections;
+import java.util.Date;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class QualityInspectControllerTest {
+
+ @Mock private IQualityInspectService inspectService;
+ @Mock private IQualityInspectParamService paramService;
+ @Mock private IQualityInspectFileService fileService;
+ @Mock private ProcurementRecordService procurementRecordService;
+ @InjectMocks private QualityInspectController controller;
+
+ @Test
+ void addAcceptsCompleteInspection() {
+ QualityInspectDto dto = validInspection(0);
+ when(inspectService.add(dto)).thenReturn(1);
+
+ AjaxResult result = controller.add(dto);
+
+ assertTrue(result.isSuccess());
+ assertEquals(1, result.get(AjaxResult.DATA_TAG));
+ }
+
+ @Test
+ void addRejectsInspectionWithoutMetrics() {
+ QualityInspectDto dto = validInspection(0);
+ dto.setQualityInspectParams(Collections.emptyList());
+
+ AjaxResult result = controller.add(dto);
+
+ assertTrue(result.isError());
+ assertEquals("褰撳墠浜у搧鏈厤缃楠屾寚鏍囷紝璇峰厛缁存姢鎸囨爣", result.get(AjaxResult.MSG_TAG));
+ verify(inspectService, never()).add(any());
+ }
+
+ @Test
+ void addRejectsMetricWithoutTestValue() {
+ QualityInspectDto dto = validInspection(0);
+ dto.getQualityInspectParams().get(0).setTestValue(" ");
+
+ AjaxResult result = controller.add(dto);
+
+ assertTrue(result.isError());
+ assertEquals("璇峰~鍐欌�滅‖搴︹�濈殑妫�楠屽��", result.get(AjaxResult.MSG_TAG));
+ }
+
+ @Test
+ void processInspectionRequiresProcess() {
+ QualityInspectDto dto = validInspection(1);
+ dto.setProcess(null);
+
+ AjaxResult result = controller.add(dto);
+
+ assertTrue(result.isError());
+ assertEquals("杩囩▼妫�楠屽繀椤婚�夋嫨宸ュ簭", result.get(AjaxResult.MSG_TAG));
+ }
+
+ @Test
+ void updateRejectsSubmittedInspection() {
+ QualityInspectDto dto = validInspection(2);
+ dto.setId(9L);
+ QualityInspect stored = new QualityInspect();
+ stored.setInspectState(1);
+ when(inspectService.getById(9L)).thenReturn(stored);
+
+ AjaxResult result = controller.update(dto);
+
+ assertTrue(result.isError());
+ assertEquals("宸叉彁浜ょ殑妫�楠岃褰曚笉鑳戒慨鏀�", result.get(AjaxResult.MSG_TAG));
+ verify(inspectService, never()).updateQualityInspect(any());
+ }
+
+ @Test
+ void updateAcceptsUnsubmittedInspection() {
+ QualityInspectDto dto = validInspection(2);
+ dto.setId(9L);
+ QualityInspect stored = new QualityInspect();
+ stored.setInspectState(0);
+ when(inspectService.getById(9L)).thenReturn(stored);
+ when(inspectService.updateQualityInspect(dto)).thenReturn(1);
+
+ AjaxResult result = controller.update(dto);
+
+ assertTrue(result.isSuccess());
+ }
+
+ @Test
+ void listPageDelegatesByInspectionType() {
+ Page<QualityInspect> page = new Page<>(1, 10);
+ QualityInspect query = new QualityInspect();
+ query.setInspectType(2);
+ when(inspectService.qualityInspectListPage(page, query)).thenReturn(page);
+
+ AjaxResult result = controller.qualityInspectListPage(page, query);
+
+ assertTrue(result.isSuccess());
+ assertEquals(page, result.get(AjaxResult.DATA_TAG));
+ }
+
+ private QualityInspectDto validInspection(int inspectType) {
+ QualityInspectDto dto = new QualityInspectDto();
+ dto.setInspectType(inspectType);
+ dto.setProductId(10L);
+ dto.setCheckTime(new Date());
+ dto.setQuantity(BigDecimal.ONE);
+ dto.setCheckResult("鍚堟牸");
+ dto.setProcess(inspectType == 1 ? "瑁呴厤" : null);
+ QualityInspectParam parameter = new QualityInspectParam();
+ parameter.setParameterItem("纭害");
+ parameter.setStandardValue("50-55");
+ parameter.setTestValue("52");
+ dto.setQualityInspectParams(Collections.singletonList(parameter));
+ return dto;
+ }
+}
diff --git a/src/test/java/com/ruoyi/quality/controller/QualityMetricControllerTest.java b/src/test/java/com/ruoyi/quality/controller/QualityMetricControllerTest.java
new file mode 100644
index 0000000..3b92515
--- /dev/null
+++ b/src/test/java/com/ruoyi/quality/controller/QualityMetricControllerTest.java
@@ -0,0 +1,198 @@
+package com.ruoyi.quality.controller;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.quality.dto.QualityMetricDto;
+import com.ruoyi.quality.mapper.QualityTestStandardBindingMapper;
+import com.ruoyi.quality.mapper.QualityTestStandardParamMapper;
+import com.ruoyi.quality.pojo.QualityTestStandard;
+import com.ruoyi.quality.pojo.QualityTestStandardBinding;
+import com.ruoyi.quality.pojo.QualityTestStandardParam;
+import com.ruoyi.quality.service.IQualityTestStandardService;
+import com.ruoyi.quality.service.QualityTestStandardBindingService;
+import com.ruoyi.quality.service.QualityTestStandardParamService;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class QualityMetricControllerTest {
+
+ @Mock
+ private QualityTestStandardParamMapper paramMapper;
+ @Mock
+ private QualityTestStandardParamService paramService;
+ @Mock
+ private QualityTestStandardBindingService bindingService;
+ @Mock
+ private IQualityTestStandardService standardService;
+ @Mock
+ private QualityTestStandardBindingMapper bindingMapper;
+
+ private QualityMetricController controller;
+
+ @BeforeEach
+ void setUp() {
+ controller = new QualityMetricController(paramMapper, paramService,
+ bindingService, standardService, bindingMapper);
+ }
+
+ @Test
+ void addCreatesStandardAndBindingForFirstMetric() {
+ QualityMetricDto metric = metric(10L, null, "纭害", "HRC", "50-55", "51-54");
+ when(bindingService.list(any(Wrapper.class))).thenReturn(Collections.emptyList());
+ when(standardService.save(any(QualityTestStandard.class))).thenAnswer(invocation -> {
+ QualityTestStandard standard = invocation.getArgument(0);
+ standard.setId(100L);
+ return true;
+ });
+ when(bindingService.save(any(QualityTestStandardBinding.class))).thenReturn(true);
+ when(paramService.save(any(QualityTestStandardParam.class))).thenReturn(true);
+
+ AjaxResult result = controller.add(metric);
+
+ assertTrue(result.isSuccess());
+ ArgumentCaptor<QualityTestStandardBinding> bindingCaptor =
+ ArgumentCaptor.forClass(QualityTestStandardBinding.class);
+ verify(bindingService).save(bindingCaptor.capture());
+ assertEquals(10L, bindingCaptor.getValue().getProductId());
+ assertEquals(100, bindingCaptor.getValue().getTestStandardId());
+
+ ArgumentCaptor<QualityTestStandardParam> parameterCaptor =
+ ArgumentCaptor.forClass(QualityTestStandardParam.class);
+ verify(paramService).save(parameterCaptor.capture());
+ assertEquals(100L, parameterCaptor.getValue().getTestStandardId());
+ assertEquals("纭害", parameterCaptor.getValue().getParameterItem());
+ assertEquals("50-55", parameterCaptor.getValue().getStandardValue());
+ }
+
+ @Test
+ void addReusesExistingProductBinding() {
+ QualityTestStandardBinding existing = new QualityTestStandardBinding();
+ existing.setProductId(10L);
+ existing.setTestStandardId(88);
+ when(bindingService.list(any(Wrapper.class))).thenReturn(Collections.singletonList(existing));
+ QualityTestStandard matched = new QualityTestStandard();
+ matched.setId(88L);
+ matched.setInspectType(0);
+ when(standardService.getOne(any(Wrapper.class))).thenReturn(matched);
+ when(paramService.save(any(QualityTestStandardParam.class))).thenReturn(true);
+
+ AjaxResult result = controller.add(metric(10L, null, "闀垮害", "mm", "100", "99-101"));
+
+ assertTrue(result.isSuccess());
+ verify(standardService, never()).save(any(QualityTestStandard.class));
+ verify(bindingService, never()).save(any(QualityTestStandardBinding.class));
+ ArgumentCaptor<QualityTestStandardParam> captor =
+ ArgumentCaptor.forClass(QualityTestStandardParam.class);
+ verify(paramService).save(captor.capture());
+ assertEquals(88L, captor.getValue().getTestStandardId());
+ }
+
+ @Test
+ void addRejectsMissingProductWithoutWritingData() {
+ AjaxResult result = controller.add(metric(null, null, "闀垮害", "mm", "100", null));
+
+ assertTrue(result.isError());
+ assertEquals("璇峰厛閫夋嫨浜у搧", result.get(AjaxResult.MSG_TAG));
+ verify(standardService, never()).save(any(QualityTestStandard.class));
+ verify(paramService, never()).save(any(QualityTestStandardParam.class));
+ }
+
+ @Test
+ void updateChangesOnlyEditableMetricFields() {
+ QualityTestStandardParam stored = new QualityTestStandardParam();
+ stored.setId(5L);
+ stored.setTestStandardId(88L);
+ stored.setParameterItem("鏃ф寚鏍�");
+ when(paramService.getById(5L)).thenReturn(stored);
+ when(paramService.updateById(any(QualityTestStandardParam.class))).thenReturn(true);
+
+ AjaxResult result = controller.update(metric(null, 5L, "鏂版寚鏍�", "mm", "20", "19-21"));
+
+ assertTrue(result.isSuccess());
+ ArgumentCaptor<QualityTestStandardParam> captor =
+ ArgumentCaptor.forClass(QualityTestStandardParam.class);
+ verify(paramService).updateById(captor.capture());
+ assertSame(stored, captor.getValue());
+ assertEquals(88L, stored.getTestStandardId());
+ assertEquals("鏂版寚鏍�", stored.getParameterItem());
+ assertEquals("20", stored.getStandardValue());
+ }
+
+ @Test
+ void updateReportsMissingMetric() {
+ when(paramService.getById(99L)).thenReturn(null);
+
+ AjaxResult result = controller.update(metric(null, 99L, "鎸囨爣", "mm", "1", null));
+
+ assertTrue(result.isError());
+ assertEquals("妫�娴嬫寚鏍囦笉瀛樺湪", result.get(AjaxResult.MSG_TAG));
+ verify(paramService, never()).updateById(any(QualityTestStandardParam.class));
+ }
+
+ @Test
+ void deleteRejectsEmptySelectionAndDeletesSelectedMetrics() {
+ AjaxResult emptyResult = controller.delete(Collections.emptyList());
+ assertTrue(emptyResult.isError());
+ verify(paramService, never()).removeBatchByIds(any());
+
+ when(paramService.removeBatchByIds(Arrays.asList(1L, 2L))).thenReturn(true);
+ AjaxResult deleteResult = controller.delete(Arrays.asList(1L, 2L));
+ assertTrue(deleteResult.isSuccess());
+ }
+
+ @Test
+ void listByProductReturnsMapperData() {
+ QualityTestStandardParam parameter = new QualityTestStandardParam();
+ parameter.setId(1L);
+ when(paramMapper.selectListByProductId(10L, 0, null)).thenReturn(Collections.singletonList(parameter));
+
+ AjaxResult result = controller.listByProduct(10L, 0, null);
+
+ assertTrue(result.isSuccess());
+ assertEquals(Collections.singletonList(parameter), result.get(AjaxResult.DATA_TAG));
+ }
+
+ @Test
+ void listPageReturnsPagedMapperData() {
+ Page<QualityTestStandardParam> expected = new Page<>(1, 10);
+ expected.setRecords(Collections.singletonList(new QualityTestStandardParam()));
+ when(paramMapper.selectPageByProductId(any(Page.class), any(Long.class), any(), any()))
+ .thenReturn(expected);
+
+ AjaxResult result = controller.listPage(new Page<>(1, 10), 10L, 0, null);
+
+ assertTrue(result.isSuccess());
+ assertSame(expected, result.get(AjaxResult.DATA_TAG));
+ assertFalse(expected.getRecords().isEmpty());
+ }
+
+ private QualityMetricDto metric(Long productId, Long id, String name,
+ String unit, String standardValue, String controlValue) {
+ QualityMetricDto metric = new QualityMetricDto();
+ metric.setProductId(productId);
+ metric.setId(id);
+ metric.setParameterItem(name);
+ metric.setUnit(unit);
+ metric.setStandardValue(standardValue);
+ metric.setControlValue(controlValue);
+ return metric;
+ }
+}
diff --git a/src/test/java/com/ruoyi/quality/controller/QualityUnqualifiedControllerTest.java b/src/test/java/com/ruoyi/quality/controller/QualityUnqualifiedControllerTest.java
new file mode 100644
index 0000000..aa59590
--- /dev/null
+++ b/src/test/java/com/ruoyi/quality/controller/QualityUnqualifiedControllerTest.java
@@ -0,0 +1,117 @@
+package com.ruoyi.quality.controller;
+
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.quality.pojo.QualityUnqualified;
+import com.ruoyi.quality.service.IQualityUnqualifiedService;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class QualityUnqualifiedControllerTest {
+
+ @Mock private IQualityUnqualifiedService service;
+ @InjectMocks private QualityUnqualifiedController controller;
+
+ @Test
+ void addCreatesPendingRecordByDefault() {
+ QualityUnqualified record = pendingRecord();
+ record.setInspectState(null);
+ when(service.save(record)).thenReturn(true);
+
+ AjaxResult result = controller.add(record);
+
+ assertTrue(result.isSuccess());
+ assertEquals(0, record.getInspectState());
+ }
+
+ @Test
+ void addRejectsMissingReason() {
+ QualityUnqualified record = pendingRecord();
+ record.setDefectivePhenomena(" ");
+
+ AjaxResult result = controller.add(record);
+
+ assertTrue(result.isError());
+ assertEquals("璇峰~鍐欎笉鍚堟牸鍘熷洜鎴栫幇璞�", result.get(AjaxResult.MSG_TAG));
+ verify(service, never()).save(any());
+ }
+
+ @Test
+ void processedRecordRequiresTreatmentMethod() {
+ QualityUnqualified record = processedRecord();
+ record.setDealType(null);
+
+ AjaxResult result = controller.add(record);
+
+ assertTrue(result.isError());
+ assertEquals("璇烽�夋嫨澶勭悊鏂瑰紡", result.get(AjaxResult.MSG_TAG));
+ }
+
+ @Test
+ void processedRecordRequiresTreatmentResult() {
+ QualityUnqualified record = processedRecord();
+ record.setDealResult(null);
+
+ AjaxResult result = controller.add(record);
+
+ assertTrue(result.isError());
+ assertEquals("璇峰~鍐欏鐞嗙粨鏋�", result.get(AjaxResult.MSG_TAG));
+ }
+
+ @Test
+ void updateReportsMissingRecord() {
+ QualityUnqualified record = processedRecord();
+ record.setId(99L);
+ when(service.getById(99L)).thenReturn(null);
+
+ AjaxResult result = controller.update(record);
+
+ assertTrue(result.isError());
+ assertEquals("涓嶅悎鏍艰褰曚笉瀛樺湪", result.get(AjaxResult.MSG_TAG));
+ }
+
+ @Test
+ void updateClosesCompleteRecord() {
+ QualityUnqualified record = processedRecord();
+ record.setId(8L);
+ when(service.getById(8L)).thenReturn(pendingRecord());
+ when(service.updateById(record)).thenReturn(true);
+
+ AjaxResult result = controller.update(record);
+
+ assertTrue(result.isSuccess());
+ }
+
+ private QualityUnqualified pendingRecord() {
+ QualityUnqualified record = new QualityUnqualified();
+ record.setInspectType(0);
+ record.setInspectState(0);
+ record.setProductId(10L);
+ record.setQuantity(BigDecimal.ONE);
+ record.setDefectivePhenomena("琛ㄩ潰鍒掍激");
+ return record;
+ }
+
+ private QualityUnqualified processedRecord() {
+ QualityUnqualified record = pendingRecord();
+ record.setInspectState(1);
+ record.setDealType("rework");
+ record.setDealResult("杩斿伐鍚庡妫�鍚堟牸");
+ record.setDealName("寮犱笁");
+ record.setDealTime(new Date());
+ return record;
+ }
+}
diff --git a/src/test/java/com/ruoyi/quality/service/QualityInspectServiceImplTest.java b/src/test/java/com/ruoyi/quality/service/QualityInspectServiceImplTest.java
new file mode 100644
index 0000000..b346a94
--- /dev/null
+++ b/src/test/java/com/ruoyi/quality/service/QualityInspectServiceImplTest.java
@@ -0,0 +1,112 @@
+package com.ruoyi.quality.service;
+
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.procurementrecord.service.ProcurementRecordService;
+import com.ruoyi.quality.dto.QualityInspectDto;
+import com.ruoyi.quality.mapper.QualityInspectMapper;
+import com.ruoyi.quality.mapper.QualityTestStandardMapper;
+import com.ruoyi.quality.mapper.QualityUnqualifiedMapper;
+import com.ruoyi.quality.pojo.QualityInspect;
+import com.ruoyi.quality.pojo.QualityInspectParam;
+import com.ruoyi.quality.service.impl.QualityInspectServiceImpl;
+import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Collections;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class QualityInspectServiceImplTest {
+
+ @Mock private QualityInspectMapper inspectMapper;
+ @Mock private IQualityInspectParamService paramService;
+ @Mock private QualityTestStandardMapper standardMapper;
+ @Mock private QualityUnqualifiedMapper unqualifiedMapper;
+ @Mock private SalesLedgerProductMapper productMapper;
+ @Mock private ProcurementRecordService procurementRecordService;
+ @InjectMocks private QualityInspectServiceImpl service;
+
+ @Test
+ void addPersistsInspectionAndMetrics() {
+ QualityInspectDto dto = new QualityInspectDto();
+ QualityInspectParam parameter = new QualityInspectParam();
+ dto.setQualityInspectParams(Collections.singletonList(parameter));
+ when(inspectMapper.insert(any(QualityInspect.class))).thenAnswer(invocation -> {
+ QualityInspect inspect = invocation.getArgument(0);
+ inspect.setId(12L);
+ return 1;
+ });
+ when(paramService.saveBatch(dto.getQualityInspectParams())).thenReturn(true);
+
+ int result = service.add(dto);
+
+ assertEquals(1, result);
+ ArgumentCaptor<QualityInspect> inspectCaptor = ArgumentCaptor.forClass(QualityInspect.class);
+ verify(inspectMapper).insert(inspectCaptor.capture());
+ assertEquals(0, inspectCaptor.getValue().getInspectState());
+ assertEquals(12L, parameter.getInspectId());
+ }
+
+ @Test
+ void submitRejectsRepeatedSubmissionBeforeCreatingSideEffects() {
+ QualityInspect submitted = new QualityInspect();
+ submitted.setId(5L);
+ submitted.setInspectState(1);
+ when(inspectMapper.selectById(5L)).thenReturn(submitted);
+
+ QualityInspect request = new QualityInspect();
+ request.setId(5L);
+ ServiceException error = assertThrows(ServiceException.class, () -> service.submit(request));
+
+ assertEquals("妫�楠岃褰曞凡鎻愪氦锛岃鍕块噸澶嶆搷浣�", error.getMessage());
+ verify(unqualifiedMapper, never()).insert(any());
+ verify(procurementRecordService, never()).add(any());
+ }
+
+ @Test
+ void submitRejectsInspectionWithoutMetrics() {
+ QualityInspect stored = pendingInspection();
+ when(inspectMapper.selectById(5L)).thenReturn(stored);
+ when(paramService.list(any())).thenReturn(Collections.emptyList());
+
+ QualityInspect request = new QualityInspect();
+ request.setId(5L);
+ ServiceException error = assertThrows(ServiceException.class, () -> service.submit(request));
+
+ assertEquals("妫�楠岄」鐩负绌猴紝涓嶈兘鎻愪氦", error.getMessage());
+ }
+
+ @Test
+ void submitRejectsMetricWithoutTestValue() {
+ QualityInspect stored = pendingInspection();
+ QualityInspectParam parameter = new QualityInspectParam();
+ parameter.setParameterItem("纭害");
+ when(inspectMapper.selectById(5L)).thenReturn(stored);
+ when(paramService.list(any())).thenReturn(Collections.singletonList(parameter));
+
+ QualityInspect request = new QualityInspect();
+ request.setId(5L);
+ ServiceException error = assertThrows(ServiceException.class, () -> service.submit(request));
+
+ assertEquals("妫�楠岄」鐩�滅‖搴︹�濆皻鏈~鍐欐楠屽��", error.getMessage());
+ }
+
+ private QualityInspect pendingInspection() {
+ QualityInspect stored = new QualityInspect();
+ stored.setId(5L);
+ stored.setInspectState(0);
+ stored.setCheckResult("鍚堟牸");
+ return stored;
+ }
+}
--
Gitblit v1.9.3