From 6b8585fc452ecdcaa82d86fab79a9f27bb442851 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 09:13:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_南通_苏珩' into dev_南通_苏珩
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkOrderTechnicalFileMapper.java | 13
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesQcCheckResultEnum.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java | 52 -
docs/project-business/mermaid/05-quality-flow.mmd | 15
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java | 16
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderTechnicalFileService.java | 57 ++
docs/project-business/mermaid/04-production-flow.mmd | 8
sql/mysql/20261104_hrm_resignation_handover_columns.sql | 14
sql/mysql/mdm_mes_item_add_sort.sql | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java | 12
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/attachment/MesQcAttachmentController.java | 124 +++++
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImplTest.java | 12
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java | 10
docs/project-business/index.html | 34
sql/mysql/20261104_work_order_technical_files.sql | 16
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcCompletionHelper.java | 37 +
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImplTest.java | 43 +
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemTechnicalFileServiceImpl.java | 11
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/scrap/MesWmScrapReceiptController.java | 43 ++
docs/project-business/data/flows.json | 13
scripts/item-sort/ItemSortMigration.java | 13
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageRecordTypeEnum.java | 5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java | 51 -
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProWorkstationPendingCountVO.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/link/MesQcSourceLinkController.java | 38 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java | 37 -
yudao-module-mes/src/test/resources/sql/create_tables.sql | 1
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java | 45 -
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemTechnicalFileService.java | 1
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/scrap/MesWmScrapReceiptMapper.java | 6
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcAutoCreateTest.java | 7
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImplTest.java | 40 +
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java | 8
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkOrderTechnicalFileDO.java | 19
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImplTest.java | 30 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java | 4
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImplTest.java | 29 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java | 14
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java | 37 -
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/link/MesQcSourceLinkService.java | 234 +++++++++++
sql/mysql/20261104_mdm_item_technical_file.sql | 15
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/mysql/item/MdmItemTechnicalFileMapper.java | 12
yudao-server/src/main/resources/application-local.yaml | 2
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/storage/StorageAttachmentApi.java | 3
docs/project-business/mermaid/02-sales-flow.mmd | 7
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/util/storage/StorageFileUtil.java | 8
docs/project-business/data/objects.json | 8
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineReelTest.java | 8
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/storage/StorageAttachmentApiImpl.java | 13
docs/project-business/mermaid/10-business-object.mmd | 4
50 files changed, 966 insertions(+), 279 deletions(-)
diff --git a/docs/project-business/data/flows.json b/docs/project-business/data/flows.json
index 5a53ac8..cffcf50 100644
--- a/docs/project-business/data/flows.json
+++ b/docs/project-business/data/flows.json
@@ -1,13 +1,13 @@
{
"flows": [
{"id": "sales", "name": "閿�鍞祦绋�", "mermaid": "mermaid/02-sales-flow.mmd", "color": "#4f9cff",
- "summary": "绾跨储杞寲瀹㈡埛 鈫� 鍟嗘満鎺ㄨ繘 鈫� 鎶ヤ环(鍙疉I璇嗗埆) 鈫� 鍚堝悓 BPM 瀹℃壒 鈫� 鐢熸垚 ERP 閿�鍞鍗曞苟瀹℃壒 鈫� 闇�鐢熶骇琛岃嚜鍔ㄥ缓 MPS 鈫� 鍙戣揣閫氱煡 鈫� 閿�鍞嚭搴�(OQC)鍥炲啓 鈫� 寮�绁�(BPM) 鈫� 鍥炴(鍏堝紑绁ㄦ牎楠�)銆�",
+ "summary": "绾跨储杞寲瀹㈡埛 鈫� 鍟嗘満鎺ㄨ繘 鈫� 鎶ヤ环(鍙疉I璇嗗埆) 鈫� 鍚堝悓 BPM 瀹℃壒 鈫� 鐢熸垚 ERP 閿�鍞鍗曞苟瀹℃壒 鈫� 闇�鐢熶骇琛岃嚜鍔ㄥ缓 MPS 鈫� 鍙戣揣閫氱煡 鈫� 閿�鍞嚭搴撴彁浜�(闇�妫�楠岃杞緟妫�娴�) 鈫� 鐙珛褰曞叆 OQC 鍚庢寜鐗╂枡+鐩樺彿+鏁伴噺鍏宠仈鍥炲啓 鈫� 鎷h揣鍙戣繍 鈫� 寮�绁�(BPM) 鈫� 鍥炴(鍏堝紑绁ㄦ牎楠�)銆�",
"steps": [
{"stage": "鑾峰", "action": "绾跨储杞寲瀹㈡埛銆佸缓鑱旂郴浜恒�佺珛椤瑰晢鏈�", "roles": ["閿�鍞唴鍕�"]},
{"stage": "鎶ヤ环", "action": "鍟嗘満璧㈠崟鍚庡缓鎶ヤ环鍗�(AI OCR 棰勫~)锛岃浆鍚堝悓", "roles": ["閿�鍞唴鍕�"]},
{"stage": "绛剧害", "action": "鍚堝悓鏉ユ簮锛氭墜宸ユ柊寤� / 鎶ヤ环鍗曡浆鍏� / Excel 瀵煎叆(涓�鍚堝悓澶氫骇鍝佹槑缁嗚)锛涙彁浜� BPM 瀹℃壒(鍙�夋祦绋嬪畾涔�)锛岄�氳繃=20", "roles": ["閿�鍞�", "瀹℃壒浜�"]},
{"stage": "鎺ュ崟", "action": "鍚堝悓涓�閿敓鎴愰攢鍞鍗�(XSDD)锛岄攢鍞鍗曞啀璧� BPM锛涘鎵归�氳繃鑷姩涓� needProduction 鏄庣粏鍒涘缓 MPS", "roles": ["閿�鍞�", "璁″垝鍛�"]},
- {"stage": "浜や粯", "action": "鍙戣揣閫氱煡瀹℃牳(鍗犵敤)鈫� 閿�鍞嚭搴� OQC 鈫� 鍙戣繍 鈫� 鍑哄簱鍥炲啓閮ㄥ垎/鍏ㄩ儴鍑哄簱", "roles": ["浠撶", "璐ㄦ"]},
+ {"stage": "浜や粯", "action": "鍙戣揣閫氱煡瀹℃牳(鍗犵敤)鈫� 閿�鍞嚭搴撴彁浜わ細鏈� oqcCheckFlag 琛岃浆寰呮娴嬶紝鎻愪氦鏃朵笉鍐嶈嚜鍔ㄥ缓 OQC锛涜川妫�鍛樼嫭绔嬪綍鍏ュ苟瀹屾垚 OQC 鍚庯紝鍦ㄦ楠屽崟璇︽儏鎸夌墿鏂�+鐩樺彿+鏁伴噺涓�鑷撮�夋嫨寰呮鍑哄簱琛屽叧鑱旓紝鍏ㄩ儴寰呮琛屽悎鏍煎悗鍑哄簱鍗曡浆寰呮嫞璐� 鈫� 鍙戣繍 鈫� 鍑哄簱鍥炲啓閮ㄥ垎/鍏ㄩ儴鍑哄簱", "roles": ["浠撶", "璐ㄦ"]},
{"stage": "鍥炴", "action": "寮�绁� BPM(绱鈮ゅ悎鍚岄) 鈫� 鍥炴寮哄埗鍏堝紑绁�(绱鈮ゅ悎鍚屽墿浣欎笌寮�绁ㄥ墿浣�)", "roles": ["璐㈠姟", "閿�鍞�"]}]},
{"id": "purchase", "name": "閲囪喘娴佺▼", "mermaid": "mermaid/03-purchase-flow.mmd", "color": "#5fc79e",
"summary": "渚涘簲鍟嗘。妗�(澶氳仈绯讳汉/澶氶摱琛屄峰惈閾惰琛屽彿) 鈫� 璇环姣斾环(浜у搧脳渚涘簲鍟嗘í鍚戞姤浠凤紝鎸変骇鍝侀�変腑鏍�) 鈫� 纭鍚庢寜涓爣渚涘簲鍟嗘媶閲囪喘璁㈠崟鑽夌骞惰蛋鐜版湁 BPM 鈫� 纭鏀惰揣鐢熸垚 MES 鍒拌揣閫氱煡 鈫� IQC(鍚堟牸/鐗归噰鍏ュ簱路閫�璐�/鎶ュ簾) 鈫� 閲囪喘鍏ュ簱鍥炲啓璁㈠崟涓庣敵璇� 鈫� 鏉ョエ(AI OCR) 鈫� 浠樻鍗� BPM 鈫� 渚涘簲鍟嗗線鏉ュ璐︼紱鎶曟爣淇濊瘉閲戝彴璐︾嫭绔嬭褰曚腑鏍囦笌閫�鍥炪��",
@@ -27,14 +27,15 @@
{"stage": "娲惧伐", "action": "宸ュ崟纭鎸夊伐鑹鸿矾绾块�愬伐搴忕敓鎴愪换鍔★紝鍙寚娲�/鏆傚仠/鍙栨秷", "roles": ["杞﹂棿涓讳换"]},
{"stage": "澶囨枡", "action": "鐢熶骇棰嗘枡鍗曞嚭搴撴垨绾胯竟铏氭嫙搴撳鏂�", "roles": ["浠撶"]},
{"stage": "鎶ュ伐", "action": "鎻愪氦鎶ュ伐锛氫笂涓�閬撳伐搴忔湭鎶ユ弧鐩存帴鎷︽埅锛涘惎鐢� BPM 璧板鎵�", "roles": ["鎿嶄綔宸�"]},
- {"stage": "鑱斿姩", "action": "瀹℃壒閫氳繃鎸夊伐搴忔爣璁�: 鍊掑啿鈫掕嚜鍔ㄧ墿鏂欐秷鑰楁墸绾胯竟搴�(鍏佽璐熷簱瀛�)锛涜川妫�鈫掍骇鍑哄緟妫�琛岀瓑 IPQC锛涘叧閿潪妫�鈫掔洿鎺ヤ骇鍑哄叆搴�", "roles": ["绯荤粺鑷姩"]},
+ {"stage": "鑱斿姩", "action": "瀹℃壒閫氳繃鎸夊伐搴忔爣璁�: 鍊掑啿鈫掕嚜鍔ㄧ墿鏂欐秷鑰楁墸绾胯竟搴�(鍏佽璐熷簱瀛�)锛涜川妫�鈫掓姤宸ヨ浆寰呮楠屽苟鐢熸垚 PENDING 浜у嚭琛岋紝绛夊緟璐ㄦ鍛樼嫭绔嬪綍鍏� IPQC锛涘叧閿潪妫�鈫掔洿鎺ヤ骇鍑哄叆搴�", "roles": ["绯荤粺鑷姩"]},
+ {"stage": "妫�楠�", "action": "宸插畬鎴� IPQC 鍦ㄨ鎯呴〉鎸夌墿鏂�+鐩樺彿+鏁伴噺涓�鑷撮�夋嫨寰呮浜у嚭琛屽叧鑱旓細鍥炲啓鎶ュ伐瀹屾垚骞舵媶鍒嗗悎鏍�/涓嶅悎鏍间骇鍑哄叆搴擄紱鏈叧鑱旂殑宸插畬鎴愭楠屽崟涓嶅洖鍐�", "roles": ["IPQC 璐ㄦ鍛�"]},
{"stage": "瀹屽伐", "action": "浠呮湯閬撳伐搴忓洖鍐欏伐鍗曞凡鐢熶骇鏁伴噺锛岃揪鏍囪嚜鍔ㄥ畬鎴愶紱MPS 绱鍒ゆ柇瀹屾垚骞跺彂浜嬩欢缁欓攢鍞鍗�", "roles": ["绯荤粺鑷姩"]}]},
{"id": "quality", "name": "璐ㄩ噺娴佺▼", "mermaid": "mermaid/05-quality-flow.mmd", "color": "#e06c6c",
- "summary": "鍥涢亾妫�楠岄椄鍙�(IQC/IPQC/OQC/RQC锛屼簩鎬� 0鈫�4) + 鍒ゅ畾鍥涙灉(鍚堟牸/鐗归噰/閫�璐�/鎶ュ簾) + NCR 璇勫澶勭疆鍏抽棴锛汚I 鎻愪緵鍒ゅ畾寤鸿锛汵CR 褰撳墠浠呭彴璐︿笉瑙﹀彂杩斿伐鍗曪紱妫�楠屽崟鍙敱鏅鸿兘璐ㄦ鎶ュ憡骞冲彴涓�閿嚭浠讹紙generate-from-qc锛氭暟鎹粠 MES 鍙栵紝浜旈亾鏍¢獙鍚庢覆鏌撹惤搴擄級銆�",
+ "summary": "鍥涢亾妫�楠岄椄鍙�(IQC/IPQC/OQC/RQC锛屼簩鎬� 0鈫�4) + 瀹屾垚鏃舵寜鍚堟牸/涓嶅悎鏍兼暟閲忚嚜鍔ㄥ垽瀹�(1 鏍¢獙閫氳繃/2 鏍¢獙涓嶉�氳繃) + NCR 璇勫澶勭疆鍏抽棴锛汭PQC 瀹屾垚鍚庢寜鐗╂枡+鐩樺彿+鏁伴噺鍏宠仈鎶ュ伐寰呮琛岋紝OQC 瀹屾垚鍚庢寜鍚屾牱瑙勫垯鍏宠仈閿�鍞嚭搴撳緟妫�琛岋紱AI 鎻愪緵鍒ゅ畾寤鸿锛汵CR 褰撳墠浠呭彴璐︿笉瑙﹀彂杩斿伐鍗曪紱妫�楠屽崟鍙敱鏅鸿兘璐ㄦ鎶ュ憡骞冲彴涓�閿嚭浠讹紙generate-from-qc锛氭暟鎹粠 MES 鍙栵紝浜旈亾鏍¢獙鍚庢覆鏌撹惤搴擄級銆�",
"steps": [
{"stage": "鏉ユ枡", "action": "鍒拌揣閫氱煡/澶栧崗鍏ュ簱鈫扞QC锛岀粨璁哄洖鍐欐帹杩涘緟鍏ュ簱鎴栬Е鍙戦��璐�", "roles": ["IQC 璐ㄦ鍛�"]},
- {"stage": "杩囩▼", "action": "鎶ュ伐璐ㄦ宸ュ簭浜у嚭琛屸啋IPQC锛屽悎鏍兼媶琛屽叆搴撱�佷笉鍚堟牸鐢熸垚 NCR", "roles": ["IPQC 璐ㄦ鍛�"]},
- {"stage": "鍑鸿揣", "action": "閿�鍞嚭搴撴彁浜も啋OQC锛屽畬鎴愬悗鍑哄簱鍗曡繘鍏ュ緟鎷h揣", "roles": ["OQC 璐ㄦ鍛�"]},
+ {"stage": "杩囩▼", "action": "鎶ュ伐璐ㄦ宸ュ簭浜у嚭琛屽緟妫�鈫掕川妫�鍛樼嫭绔嬪綍鍏� IPQC锛涘畬鎴愬悗鎸夌墿鏂�+鐩樺彿+鏁伴噺涓�鑷村叧鑱旀姤宸ュ緟妫�琛岋紝鍚堟牸鎷嗚鍏ュ簱銆佷笉鍚堟牸鐢熸垚 NCR", "roles": ["IPQC 璐ㄦ鍛�"]},
+ {"stage": "鍑鸿揣", "action": "閿�鍞嚭搴撴彁浜ゅ悗琛岃浆寰呮娴嬧啋璐ㄦ鍛樼嫭绔嬪綍鍏� OQC锛涘畬鎴愬悗鎸夌墿鏂�+鐩樺彿+鏁伴噺涓�鑷村叧鑱斿嚭搴撳緟妫�琛岋紝鍏ㄩ儴鍚堟牸鍚庡嚭搴撳崟杩涘叆寰呮嫞璐�", "roles": ["OQC 璐ㄦ鍛�"]},
{"stage": "閫�璐�", "action": "閫�鏂�/閿�鍞��璐�/鍞悗閫�璐р啋RQC锛岀粨璁哄洖璋冨崟鎹笌鍞悗", "roles": ["RQC 璐ㄦ鍛�"]},
{"stage": "瀵煎叆", "action": "IQC/IPQC/OQC 涓夊垪琛ㄥ悇鏀寔 Excel 鎵归噺瀵煎叆(鎸夐挳鍦ㄣ�屾柊澧炪�嶄笌銆屽鍑恒�嶄箣闂达紝绾柊澧炰笉鍋氭洿鏂拌鐩�)锛氫竴琛屼竴寮犲崟锛岀紪鍙风暀绌鸿嚜鍔ㄧ敓鎴愶紝璐ㄦ鏂规鐣欑┖鎸夌墿鏂�+妫�楠岀被鍨嬭嚜鍔ㄥ尮閰嶏紝妫�娴嬩汉鍛樼暀绌哄彇褰撳墠鐧诲綍鐢ㄦ埛锛涚墿鏂�/渚涘簲鍟�/瀹㈡埛/宸ュ崟/宸ヤ綅鎸夌紪鐮佹垨鍚嶇О绮剧‘鍖归厤(IPQC 鐗╂枡鐢卞伐鍗曟帹瀵硷紝妯℃澘涓嶅~)锛屽悎鏍�+涓嶅悎鏍�=妫�娴�/鎺ユ敹鏁伴噺銆両PQC 宸ュ簾+鏂欏簾+鍏朵粬搴熷搧鈮や笉鍚堟牸銆丱QC 瀹㈡埛椤诲湪鏈汉鏁版嵁鏉冮檺鍐咃紱閫愯瀵煎叆閮ㄥ垎鎴愬姛锛屽け璐ヨ杩� failureList 甯﹁鍙蜂笌鍙墽琛屽姩浣滐紝鎴愬姛鍗曚竴寰嬪緟妫�楠�0锛涘悓涓�鎵规暟鎹笉鍙噸澶嶅鍏ワ細鏂囦欢鍐呴噸澶嶈涓庡簱鍐呭凡瀛樺湪鍚屼笟鍔¢敭鍗曟嵁锛圛QC 鐗╂枡+渚涘簲鍟�+渚涘簲鍟嗘壒娆�+鏉ユ枡鏃ユ湡銆両PQC 鐢熶骇宸ュ崟+妫�楠岀被鍨�+宸ヤ綅+妫�娴嬫棩鏈熴�丱QC 鐗╂枡+瀹㈡埛+鎵规鍙�+鍑鸿揣鏃ユ湡锛夊潎鎷掕琛岋紝鎻愮ず鍚淮搴︺�佸弻鏂瑰疄闄呭�间笌銆屽厛鍒犻櫎璇ュ崟鎹啀閲嶈瘯銆嶅姩浣�", "roles": ["璐ㄦ鍛�", "IQC 璐ㄦ鍛�", "IPQC 璐ㄦ鍛�", "OQC 璐ㄦ鍛�"]},
{"stage": "涓嶅悎鏍�", "action": "NCR: 寰呰瘎瀹♀啋璇勫鈫掑缃�(閫�璐�/鎶ュ簾/杩斿伐/璁╂鎺ユ敹/闄嶇骇)鈫掑叧闂�", "roles": ["璐ㄩ噺宸ョ▼甯�"]},
diff --git a/docs/project-business/data/objects.json b/docs/project-business/data/objects.json
index 16d07e1..68185c0 100644
--- a/docs/project-business/data/objects.json
+++ b/docs/project-business/data/objects.json
@@ -29,12 +29,12 @@
{"name": "涓荤敓浜ц鍒�", "module": "鐢熶骇", "table": "mes_pro_mps", "doc": "MPS璁″垝锛岃崏绋�0鈫掑凡涓嬪彂1鈫掑畬鎴�2/鍙栨秷3锛屽彲鍚堝苟涓嬪彂", "upstream": ["閿�鍞鍗�"], "downstream": ["鐢熶骇宸ュ崟"], "keywords": "MPS 涓昏鍒� 鐢熶骇璁″垝"},
{"name": "鐢熶骇宸ュ崟", "module": "鐢熶骇", "table": "mes_pro_work_order", "doc": "鑽夌0鈫掑凡纭1鈫掑畬鎴�2/鍙栨秷3锛岀‘璁ゆ椂鎸夊伐鑹鸿矾绾跨敓鎴愪换鍔★紝鏈�鍚庝竴閬撳伐搴忔姤宸ュ洖鍐欏凡鐢熶骇鏁伴噺", "upstream": ["MPS"], "downstream": ["鐢熶骇浠诲姟", "棰嗘枡", "瀹屽伐鍏ュ簱"], "keywords": "宸ュ崟 鐢熶骇宸ュ崟 work order"},
{"name": "鐢熶骇浠诲姟", "module": "鐢熶骇", "table": "mes_pro_task", "doc": "宸ュ簭绮掑害锛岄澶�0鈫掔敓浜т腑1鈫掗儴鍒�2鈫掑畬鎴�4锛屽彲鏆傚仠9鍙栨秷5", "upstream": ["鐢熶骇宸ュ崟"], "downstream": ["鎶ュ伐"], "keywords": "浠诲姟 task 宸ュ簭"},
- {"name": "鎶ュ伐鍗�", "module": "鐢熶骇", "table": "mes_pro_feedback", "doc": "鑽夌0鈫掑鎵逛腑2鈫掑緟妫�3/瀹屾垚4锛屾寜宸ュ簭椤哄簭鏍¢獙(涓婇亾宸ュ簭鎶ユ弧鎵嶅彲鎶�)锛岃仈鍔ㄥ�掑啿娑堣��/浜у嚭鍏ュ簱/IPQC", "upstream": ["鐢熶骇浠诲姟"], "downstream": ["浜у搧浜у嚭", "鐗╂枡娑堣��", "IPQC"], "keywords": "鎶ュ伐 feedback"},
+ {"name": "鎶ュ伐鍗�", "module": "鐢熶骇", "table": "mes_pro_feedback", "doc": "鑽夌0鈫掑鎵逛腑2鈫掑緟妫�3/瀹屾垚4锛屾寜宸ュ簭椤哄簭鏍¢獙(涓婇亾宸ュ簭鎶ユ弧鎵嶅彲鎶�)锛岃仈鍔ㄥ�掑啿娑堣��/浜у嚭鍏ュ簱/IPQC锛涜川妫�宸ュ簭鎶ュ伐瀹℃壒鍚庤浆寰呮楠屽苟鐢熸垚 PENDING 浜у嚭琛岋紝绛夊凡瀹屾垚 IPQC 鎸夌墿鏂�+鐩樺彿+鏁伴噺鍏宠仈鍚庢墠鍥炲啓瀹屾垚", "upstream": ["鐢熶骇浠诲姟"], "downstream": ["浜у搧浜у嚭", "鐗╂枡娑堣��", "IPQC"], "keywords": "鎶ュ伐 feedback"},
{"name": "宸ヨ壓璺嚎", "module": "鐢熶骇", "table": "mes_pro_route", "doc": "宸ュ簭椤哄簭+璐ㄦ/鍏抽敭/鍊掑啿鏍囪锛岄┍鍔ㄥ伐鍗曚换鍔′笌鎶ュ伐瑙勫垯", "upstream": [], "downstream": ["鐢熶骇宸ュ崟"], "keywords": "宸ヨ壓 璺嚎 route 宸ュ簭"},
{"name": "鍒拌揣閫氱煡鍗�", "module": "浠撳偍", "table": "mes_wm_arrival_notice", "doc": "閲囪喘璁㈠崟纭鏀惰揣鐢熸垚锛岃崏绋�0鈫掑緟璐ㄦ2鈫掑緟鍏ュ簱3鈫掑畬鎴�4", "upstream": ["閲囪喘璁㈠崟"], "downstream": ["IQC", "閲囪喘鍏ュ簱"], "keywords": "鍒拌揣 鏀惰揣 arrival"},
{"name": "閲囪喘鍏ュ簱鍗�", "module": "浠撳偍", "table": "mes_wm_item_receipt", "doc": "鑽夌0鈫掑緟涓婃灦2鈫掑緟鎵ц3鈫掑畬鎴�4锛屽畬鎴愬悗搴撳瓨+骞跺洖鍐� ERP inCount/inStatus", "upstream": ["鍒拌揣閫氱煡"], "downstream": ["搴撳瓨鍙拌处", "閲囪喘璁㈠崟(鍥炲啓)"], "keywords": "閲囪喘鍏ュ簱 鏀惰揣鍏ュ簱 receipt"},
{"name": "鐢熶骇棰嗘枡鍗�", "module": "浠撳偍", "table": "mes_wm_product_issue", "doc": "鑽夌0鈫掑緟鎷h揣2鈫掑緟鎵ц3鈫掑畬鎴�4锛屽簱瀛�-", "upstream": ["鐢熶骇宸ュ崟"], "downstream": ["搴撳瓨鍙拌处"], "keywords": "棰嗘枡 issue"},
- {"name": "閿�鍞嚭搴撳崟", "module": "浠撳偍", "table": "mes_wm_product_sales", "doc": "鍙戣揣閫氱煡瀹℃牳鍚庣敓鎴愶紝鎻愪氦鈫扥QC妫�娴嬧啋鎷h揣鈫掑彂杩�10鈫掑緟鎵ц3鈫掑畬鎴�4锛屽洖鍐欓攢鍞鍗曞嚭搴撴暟涓庣姸鎬�", "upstream": ["鍙戣揣閫氱煡", "閿�鍞鍗�"], "downstream": ["搴撳瓨鍙拌处", "OQC"], "keywords": "閿�鍞嚭搴� 鍙戣揣 鍑哄簱鍗� sales"},
+ {"name": "閿�鍞嚭搴撳崟", "module": "浠撳偍", "table": "mes_wm_product_sales", "doc": "鍙戣揣閫氱煡瀹℃牳鍚庣敓鎴愶紝鎻愪氦鍚庢湁 oqcCheckFlag 琛岃浆寰呮娴�1锛堟彁浜ゆ椂涓嶅啀鑷姩寤� OQC锛夛紝闇�璐ㄦ鍛樼嫭绔嬪綍鍏� OQC 骞跺湪妫�楠屽崟璇︽儏鎸夌墿鏂�+鐩樺彿+鏁伴噺鍏宠仈寰呮琛岋紱鍏ㄩ儴寰呮琛屽悎鏍煎悗杞緟鎷h揣2鈫掑彂杩�10鈫掑緟鎵ц3鈫掑畬鎴�4锛屽洖鍐欓攢鍞鍗曞嚭搴撴暟涓庣姸鎬�", "upstream": ["鍙戣揣閫氱煡", "閿�鍞鍗�"], "downstream": ["搴撳瓨鍙拌处", "OQC"], "keywords": "閿�鍞嚭搴� 鍙戣揣 鍑哄簱鍗� sales"},
{"name": "閿�鍞��璐у崟", "module": "浠撳偍", "table": "mes_wm_return_sales", "doc": "鑽夌鈫掑緟妫�楠�(RQC)鈫掑緟涓婃灦鈫掑緟鍏ュ簱鈫掑畬鎴愶紝鍞悗涓庢墜宸ヤ袱鏉ユ簮", "upstream": ["鍞悗閫�璐х敵璇�"], "downstream": ["搴撳瓨鍙拌处", "RQC"], "keywords": "閿�鍞��璐� 閫�璐у叆搴�"},
{"name": "渚涘簲鍟嗛��璐у崟", "module": "浠撳偍", "table": "mes_wm_return_vendor", "doc": "璐ㄩ噺閮ㄥ彂璧烽��璐э紝鑽夌0鈫掑鎵逛腑1(BPM锛氶噰璐啋璐ㄩ噺鈫掍粨搴�)鈫掑緟鎷h揣2鈫掑緟鎵ц閫�璐�3鈫掑畬鎴�4锛屽彲鍙栨秷5锛屽簱瀛�-锛涗笂浼犻檮浠惰蛋 storage-attachment锛涘鐞嗘柟寮� 1閫�娆�(瀹屾垚鍚庤嚜鍔ㄧ敓鎴愯礋鏁板啿绾粯娆惧崟) / 2鎹㈣揣(瀹屾垚鍚庤嚜鍔ㄧ敓鎴愬緟璐ㄦ鍒拌揣閫氱煡鍗曞苟鍒涘缓 IQC锛岄噸鏂板叆搴撹川妫�)锛涘悎鍚屽彿浠庨噰璐鍗曞揩鐓�", "upstream": ["IQC", "閲囪喘璁㈠崟(鍚堝悓鍙�)"], "downstream": ["搴撳瓨鍙拌处", "閲囪喘璁㈠崟(returnCount)", "浠樻鍗�(鍐茬孩)", "鍒拌揣閫氱煡(鎹㈣揣)"], "keywords": "渚涘簲鍟嗛��璐� 閫�鏂� 閫�璐� vendor"},
{"name": "璋冩嫧鍗�", "module": "浠撳偍", "table": "mes_wm_transfer", "doc": "鍐呴儴/澶栭儴璋冩嫧锛屾垚瀵� MOVE_OUT+MOVE_IN 浜嬪姟锛屽湪閫旀暟閲�", "upstream": [], "downstream": ["搴撳瓨鍙拌处"], "keywords": "璋冩嫧 绉诲簱 transfer"},
@@ -42,8 +42,8 @@
{"name": "搴撳瓨鍙拌处", "module": "浠撳偍", "table": "mes_wm_material_stock", "doc": "鐗╂枡脳浠撳簱脳搴撳尯脳搴撲綅脳鎵规脳渚涘簲鍟嗗叚鍏冪粍锛屾暟閲�/鍐荤粨/鍗犵敤/鍦ㄩ�斿洓閲�", "upstream": ["鍏ㄩ儴鍏ュ簱鍗�"], "downstream": ["鍏ㄩ儴鍑哄簱鍗�", "浜嬪姟娴佹按"], "keywords": "搴撳瓨 鍙拌处 stock 鍙敤閲�"},
{"name": "鎵规", "module": "浠撳偍", "table": "mes_wm_batch", "doc": "鍏宠仈鐗╂枡/宸ュ崟/渚涘簲鍟�/瀹㈡埛/璐ㄩ噺鐘舵�侊紱SN 鐮佸惈鎵规 uuid锛涙潯鐮佹敮鎸�18绉嶄笟鍔″璞�", "upstream": ["鍏ュ簱鍗曟嵁"], "downstream": ["搴撳瓨鍙拌处"], "keywords": "鎵规 batch SN 鏉$爜 杩芥函"},
{"name": "IQC鏉ユ枡妫�楠�", "module": "璐ㄩ噺", "table": "mes_qc_iqc", "doc": "鍒拌揣閫氱煡/澶栧崗鍏ュ簱瑙﹀彂锛岃崏绋�0鈫掑畬鎴�4锛岀粨璁哄洖鍐欐潵婧愬崟鎹紱琛屾搷浣溿�屽嚭鎶ュ憡銆嶄粎鍦ㄥ凡瀹屾垚鏃跺彲瑙侊紱鏀寔 Excel 鎵归噺瀵煎叆锛堝伐鍏锋爮銆屾壒閲忓鍏ャ�嶏紝绾柊澧炪�佸鍏ュ崟涓鸿崏绋裤�佺紪鍙峰彲鐣欑┖鑷姩鐢熸垚锛夛紱鍚屼竴鎵规暟鎹笉鍙噸澶嶅鍏ワ紙鐗╂枡+渚涘簲鍟�+渚涘簲鍟嗘壒娆�+鏉ユ枡鏃ユ湡锛屾枃浠跺唴閲嶅琛屼笌搴撳唴宸叉湁鍗曢兘鎷掕琛岋級", "upstream": ["鍒拌揣閫氱煡", "澶栧崗鍏ュ簱", "Excel 鎵归噺瀵煎叆"], "downstream": ["閲囪喘鍏ュ簱", "渚涘簲鍟嗛��璐�", "NCR", "鎶ュ憡瀹炰緥(鍑烘姤鍛�)"], "keywords": "IQC 鏉ユ枡妫�楠� 鍑烘姤鍛� 鎵归噺瀵煎叆 瀵煎叆妯℃澘"},
- {"name": "IPQC杩囩▼妫�楠�", "module": "璐ㄩ噺", "table": "mes_qc_ipqc", "doc": "鎶ュ伐璐ㄦ宸ュ簭浜у嚭琛岃Е鍙戯紝瀹屾垚鍥炶皟鎺ㄨ繘鎶ュ伐涓庝骇鍑哄叆搴擄紱琛屾搷浣溿�屽嚭鎶ュ憡銆嶄粎鍦ㄥ凡瀹屾垚鏃跺彲瑙侊紱鏀寔 Excel 鎵归噺瀵煎叆锛堜骇鍝佺墿鏂欑敱鐢熶骇宸ュ崟鎺ㄥ锛屾ā鏉夸笉濉墿鏂欙紱宸ュ簾+鏂欏簾+鍏朵粬搴熷搧涓嶅緱瓒呰繃涓嶅悎鏍煎搧鏁伴噺锛夛紱鍚屼竴鎵规暟鎹笉鍙噸澶嶅鍏ワ紙鐢熶骇宸ュ崟+妫�楠岀被鍨�+宸ヤ綅+妫�娴嬫棩鏈燂紝鏂囦欢鍐呴噸澶嶈涓庡簱鍐呭凡鏈夊崟閮芥嫆璇ヨ锛�", "upstream": ["鎶ュ伐", "Excel 鎵归噺瀵煎叆"], "downstream": ["浜у嚭鍏ュ簱", "NCR", "鎶ュ憡瀹炰緥(鍑烘姤鍛�)"], "keywords": "IPQC 杩囩▼妫�楠� 宸℃ 鍑烘姤鍛� 鎵归噺瀵煎叆 瀵煎叆妯℃澘"},
- {"name": "OQC鍑鸿揣妫�楠�", "module": "璐ㄩ噺", "table": "mes_qc_oqc", "doc": "閿�鍞嚭搴撴彁浜よЕ鍙戯紝瀹屾垚鎺ㄨ繘鍑哄簱鍗曞緟鎷h揣锛涜鎿嶄綔銆屽嚭鎶ュ憡銆嶄粎鍦ㄥ凡瀹屾垚鏃跺彲瑙侊紱鏀寔 Excel 鎵归噺瀵煎叆锛堝鎴烽』鍦ㄥ綋鍓嶇櫥褰曠敤鎴风殑瀹㈡埛鏁版嵁鏉冮檺鑼冨洿鍐咃級锛涘悓涓�鎵规暟鎹笉鍙噸澶嶅鍏ワ紙鐗╂枡+瀹㈡埛+鎵规鍙�+鍑鸿揣鏃ユ湡锛屾枃浠跺唴閲嶅琛屼笌搴撳唴宸叉湁鍗曢兘鎷掕琛岋級", "upstream": ["閿�鍞嚭搴撳崟", "Excel 鎵归噺瀵煎叆"], "downstream": ["閿�鍞嚭搴撳崟(鎺ㄨ繘)", "鎶ュ憡瀹炰緥(鍑烘姤鍛�)"], "keywords": "OQC 鍑鸿揣妫�楠� 鍑哄巶妫�楠� 鍑烘姤鍛� 鎵归噺瀵煎叆 瀵煎叆妯℃澘"},
+ {"name": "IPQC杩囩▼妫�楠�", "module": "璐ㄩ噺", "table": "mes_qc_ipqc", "doc": "鎶ュ伐璐ㄦ宸ュ簭浜у嚭琛屽緟妫�鍚庣嫭绔嬪綍鍏ワ紝瀹屾垚鏃舵寜鍚堟牸+涓嶅悎鏍�=妫�娴嬫暟閲忚嚜鍔ㄥ垽瀹� 1 閫氳繃/2 涓嶉�氳繃锛堥渶宸蹭笂浼犳楠岄檮浠讹級锛涘凡瀹屾垚涓旀湭缁戝畾鏉ユ簮鐨勫崟鎹紝鍦ㄨ鎯呮寜鐗╂枡+鐩樺彿+鏁伴噺涓�鑷撮�夋嫨寰呮浜у嚭琛屽叧鑱旓紝鍥炲啓鎶ュ伐瀹屾垚涓庝骇鍑哄叆搴擄紱鏈叧鑱斾笉鍥炲啓銆傝鎿嶄綔銆屽嚭鎶ュ憡銆嶄粎鍦ㄥ凡瀹屾垚鏃跺彲瑙侊紱鏀寔 Excel 鎵归噺瀵煎叆锛堜骇鍝佺墿鏂欑敱鐢熶骇宸ュ崟鎺ㄥ锛屾ā鏉夸笉濉墿鏂欙紱宸ュ簾+鏂欏簾+鍏朵粬搴熷搧涓嶅緱瓒呰繃涓嶅悎鏍煎搧鏁伴噺锛夛紱鍚屼竴鎵规暟鎹笉鍙噸澶嶅鍏ワ紙鐢熶骇宸ュ崟+妫�楠岀被鍨�+宸ヤ綅+妫�娴嬫棩鏈燂紝鏂囦欢鍐呴噸澶嶈涓庡簱鍐呭凡鏈夊崟閮芥嫆璇ヨ锛�", "upstream": ["鎶ュ伐", "Excel 鎵归噺瀵煎叆"], "downstream": ["浜у嚭鍏ュ簱", "NCR", "鎶ュ憡瀹炰緥(鍑烘姤鍛�)"], "keywords": "IPQC 杩囩▼妫�楠� 宸℃ 鐩樺彿鍏宠仈 鎶ュ伐鍏宠仈 鍑烘姤鍛� 鎵归噺瀵煎叆 瀵煎叆妯℃澘"},
+ {"name": "OQC鍑鸿揣妫�楠�", "module": "璐ㄩ噺", "table": "mes_qc_oqc", "doc": "閿�鍞嚭搴撴彁浜ゅ悗寰呮娴嬭鐙珛褰曞叆锛屽畬鎴愭椂鎸夊悎鏍�+涓嶅悎鏍�=妫�娴嬫暟閲忚嚜鍔ㄥ垽瀹� 1 閫氳繃/2 涓嶉�氳繃锛堥渶宸蹭笂浼犳楠岄檮浠讹級锛涘凡瀹屾垚涓旀湭缁戝畾鏉ユ簮鐨勫崟鎹紝鍦ㄨ鎯呮寜鐗╂枡+鐩樺彿+鏁伴噺涓�鑷撮�夋嫨寰呮鍑哄簱琛屽叧鑱旓紝鍥炲啓鍑哄簱琛岃川閲忕姸鎬� PASS/FAIL锛屽叏閮ㄥ緟妫�琛屽悎鏍煎悗鍑哄簱鍗曡浆寰呮嫞璐э紱涓嶅悎鏍艰鐣欏緟鍚庣画澶勭疆锛屼笉鑷姩鍙栨秷鍑哄簱鍗曘�傝鎿嶄綔銆屽嚭鎶ュ憡銆嶄粎鍦ㄥ凡瀹屾垚鏃跺彲瑙侊紱鏀寔 Excel 鎵归噺瀵煎叆锛堝鎴烽』鍦ㄥ綋鍓嶇櫥褰曠敤鎴风殑瀹㈡埛鏁版嵁鏉冮檺鑼冨洿鍐咃級锛涘悓涓�鎵规暟鎹笉鍙噸澶嶅鍏ワ紙鐗╂枡+瀹㈡埛+鎵规鍙�+鍑鸿揣鏃ユ湡锛屾枃浠跺唴閲嶅琛屼笌搴撳唴宸叉湁鍗曢兘鎷掕琛岋級", "upstream": ["閿�鍞嚭搴撳崟", "Excel 鎵归噺瀵煎叆"], "downstream": ["閿�鍞嚭搴撳崟(鎺ㄨ繘)", "鎶ュ憡瀹炰緥(鍑烘姤鍛�)"], "keywords": "OQC 鍑鸿揣妫�楠� 鍑哄巶妫�楠� 鐩樺彿鍏宠仈 鍑哄簱鍏宠仈 鍑烘姤鍛� 鎵归噺瀵煎叆 瀵煎叆妯℃澘"},
{"name": "RQC閫�璐ф楠�", "module": "璐ㄩ噺", "table": "mes_qc_rqc", "doc": "鐢熶骇閫�鏂�/閿�鍞��璐�/鍞悗閫�璐цЕ鍙戯紝缁撹鍥炶皟鍞悗锛涜鎿嶄綔銆屽嚭鎶ュ憡銆嶄粎鍦ㄥ凡瀹屾垚鏃跺彲瑙併�傛帾杈炲凡缁熶竴涓恒�岄��璐ф楠屻�嶏紙鍘熻彍鍗曠埗椤逛笌 mes_qc_type 瀛楀吀鍐欍�岄��鏂欐楠屻�嶏紝涓庡悗绔灇涓�/琛ㄦ敞閲�/鑿滃崟鏉冮檺瀛愰」涓嶄竴鑷达紱RQC 涓夎�呴兘瑕嗙洊锛屾晠鍙栥�岄��璐ф楠屻�嶏級", "upstream": ["閫�鏂�", "閫�璐�"], "downstream": ["閫�璐у叆搴�", "鍞悗鍥炶皟", "鎶ュ憡瀹炰緥(鍑烘姤鍛�)"], "keywords": "RQC 閫�璐ф楠� 閫�鏂欐楠� 鍑烘姤鍛�"},
{"name": "NCR涓嶅悎鏍煎搧", "module": "璐ㄩ噺", "table": "mes_qc_ncr", "doc": "寰呰瘎瀹�0鈫掑凡璇勫6鈫掑凡澶勭疆7鈫掑凡鍏抽棴8锛屽缃�:閫�璐�/鎶ュ簾/杩斿伐/璁╂鎺ユ敹/闄嶇骇", "upstream": ["IQC/IPQC/OQC/RQC"], "downstream": ["閫�璐�/鎶ュ簾/杩斿伐(鍙拌处)"], "keywords": "NCR 涓嶅悎鏍� 澶勭疆 鐗归噰 鎶ュ簾"},
{"name": "璁惧", "module": "璁惧", "table": "mes_dv_machinery", "doc": "鍙拌处鐘舵��:鍋滄満/鐢熶骇涓�/淇濆吇涓紱鐐规路淇濆吇路缁翠慨宸ュ崟锛汚I 椋庨櫓棰勬祴娑堣垂鍏舵暟鎹�", "upstream": [], "downstream": ["鐐规", "缁翠慨", "鐢熶骇椋庨櫓棰勬祴"], "keywords": "璁惧 鐐规 淇濆吇 缁翠慨 machinery"},
diff --git a/docs/project-business/index.html b/docs/project-business/index.html
index 1ec6812..8a2b9e8 100644
--- a/docs/project-business/index.html
+++ b/docs/project-business/index.html
@@ -734,7 +734,12 @@
H -->|鎻愪氦BPM| I[閿�鍞鍗曞鎵孤峰鎵逛腑15鈫掑凡瀹℃牳20]
I -->|鏄庣粏闇�鐢熶骇路鑷姩鍒涘缓| J[MES 涓荤敓浜ц鍒� MPS]
I --> K[鍙戣揣閫氱煡鍗昡
- K -->|瀹℃牳閫氳繃| L[閿�鍞嚭搴撳崟路OQC鈫掓嫞璐р啋鍙戣繍鈫掑嚭搴撳畬鎴怾
+ K -->|瀹℃牳閫氳繃| L0[閿�鍞嚭搴撳崟路鎻愪氦]
+ L0 -->|闇�妫�楠岃 oqcCheckFlag=1| L1[寰呮娴�1路鍑哄簱琛岃川閲忕姸鎬� PENDING]
+ L0 -->|鏃犻渶妫�楠寍 L2[寰呮嫞璐�2]
+ L1 -->|宸插畬鎴� OQC 鎸夌墿鏂�+鐩樺彿+鏁伴噺涓�鑷撮�夊緟妫�琛屽叧鑱攟 L3[鍑哄簱琛岃川閲忕姸鎬� PASS/FAIL]
+ L3 -->|鍏ㄩ儴寰呮琛屽悎鏍紎 L2
+ L2 --> L[鎷h揣鈫掑彂杩愨啋鍑哄簱瀹屾垚]
L -->|鍥炲啓鍑哄簱鏁伴噺涓庣姸鎬亅 M[閿�鍞鍗� 閮ㄥ垎鍑哄簱2/鍏ㄩ儴鍑哄簱3]
G --> N[鍥炴璁″垝路鎸夋湡鏁板垎鏈焆
G -->|鎻愪氦BPM| O[寮�绁� KP路瀹℃壒涓�10鈫掗�氳繃20路绱涓嶈秴鍚堝悓棰漖
@@ -777,10 +782,12 @@
P5 -->|鍚敤BPM鍒欐彁浜ゅ鎵箌 P6{鎶ュ伐瀹℃壒}
P6 -->|椹冲洖| P5
P6 -->|閫氳繃涓斿�掑啿宸ュ簭| P7[鎸夊伐鍗旴OM鑷姩鐢熸垚鐗╂枡娑堣�椔锋墸绾胯竟铏氭嫙搴揊IFO鍏佽璐熷簱瀛榏
- P6 -->|閫氳繃涓旇川妫�宸ュ簭| P8[浜у嚭琛屽緟妫�鈫扞PQC 杩囩▼妫�楠宂
+ P6 -->|閫氳繃涓旇川妫�宸ュ簭| P8[鎶ュ伐杞緟妫�楠屄蜂骇鍑鸿 PENDING]
P6 -->|閫氳繃涓旈潪璐ㄦ鍏抽敭宸ュ簭| P9[浜у搧浜у嚭鐩存帴瀹屽伐鍏ュ簱]
- P8 -->|妫�楠屽悎鏍紎 P10[鎷嗗悎鏍间笌涓嶅悎鏍艰鍏ュ簱]
- P8 -->|涓嶅悎鏍紎 P11[NCR 涓嶅悎鏍煎搧]
+ P8 -->|宸插畬鎴� IPQC 鎸夌墿鏂�+鐩樺彿+鏁伴噺涓�鑷撮�夊緟妫�浜у嚭琛屽叧鑱攟 P8L[鍥炲啓鎶ュ伐瀹屾垚路鎶ュ伐鐘舵�佲啋瀹屾垚4]
+ P8L -->|鍚堟牸鏁伴噺>0| P10[鍚堟牸琛屽叆搴撀蜂笉鍚堟牸鏁伴噺鎷嗗嚭涓轰笉鍚堟牸琛宂
+ P8L -->|涓嶅悎鏍兼暟閲�>0| P11[NCR 涓嶅悎鏍煎搧路绛夊緟鍚庣画澶勭疆]
+ P8 -.->|鏈叧鑱旂殑宸插畬鎴� IPQC 涓嶅洖鍐櫬烽渶鍦ㄦ楠屽崟璇︽儏鎵嬪姩鍏宠仈| P8
P9 --> P12[杩涘害鍥炲啓路浠呮渶鍚庝竴閬撳伐搴忔姤宸ユ墠鏇存柊宸ュ崟宸茬敓浜ф暟閲廬
P10 --> P12
P12 -->|宸茬敓浜ф暟閲忊墺璁″垝鏁伴噺路鑷姩| P13[宸ュ崟瀹屾垚2]
@@ -790,8 +797,8 @@
<pre style="display:none" class="mmd-src" data-mmd="05-quality-flow">
flowchart TD
T1[鍒拌揣閫氱煡鍗� 鎴� 澶栧崗鍏ュ簱鍗昡 --> A1[IQC 鏉ユ枡妫�楠屄疯崏绋�0鈫掑畬鎴�4]
- T2[鎶ュ伐璐ㄦ宸ュ簭閫氳繃鍚庝骇鍑鸿] --> A2[IPQC 杩囩▼妫�楠屄疯崏绋�0鈫掑畬鎴�4]
- T3[閿�鍞嚭搴撳崟鎻愪氦] --> A3[OQC 鍑鸿揣妫�楠屄疯崏绋�0鈫掑畬鎴�4]
+ T2[鎶ュ伐璐ㄦ宸ュ簭閫氳繃鍚庝骇鍑鸿路鐙珛褰曞叆 IPQC] --> A2[IPQC 杩囩▼妫�楠屄疯崏绋�0鈫掑畬鎴�4]
+ T3[閿�鍞嚭搴撳崟寰呮娴嬭路鐙珛褰曞叆 OQC] --> A3[OQC 鍑鸿揣妫�楠屄疯崏绋�0鈫掑畬鎴�4]
T4[鐢熶骇閫�鏂欏崟 鎴� 閿�鍞��璐у崟 鎴� 鍞悗閫�璐 --> A4[RQC 閫�璐ф楠屄疯崏绋�0鈫掑畬鎴�4]
T5[Excel 鎵归噺瀵煎叆路IQC IPQC OQC 涓夊垪琛ㄥ悇涓�涓叆鍙B锋寜閽湪鏂板涓庡鍑轰箣闂碷 --> IMP{瀵煎叆闂搁棬路閫愯瑙f瀽路澶辫触琛屼簰涓嶅奖鍝峿
IMP -->|缂栧彿鐣欑┖鑷姩鐢熸垚路缂栧彿閲嶅鎴栧悓涓�鎵规暟鎹噸澶嶅垯鎷掕琛寍 A1
@@ -809,12 +816,11 @@
A2 --> R
A3 --> R
A4 --> R
- R -->|1 鍚堟牸| Q1[鍏佽鍏ュ簱路鍥炲啓鏉ユ簮鍗曟嵁鎺ㄨ繘鐘舵�乚
- R -->|2 鐗归噰| Q2[鍏佽鍏ュ簱路骞剁敓鎴怤CR鐣欑棔]
- R -->|3 涓嶅悎鏍奸��璐 Q3[鐢熸垚NCR路璧颁緵搴斿晢閫�璐ф垨閿�鍞��璐
- R -->|4 涓嶅悎鏍兼姤搴焲 Q4[鐢熸垚NCR路璧版姤搴熷嚭搴揮
- A2 -->|鍚堟牸鏁伴噺| Q5[鎶ュ伐杞畬鎴惵蜂骇鍑烘媶琛屽叆搴揮
- A3 -->|瀹屾垚| Q6[閿�鍞嚭搴撳崟鎺ㄨ繘寰呮嫞璐
+ R -->|1 鏍¢獙閫氳繃| Q1[鍏佽鍏ュ簱路鍥炲啓鏉ユ簮鍗曟嵁鎺ㄨ繘鐘舵�乚
+ R -->|2 鏍¢獙涓嶉�氳繃| Q2[鐢熸垚NCR路鐣欏緟鍚庣画澶勭疆路涓嶈嚜鍔ㄥ彇娑堟潵婧愬崟鎹甝
+ R -.->|3 涓嶅悎鏍奸��璐� 4 涓嶅悎鏍兼姤搴� 涓哄巻鍙叉灇涓韭峰畬鎴愭椂涓嶅啀浜х敓| Q4[閫�璐�/鎶ュ簾璧板悗缁崟鎹甝
+ A2 -->|宸插畬鎴愪笖鏈粦瀹氭潵婧惵锋寜鐗╂枡+鐩樺彿+鏁伴噺涓�鑷磡 Q5[鍏宠仈鎶ュ伐寰呮琛屄峰洖鍐欐姤宸ュ畬鎴愪笌浜у嚭鍏ュ簱]
+ A3 -->|宸插畬鎴愪笖鏈粦瀹氭潵婧惵锋寜鐗╂枡+鐩樺彿+鏁伴噺涓�鑷磡 Q6[鍏宠仈閿�鍞嚭搴撳緟妫�琛屄峰洖鍐欏嚭搴撹璐ㄩ噺鐘舵�伮峰叏閮ㄥ悎鏍兼帹杩涘緟鎷h揣]
A4 -->|瀹屾垚| Q7[閫�璐у崟鎺ㄨ繘涓婃灦鎴栧叆搴撀峰敭鍚庡洖璋冪粨璁篯
N1[NCR 寰呰瘎瀹�0] -->|璇勫| N2[宸茶瘎瀹�6]
N2 -->|澶勭疆鏂瑰紡:閫�璐�1鎶ュ簾2杩斿伐3璁╂鎺ユ敹4闄嶇骇浣跨敤5| N3[宸插缃�7]
@@ -1082,8 +1088,8 @@
mes_wm_arrival_notice ||--o| mes_qc_iqc : "瑙﹀彂IQC"
mes_wm_arrival_notice ||--o{ mes_wm_item_receipt : "鐢熸垚閲囪喘鍏ュ簱"
erp_sale_order ||--o{ mes_wm_product_sales : "閿�鍞嚭搴�"
- mes_wm_product_sales ||--o| mes_qc_oqc : "瑙﹀彂OQC"
- mes_pro_feedback ||--o| mes_qc_ipqc : "璐ㄦ宸ュ簭瑙﹀彂IPQC"
+ mes_wm_product_sales ||--o| mes_qc_oqc : "鍑哄簱寰呮琛屾寜鐗╂枡+鐩樺彿+鏁伴噺鍏宠仈OQC"
+ mes_pro_feedback ||--o| mes_qc_ipqc : "鎶ュ伐寰呮琛屾寜鐗╂枡+鐩樺彿+鏁伴噺鍏宠仈IPQC"
mes_pro_feedback ||--o{ mes_wm_product_produce : "浜у嚭鍏ュ簱"
mes_pro_feedback ||--o{ mes_wm_item_consume : "BOM鍊掑啿娑堣��"
mes_qc_iqc ||--o| mes_qc_ncr : "涓嶅悎鏍肩敓鎴怤CR"
diff --git a/docs/project-business/mermaid/02-sales-flow.mmd b/docs/project-business/mermaid/02-sales-flow.mmd
index d84336a..ec5abe5 100644
--- a/docs/project-business/mermaid/02-sales-flow.mmd
+++ b/docs/project-business/mermaid/02-sales-flow.mmd
@@ -12,7 +12,12 @@
H -->|鎻愪氦BPM| I[閿�鍞鍗曞鎵孤峰鎵逛腑15鈫掑凡瀹℃牳20]
I -->|鏄庣粏闇�鐢熶骇路鑷姩鍒涘缓| J[MES 涓荤敓浜ц鍒� MPS]
I --> K[鍙戣揣閫氱煡鍗昡
- K -->|瀹℃牳閫氳繃| L[閿�鍞嚭搴撳崟路OQC鈫掓嫞璐р啋鍙戣繍鈫掑嚭搴撳畬鎴怾
+ K -->|瀹℃牳閫氳繃| L0[閿�鍞嚭搴撳崟路鎻愪氦]
+ L0 -->|闇�妫�楠岃 oqcCheckFlag=1| L1[寰呮娴�1路鍑哄簱琛岃川閲忕姸鎬� PENDING]
+ L0 -->|鏃犻渶妫�楠寍 L2[寰呮嫞璐�2]
+ L1 -->|宸插畬鎴� OQC 鎸夌墿鏂�+鐩樺彿+鏁伴噺涓�鑷撮�夊緟妫�琛屽叧鑱攟 L3[鍑哄簱琛岃川閲忕姸鎬� PASS/FAIL]
+ L3 -->|鍏ㄩ儴寰呮琛屽悎鏍紎 L2
+ L2 --> L[鎷h揣鈫掑彂杩愨啋鍑哄簱瀹屾垚]
L -->|鍥炲啓鍑哄簱鏁伴噺涓庣姸鎬亅 M[閿�鍞鍗� 閮ㄥ垎鍑哄簱2/鍏ㄩ儴鍑哄簱3]
G --> N[鍥炴璁″垝路鎸夋湡鏁板垎鏈焆
G -->|鎻愪氦BPM| O[寮�绁� KP路瀹℃壒涓�10鈫掗�氳繃20路绱涓嶈秴鍚堝悓棰漖
diff --git a/docs/project-business/mermaid/04-production-flow.mmd b/docs/project-business/mermaid/04-production-flow.mmd
index fe2c845..638920e 100644
--- a/docs/project-business/mermaid/04-production-flow.mmd
+++ b/docs/project-business/mermaid/04-production-flow.mmd
@@ -8,10 +8,12 @@
P5 -->|鍚敤BPM鍒欐彁浜ゅ鎵箌 P6{鎶ュ伐瀹℃壒}
P6 -->|椹冲洖| P5
P6 -->|閫氳繃涓斿�掑啿宸ュ簭| P7[鎸夊伐鍗旴OM鑷姩鐢熸垚鐗╂枡娑堣�椔锋墸绾胯竟铏氭嫙搴揊IFO鍏佽璐熷簱瀛榏
- P6 -->|閫氳繃涓旇川妫�宸ュ簭| P8[浜у嚭琛屽緟妫�鈫扞PQC 杩囩▼妫�楠宂
+ P6 -->|閫氳繃涓旇川妫�宸ュ簭| P8[鎶ュ伐杞緟妫�楠屄蜂骇鍑鸿 PENDING]
P6 -->|閫氳繃涓旈潪璐ㄦ鍏抽敭宸ュ簭| P9[浜у搧浜у嚭鐩存帴瀹屽伐鍏ュ簱]
- P8 -->|妫�楠屽悎鏍紎 P10[鎷嗗悎鏍间笌涓嶅悎鏍艰鍏ュ簱]
- P8 -->|涓嶅悎鏍紎 P11[NCR 涓嶅悎鏍煎搧]
+ P8 -->|宸插畬鎴� IPQC 鎸夌墿鏂�+鐩樺彿+鏁伴噺涓�鑷撮�夊緟妫�浜у嚭琛屽叧鑱攟 P8L[鍥炲啓鎶ュ伐瀹屾垚路鎶ュ伐鐘舵�佲啋瀹屾垚4]
+ P8L -->|鍚堟牸鏁伴噺>0| P10[鍚堟牸琛屽叆搴撀蜂笉鍚堟牸鏁伴噺鎷嗗嚭涓轰笉鍚堟牸琛宂
+ P8L -->|涓嶅悎鏍兼暟閲�>0| P11[NCR 涓嶅悎鏍煎搧路绛夊緟鍚庣画澶勭疆]
+ P8 -.->|鏈叧鑱旂殑宸插畬鎴� IPQC 涓嶅洖鍐櫬烽渶鍦ㄦ楠屽崟璇︽儏鎵嬪姩鍏宠仈| P8
P9 --> P12[杩涘害鍥炲啓路浠呮渶鍚庝竴閬撳伐搴忔姤宸ユ墠鏇存柊宸ュ崟宸茬敓浜ф暟閲廬
P10 --> P12
P12 -->|宸茬敓浜ф暟閲忊墺璁″垝鏁伴噺路鑷姩| P13[宸ュ崟瀹屾垚2]
diff --git a/docs/project-business/mermaid/05-quality-flow.mmd b/docs/project-business/mermaid/05-quality-flow.mmd
index 43c47b6..fa07acb 100644
--- a/docs/project-business/mermaid/05-quality-flow.mmd
+++ b/docs/project-business/mermaid/05-quality-flow.mmd
@@ -1,7 +1,7 @@
flowchart TD
T1[鍒拌揣閫氱煡鍗� 鎴� 澶栧崗鍏ュ簱鍗昡 --> A1[IQC 鏉ユ枡妫�楠屄疯崏绋�0鈫掑畬鎴�4]
- T2[鎶ュ伐璐ㄦ宸ュ簭閫氳繃鍚庝骇鍑鸿] --> A2[IPQC 杩囩▼妫�楠屄疯崏绋�0鈫掑畬鎴�4]
- T3[閿�鍞嚭搴撳崟鎻愪氦] --> A3[OQC 鍑鸿揣妫�楠屄疯崏绋�0鈫掑畬鎴�4]
+ T2[鎶ュ伐璐ㄦ宸ュ簭閫氳繃鍚庝骇鍑鸿路鐙珛褰曞叆 IPQC] --> A2[IPQC 杩囩▼妫�楠屄疯崏绋�0鈫掑畬鎴�4]
+ T3[閿�鍞嚭搴撳崟寰呮娴嬭路鐙珛褰曞叆 OQC] --> A3[OQC 鍑鸿揣妫�楠屄疯崏绋�0鈫掑畬鎴�4]
T4[鐢熶骇閫�鏂欏崟 鎴� 閿�鍞��璐у崟 鎴� 鍞悗閫�璐 --> A4[RQC 閫�璐ф楠屄疯崏绋�0鈫掑畬鎴�4]
T5[Excel 鎵归噺瀵煎叆路IQC IPQC OQC 涓夊垪琛ㄥ悇涓�涓叆鍙B锋寜閽湪鏂板涓庡鍑轰箣闂碷 --> IMP{瀵煎叆闂搁棬路閫愯瑙f瀽路澶辫触琛屼簰涓嶅奖鍝峿
IMP -->|缂栧彿鐣欑┖鑷姩鐢熸垚路缂栧彿閲嶅鎴栧悓涓�鎵规暟鎹噸澶嶅垯鎷掕琛寍 A1
@@ -19,12 +19,11 @@
A2 --> R
A3 --> R
A4 --> R
- R -->|1 鍚堟牸| Q1[鍏佽鍏ュ簱路鍥炲啓鏉ユ簮鍗曟嵁鎺ㄨ繘鐘舵�乚
- R -->|2 鐗归噰| Q2[鍏佽鍏ュ簱路骞剁敓鎴怤CR鐣欑棔]
- R -->|3 涓嶅悎鏍奸��璐 Q3[鐢熸垚NCR路璧颁緵搴斿晢閫�璐ф垨閿�鍞��璐
- R -->|4 涓嶅悎鏍兼姤搴焲 Q4[鐢熸垚NCR路璧版姤搴熷嚭搴揮
- A2 -->|鍚堟牸鏁伴噺| Q5[鎶ュ伐杞畬鎴惵蜂骇鍑烘媶琛屽叆搴揮
- A3 -->|瀹屾垚| Q6[閿�鍞嚭搴撳崟鎺ㄨ繘寰呮嫞璐
+ R -->|1 鏍¢獙閫氳繃| Q1[鍏佽鍏ュ簱路鍥炲啓鏉ユ簮鍗曟嵁鎺ㄨ繘鐘舵�乚
+ R -->|2 鏍¢獙涓嶉�氳繃| Q2[鐢熸垚NCR路鐣欏緟鍚庣画澶勭疆路涓嶈嚜鍔ㄥ彇娑堟潵婧愬崟鎹甝
+ R -.->|3 涓嶅悎鏍奸��璐� 4 涓嶅悎鏍兼姤搴� 涓哄巻鍙叉灇涓韭峰畬鎴愭椂涓嶅啀浜х敓| Q4[閫�璐�/鎶ュ簾璧板悗缁崟鎹甝
+ A2 -->|宸插畬鎴愪笖鏈粦瀹氭潵婧惵锋寜鐗╂枡+鐩樺彿+鏁伴噺涓�鑷磡 Q5[鍏宠仈鎶ュ伐寰呮琛屄峰洖鍐欐姤宸ュ畬鎴愪笌浜у嚭鍏ュ簱]
+ A3 -->|宸插畬鎴愪笖鏈粦瀹氭潵婧惵锋寜鐗╂枡+鐩樺彿+鏁伴噺涓�鑷磡 Q6[鍏宠仈閿�鍞嚭搴撳緟妫�琛屄峰洖鍐欏嚭搴撹璐ㄩ噺鐘舵�伮峰叏閮ㄥ悎鏍兼帹杩涘緟鎷h揣]
A4 -->|瀹屾垚| Q7[閫�璐у崟鎺ㄨ繘涓婃灦鎴栧叆搴撀峰敭鍚庡洖璋冪粨璁篯
N1[NCR 寰呰瘎瀹�0] -->|璇勫| N2[宸茶瘎瀹�6]
N2 -->|澶勭疆鏂瑰紡:閫�璐�1鎶ュ簾2杩斿伐3璁╂鎺ユ敹4闄嶇骇浣跨敤5| N3[宸插缃�7]
diff --git a/docs/project-business/mermaid/10-business-object.mmd b/docs/project-business/mermaid/10-business-object.mmd
index d65f2ef..60c5baa 100644
--- a/docs/project-business/mermaid/10-business-object.mmd
+++ b/docs/project-business/mermaid/10-business-object.mmd
@@ -16,8 +16,8 @@
mes_wm_arrival_notice ||--o| mes_qc_iqc : "瑙﹀彂IQC"
mes_wm_arrival_notice ||--o{ mes_wm_item_receipt : "鐢熸垚閲囪喘鍏ュ簱"
erp_sale_order ||--o{ mes_wm_product_sales : "閿�鍞嚭搴�"
- mes_wm_product_sales ||--o| mes_qc_oqc : "瑙﹀彂OQC"
- mes_pro_feedback ||--o| mes_qc_ipqc : "璐ㄦ宸ュ簭瑙﹀彂IPQC"
+ mes_wm_product_sales ||--o| mes_qc_oqc : "鍑哄簱寰呮琛屾寜鐗╂枡+鐩樺彿+鏁伴噺鍏宠仈OQC"
+ mes_pro_feedback ||--o| mes_qc_ipqc : "鎶ュ伐寰呮琛屾寜鐗╂枡+鐩樺彿+鏁伴噺鍏宠仈IPQC"
mes_pro_feedback ||--o{ mes_wm_product_produce : "浜у嚭鍏ュ簱"
mes_pro_feedback ||--o{ mes_wm_item_consume : "BOM鍊掑啿娑堣��"
mes_qc_iqc ||--o| mes_qc_ncr : "涓嶅悎鏍肩敓鎴怤CR"
diff --git a/scripts/item-sort/ItemSortMigration.java b/scripts/item-sort/ItemSortMigration.java
new file mode 100644
index 0000000..4534f35
--- /dev/null
+++ b/scripts/item-sort/ItemSortMigration.java
@@ -0,0 +1,13 @@
+import java.sql.*;
+public class ItemSortMigration {
+ public static void main(String[] a) throws Exception {
+ try (Connection c = DriverManager.getConnection("jdbc:mysql://1.95.78.124:9000/mom-xgdl?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true", "root", System.getenv("MOM_DB_PASSWORD")); Statement s=c.createStatement()) {
+ if (a.length > 0) { for (String table : new String[]{"mdm_item", "mes_md_item"}) { try (ResultSet r=s.executeQuery("SELECT COUNT(*) FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name=\u0027"+table+"\u0027 AND column_name=\u0027sort\u0027")) { r.next(); if (r.getInt(1)==0) { try (Statement ddl=c.createStatement()) { ddl.executeUpdate("ALTER TABLE `"+table+"` ADD COLUMN sort INT NOT NULL DEFAULT 0 COMMENT \u0027鎺掑簭锛屾暟鍊艰秺灏忚秺闈犲墠\u0027"); } } } } System.out.println("Synchronized rows="+s.executeUpdate("UPDATE mes_md_item m JOIN mdm_item d ON m.mdm_item_id=d.id SET m.sort=d.sort WHERE m.sort <> d.sort")); }
+ try(ResultSet r=s.executeQuery("SELECT COUNT(*), SUM(m.mdm_item_id IS NOT NULL), SUM(d.id IS NOT NULL) FROM mes_md_item m LEFT JOIN mdm_item d ON m.mdm_item_id=d.id WHERE m.deleted=0")) {r.next(); System.out.println("MES active="+r.getLong(1)+" linked="+r.getLong(2)+" matched="+r.getLong(3));}
+ for(String table : new String[]{"mdm_item","mes_md_item"}) {
+ try(ResultSet r=s.executeQuery("SELECT COUNT(*) FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='"+table+"' AND column_name='sort'")) { r.next(); System.out.println(table+" sort columns="+r.getInt(1)); }
+ try(ResultSet r=s.executeQuery("SELECT COUNT(*) FROM `"+table+"`")) {r.next(); System.out.println(table+" rows="+r.getLong(1));}
+ }
+ }
+ }
+}
diff --git a/sql/mysql/20261104_hrm_resignation_handover_columns.sql b/sql/mysql/20261104_hrm_resignation_handover_columns.sql
new file mode 100644
index 0000000..2d56037
--- /dev/null
+++ b/sql/mysql/20261104_hrm_resignation_handover_columns.sql
@@ -0,0 +1,14 @@
+-- 琛ラ綈绂昏亴鐢宠浜ゆ帴瀛楁锛涘彧娣诲姞缂哄け瀛楁锛屽彲閲嶅鎵ц銆�
+SET @target_db = DATABASE();
+SET @ddl = (SELECT IF(COUNT(*) = 0,
+ 'ALTER TABLE hrm_resignation_application ADD COLUMN handover_employee_id BIGINT NULL COMMENT ''浜ゆ帴鍛樺伐ID''',
+ 'SELECT 1') FROM information_schema.columns WHERE table_schema = @target_db AND table_name = 'hrm_resignation_application' AND column_name = 'handover_employee_id');
+PREPARE handover_stmt FROM @ddl;
+EXECUTE handover_stmt;
+DEALLOCATE PREPARE handover_stmt;
+SET @ddl = (SELECT IF(COUNT(*) = 0,
+ 'ALTER TABLE hrm_resignation_application ADD COLUMN handover_data_status TINYINT NOT NULL DEFAULT 0 COMMENT ''鐢ㄦ埛鏁版嵁浜ゆ帴鐘舵�侊細0鏈紑濮� 10杩涜涓� 20宸插畬鎴�''',
+ 'SELECT 1') FROM information_schema.columns WHERE table_schema = @target_db AND table_name = 'hrm_resignation_application' AND column_name = 'handover_data_status');
+PREPARE handover_stmt FROM @ddl;
+EXECUTE handover_stmt;
+DEALLOCATE PREPARE handover_stmt;
diff --git a/sql/mysql/20261104_mdm_item_technical_file.sql b/sql/mysql/20261104_mdm_item_technical_file.sql
new file mode 100644
index 0000000..b74b816
--- /dev/null
+++ b/sql/mysql/20261104_mdm_item_technical_file.sql
@@ -0,0 +1,15 @@
+-- 鐗╂枡鎶�鏈枃浠惰拷鍔犺褰曪紱宸ュ崟淇濆瓨鍏朵腑鍚勬潯璁板綍鐨勫揩鐓с��
+CREATE TABLE IF NOT EXISTS `mdm_item_technical_file` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `item_id` bigint NOT NULL COMMENT '鐗╂枡缂栧彿',
+ `storage_blob_id` bigint NOT NULL COMMENT '鏂囦欢瀛樺偍缂栧彿',
+ `version_no` int NOT NULL COMMENT '涓婁紶搴忓彿',
+ `file_name` varchar(255) DEFAULT NULL COMMENT '鏂囦欢鍚嶇О',
+ `creator` varchar(64) DEFAULT '',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `updater` varchar(64) DEFAULT '',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ `deleted` bit(1) NOT NULL DEFAULT b'0',
+ PRIMARY KEY (`id`),
+ KEY `idx_item_version` (`item_id`, `version_no`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='鐗╂枡鎶�鏈枃浠惰褰�';
diff --git a/sql/mysql/20261104_work_order_technical_files.sql b/sql/mysql/20261104_work_order_technical_files.sql
new file mode 100644
index 0000000..36c0136
--- /dev/null
+++ b/sql/mysql/20261104_work_order_technical_files.sql
@@ -0,0 +1,16 @@
+-- 鎸夊伐鍗曚繚瀛樻妧鏈枃浠舵竻鍗曪紝鍘嗗彶宸ュ崟涓嶅仛鐚滄祴鎬у洖濉��
+CREATE TABLE IF NOT EXISTS `mes_pro_work_order_technical_file` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `work_order_id` bigint NOT NULL,
+ `source_file_id` bigint NOT NULL,
+ `blob_id` bigint NOT NULL,
+ `version_no` int DEFAULT NULL,
+ `file_name` varchar(255) DEFAULT NULL,
+ `creator` varchar(64) DEFAULT '',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `updater` varchar(64) DEFAULT '',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ `deleted` bit(1) NOT NULL DEFAULT b'0',
+ PRIMARY KEY (`id`),
+ KEY `idx_work_order_id` (`work_order_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='鐢熶骇宸ュ崟鎶�鏈枃浠跺揩鐓�';
diff --git a/sql/mysql/mdm_mes_item_add_sort.sql b/sql/mysql/mdm_mes_item_add_sort.sql
new file mode 100644
index 0000000..3ca83df
--- /dev/null
+++ b/sql/mysql/mdm_mes_item_add_sort.sql
@@ -0,0 +1,3 @@
+ALTER TABLE mdm_item ADD COLUMN sort INT NOT NULL DEFAULT 0 COMMENT '鎺掑簭锛屾暟鍊艰秺灏忚秺闈犲墠';
+ALTER TABLE mes_md_item ADD COLUMN sort INT NOT NULL DEFAULT 0 COMMENT '鎺掑簭锛屾暟鍊艰秺灏忚秺闈犲墠';
+UPDATE mes_md_item m JOIN mdm_item d ON m.mdm_item_id = d.id SET m.sort = d.sort WHERE m.sort <> d.sort;
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java
index 24a6893..88da32b 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java
@@ -114,6 +114,14 @@
return success(technicalFileService.createTechnicalFile(reqVO));
}
+ @DeleteMapping("/technical-file/delete")
+ @Operation(summary = "浠庣墿鏂欑Щ闄ゆ妧鏈枃浠�")
+ @PreAuthorize("@ss.hasPermission('mdm:item:update')")
+ public CommonResult<Boolean> deleteTechnicalFile(@RequestParam("itemId") Long itemId, @RequestParam("id") Long id) {
+ technicalFileService.deleteTechnicalFile(itemId, id);
+ return success(true);
+ }
+
@GetMapping("/technical-file/list")
@Operation(summary = "鑾峰緱浜у搧鎶�鏈枃浠跺巻鍙�")
public CommonResult<List<MdmItemTechnicalFileRespVO>> getTechnicalFileList(@RequestParam("itemId") Long itemId) {
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/mysql/item/MdmItemTechnicalFileMapper.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/mysql/item/MdmItemTechnicalFileMapper.java
index 0cd95bc..4340613 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/mysql/item/MdmItemTechnicalFileMapper.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/dal/mysql/item/MdmItemTechnicalFileMapper.java
@@ -4,6 +4,8 @@
import cn.iocoder.yudao.module.mdm.dal.dataobject.item.MdmItemTechnicalFileDO;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
import java.util.List;
@@ -16,11 +18,7 @@
.orderByDesc(MdmItemTechnicalFileDO::getVersionNo));
}
- default Integer selectMaxVersionNo(Long itemId) {
- MdmItemTechnicalFileDO row = selectOne(new LambdaQueryWrapper<MdmItemTechnicalFileDO>()
- .eq(MdmItemTechnicalFileDO::getItemId, itemId)
- .orderByDesc(MdmItemTechnicalFileDO::getVersionNo)
- .last("LIMIT 1"));
- return row == null || row.getVersionNo() == null ? 0 : row.getVersionNo();
- }
+ // 鍖呭惈宸茬Щ闄よ褰曪紝閬垮厤鍚庣画涓婁紶澶嶇敤宸叉湁宸ュ崟鏄剧ず杩囩殑搴忓彿銆�
+ @Select("SELECT COALESCE(MAX(version_no), 0) FROM mdm_item_technical_file WHERE item_id = #{itemId}")
+ Integer selectMaxVersionNo(@Param("itemId") Long itemId);
}
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemTechnicalFileService.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemTechnicalFileService.java
index 9ec54f9..a39a8eb 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemTechnicalFileService.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemTechnicalFileService.java
@@ -7,5 +7,6 @@
public interface MdmItemTechnicalFileService {
Long createTechnicalFile(MdmItemTechnicalFileCreateReqVO reqVO);
+ void deleteTechnicalFile(Long itemId, Long id);
List<MdmItemTechnicalFileRespVO> getTechnicalFileList(Long itemId);
}
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemTechnicalFileServiceImpl.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemTechnicalFileServiceImpl.java
index b798384..5669b0b 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemTechnicalFileServiceImpl.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemTechnicalFileServiceImpl.java
@@ -52,6 +52,17 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteTechnicalFile(Long itemId, Long id) {
+ MdmItemTechnicalFileDO file = mapper.selectById(id);
+ if (file == null || !java.util.Objects.equals(file.getItemId(), itemId)) {
+ throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400, "鎶�鏈枃浠朵笉瀛樺湪鎴栦笉灞炰簬璇ョ墿鏂�");
+ }
+ // 鍙Щ闄ょ墿鏂欑殑褰撳墠鏂囦欢璁板綍銆備繚鐣欓檮浠跺強鏂囦欢鏈綋锛屼緵宸叉湁宸ュ崟蹇収浣跨敤銆�
+ mapper.deleteById(id);
+ }
+
+ @Override
public List<MdmItemTechnicalFileRespVO> getTechnicalFileList(Long itemId) {
return mapper.selectListByItemId(itemId).stream().map(file -> {
MdmItemTechnicalFileRespVO resp = BeanUtils.toBean(file, MdmItemTechnicalFileRespVO.class);
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
index 149e109..dabd072 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
@@ -73,6 +73,22 @@
public class MesProTaskController {
@Resource
+ private cn.iocoder.yudao.module.mes.dal.mysql.pro.task.MesProTaskMapper pendingCountMapper;
+
+ @GetMapping("/unfinished-workstation-counts")
+ @Operation(summary = "鑾峰緱鍚勫伐浣滅珯鏈畬鎴愪换鍔℃暟閲�")
+ public CommonResult<List<cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProWorkstationPendingCountVO>> getPendingWorkstationCounts() {
+ Long userId = cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId();
+ Long assigneeId = userId != null && !permissionApi.hasAnyRoles(userId,
+ cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum.SUPER_ADMIN.getCode()) ? userId : null;
+ return success(pendingCountMapper.selectPendingCounts(assigneeId,
+ cn.iocoder.yudao.module.mes.enums.pro.MesProTaskStatusEnum.PREPARE.getStatus(),
+ cn.iocoder.yudao.module.mes.enums.pro.MesProTaskStatusEnum.PRODUCING.getStatus(),
+ cn.iocoder.yudao.module.mes.enums.pro.MesProTaskStatusEnum.PARTIAL_FINISHED.getStatus(),
+ cn.iocoder.yudao.module.mes.enums.pro.MesProTaskStatusEnum.PAUSED.getStatus()));
+ }
+
+ @Resource
private cn.iocoder.yudao.module.mes.service.pro.task.schedule.MesProBatchScheduleService batchScheduleService;
@PostMapping("/auto-schedule/preview")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProWorkstationPendingCountVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProWorkstationPendingCountVO.java
new file mode 100644
index 0000000..039cff1
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProWorkstationPendingCountVO.java
@@ -0,0 +1,9 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo;
+
+import lombok.Data;
+
+@Data
+public class MesProWorkstationPendingCountVO {
+ private Long workstationId;
+ private Long pendingCount;
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java
index 60714d3..696fcb7 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java
@@ -67,6 +67,16 @@
private MesProTaskService taskService;
@Resource
private MesProProcessService processService;
+ @Resource
+ private cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderTechnicalFileService technicalFileService;
+
+ @GetMapping("/technical-files")
+ @Operation(summary = "鑾峰緱宸ュ崟鍒涘缓鏃剁殑鎶�鏈枃浠跺揩鐓�")
+ @PreAuthorize("@ss.hasPermission('mes:pro-work-order:query')")
+ public CommonResult<List<cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemTechnicalFileRespVO>> getTechnicalFiles(@RequestParam("id") Long id) {
+ workOrderService.validateWorkOrderExists(id);
+ return success(technicalFileService.list(id));
+ }
@PostMapping("/create")
@Operation(summary = "鍒涘缓鐢熶骇宸ュ崟")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/attachment/MesQcAttachmentController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/attachment/MesQcAttachmentController.java
new file mode 100644
index 0000000..2489fd3
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/attachment/MesQcAttachmentController.java
@@ -0,0 +1,124 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.attachment;
+
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.mes.service.qc.iqc.MesQcIqcService;
+import cn.iocoder.yudao.module.mes.service.qc.ipqc.MesQcIpqcService;
+import cn.iocoder.yudao.module.mes.service.qc.oqc.MesQcOqcService;
+import cn.iocoder.yudao.module.mes.service.qc.rqc.MesQcRqcService;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
+import cn.iocoder.yudao.module.system.api.storage.dto.StorageBlobRespDTO;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/** 璐ㄦ闄勪欢鐙珛浜庢楠岀粨璁猴紝涓婁紶闄勪欢涓嶈嚜鍔ㄥ皢浜у搧鍒や负鍚堟牸銆� */
+@RestController
+@RequestMapping("/mes/qc/attachment")
+@Validated
+public class MesQcAttachmentController {
+ @Resource private MesQcIqcService iqcService;
+ @Resource private MesQcIpqcService ipqcService;
+ @Resource private MesQcOqcService oqcService;
+ @Resource private MesQcRqcService rqcService;
+ @Resource private StorageAttachmentApi storageApi;
+ @Resource private org.springframework.jdbc.core.JdbcTemplate jdbcTemplate;
+
+ @GetMapping("/list")
+ @PreAuthorize("@ss.hasPermission('mes:qc-' + #type.toLowerCase() + ':query')")
+ public CommonResult<List<StorageBlobRespDTO>> list(
+ @RequestParam @Pattern(regexp = "iqc|ipqc|oqc|rqc") String type,
+ @RequestParam @NotNull Long id) {
+ validateDocument(type, id);
+ var files = storageApi.listAttachments(recordType(type), id);
+ return success(files == null ? List.of() : files);
+ }
+
+ @PutMapping("/save")
+ @PreAuthorize("@ss.hasPermission('mes:qc-' + #req.type.toLowerCase() + ':update')")
+ @Transactional(rollbackFor = Exception.class)
+ public CommonResult<Boolean> save(@Valid @RequestBody SaveReq req) {
+ lockDocument(req.getType(), req.getId());
+ validateDocument(req.getType(), req.getId());
+ // bindAttachments 浠呮浛鎹㈠叧鑱旓紝涓嶅垹闄ゅ叡浜枃浠舵湰浣撱��
+ storageApi.bindAttachments("file", recordType(req.getType()), req.getId(), req.getBlobIds().stream().distinct().toList());
+ return success(true);
+ }
+
+ @PostMapping("/append")
+ @PreAuthorize("@ss.hasPermission('mes:qc-' + #req.type.toLowerCase() + ':update')")
+ @Transactional(rollbackFor = Exception.class)
+ public CommonResult<Boolean> append(@Valid @RequestBody AppendReq req) {
+ lockDocument(req.getType(), req.getId());
+ validateDocument(req.getType(), req.getId());
+ var existing = storageApi.listAttachments(recordType(req.getType()), req.getId());
+ var ids = new java.util.LinkedHashSet<Long>();
+ if (existing != null) existing.forEach(blob -> ids.add(blob.getId()));
+ ids.add(req.getBlobId());
+ if (ids.size() > 50) throw new ServiceException(400, "姣忓紶璐ㄦ鍗曟渶澶氫笂浼�50浠介檮浠�");
+ storageApi.bindAttachments("file", recordType(req.getType()), req.getId(), List.copyOf(ids));
+ return success(true);
+ }
+
+ @DeleteMapping("/remove")
+ @PreAuthorize("@ss.hasPermission('mes:qc-' + #type.toLowerCase() + ':update')")
+ @Transactional(rollbackFor = Exception.class)
+ public CommonResult<Boolean> remove(
+ @RequestParam @Pattern(regexp = "iqc|ipqc|oqc|rqc") String type,
+ @RequestParam @NotNull Long id, @RequestParam @NotNull Long blobId) {
+ lockDocument(type, id);
+ validateDocument(type, id);
+ storageApi.removeReference("file", recordType(type), id, blobId);
+ return success(true);
+ }
+
+ private String recordType(String type) {
+ return switch (type) {
+ case "iqc", "ipqc", "oqc", "rqc" -> "mes_qc_" + type + "_attachment";
+ default -> throw new ServiceException(400, "璐ㄦ绫诲瀷鏃犳晥");
+ };
+ }
+
+ private void lockDocument(String type, Long id) {
+ String table = switch (type) {
+ case "iqc" -> "mes_qc_iqc";
+ case "ipqc" -> "mes_qc_ipqc";
+ case "oqc" -> "mes_qc_oqc";
+ case "rqc" -> "mes_qc_rqc";
+ default -> throw new ServiceException(400, "璐ㄦ绫诲瀷鏃犳晥");
+ };
+ var ids = jdbcTemplate.queryForList("SELECT id FROM " + table + " WHERE id = ? AND deleted = 0 FOR UPDATE", Long.class, id);
+ if (ids.isEmpty()) throw new ServiceException(400, "璐ㄦ鍗曚笉瀛樺湪");
+ }
+
+ private Integer validateDocument(String type, Long id) {
+ return switch (type) {
+ case "iqc" -> iqcService.validateIqcExists(id).getStatus();
+ case "ipqc" -> ipqcService.validateIpqcExists(id).getStatus();
+ case "oqc" -> oqcService.validateOqcExists(id).getStatus();
+ case "rqc" -> rqcService.validateRqcExists(id).getStatus();
+ default -> throw new ServiceException(400, "璐ㄦ绫诲瀷鏃犳晥");
+ };
+ }
+
+ @Data public static class SaveReq {
+ @NotNull @Pattern(regexp = "iqc|ipqc|oqc|rqc") private String type;
+ @NotNull private Long id;
+ @NotEmpty @Size(max = 50) private List<@NotNull Long> blobIds;
+ }
+ @Data public static class AppendReq {
+ @NotNull @Pattern(regexp = "iqc|ipqc|oqc|rqc") private String type;
+ @NotNull private Long id;
+ @NotNull private Long blobId;
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/link/MesQcSourceLinkController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/link/MesQcSourceLinkController.java
new file mode 100644
index 0000000..9b6549e
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/link/MesQcSourceLinkController.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.link;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.mes.service.qc.link.MesQcSourceLinkService;
+import jakarta.annotation.Resource;
+import jakarta.validation.constraints.NotNull;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@RestController
+@RequestMapping("/mes/qc/source-link")
+@Validated
+public class MesQcSourceLinkController {
+ @Resource private MesQcSourceLinkService service;
+ @GetMapping("/feedback-candidates")
+ @PreAuthorize("@ss.hasPermission('mes:qc-ipqc:update')")
+ public CommonResult<List<MesQcSourceLinkService.Candidate>> feedbackCandidates(@RequestParam @NotNull Long qcId) {
+ return success(service.feedbackCandidates(qcId));
+ }
+ @PostMapping("/feedback")
+ @PreAuthorize("@ss.hasPermission('mes:qc-ipqc:update')")
+ public CommonResult<Boolean> feedback(@RequestParam @NotNull Long qcId, @RequestParam @NotNull Long lineId) {
+ service.linkFeedback(qcId, lineId); return success(true);
+ }
+ @GetMapping("/sales-candidates")
+ @PreAuthorize("@ss.hasPermission('mes:qc-oqc:update')")
+ public CommonResult<List<MesQcSourceLinkService.Candidate>> salesCandidates(@RequestParam @NotNull Long qcId) {
+ return success(service.salesCandidates(qcId));
+ }
+ @PostMapping("/sales")
+ @PreAuthorize("@ss.hasPermission('mes:qc-oqc:update')")
+ public CommonResult<Boolean> sales(@RequestParam @NotNull Long qcId, @RequestParam @NotNull Long lineId) {
+ service.linkSales(qcId, lineId); return success(true);
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/scrap/MesWmScrapReceiptController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/scrap/MesWmScrapReceiptController.java
index b77debc..60d9a9d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/scrap/MesWmScrapReceiptController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/scrap/MesWmScrapReceiptController.java
@@ -42,6 +42,49 @@
@Resource private MesProWorkOrderMapper workOrderMapper;
@Resource private MesWmTransactionService transactionService;
@Resource private MesWmWarehouseAreaService areaService;
+ @Resource private cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService warehouseService;
+ @Resource private cn.iocoder.yudao.module.mdm.api.item.MdmItemApi itemApi;
+
+ @GetMapping("/order-outputs")
+ @PreAuthorize("@ss.hasPermission('mes:wm-scrap-receipt:create')")
+ public CommonResult<List<OutputItem>> orderOutputs(@RequestParam("workOrderId") Long workOrderId) {
+ var order = workOrderMapper.selectById(workOrderId);
+ if (order == null || !java.util.Objects.equals(order.getStatus(), cn.iocoder.yudao.module.mes.enums.pro.MesProWorkOrderStatusEnum.FINISHED.getStatus()))
+ throw new ServiceException(400, "浠呭凡瀹屾垚鐨勭敓浜ц鍗曞彲浠ョ櫥璁板簾鏂�");
+ var list = receiptMapper.selectOrderOutputs(workOrderId, cn.iocoder.yudao.module.mes.enums.wm.MesWmProductProduceStatusEnum.FINISHED.getStatus());
+ var items = itemApi.getItemMap(list.stream().map(OutputItem::getItemId).collect(java.util.stream.Collectors.toSet()));
+ list.forEach(output -> { var item = items.get(output.getItemId()); if (item != null) { output.setItemName(item.getName()); output.setItemCode(item.getCode()); } });
+ return success(list);
+ }
+
+ @PostMapping("/create-from-output")
+ @PreAuthorize("@ss.hasPermission('mes:wm-scrap-receipt:create')")
+ @Transactional(rollbackFor = Exception.class)
+ public CommonResult<Long> createFromOutput(@Valid @RequestBody CreateReq req) {
+ var locked = workOrderMapper.lockScheduleOrders(List.of(req.getWorkOrderId()));
+ if (locked.isEmpty() || !java.util.Objects.equals(locked.get(0).getStatus(), cn.iocoder.yudao.module.mes.enums.pro.MesProWorkOrderStatusEnum.FINISHED.getStatus()))
+ throw new ServiceException(400, "浠呭凡瀹屾垚鐨勭敓浜ц鍗曞彲浠ョ櫥璁板簾鏂�");
+ if (receiptMapper.selectOrderOutputs(req.getWorkOrderId(), cn.iocoder.yudao.module.mes.enums.wm.MesWmProductProduceStatusEnum.FINISHED.getStatus()).stream()
+ .noneMatch(item -> java.util.Objects.equals(item.getItemId(), req.getItemId())
+ && java.util.Objects.equals(item.getBatchId(), req.getBatchId())
+ && java.util.Objects.equals(cn.hutool.core.util.StrUtil.blankToDefault(item.getBatchCode(), ""),
+ cn.hutool.core.util.StrUtil.blankToDefault(req.getBatchCode(), ""))))
+ throw new ServiceException(400, "鎵�閫夌墿鏂欎笉鏄璁㈠崟鐨勫凡瀹屾垚浜у嚭");
+ var warehouse = warehouseService.validateWarehouseExists(req.getWarehouseId());
+ if (!java.util.Objects.equals("搴熸枡浠�", warehouse.getWarehouseType()) && !java.util.Objects.equals("搴熸枡", warehouse.getWarehouseType()))
+ throw new ServiceException(400, "璇烽�夋嫨浠撳簱绫诲瀷涓哄簾鏂欎粨鐨勪粨搴�");
+ return create(req);
+ }
+
+ @Data
+ public static class OutputItem {
+ private Long itemId;
+ private String itemCode;
+ private String itemName;
+ private Long batchId;
+ private String batchCode;
+ private BigDecimal quantity;
+ }
@PostMapping("/create")
@PreAuthorize("@ss.hasPermission('mes:wm-scrap-receipt:create')")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkOrderTechnicalFileDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkOrderTechnicalFileDO.java
new file mode 100644
index 0000000..dc49800
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkOrderTechnicalFileDO.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("mes_pro_work_order_technical_file")
+public class MesProWorkOrderTechnicalFileDO extends BaseDO {
+ @TableId private Long id;
+ private Long workOrderId;
+ private Long sourceFileId;
+ private Long blobId;
+ private Integer versionNo;
+ private String fileName;
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
index 9f089fe..f5bf7fc 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
@@ -11,6 +11,8 @@
import cn.iocoder.yudao.module.mes.enums.pro.MesProTaskStatusEnum;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
import java.math.BigDecimal;
import java.util.List;
@@ -23,6 +25,16 @@
@Mapper
public interface MesProTaskMapper extends BaseMapperX<MesProTaskDO> {
+ @Select({"<script>",
+ "SELECT t.workstation_id AS workstationId, COUNT(*) AS pendingCount FROM mes_pro_task t",
+ "WHERE t.deleted = 0 AND t.workstation_id IS NOT NULL AND t.status IN (#{prepare}, #{producing}, #{partial}, #{paused})",
+ "<if test='assigneeId != null'>AND EXISTS (SELECT 1 FROM mes_pro_task_assignee a",
+ "WHERE a.task_id=t.id AND a.user_id=#{assigneeId} AND a.deleted=0)</if>",
+ "GROUP BY t.workstation_id", "</script>"})
+ java.util.List<cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProWorkstationPendingCountVO> selectPendingCounts(
+ @Param("assigneeId") Long assigneeId, @Param("prepare") Integer prepare,
+ @Param("producing") Integer producing, @Param("partial") Integer partial, @Param("paused") Integer paused);
+
/** 鎵�鏈夋帓浜у啓鍏ュ彛浠ョ浉鍚岄『搴忛攣瀹氬伐浣滅珯锛涗簨鍔℃彁浜ゅ悗閲婃斁锛岃法杩涚▼闃叉璧勬簮绔炴�併�� */
@org.apache.ibatis.annotations.Select("SELECT id FROM mes_md_workstation WHERE deleted = 0 ORDER BY id FOR UPDATE")
List<Long> lockSchedulingResources();
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkOrderTechnicalFileMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkOrderTechnicalFileMapper.java
new file mode 100644
index 0000000..9053b65
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkOrderTechnicalFileMapper.java
@@ -0,0 +1,13 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderTechnicalFileDO;
+import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+
+@Mapper
+public interface MesProWorkOrderTechnicalFileMapper extends BaseMapperX<MesProWorkOrderTechnicalFileDO> {
+ default List<MesProWorkOrderTechnicalFileDO> selectByWorkOrderId(Long id) {
+ return selectList(MesProWorkOrderTechnicalFileDO::getWorkOrderId, id);
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/scrap/MesWmScrapReceiptMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/scrap/MesWmScrapReceiptMapper.java
index eec7891..0e1861c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/scrap/MesWmScrapReceiptMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/scrap/MesWmScrapReceiptMapper.java
@@ -14,6 +14,12 @@
@Mapper
public interface MesWmScrapReceiptMapper extends BaseMapperX<MesWmScrapReceiptDO> {
+ @Select("SELECT l.item_id AS itemId, l.batch_id AS batchId, l.batch_code AS batchCode, SUM(l.quantity) AS quantity FROM mes_wm_product_produce p " +
+ "JOIN mes_wm_product_produce_line l ON l.produce_id=p.id AND l.deleted=0 " +
+ "WHERE p.deleted=0 AND p.work_order_id=#{orderId} AND p.status=#{finished} " +
+ "AND l.item_id IS NOT NULL AND l.quantity > 0 GROUP BY l.item_id,l.batch_id,l.batch_code")
+ List<cn.iocoder.yudao.module.mes.controller.admin.wm.scrap.MesWmScrapReceiptController.OutputItem> selectOrderOutputs(
+ @Param("orderId") Long orderId, @Param("finished") Integer finished);
default MesWmScrapReceiptDO selectByCode(String code) {
return selectOne(MesWmScrapReceiptDO::getCode, code);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesQcCheckResultEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesQcCheckResultEnum.java
index 718f342..b8c9d40 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesQcCheckResultEnum.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesQcCheckResultEnum.java
@@ -38,10 +38,10 @@
* 鍒ゆ柇鏄惁鍙互鍏ュ簱
*
* @param type 妫�娴嬬粨鏋�
- * @return true 鍙互鍏ュ簱
+ * @return true 鍙互鍏ュ簱銆傚綋鍓嶈川妫�瀛楀吀灏� 2 鐢ㄤ綔涓嶉�氳繃锛屼笉鑳芥寜鏃р�滅壒閲団�濆惈涔夋斁琛屻��
*/
public static boolean canInbound(Integer type) {
- return QUALIFIED.getType().equals(type) || SPECIAL_APPROVAL.getType().equals(type);
+ return QUALIFIED.getType().equals(type);
}
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java
index 22d2cd5..5e01383 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderServiceImpl.java
@@ -74,6 +74,8 @@
private MesMdWorkstationService workstationService;
@Resource
private CrmCustomerApi customerApi;
+ @Resource
+ private MesProWorkOrderTechnicalFileService technicalFileService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -89,6 +91,7 @@
MesProWorkOrderDO workOrder = BeanUtils.toBean(createReqVO, MesProWorkOrderDO.class);
workOrder.setStatus(MesProWorkOrderStatusEnum.PREPARE.getStatus());
workOrderMapper.insert(workOrder);
+ technicalFileService.snapshot(workOrder.getId(), workOrder.getProductId());
// 3. 鑷姩鐢熸垚 BOM锛氭牴鎹骇鍝� BOM 鐢熸垚宸ュ崟 BOM
workOrderBomService.generateWorkOrderBom(workOrder.getId(), createReqVO, false);
@@ -125,6 +128,7 @@
// 宸ュ崟鐩樺彿娌跨敤鍒涘缓鏃剁殑鏉ユ簮蹇収锛岄伩鍏嶄笌璁″垝鍜屽凡鐢熸垚鐨勪笅娓歌褰曚笉涓�鑷淬��
updateObj.setReelNo(null);
workOrderMapper.updateById(updateObj);
+ if (productChanged) technicalFileService.replace(updateReqVO.getId(), updateReqVO.getProductId());
}
@Override
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderTechnicalFileService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderTechnicalFileService.java
new file mode 100644
index 0000000..6b98609
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderTechnicalFileService.java
@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.mes.service.pro.workorder;
+
+import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemTechnicalFileRespVO;
+import cn.iocoder.yudao.module.mdm.service.item.MdmItemTechnicalFileService;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderTechnicalFileDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderTechnicalFileMapper;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Service
+public class MesProWorkOrderTechnicalFileService {
+ private static final String RECORD_TYPE = "mes_work_order_technical_file";
+ @Resource private MdmItemTechnicalFileService itemTechnicalFileService;
+ @Resource private MesProWorkOrderTechnicalFileMapper mapper;
+ @Resource private StorageAttachmentApi storageApi;
+
+ /** 璋冪敤鏂瑰湪宸ュ崟浜嬪姟涓墽琛岋紝閬垮厤娓呭崟涓庡伐鍗曞垱寤虹粨鏋滀笉涓�鑷淬�� */
+ public void snapshot(Long orderId, Long itemId) {
+ var files = itemTechnicalFileService.getTechnicalFileList(itemId);
+ for (var file : files) {
+ MesProWorkOrderTechnicalFileDO row = new MesProWorkOrderTechnicalFileDO();
+ row.setWorkOrderId(orderId);
+ row.setSourceFileId(file.getId());
+ row.setBlobId(file.getBlobId());
+ row.setVersionNo(file.getVersionNo());
+ row.setFileName(file.getFileName());
+ mapper.insert(row);
+ }
+ if (!files.isEmpty()) storageApi.bindAttachments("file", RECORD_TYPE, orderId,
+ files.stream().map(MdmItemTechnicalFileRespVO::getBlobId).distinct().toList());
+ }
+
+ public void replace(Long orderId, Long itemId) {
+ // 涓嶈皟鐢� deleteAttachmentsByRecord锛氳鎺ュ彛浼氬垹闄ゅ叡浜殑搴曞眰鏂囦欢銆�
+ mapper.delete(MesProWorkOrderTechnicalFileDO::getWorkOrderId, orderId);
+ snapshot(orderId, itemId);
+ }
+
+ public List<MdmItemTechnicalFileRespVO> list(Long orderId) {
+ var blobs = storageApi.listAttachments(RECORD_TYPE, orderId);
+ var byId = blobs == null ? Map.<Long, cn.iocoder.yudao.module.system.api.storage.dto.StorageBlobRespDTO>of()
+ : blobs.stream().collect(Collectors.toMap(b -> b.getId(), Function.identity(), (a, b) -> a));
+ return mapper.selectByWorkOrderId(orderId).stream().map(row -> {
+ MdmItemTechnicalFileRespVO result = new MdmItemTechnicalFileRespVO();
+ result.setId(row.getSourceFileId()); result.setBlobId(row.getBlobId());
+ result.setVersionNo(row.getVersionNo()); result.setFileName(row.getFileName());
+ var blob = byId.get(row.getBlobId());
+ if (blob != null) { result.setPreviewURL(blob.getPreviewURL()); result.setDownloadURL(blob.getDownloadURL()); }
+ return result;
+ }).toList();
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcCompletionHelper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcCompletionHelper.java
new file mode 100644
index 0000000..aad0c81
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcCompletionHelper.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.mes.service.qc;
+
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Component;
+import java.math.BigDecimal;
+
+/** 鎸夋暟閲忔眹鎬昏川妫�缁撴灉锛屼笉鎺ㄦ柇涓嶅悎鏍煎搧鐨勫悗缁缃柟寮忋�� */
+@Component
+public class MesQcCompletionHelper {
+ @Resource private StorageAttachmentApi storageApi;
+ @Resource private org.springframework.jdbc.core.JdbcTemplate jdbcTemplate;
+
+ public void lockDocument(String type, Long id) {
+ String table = switch (type) {
+ case "iqc", "ipqc", "oqc", "rqc" -> "mes_qc_" + type;
+ default -> throw new ServiceException(400, "璐ㄦ绫诲瀷鏃犳晥");
+ };
+ var rows = jdbcTemplate.queryForList("SELECT id FROM " + table + " WHERE id = ? AND deleted = 0 FOR UPDATE", Long.class, id);
+ if (rows.isEmpty()) throw new ServiceException(400, "璐ㄦ鍗曚笉瀛樺湪");
+ }
+
+ public int validateAndGetResult(String type, Long id, BigDecimal qualified, BigDecimal unqualified, BigDecimal checked) {
+ if (qualified == null || unqualified == null || qualified.signum() < 0 || unqualified.signum() < 0) {
+ throw new ServiceException(400, "璇峰~鍐欏ぇ浜庣瓑浜庨浂鐨勫悎鏍兼暟閲忓拰涓嶅悎鏍兼暟閲�");
+ }
+ BigDecimal total = qualified.add(unqualified);
+ if (total.signum() <= 0 || checked == null || total.compareTo(checked) != 0) {
+ throw new ServiceException(400, "鍚堟牸鏁伴噺涓庝笉鍚堟牸鏁伴噺涔嬪拰椤诲ぇ浜庨浂涓旂瓑浜庢娴嬫暟閲�");
+ }
+ var attachments = storageApi.listAttachments("mes_qc_" + type + "_attachment", id);
+ if (attachments == null || attachments.isEmpty()) throw new ServiceException(400, "璇峰厛涓婁紶妫�楠岄檮浠�");
+ // 涓庣幇鏈� mes_qc_check_result 瀛楀吀涓�鑷达細1 閫氳繃锛�2 涓嶉�氳繃銆�
+ return unqualified.signum() == 0 ? 1 : 2;
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java
index efe1c69..35454eb 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java
@@ -76,6 +76,9 @@
@Slf4j
public class MesQcIpqcServiceImpl implements MesQcIpqcService {
+ @Resource
+ private cn.iocoder.yudao.module.mes.service.qc.MesQcCompletionHelper completionHelper;
+
/**
* IPQC 淇濆瓨鏁版嵁鏍¢獙涓婁笅鏂�
*
@@ -141,22 +144,7 @@
MesProWorkOrderDO workOrder = workOrderService.validateWorkOrderExists(createReqVO.getWorkOrderId());
// 1.3 纭畾妫�楠岀墿鏂欙細鏈変换鍔℃椂鍙栦换鍔$殑鐗╂枡锛屾棤浠诲姟鏃跺彇宸ュ崟鐨勪骇鍝�
Long itemId = (ctx.task() != null) ? ctx.task().getItemId() : workOrder.getProductId();
- // 1.4 鏍规嵁鐗╂枡 + IPQC 绫诲瀷鏌ユ壘鍙敤璐ㄦ鏂规锛堟敮鎸佸墠绔樉寮忔寚瀹氾級
- List<MesQcTemplateItemDO> templateItems = templateItemService.getTemplateItemList(
- itemId, MesQcTypeEnum.IPQC.getType(), null, null);
- if (CollUtil.isEmpty(templateItems)) {
- throw exception(QC_NO_TEMPLATE);
- }
- MesQcTemplateItemDO templateItem = templateItems.get(0);
- if (createReqVO.getTemplateId() != null) {
- templateItem = templateItems.stream()
- .filter(available -> Objects.equals(available.getTemplateId(), createReqVO.getTemplateId()))
- .findFirst().orElse(null);
- if (templateItem == null) {
- throw exception(QC_NO_TEMPLATE); // 鎸囧畾浜嗘柟妗堜絾涓嶅湪鍖归厤鍒楄〃涓紝鎷掔粷
- }
- }
- Long templateId = templateItem.getTemplateId();
+ // 鏂板缓璐ㄦ鍗曚笉渚濊禆璐ㄦ鏂规銆�
// 1.5 鑾峰彇鏉ユ簮鍗曟嵁缂栧彿
String sourceDocCode = validateAndGetSourceDocCode(
createReqVO.getSourceDocType(), createReqVO.getSourceDocId(), createReqVO.getSourceLineId());
@@ -166,13 +154,10 @@
.setItemId(itemId)
.setReelNo(workOrder.getReelNo())
.setProcessId(getProcessId(itemId, ctx.workstation().getProcessId()))
- .setTemplateId(templateId)
+ .setTemplateId(null)
.setSourceDocCode(sourceDocCode)
.setStatus(MesQcStatusEnum.DRAFT.getStatus());
ipqcMapper.insert(ipqc);
-
- // 3. 浠庢ā鏉挎寚鏍囪嚜鍔ㄧ敓鎴愭楠岃
- ipqcLineService.createLinesFromTemplate(ipqc.getId(), templateId);
return ipqc.getId();
}
@@ -247,18 +232,16 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void finishIpqc(Long id) {
+ completionHelper.lockDocument("ipqc", id);
// 1.1 鏍¢獙瀛樺湪 + 鑽夌鐘舵��
MesQcIpqcDO ipqc = validateIpqcStatusPrepare(id);
- // 1.2 鏍¢獙妫�娴嬬粨璁哄繀濉�
- if (ipqc.getCheckResult() == null) {
- throw exception(QC_IPQC_CHECK_RESULT_EMPTY);
- }
- // 1.3 鏍¢獙鑷冲皯瀛樺湪涓�鏉℃娴嬬粨鏋�
- indicatorResultService.validateIndicatorResultExistsByQcIdAndType(id, MesQcTypeEnum.IPQC.getType());
+ int result = completionHelper.validateAndGetResult("ipqc", id, ipqc.getQualifiedQuantity(), ipqc.getUnqualifiedQuantity(), ipqc.getCheckQuantity());
+ ipqc.setCheckResult(result);
+
// 2. 鏇存柊鐘舵�佷负宸插畬鎴�
ipqcMapper.updateById(new MesQcIpqcDO()
- .setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus()));
+ .setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus()).setCheckResult(result));
// 3. 涓嶅悎鏍兼椂鑷姩鍒涘缓 NCR
generateNcrIfNeeded(ipqc);
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java
index fc6a153..93efc25 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java
@@ -63,6 +63,9 @@
public class MesQcIqcServiceImpl implements MesQcIqcService {
@Resource
+ private cn.iocoder.yudao.module.mes.service.qc.MesQcCompletionHelper completionHelper;
+
+ @Resource
private MesQcIqcMapper iqcMapper;
@Resource
@@ -104,33 +107,15 @@
// 1.2 鏍¢獙鏉ユ簮鍗曟嵁鍙傛暟锛屽苟楠岃瘉鏁版嵁瀛樺湪
String sourceDocCode = validateAndGetSourceDocCode(
createReqVO.getSourceDocType(), createReqVO.getSourceDocId(), createReqVO.getSourceLineId());
- // 1.3 鏍规嵁浜у搧 + IQC 绫诲瀷鏌ユ壘鍙敤璐ㄦ鏂规锛堟敮鎸佸墠绔樉寮忔寚瀹氾級
- List<MesQcTemplateItemDO> templateItems = templateItemService.getTemplateItemList(
- createReqVO.getItemId(), MesQcTypeEnum.IQC.getType(), null, null);
- if (CollUtil.isEmpty(templateItems)) {
- throw exception(QC_NO_TEMPLATE);
- }
- MesQcTemplateItemDO templateItem = templateItems.get(0);
- if (createReqVO.getTemplateId() != null) {
- templateItem = templateItems.stream()
- .filter(item -> Objects.equals(item.getTemplateId(), createReqVO.getTemplateId()))
- .findFirst().orElse(null);
- if (templateItem == null) {
- throw exception(QC_NO_TEMPLATE); // 鎸囧畾浜嗘柟妗堜絾涓嶅湪鍖归厤鍒楄〃涓紝鎷掔粷
- }
- }
- Long templateId = templateItem.getTemplateId();
+ // 鏂板缓璐ㄦ鍗曚笉渚濊禆璐ㄦ鏂规銆�
// 2. 鎻掑叆涓昏〃
MesQcIqcDO iqc = BeanUtils.toBean(createReqVO, MesQcIqcDO.class)
- .setTemplateId(templateId)
+ .setTemplateId(null)
.setCheckQuantity(createReqVO.getQualifiedQuantity().add(createReqVO.getUnqualifiedQuantity()))
.setSourceDocCode(sourceDocCode)
.setStatus(MesQcStatusEnum.DRAFT.getStatus());
iqcMapper.insert(iqc);
-
- // 3. 浠庢ā鏉挎寚鏍囪嚜鍔ㄧ敓鎴愭楠岃
- iqcLineService.createLinesFromTemplate(iqc.getId(), templateId);
return iqc.getId();
}
@@ -175,17 +160,16 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void finishIqc(Long id) {
+ completionHelper.lockDocument("iqc", id);
// 1.1 鏍¢獙瀛樺湪 + 鑽夌鐘舵��
MesQcIqcDO iqc = validateIqcStatusPrepare(id);
- if (iqc.getCheckResult() == null) {
- throw exception(QC_IQC_CHECK_RESULT_EMPTY);
- }
- // 1.2 鏍¢獙鑷冲皯瀛樺湪涓�鏉℃娴嬬粨鏋�
- indicatorResultService.validateIndicatorResultExistsByQcIdAndType(id, MesQcTypeEnum.IQC.getType());
+ int result = completionHelper.validateAndGetResult("iqc", id, iqc.getQualifiedQuantity(), iqc.getUnqualifiedQuantity(), iqc.getCheckQuantity());
+ iqc.setCheckResult(result);
+
// 2. 鏇存柊鐘舵�佷负宸插畬鎴�
MesQcIqcDO updateObj = new MesQcIqcDO()
- .setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus());
+ .setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus()).setCheckResult(result);
iqcMapper.updateById(updateObj);
// 3. 涓嶅悎鏍兼椂鑷姩鍒涘缓 NCR
@@ -387,17 +371,6 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Long createIqcFromArrivalNotice(Long noticeId, MesWmArrivalNoticeLineDO line, String noticeCode, Long vendorId) {
- // 1. 鏍¢獙鐗╂枡鏄惁閰嶇疆浜� IQC 妫�楠屾ā鏉�
- MesQcTemplateItemDO templateItem;
- try {
- templateItem = templateItemService.getRequiredTemplateByItemIdAndType(
- line.getItemId(), MesQcTypeEnum.IQC.getType());
- } catch (Exception e) {
- // 鑾峰彇鐗╂枡淇℃伅锛屾彁渚涙洿鏄庣‘鐨勯敊璇彁绀�
- String itemInfo = getItemInfo(line.getItemId());
- throw exception(QC_NO_TEMPLATE_FOR_ITEM, itemInfo);
- }
- Long templateId = templateItem.getTemplateId();
// 2. 鐢熸垚妫�楠屽崟缂栫爜
String code = "IQC" + System.currentTimeMillis();
@@ -406,7 +379,7 @@
MesQcIqcDO iqc = new MesQcIqcDO();
iqc.setCode(code);
iqc.setName(noticeCode + "-鐗╂枡妫�楠�");
- iqc.setTemplateId(templateId);
+
iqc.setSourceDocType(MesBizTypeConstants.WM_ARRIVAL_NOTICE);
iqc.setSourceDocId(noticeId);
iqc.setSourceLineId(line.getId());
@@ -427,8 +400,6 @@
iqc.setStatus(MesQcStatusEnum.DRAFT.getStatus());
iqcMapper.insert(iqc);
- // 4. 浠庢ā鏉挎寚鏍囪嚜鍔ㄧ敓鎴愭楠岃
- iqcLineService.createLinesFromTemplate(iqc.getId(), templateId);
return iqc.getId();
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/link/MesQcSourceLinkService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/link/MesQcSourceLinkService.java
new file mode 100644
index 0000000..39c3539
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/link/MesQcSourceLinkService.java
@@ -0,0 +1,234 @@
+package cn.iocoder.yudao.module.mes.service.qc.link;
+
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc.MesQcIpqcDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceLineDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesLineDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.feedback.MesProFeedbackMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.qc.ipqc.MesQcIpqcMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.qc.oqc.MesQcOqcMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productproduce.MesWmProductProduceLineMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesLineMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesMapper;
+import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
+import cn.iocoder.yudao.module.mes.enums.pro.MesProFeedbackStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.qc.MesQcStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductSalesStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
+import cn.iocoder.yudao.module.mes.service.pro.feedback.MesProFeedbackService;
+import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesLineService;
+import jakarta.annotation.Resource;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
+import java.util.*;
+
+/** 涓�寮犲凡瀹屾垚璐ㄦ鍗曞搴斾竴鏉℃暟閲忓畬鍏ㄤ竴鑷寸殑寰呮涓氬姟琛屻�� */
+@Service
+public class MesQcSourceLinkService {
+ @Resource private MesQcIpqcMapper ipqcMapper;
+ @Resource private MesQcOqcMapper oqcMapper;
+ @Resource private MesProFeedbackMapper feedbackMapper;
+ @Resource private MesWmProductProduceLineMapper produceLineMapper;
+ @Resource private MesWmProductSalesMapper salesMapper;
+ @Resource private MesWmProductSalesLineMapper salesLineMapper;
+ @Resource private ErpSaleOrderApi saleOrderApi;
+ @Resource @Lazy private MesProFeedbackService feedbackService;
+ @Resource @Lazy private MesWmProductSalesLineService salesLineService;
+
+ public record Candidate(Long lineId, Long documentId, String documentCode, String reelNo, BigDecimal quantity) {}
+
+ public List<Candidate> feedbackCandidates(Long qcId) {
+ MesQcIpqcDO qc = ipqcMapper.selectById(qcId);
+ requireIpqc(qc);
+ var lines = produceLineMapper.selectList(new LambdaQueryWrapperX<MesWmProductProduceLineDO>()
+ .eq(MesWmProductProduceLineDO::getItemId, qc.getItemId())
+ .eq(MesWmProductProduceLineDO::getQualityStatus, MesWmQualityStatusEnum.PENDING.getStatus())
+ .isNotNull(MesWmProductProduceLineDO::getFeedbackId).orderByDesc(MesWmProductProduceLineDO::getId));
+ List<Candidate> result = new ArrayList<>();
+ for (var line : lines) {
+ MesProFeedbackDO feedback = feedbackMapper.selectById(line.getFeedbackId());
+ if (feedback != null && feedbackMismatch(qc, line, feedback) == null) {
+ result.add(new Candidate(line.getId(), feedback.getId(), feedback.getCode(), line.getReelNo(), line.getQuantity()));
+ }
+ }
+ return result;
+ }
+
+ public List<Candidate> salesCandidates(Long qcId) {
+ MesQcOqcDO qc = oqcMapper.selectById(qcId);
+ requireOqc(qc);
+ var lines = salesLineMapper.selectList(new LambdaQueryWrapperX<MesWmProductSalesLineDO>()
+ .eq(MesWmProductSalesLineDO::getItemId, qc.getItemId())
+ .eq(MesWmProductSalesLineDO::getOqcCheckFlag, true)
+ .isNull(MesWmProductSalesLineDO::getOqcId).orderByDesc(MesWmProductSalesLineDO::getId));
+ List<Candidate> result = new ArrayList<>();
+ for (var line : lines) {
+ var sales = salesMapper.selectById(line.getSalesId());
+ String reel = salesReel(line);
+ if (sales != null && salesMismatch(qc, line, sales, reel) == null) {
+ result.add(new Candidate(line.getId(), sales.getId(), sales.getCode(), reel, line.getQuantity()));
+ }
+ }
+ return result;
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public void linkFeedback(Long qcId, Long lineId) {
+ var qc = ipqcMapper.selectOne(new LambdaQueryWrapperX<MesQcIpqcDO>().eq(MesQcIpqcDO::getId, qcId).last("FOR UPDATE"));
+ requireIpqc(qc);
+ var line = produceLineMapper.selectById(lineId);
+ if (line == null || line.getFeedbackId() == null) {
+ throw new ServiceException(400, "鎵�閫夋姤宸ヤ骇鍑鸿涓嶅瓨鍦ㄦ垨鏈叧鑱旀姤宸ュ崟锛岃鍒锋柊鍊欓�夊垪琛ㄥ悗閲嶈瘯");
+ }
+ var feedback = feedbackMapper.selectByIdForUpdate(line.getFeedbackId());
+ line = produceLineMapper.selectOne(new LambdaQueryWrapperX<MesWmProductProduceLineDO>()
+ .eq(MesWmProductProduceLineDO::getId, lineId).last("FOR UPDATE"));
+ String mismatch = feedbackMismatch(qc, line, feedback);
+ if (mismatch != null) throw new ServiceException(400, mismatch);
+ long used = ipqcMapper.selectCount(new LambdaQueryWrapperX<MesQcIpqcDO>()
+ .eq(MesQcIpqcDO::getSourceDocType, MesBizTypeConstants.PRO_FEEDBACK)
+ .eq(MesQcIpqcDO::getSourceLineId, lineId));
+ if (used > 0) throw new ServiceException(400, "璇ュ緟妫�浜у嚭琛屽凡琚叾浠栬繃绋嬫楠屽崟鍏宠仈锛岃鍒锋柊鍊欓�夊垪琛ㄥ悗閲嶈瘯");
+ ipqcMapper.updateById(new MesQcIpqcDO().setId(qcId).setSourceDocType(MesBizTypeConstants.PRO_FEEDBACK)
+ .setSourceDocId(feedback.getId()).setSourceLineId(lineId).setSourceDocCode(feedback.getCode()));
+ feedbackService.updateProFeedbackWhenIpqcFinish(feedback.getId(), lineId, qc.getQualifiedQuantity(), qc.getUnqualifiedQuantity(),
+ zero(qc.getLaborScrapQuantity()), zero(qc.getMaterialScrapQuantity()), zero(qc.getOtherScrapQuantity()));
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public void linkSales(Long qcId, Long lineId) {
+ var qc = oqcMapper.selectOne(new LambdaQueryWrapperX<MesQcOqcDO>().eq(MesQcOqcDO::getId, qcId).last("FOR UPDATE"));
+ requireOqc(qc);
+ var line = salesLineMapper.selectById(lineId);
+ if (line == null || line.getSalesId() == null) {
+ throw new ServiceException(400, "鎵�閫夐攢鍞嚭搴撴槑缁嗕笉瀛樺湪鎴栨湭鍏宠仈鍑哄簱鍗曪紝璇峰埛鏂板�欓�夊垪琛ㄥ悗閲嶈瘯");
+ }
+ var sales = salesMapper.selectOne(new LambdaQueryWrapperX<MesWmProductSalesDO>()
+ .eq(MesWmProductSalesDO::getId, line.getSalesId()).last("FOR UPDATE"));
+ line = salesLineMapper.selectOne(new LambdaQueryWrapperX<MesWmProductSalesLineDO>()
+ .eq(MesWmProductSalesLineDO::getId, lineId).last("FOR UPDATE"));
+ String mismatch = salesMismatch(qc, line, sales, salesReel(line));
+ if (mismatch != null) throw new ServiceException(400, mismatch);
+ var linked = oqcMapper.selectOne(new LambdaQueryWrapperX<MesQcOqcDO>()
+ .eq(MesQcOqcDO::getSourceDocType, MesBizTypeConstants.WM_PRODUCT_SALES)
+ .eq(MesQcOqcDO::getSourceLineId, lineId).last("LIMIT 1"));
+ if (linked != null) {
+ throw new ServiceException(400, "璇ュ嚭搴撴槑缁嗗凡鍏宠仈鍑鸿揣妫�楠屽崟[" + linked.getCode() + "]锛岃鍒锋柊鍊欓�夊垪琛ㄥ悗閲嶈瘯");
+ }
+ oqcMapper.updateById(new MesQcOqcDO().setId(qcId).setSourceDocType(MesBizTypeConstants.WM_PRODUCT_SALES)
+ .setSourceDocId(sales.getId()).setSourceLineId(lineId).setSourceDocCode(sales.getCode()));
+ salesLineService.updateProductSalesLineWhenOqcFinish(lineId, qcId, qc.getCheckResult());
+ }
+
+ /** 杩斿洖绗竴澶勪笉婊¤冻鐨勫師鍥狅紱涓虹┖琛ㄧず鍙叧鑱斻�� */
+ private String feedbackMismatch(MesQcIpqcDO q, MesWmProductProduceLineDO l, MesProFeedbackDO f) {
+ if (l == null) return "鎵�閫夋姤宸ヤ骇鍑鸿涓嶅瓨鍦ㄦ垨宸插垹闄わ紝璇峰埛鏂板�欓�夊垪琛ㄥ悗閲嶈瘯";
+ if (f == null) return "鍏宠仈鐨勬姤宸ュ崟涓嶅瓨鍦ㄦ垨宸插垹闄わ紝璇峰埛鏂板�欓�夊垪琛ㄥ悗閲嶈瘯";
+ if (!Objects.equals(f.getStatus(), MesProFeedbackStatusEnum.UNCHECK.getStatus())) {
+ return "鎶ュ伐鍗昜" + f.getCode() + "]褰撳墠鐘舵�佷负[" + feedbackStatusName(f.getStatus()) + "]锛屼粎寰呮楠屾姤宸ュ彲鍏宠仈锛岃閲嶆柊閫夋嫨";
+ }
+ if (!Objects.equals(l.getQualityStatus(), MesWmQualityStatusEnum.PENDING.getStatus())) {
+ return "鎶ュ伐浜у嚭琛屽綋鍓嶈川閲忕姸鎬佷负[" + qualityStatusName(l.getQualityStatus()) + "]锛屽凡琚楠屾垨宸插叆搴擄紝璇烽噸鏂伴�夋嫨";
+ }
+ if (!Objects.equals(q.getItemId(), l.getItemId())) {
+ return "鐗╂枡涓嶄竴鑷达細璐ㄦ鍗曠墿鏂橧D=" + display(q.getItemId()) + "锛屾姤宸ヤ骇鍑鸿鐗╂枡ID=" + display(l.getItemId()) + "锛岃閲嶆柊閫夋嫨";
+ }
+ if (!Objects.equals(q.getWorkOrderId(), f.getWorkOrderId())) {
+ return "鐢熶骇宸ュ崟涓嶄竴鑷达細璐ㄦ鍗曞伐鍗旾D=" + display(q.getWorkOrderId()) + "锛屾姤宸ュ崟宸ュ崟ID=" + display(f.getWorkOrderId()) + "锛岃閲嶆柊閫夋嫨";
+ }
+ if (q.getTaskId() != null && !Objects.equals(q.getTaskId(), f.getTaskId())) {
+ return "鐢熶骇浠诲姟涓嶄竴鑷达細璐ㄦ鍗曚换鍔D=" + display(q.getTaskId()) + "锛屾姤宸ュ崟浠诲姟ID=" + display(f.getTaskId()) + "锛岃閲嶆柊閫夋嫨";
+ }
+ if (!sameReel(q.getReelNo(), l.getReelNo())) {
+ return "鐩樺彿涓嶄竴鑷达細璐ㄦ鍗曠洏鍙穂" + display(q.getReelNo()) + "]锛屾姤宸ヤ骇鍑鸿鐩樺彿[" + display(l.getReelNo()) + "]锛岃閲嶆柊閫夋嫨";
+ }
+ if (!sameQty(q.getCheckQuantity(), l.getQuantity())) {
+ return "鏁伴噺涓嶄竴鑷达細璐ㄦ鍗曟娴嬫暟閲廩" + display(q.getCheckQuantity()) + "]锛屽緟妫�浜у嚭琛屾暟閲廩" + display(l.getQuantity()) + "]锛岃閲嶆柊閫夋嫨";
+ }
+ return null;
+ }
+
+ private String salesMismatch(MesQcOqcDO q, MesWmProductSalesLineDO l, MesWmProductSalesDO s, String reel) {
+ if (l == null) return "鎵�閫夐攢鍞嚭搴撴槑缁嗕笉瀛樺湪鎴栧凡鍒犻櫎锛岃鍒锋柊鍊欓�夊垪琛ㄥ悗閲嶈瘯";
+ if (s == null) return "鎵�灞為攢鍞嚭搴撳崟涓嶅瓨鍦ㄦ垨宸插垹闄わ紝璇峰埛鏂板�欓�夊垪琛ㄥ悗閲嶈瘯";
+ if (!Objects.equals(s.getStatus(), MesWmProductSalesStatusEnum.CONFIRMED.getStatus())) {
+ return "閿�鍞嚭搴撳崟[" + s.getCode() + "]褰撳墠鐘舵�佷负[" + salesStatusName(s.getStatus()) + "]锛屼粎寰呮娴嬪嚭搴撳崟鍙叧鑱旓紝璇烽噸鏂伴�夋嫨";
+ }
+ if (!Boolean.TRUE.equals(l.getOqcCheckFlag())) {
+ return "璇ュ嚭搴撴槑缁嗘湭鍕鹃�夈�岄渶瑕佸嚭璐ф楠屻�嶏紝鏃犳硶鍏宠仈锛岃鍏堢‘璁ゅ嚭搴撴槑缁嗚缃�";
+ }
+ if (l.getOqcId() != null) {
+ return "璇ュ嚭搴撴槑缁嗗凡鍏宠仈璐ㄦ鍗旾D=" + l.getOqcId() + "锛岃鍒锋柊鍊欓�夊垪琛ㄥ悗閲嶆柊閫夋嫨";
+ }
+ if (!Objects.equals(q.getItemId(), l.getItemId())) {
+ return "鐗╂枡涓嶄竴鑷达細璐ㄦ鍗曠墿鏂橧D=" + display(q.getItemId()) + "锛屽嚭搴撴槑缁嗙墿鏂橧D=" + display(l.getItemId()) + "锛岃閲嶆柊閫夋嫨";
+ }
+ if (q.getClientId() != null && !Objects.equals(q.getClientId(), s.getClientId())) {
+ return "瀹㈡埛涓嶄竴鑷达細璐ㄦ鍗曞鎴稩D=" + display(q.getClientId()) + "锛岄攢鍞嚭搴撳崟瀹㈡埛ID=" + display(s.getClientId()) + "锛岃閲嶆柊閫夋嫨";
+ }
+ if (!sameReel(q.getReelNo(), reel)) {
+ return "鐩樺彿涓嶄竴鑷达細璐ㄦ鍗曠洏鍙穂" + display(q.getReelNo()) + "]锛屽嚭搴撴槑缁嗙洏鍙穂" + display(reel) + "]锛岃纭閿�鍞鍗曟槑缁嗙洏鍙峰悗閲嶆柊閫夋嫨";
+ }
+ if (!sameQty(q.getCheckQuantity(), l.getQuantity())) {
+ return "鏁伴噺涓嶄竴鑷达細璐ㄦ鍗曟娴嬫暟閲廩" + display(q.getCheckQuantity()) + "]锛屽緟妫�鍑哄簱鏄庣粏鏁伴噺[" + display(l.getQuantity()) + "]锛岃閲嶆柊閫夋嫨";
+ }
+ return null;
+ }
+
+ private String salesReel(MesWmProductSalesLineDO line) {
+ if (line == null || line.getSaleOrderItemId() == null) return null;
+ var item = saleOrderApi.getSaleOrderItem(line.getSaleOrderItemId()).getCheckedData();
+ return item == null ? null : item.getReelNo();
+ }
+ private static boolean sameReel(String a, String b) { return a != null && b != null && !a.isBlank() && a.trim().equals(b.trim()); }
+ private static boolean sameQty(BigDecimal a, BigDecimal b) { return a != null && b != null && a.signum() > 0 && a.compareTo(b) == 0; }
+ private static BigDecimal zero(BigDecimal value) { return value == null ? BigDecimal.ZERO : value; }
+ private static String display(Object value) { return value == null ? "绌�" : value.toString(); }
+ private static String feedbackStatusName(Integer status) {
+ for (var e : MesProFeedbackStatusEnum.values()) if (Objects.equals(e.getStatus(), status)) return e.getName();
+ return "鏈煡(" + display(status) + ")";
+ }
+ private static String qualityStatusName(Integer status) {
+ for (var e : MesWmQualityStatusEnum.values()) if (Objects.equals(e.getStatus(), status)) return e.getName();
+ return "鏈煡(" + display(status) + ")";
+ }
+ private static String salesStatusName(Integer status) {
+ for (var e : MesWmProductSalesStatusEnum.values()) if (Objects.equals(e.getStatus(), status)) return e.getName();
+ return "鏈煡(" + display(status) + ")";
+ }
+ private static void requireIpqc(MesQcIpqcDO q) {
+ if (q == null) throw new ServiceException(400, "杩囩▼妫�楠屽崟涓嶅瓨鍦ㄦ垨宸插垹闄わ紝璇峰埛鏂板悗閲嶈瘯");
+ if (!Objects.equals(q.getStatus(), MesQcStatusEnum.FINISHED.getStatus())) {
+ throw new ServiceException(400, "浠呭凡瀹屾垚鐨勮繃绋嬫楠屽崟鍙叧鑱旓紝褰撳墠鐘舵�佷负[" + qcStatusName(q.getStatus()) + "]");
+ }
+ if (q.getSourceDocType() != null || q.getSourceDocId() != null || q.getSourceLineId() != null) {
+ throw new ServiceException(400, "璇ヨ繃绋嬫楠屽崟宸插叧鑱旀潵婧愬崟鎹甗" + display(q.getSourceDocCode()) + "]锛屼笉鑳介噸澶嶅叧鑱�");
+ }
+ if (q.getReelNo() == null || q.getReelNo().isBlank()) {
+ throw new ServiceException(400, "璇ヨ繃绋嬫楠屽崟缂哄皯鐩樺彿锛屾棤娉曟寜鐩樺彿绛涢�夊緟妫�浜у嚭琛岋紝璇疯ˉ鍏呯洏鍙峰悗閲嶈瘯");
+ }
+ }
+ private static void requireOqc(MesQcOqcDO q) {
+ if (q == null) throw new ServiceException(400, "鍑鸿揣妫�楠屽崟涓嶅瓨鍦ㄦ垨宸插垹闄わ紝璇峰埛鏂板悗閲嶈瘯");
+ if (!Objects.equals(q.getStatus(), MesQcStatusEnum.FINISHED.getStatus())) {
+ throw new ServiceException(400, "浠呭凡瀹屾垚鐨勫嚭璐ф楠屽崟鍙叧鑱旓紝褰撳墠鐘舵�佷负[" + qcStatusName(q.getStatus()) + "]");
+ }
+ if (q.getSourceDocType() != null || q.getSourceDocId() != null || q.getSourceLineId() != null) {
+ throw new ServiceException(400, "璇ュ嚭璐ф楠屽崟宸插叧鑱旀潵婧愬崟鎹甗" + display(q.getSourceDocCode()) + "]锛屼笉鑳介噸澶嶅叧鑱�");
+ }
+ if (q.getReelNo() == null || q.getReelNo().isBlank()) {
+ throw new ServiceException(400, "璇ュ嚭璐ф楠屽崟缂哄皯鐩樺彿锛屾棤娉曟寜鐩樺彿绛涢�夊緟妫�鍑哄簱鏄庣粏锛岃琛ュ厖鐩樺彿鍚庨噸璇�");
+ }
+ }
+ private static String qcStatusName(Integer status) {
+ for (var e : MesQcStatusEnum.values()) if (Objects.equals(e.getStatus(), status)) return e.getName();
+ return "鏈煡(" + display(status) + ")";
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
index c0ce9a5..32eff6f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
@@ -67,6 +67,9 @@
public class MesQcOqcServiceImpl implements MesQcOqcService {
@Resource
+ private cn.iocoder.yudao.module.mes.service.qc.MesQcCompletionHelper completionHelper;
+
+ @Resource
private MesQcOqcMapper oqcMapper;
@Resource
@@ -111,26 +114,11 @@
// 1.2 鏍¢獙鏉ユ簮鍗曟嵁鍙傛暟锛屽苟楠岃瘉鏁版嵁瀛樺湪
String sourceDocCode = validateAndGetSourceDocCode(
createReqVO.getSourceDocType(), createReqVO.getSourceLineId());
- // 1.3 鏍规嵁浜у搧 + OQC 绫诲瀷鏌ユ壘鍙敤璐ㄦ鏂规锛堟敮鎸佸墠绔樉寮忔寚瀹氾級
- List<MesQcTemplateItemDO> templateItems = templateItemService.getTemplateItemList(
- createReqVO.getItemId(), MesQcTypeEnum.OQC.getType(), null, null);
- if (CollUtil.isEmpty(templateItems)) {
- throw exception(QC_NO_TEMPLATE);
- }
- MesQcTemplateItemDO templateItem = templateItems.get(0);
- if (createReqVO.getTemplateId() != null) {
- templateItem = templateItems.stream()
- .filter(available -> Objects.equals(available.getTemplateId(), createReqVO.getTemplateId()))
- .findFirst().orElse(null);
- if (templateItem == null) {
- throw exception(QC_NO_TEMPLATE); // 鎸囧畾浜嗘柟妗堜絾涓嶅湪鍖归厤鍒楄〃涓紝鎷掔粷
- }
- }
- Long templateId = templateItem.getTemplateId();
+ // 鏂板缓璐ㄦ鍗曚笉渚濊禆璐ㄦ鏂规銆�
// 2. 鎻掑叆涓昏〃
MesQcOqcDO oqc = BeanUtils.toBean(createReqVO, MesQcOqcDO.class)
- .setTemplateId(templateId)
+ .setTemplateId(null)
.setSourceDocCode(sourceDocCode)
.setStatus(MesQcStatusEnum.DRAFT.getStatus());
if (createReqVO.getSourceLineId() != null) {
@@ -138,9 +126,6 @@
.validateProductSalesLineExists(createReqVO.getSourceLineId())));
}
oqcMapper.insert(oqc);
-
- // 3. 浠庢ā鏉挎寚鏍囪嚜鍔ㄧ敓鎴愭楠岃
- oqcLineService.createLinesFromTemplate(oqc.getId(), templateId);
return oqc.getId();
}
@@ -176,18 +161,16 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void finishOqc(Long id) {
+ completionHelper.lockDocument("oqc", id);
// 1.1 鏍¢獙瀛樺湪 + 鑽夌鐘舵��
MesQcOqcDO oqc = validateOqcStatusPrepare(id);
- // 1.2 鏍¢獙妫�娴嬬粨璁哄繀濉�
- if (oqc.getCheckResult() == null) {
- throw exception(QC_OQC_CHECK_RESULT_EMPTY);
- }
- // 1.3 鏍¢獙鑷冲皯瀛樺湪涓�鏉℃娴嬬粨鏋�
- indicatorResultService.validateIndicatorResultExistsByQcIdAndType(id, MesQcTypeEnum.OQC.getType());
+ int result = completionHelper.validateAndGetResult("oqc", id, oqc.getQualifiedQuantity(), oqc.getUnqualifiedQuantity(), oqc.getCheckQuantity());
+ oqc.setCheckResult(result);
+
// 2. 鏇存柊鐘舵�佷负宸插畬鎴�
MesQcOqcDO updateObj = new MesQcOqcDO()
- .setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus());
+ .setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus()).setCheckResult(result);
oqcMapper.updateById(updateObj);
// 3. 涓嶅悎鏍兼椂鑷姩鍒涘缓 NCR
@@ -367,17 +350,6 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Long createOqcFromProductSales(Long salesId, MesWmProductSalesLineDO line, String salesCode, Long clientId) {
- // 1. 鏍¢獙鐗╂枡鏄惁閰嶇疆浜� OQC 妫�楠屾ā鏉�
- MesQcTemplateItemDO templateItem;
- try {
- templateItem = templateItemService.getRequiredTemplateByItemIdAndType(
- line.getItemId(), MesQcTypeEnum.OQC.getType());
- } catch (Exception e) {
- // 鑾峰彇鐗╂枡淇℃伅锛屾彁渚涙洿鏄庣‘鐨勯敊璇彁绀�
- String itemInfo = getItemInfo(line.getItemId());
- throw exception(QC_NO_TEMPLATE_FOR_ITEM, itemInfo);
- }
- Long templateId = templateItem.getTemplateId();
// 2. 鐢熸垚妫�楠屽崟缂栫爜
String code = "OQC" + System.currentTimeMillis();
@@ -386,7 +358,7 @@
MesQcOqcDO oqc = new MesQcOqcDO();
oqc.setCode(code);
oqc.setName(salesCode + "-鍑鸿揣妫�楠�");
- oqc.setTemplateId(templateId);
+
oqc.setSourceDocType(MesBizTypeConstants.WM_PRODUCT_SALES);
oqc.setSourceDocId(salesId);
oqc.setSourceLineId(line.getId());
@@ -407,8 +379,6 @@
oqc.setStatus(MesQcStatusEnum.DRAFT.getStatus());
oqcMapper.insert(oqc);
- // 4. 浠庢ā鏉挎寚鏍囪嚜鍔ㄧ敓鎴愭楠岃
- oqcLineService.createLinesFromTemplate(oqc.getId(), templateId);
return oqc.getId();
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java
index 1a9e1ab..b807291 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java
@@ -50,6 +50,9 @@
public class MesQcRqcServiceImpl implements MesQcRqcService {
@Resource
+ private cn.iocoder.yudao.module.mes.service.qc.MesQcCompletionHelper completionHelper;
+
+ @Resource
private MesQcRqcMapper rqcMapper;
@Resource
@@ -90,29 +93,14 @@
public Long createRqc(MesQcRqcSaveReqVO createReqVO) {
// 1.1 鏍¢獙鏁版嵁
validateRqcSaveData(createReqVO);
- // 1.2 鏍规嵁鐗╂枡 + RQC 妫�娴嬬绫绘煡鎵惧彲鐢ㄨ川妫�鏂规锛堟敮鎸佸墠绔樉寮忔寚瀹氾級
- List<MesQcTemplateItemDO> templateItems = templateItemService.getTemplateItemList(
- createReqVO.getItemId(), MesQcTypeEnum.RQC.getType(), null, null);
- if (CollUtil.isEmpty(templateItems)) {
- throw exception(QC_NO_TEMPLATE);
- }
- MesQcTemplateItemDO templateItem = templateItems.get(0);
- if (createReqVO.getTemplateId() != null) {
- templateItem = templateItems.stream()
- .filter(available -> Objects.equals(available.getTemplateId(), createReqVO.getTemplateId()))
- .findFirst().orElse(null);
- if (templateItem == null) {
- throw exception(QC_NO_TEMPLATE); // 鎸囧畾浜嗘柟妗堜絾涓嶅湪鍖归厤鍒楄〃涓紝鎷掔粷
- }
- }
- Long templateId = templateItem.getTemplateId();
+ // 鏂板缓璐ㄦ鍗曚笉渚濊禆璐ㄦ鏂规銆�
// 1.3 鑾峰彇鏉ユ簮鍗曟嵁缂栧彿
String sourceDocCode = validateAndGetSourceDocCode(
createReqVO.getSourceDocType(), createReqVO.getSourceDocId());
// 2. 鎻掑叆涓昏〃
MesQcRqcDO rqc = BeanUtils.toBean(createReqVO, MesQcRqcDO.class)
- .setTemplateId(templateId)
+ .setTemplateId(null)
.setSourceDocCode(sourceDocCode)
.setStatus(MesQcStatusEnum.DRAFT.getStatus());
if (Objects.equals(createReqVO.getSourceDocType(), MesBizTypeConstants.WM_RETURN_SALES)
@@ -125,9 +113,6 @@
rqc.setBatchCode(line.getBatchCode());
}
rqcMapper.insert(rqc);
-
- // 3. 浠庢ā鏉挎寚鏍囪嚜鍔ㄧ敓鎴愭楠岃
- rqcLineService.createLinesFromTemplate(rqc.getId(), templateId);
return rqc.getId();
}
@@ -159,25 +144,15 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void finishRqc(Long id) {
+ completionHelper.lockDocument("rqc", id);
// 1.1 鏍¢獙瀛樺湪 + 鑽夌鐘舵��
MesQcRqcDO rqc = validateRqcStatusPrepare(id);
- // 1.2 鏍¢獙妫�娴嬬粨璁哄繀濉�
- if (rqc.getCheckResult() == null) {
- throw exception(QC_RQC_CHECK_RESULT_EMPTY);
- }
- // 1.3 鏍¢獙鍚堟牸鍝� + 涓嶅悎鏍煎搧 = 妫�娴嬫暟閲�
- if (rqc.getCheckQuantity() != null && rqc.getCheckQuantity().compareTo(BigDecimal.ZERO) > 0) {
- BigDecimal qualified = rqc.getQualifiedQuantity() != null ? rqc.getQualifiedQuantity() : BigDecimal.ZERO;
- BigDecimal unqualified = rqc.getUnqualifiedQuantity() != null ? rqc.getUnqualifiedQuantity() : BigDecimal.ZERO;
- if (qualified.add(unqualified).compareTo(rqc.getCheckQuantity()) != 0) {
- throw exception(QC_RQC_QUANTITY_MISMATCH);
- }
- }
- // 1.4 鏍¢獙鑷冲皯瀛樺湪涓�鏉℃娴嬬粨鏋�
- indicatorResultService.validateIndicatorResultExistsByQcIdAndType(id, MesQcTypeEnum.RQC.getType());
+ int result = completionHelper.validateAndGetResult("rqc", id, rqc.getQualifiedQuantity(), rqc.getUnqualifiedQuantity(), rqc.getCheckQuantity());
+ rqc.setCheckResult(result);
+
// 2. 鏇存柊鐘舵�佷负宸插畬鎴�
- MesQcRqcDO updateObj = new MesQcRqcDO().setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus());
+ MesQcRqcDO updateObj = new MesQcRqcDO().setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus()).setCheckResult(result);
rqcMapper.updateById(updateObj);
// 3. 涓嶅悎鏍兼椂鑷姩鍒涘缓 NCR
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java
index d1460c8..4b2f21b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java
@@ -93,35 +93,7 @@
}
productSalesLineMapper.updateById(updateObj);
- // 妫�鏌ユ槸鍚﹂渶瑕佸垱寤� OQC 妫�楠屽崟锛氫粠涓嶉渶瑕佹楠屽彉涓洪渶瑕佹楠�
- if (Boolean.TRUE.equals(updateReqVO.getOqcCheckFlag())
- && !Boolean.TRUE.equals(oldLine.getOqcCheckFlag())) {
- // 鑾峰彇鍑哄簱鍗曚俊鎭�
- MesWmProductSalesDO sales = productSalesService.getProductSales(updateReqVO.getSalesId());
- if (sales == null) {
- log.warn("[updateProductSalesLine] 鍑哄簱鍗曚笉瀛樺湪锛宻alesId={}", updateReqVO.getSalesId());
- return;
- }
-
- // 鏋勫缓鍑哄簱鏄庣粏 DO
- MesWmProductSalesLineDO line = new MesWmProductSalesLineDO();
- line.setId(updateReqVO.getId());
- line.setItemId(updateReqVO.getItemId());
- line.setSaleOrderItemId(updateObj.getSaleOrderItemId() != null
- ? updateObj.getSaleOrderItemId() : oldLine.getSaleOrderItemId());
- line.setBatchCode(updateReqVO.getBatchCode());
- line.setQuantity(updateReqVO.getQuantity());
-
- // 鍒涘缓 OQC 妫�楠屽崟锛岃寮傚父鎶涘嚭
- Long oqcId = oqcService.createOqcFromProductSales(
- sales.getId(), line, sales.getCode(), sales.getClientId());
-
- // 鏇存柊鍑哄簱鏄庣粏鐨� oqcId 鍜岃川閲忕姸鎬�
- productSalesLineMapper.updateById(new MesWmProductSalesLineDO()
- .setId(updateReqVO.getId())
- .setOqcId(oqcId)
- .setQualityStatus(MesWmQualityStatusEnum.PENDING.getStatus()));
- }
+ // 鎻愪氦鍑哄簱鍗曞悗鐢辫川妫�浜哄憳閫夋嫨宸插畬鎴愮殑鍑哄巶妫�楠屽崟銆�
}
@Override
@@ -269,19 +241,18 @@
Long salesId = currentLine.getSalesId();
List<MesWmProductSalesLineDO> allLines = productSalesLineMapper.selectListBySalesId(salesId);
- // 2.1 妫�鏌ユ槸鍚︽湁涓嶅悎鏍艰 鈫� 鍙栨秷鍑哄簱鍗�
+ // 涓嶅悎鏍艰鐣欏緟鍚庣画澶勭疆锛屼笉鑳藉洜涓烘楠岀粨鏋滆嚜鍔ㄥ彇娑堟暣寮犲嚭搴撳崟銆�
boolean hasNg = CollectionUtils.anyMatch(allLines,
line -> Boolean.TRUE.equals(line.getOqcCheckFlag())
&& Objects.equals(line.getQualityStatus(), MesWmQualityStatusEnum.FAIL.getStatus()));
if (hasNg) {
- log.info("[updateProductSalesLineWhenOqcFinish][閿�鍞嚭搴撳崟({}) 瀛樺湪璐ㄦ涓嶅悎鏍艰锛屽彇娑堝嚭搴撳崟]", salesId);
- productSalesService.cancelProductSales(salesId);
+ log.info("[updateProductSalesLineWhenOqcFinish][閿�鍞嚭搴撳崟({}) 瀛樺湪璐ㄦ涓嶅悎鏍艰锛岀瓑寰呭悗缁缃甝", salesId);
return;
}
// 2.2 妫�鏌ユ槸鍚︽墍鏈� OQC 琛岄兘宸插畬鎴愶紝鑷姩娴佽浆 CONFIRMED 鈫� APPROVING
boolean hasUnchecked = CollectionUtils.anyMatch(allLines,
- line -> Boolean.TRUE.equals(line.getOqcCheckFlag()) && line.getOqcId() == null);
+ line -> Boolean.TRUE.equals(line.getOqcCheckFlag()) && !Objects.equals(line.getQualityStatus(), MesWmQualityStatusEnum.PASS.getStatus()));
if (!hasUnchecked) {
log.info("[updateProductSalesLineWhenOqcFinish][閿�鍞嚭搴撳崟({}) 鎵�鏈� OQC 琛屾楠屽畬鎴愶紝娴佽浆鍒板緟鎷h揣]", salesId);
productSalesService.confirmProductSales(salesId);
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java
index 3ccf050..0f1c14e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java
@@ -153,19 +153,7 @@
boolean needOqc = CollectionUtils.anyMatch(lines,
line -> Boolean.TRUE.equals(line.getOqcCheckFlag()));
if (needOqc) {
- // 涓洪渶瑕� OQC 妫�楠屼笖灏氭湭鍒涘缓妫�楠屽崟鐨勬槑缁嗗垱寤� OQC 妫�楠屽崟
- List<MesWmProductSalesLineDO> oqcLines = CollectionUtils.filterList(lines,
- line -> Boolean.TRUE.equals(line.getOqcCheckFlag()) && line.getOqcId() == null);
- for (MesWmProductSalesLineDO line : oqcLines) {
- // 鐩存帴璋冪敤锛岃寮傚父鎶涘嚭锛屼繚璇佹暟鎹竴鑷存��
- Long oqcId = oqcService.createOqcFromProductSales(
- sales.getId(), line, sales.getCode(), sales.getClientId());
- // 鏇存柊鍑哄簱鏄庣粏鐨� oqcId
- productSalesLineMapper.updateById(new MesWmProductSalesLineDO()
- .setId(line.getId())
- .setOqcId(oqcId));
- }
-
+ // 妫�楠屽崟鐢辫川妫�浜哄憳鍏堣褰曞叆锛屽緟妫�鏄庣粏閫氳繃鐩樺彿鍏宠仈宸插畬鎴愮殑妫�楠屽崟銆�
// 鎵归噺鍒濆鍖� OQC 琛岀殑璐ㄩ噺鐘舵�佷负"寰呮楠�"
List<Long> oqcLineIds = convertList(
CollectionUtils.filterList(lines, line -> Boolean.TRUE.equals(line.getOqcCheckFlag())),
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImplTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImplTest.java
index 6165ed5..9f62951 100644
--- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImplTest.java
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImplTest.java
@@ -23,12 +23,14 @@
import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProductService;
import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
+import cn.iocoder.yudao.module.mes.service.qc.MesQcCompletionHelper;
import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordService;
import cn.iocoder.yudao.module.mes.service.qc.indicatorresult.MesQcIndicatorResultService;
import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateItemService;
import cn.iocoder.yudao.module.mes.service.wm.productproduce.MesWmProductProduceLineService;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import jakarta.annotation.Resource;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.Import;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
@@ -39,6 +41,7 @@
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
/**
@@ -86,6 +89,13 @@
private MesQcIndicatorResultService indicatorResultService;
@MockitoBean
private MesWmProductProduceLineService productProduceLineService;
+ @MockitoBean
+ private MesQcCompletionHelper completionHelper;
+
+ @BeforeEach
+ void stubCompletionHelper() {
+ when(completionHelper.validateAndGetResult(anyString(), anyLong(), any(), any(), any())).thenReturn(1);
+ }
@Test
public void testFinishIpqc_writeBack_feedback() {
@@ -221,17 +231,27 @@
}
@Test
- public void testFinishIpqc_checkResultEmpty() {
- // 鍑嗗鏁版嵁锛歝heckResult 涓虹┖锛屽簲璇ユ姤閿�
+ public void testFinishIpqc_checkResultAutoComputed() {
+ // 鍑嗗鏁版嵁锛氭娴嬬粨璁轰笉鍐嶇敱鐢ㄦ埛濉啓锛屽畬鎴愭椂鎸夊悎鏍�/涓嶅悎鏍兼暟閲忚嚜鍔ㄥ垽瀹�
MesQcIpqcDO ipqc = randomPojo(MesQcIpqcDO.class, o -> {
o.setStatus(MesQcStatusEnum.DRAFT.getStatus());
- o.setCheckResult(null); // 妫�娴嬬粨璁轰负绌�
+ o.setCheckResult(null);
o.setSourceDocType(null);
+ o.setSourceDocId(null);
+ o.setSourceLineId(null);
+ o.setCheckQuantity(BigDecimal.valueOf(100));
+ o.setQualifiedQuantity(BigDecimal.valueOf(100));
+ o.setUnqualifiedQuantity(BigDecimal.ZERO);
});
ipqcMapper.insert(ipqc);
- // 璋冪敤锛屽簲璇ユ姏寮傚父锛堟娴嬬粨璁哄繀濉級
- assertThrows(Exception.class, () -> ipqcService.finishIpqc(ipqc.getId()));
+ // 璋冪敤
+ ipqcService.finishIpqc(ipqc.getId());
+
+ // 鏂█锛氭娴嬬粨璁虹敱绯荤粺鍒ゅ畾骞跺洖鍐�
+ MesQcIpqcDO updatedIpqc = ipqcMapper.selectById(ipqc.getId());
+ assertEquals(MesQcStatusEnum.FINISHED.getStatus(), updatedIpqc.getStatus());
+ assertEquals(1, updatedIpqc.getCheckResult());
}
@Test
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImplTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImplTest.java
index 87a0e26..531fac2 100644
--- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImplTest.java
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImplTest.java
@@ -6,12 +6,18 @@
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcStatusEnum;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mes.service.qc.MesQcCompletionHelper;
import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordService;
+import cn.iocoder.yudao.module.mes.service.qc.imports.MesQcImportHelper;
+import cn.iocoder.yudao.module.mes.service.qc.ncr.MesQcNcrService;
+import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateItemService;
import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
import cn.iocoder.yudao.module.mes.service.wm.outsourcereceipt.MesWmOutsourceReceiptService;
import cn.iocoder.yudao.module.mes.service.qc.indicatorresult.MesQcIndicatorResultService;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.Import;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
@@ -23,6 +29,7 @@
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
/**
@@ -55,6 +62,21 @@
private AdminUserApi adminUserApi;
@MockitoBean
private MesQcIndicatorResultService indicatorResultService;
+ @MockitoBean
+ private MesQcCompletionHelper completionHelper;
+ @MockitoBean
+ private SrmSupplierApi srmSupplierApi;
+ @MockitoBean
+ private MdmItemApi mdmItemApi;
+ @MockitoBean
+ private MesQcNcrService ncrService;
+ @MockitoBean
+ private MesQcImportHelper qcImportHelper;
+
+ @BeforeEach
+ void stubCompletionHelper() {
+ when(completionHelper.validateAndGetResult(anyString(), anyLong(), any(), any(), any())).thenReturn(1);
+ }
@Test
public void testFinishIqc_writeBack_arrivalNotice() {
@@ -174,17 +196,25 @@
}
@Test
- public void testFinishIqc_checkResultEmpty() {
- // 鍑嗗鏁版嵁锛歝heckResult 涓虹┖锛屽簲璇ユ姤閿�
+ public void testFinishIqc_checkResultAutoComputed() {
+ // 鍑嗗鏁版嵁锛氭娴嬬粨璁轰笉鍐嶇敱鐢ㄦ埛濉啓锛屽畬鎴愭椂鎸夊悎鏍�/涓嶅悎鏍兼暟閲忚嚜鍔ㄥ垽瀹�
MesQcIqcDO iqc = randomPojo(MesQcIqcDO.class, o -> {
o.setStatus(MesQcStatusEnum.DRAFT.getStatus());
- o.setCheckResult(null); // 妫�娴嬬粨璁轰负绌�
+ o.setCheckResult(null);
o.setSourceDocType(null);
+ o.setCheckQuantity(BigDecimal.valueOf(100));
+ o.setQualifiedQuantity(BigDecimal.valueOf(100));
+ o.setUnqualifiedQuantity(BigDecimal.ZERO);
});
iqcMapper.insert(iqc);
- // 璋冪敤锛屽簲璇ユ姏寮傚父锛堟娴嬬粨璁哄繀濉級
- assertThrows(Exception.class, () -> iqcService.finishIqc(iqc.getId()));
+ // 璋冪敤
+ iqcService.finishIqc(iqc.getId());
+
+ // 鏂█锛氭娴嬬粨璁虹敱绯荤粺鍒ゅ畾骞跺洖鍐�
+ MesQcIqcDO updatedIqc = iqcMapper.selectById(iqc.getId());
+ assertEquals(MesQcStatusEnum.FINISHED.getStatus(), updatedIqc.getStatus());
+ assertEquals(1, updatedIqc.getCheckResult());
}
@Test
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcAutoCreateTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcAutoCreateTest.java
index 1a1c3d8..afb8ace 100644
--- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcAutoCreateTest.java
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcAutoCreateTest.java
@@ -4,11 +4,9 @@
import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderItemRespDTO;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesLineDO;
import cn.iocoder.yudao.module.mes.dal.mysql.qc.oqc.MesQcOqcMapper;
-import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateItemService;
import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesService;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -28,7 +26,6 @@
class MesQcOqcAutoCreateTest {
@InjectMocks private MesQcOqcServiceImpl service;
@Mock private MesQcOqcMapper mapper;
- @Mock private MesQcTemplateItemService templates;
@Mock private MesQcOqcLineService lines;
@Mock private MesWmProductSalesService sales;
@Mock private ErpSaleOrderApi saleOrderApi;
@@ -36,8 +33,6 @@
@Test
void generatedInspectionUsesHistoricalShipmentDateAndPreservesPendingQuantities() {
LocalDateTime date = LocalDateTime.of(2026, 9, 23, 15, 30);
- when(templates.getRequiredTemplateByItemIdAndType(10L, 3))
- .thenReturn(new MesQcTemplateItemDO().setTemplateId(20L));
when(sales.getProductSales(30L)).thenReturn(new MesWmProductSalesDO().setSalesDate(date));
MesWmProductSalesLineDO line = new MesWmProductSalesLineDO().setId(40L)
.setItemId(10L).setSaleOrderItemId(60L).setQuantity(BigDecimal.valueOf(200)).setBatchCode("B001");
@@ -60,8 +55,6 @@
@Test
void historicalShipmentWithoutSaleItemDoesNotGuessReel() {
- when(templates.getRequiredTemplateByItemIdAndType(10L, 3))
- .thenReturn(new MesQcTemplateItemDO().setTemplateId(20L));
MesWmProductSalesLineDO line = new MesWmProductSalesLineDO().setId(40L)
.setItemId(10L).setQuantity(BigDecimal.ONE);
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImplTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImplTest.java
index 353ca08..fea2cf5 100644
--- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImplTest.java
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImplTest.java
@@ -6,6 +6,7 @@
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcStatusEnum;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.qc.MesQcCompletionHelper;
import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordService;
import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateItemService;
import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesLineService;
@@ -13,6 +14,7 @@
import cn.iocoder.yudao.module.mes.service.qc.indicatorresult.MesQcIndicatorResultService;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import jakarta.annotation.Resource;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.Import;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
@@ -22,7 +24,7 @@
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
/**
@@ -66,6 +68,13 @@
private AdminUserApi adminUserApi;
@MockitoBean
private MesQcIndicatorResultService indicatorResultService;
+ @MockitoBean
+ private MesQcCompletionHelper completionHelper;
+
+ @BeforeEach
+ void stubCompletionHelper() {
+ when(completionHelper.validateAndGetResult(anyString(), anyLong(), any(), any(), any())).thenReturn(1);
+ }
@Test
public void testFinishOqc_writeBack_productSales() {
@@ -165,17 +174,25 @@
}
@Test
- public void testFinishOqc_checkResultEmpty() {
- // 鍑嗗鏁版嵁锛歝heckResult 涓虹┖锛屽簲璇ユ姤閿�
+ public void testFinishOqc_checkResultAutoComputed() {
+ // 鍑嗗鏁版嵁锛氭娴嬬粨璁轰笉鍐嶇敱鐢ㄦ埛濉啓锛屽畬鎴愭椂鎸夊悎鏍�/涓嶅悎鏍兼暟閲忚嚜鍔ㄥ垽瀹�
MesQcOqcDO oqc = randomPojo(MesQcOqcDO.class, o -> {
o.setStatus(MesQcStatusEnum.DRAFT.getStatus());
- o.setCheckResult(null); // 妫�娴嬬粨璁轰负绌�
+ o.setCheckResult(null);
o.setSourceDocType(null);
+ o.setCheckQuantity(java.math.BigDecimal.valueOf(100));
+ o.setQualifiedQuantity(java.math.BigDecimal.valueOf(100));
+ o.setUnqualifiedQuantity(java.math.BigDecimal.ZERO);
});
oqcMapper.insert(oqc);
- // 璋冪敤锛屽簲璇ユ姏寮傚父锛堟娴嬬粨璁哄繀濉級
- assertServiceException(() -> oqcService.finishOqc(oqc.getId()), QC_OQC_CHECK_RESULT_EMPTY);
+ // 璋冪敤
+ oqcService.finishOqc(oqc.getId());
+
+ // 鏂█锛氭娴嬬粨璁虹敱绯荤粺鍒ゅ畾骞跺洖鍐�
+ MesQcOqcDO updatedOqc = oqcMapper.selectById(oqc.getId());
+ assertEquals(MesQcStatusEnum.FINISHED.getStatus(), updatedOqc.getStatus());
+ assertEquals(1, updatedOqc.getCheckResult());
}
@Test
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImplTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImplTest.java
index c096ad2..f4de3d3 100644
--- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImplTest.java
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImplTest.java
@@ -6,6 +6,7 @@
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcStatusEnum;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.qc.MesQcCompletionHelper;
import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordService;
import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateItemService;
import cn.iocoder.yudao.module.mes.service.wm.returnissue.MesWmReturnIssueLineService;
@@ -14,6 +15,7 @@
import cn.iocoder.yudao.module.mes.service.qc.ncr.MesQcNcrService;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import jakarta.annotation.Resource;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.Import;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
@@ -27,8 +29,7 @@
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.QC_RQC_NOT_PREPARE;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.*;
/**
* {@link MesQcRqcServiceImpl} 鐨勫崟鍏冩祴璇曠被
@@ -62,6 +63,13 @@
private MesQcIndicatorResultService indicatorResultService;
@MockitoBean
private MesQcNcrService ncrService;
+ @MockitoBean
+ private MesQcCompletionHelper completionHelper;
+
+ @BeforeEach
+ void stubCompletionHelper() {
+ when(completionHelper.validateAndGetResult(anyString(), anyLong(), any(), any(), any())).thenReturn(1);
+ }
@Test
public void testFinishRqc_successWithReturnIssue() {
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineReelTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineReelTest.java
index 05fb16f..5d4a225 100644
--- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineReelTest.java
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineReelTest.java
@@ -95,17 +95,17 @@
}
@Test
- void enablingInspectionRetainsSalesItemForOqc() {
+ void enablingInspectionKeepsSalesItemAndDefersOqcToLink() {
var req = request();
req.setId(6L);
req.setOqcCheckFlag(true);
when(mapper.selectById(6L)).thenReturn(MesWmProductSalesLineDO.builder()
.id(6L).salesId(1L).oqcCheckFlag(false).build());
- when(salesService.getProductSales(1L)).thenReturn(MesWmProductSalesDO.builder().id(1L).build());
- when(oqcService.createOqcFromProductSales(eq(1L), any(), any(), any())).thenReturn(7L);
service.updateProductSalesLine(req);
var line = ArgumentCaptor.forClass(MesWmProductSalesLineDO.class);
- verify(oqcService).createOqcFromProductSales(eq(1L), line.capture(), any(), any());
+ verify(mapper).updateById(line.capture());
assertEquals(5L, line.getValue().getSaleOrderItemId());
+ // 妫�楠屽崟鐢辫川妫�浜哄憳褰曞叆鍚庨�氳繃鐩樺彿鍏宠仈锛岃淇濆瓨鏃朵笉鍐嶈嚜鍔ㄥ垱寤� OQC銆�
+ verifyNoInteractions(oqcService);
}
}
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImplTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImplTest.java
index 706bbff..22ceb15 100644
--- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImplTest.java
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImplTest.java
@@ -10,8 +10,11 @@
import org.springframework.context.annotation.Import;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
+import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
+import cn.iocoder.yudao.module.mes.service.qc.oqc.MesQcOqcService;
import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
+import cn.iocoder.yudao.module.mes.service.wm.salesnotice.MesWmSalesNoticeLineService;
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
@@ -39,9 +42,15 @@
private MesWmProductSalesDetailService productSalesDetailService;
@MockitoBean
- private MesMdItemService itemService;
+ private MesMdmItemService mdmItemService;
@MockitoBean
private MesWmBatchService batchService;
+ @MockitoBean
+ private MesWmSalesNoticeLineService salesNoticeLineService;
+ @MockitoBean
+ private MesQcOqcService oqcService;
+ @MockitoBean
+ private ErpSaleOrderApi saleOrderApi;
@Test
public void testUpdateProductSalesLineWhenOqcFinish_pass() {
@@ -63,13 +72,15 @@
MesWmProductSalesLineDO updateLine = productSalesLineMapper.selectById(lineDO.getId());
assertEquals(oqcId, updateLine.getOqcId());
assertEquals(MesWmQualityStatusEnum.PASS.getStatus(), updateLine.getQualityStatus());
+ // 鏂█锛氬叏閮ㄩ渶妫�琛屽悎鏍� 鈫� 鍑哄簱鍗曡嚜鍔ㄦ祦杞緟鎷h揣
+ verify(productSalesService).confirmProductSales(lineDO.getSalesId());
}
@Test
public void testUpdateProductSalesLineWhenOqcFinish_fail() {
- // 鍑嗗鍙傛暟
+ // 鍑嗗鍙傛暟锛�2 琛ㄧず鏍¢獙涓嶉�氳繃
Long oqcId = randomLongId();
- Integer checkResult = MesQcCheckResultEnum.QUALIFIED.getType();
+ Integer checkResult = 2;
// mock 鏁版嵁
MesWmProductSalesLineDO lineDO = randomPojo(MesWmProductSalesLineDO.class, o -> {
@@ -85,10 +96,13 @@
MesWmProductSalesLineDO updateLine = productSalesLineMapper.selectById(lineDO.getId());
assertEquals(oqcId, updateLine.getOqcId());
assertEquals(MesWmQualityStatusEnum.FAIL.getStatus(), updateLine.getQualityStatus());
+ // 鏂█锛氬瓨鍦ㄤ笉鍚堟牸琛屾椂淇濇寔寰呮娴嬶紝涓嶈嚜鍔ㄥ彇娑堟暣寮犲嚭搴撳崟
+ verify(productSalesService, never()).cancelProductSales(anyLong());
+ verify(productSalesService, never()).confirmProductSales(anyLong());
}
@Test
- public void testUpdateProductSalesLineWhenOqcFinish_cancelWhenNg() {
+ public void testUpdateProductSalesLineWhenOqcFinish_noCancelWhenNg() {
// 鍑嗗鏁版嵁锛氬悓涓�鍑哄簱鍗曚笅 2 琛岋紝绗� 1 琛屽凡鍚堟牸锛岀 2 琛屽嵆灏嗗彉鏇翠负涓嶅悎鏍�
Long salesId = randomLongId();
MesWmProductSalesLineDO line1 = randomPojo(MesWmProductSalesLineDO.class, o -> {
@@ -107,14 +121,15 @@
// 璋冪敤锛氱 2 琛岃川妫�涓嶅悎鏍�
productSalesLineService.updateProductSalesLineWhenOqcFinish(
- line2.getId(), randomLongId(), MesQcCheckResultEnum.QUALIFIED.getType());
+ line2.getId(), randomLongId(), 2);
- // 鏂█锛氬簲璇ヨ皟鐢� cancelProductSales
- verify(productSalesService).cancelProductSales(eq(salesId));
+ // 鏂█锛氫笉鍚堟牸琛岀暀寰呭悗缁缃紝涓嶈兘鑷姩鍙栨秷鍑哄簱鍗�
+ verify(productSalesService, never()).cancelProductSales(anyLong());
+ verify(productSalesService, never()).confirmProductSales(anyLong());
}
@Test
- public void testUpdateProductSalesLineWhenOqcFinish_noCancelWhenAllPass() {
+ public void testUpdateProductSalesLineWhenOqcFinish_confirmWhenAllPass() {
// 鍑嗗鏁版嵁锛氬悓涓�鍑哄簱鍗曚笅 2 琛岋紝绗� 1 琛屽凡鍚堟牸锛岀 2 琛屽嵆灏嗗彉鏇翠负鍚堟牸
Long salesId = randomLongId();
MesWmProductSalesLineDO line1 = randomPojo(MesWmProductSalesLineDO.class, o -> {
@@ -135,7 +150,8 @@
productSalesLineService.updateProductSalesLineWhenOqcFinish(
line2.getId(), randomLongId(), MesQcCheckResultEnum.QUALIFIED.getType());
- // 鏂█锛氫笉搴旇璋冪敤 cancelProductSales
+ // 鏂█锛氬叏閮ㄩ渶妫�琛屽悎鏍� 鈫� 娴佽浆寰呮嫞璐э紝涓嶅彇娑堝嚭搴撳崟
+ verify(productSalesService).confirmProductSales(eq(salesId));
verify(productSalesService, never()).cancelProductSales(anyLong());
}
@@ -157,12 +173,13 @@
});
productSalesLineMapper.insert(line2);
- // 璋冪敤锛氱 2 琛岃川妫�涓嶅悎鏍�
+ // 璋冪敤锛氱 2 琛岃川妫�鍚堟牸
productSalesLineService.updateProductSalesLineWhenOqcFinish(
line2.getId(), randomLongId(), MesQcCheckResultEnum.QUALIFIED.getType());
- // 鏂█锛氱 2 琛屼笉鍚堟牸 鈫� 搴旇鍙栨秷鍑哄簱鍗�
- verify(productSalesService).cancelProductSales(eq(salesId));
+ // 鏂█锛氭湭鍕鹃�夊嚭璐ф楠岀殑琛屼笉鍙備笌寰呮鍒ゆ柇 鈫� 鍏ㄩ儴闇�妫�琛屽悎鏍煎悗娴佽浆寰呮嫞璐�
+ verify(productSalesService).confirmProductSales(eq(salesId));
+ verify(productSalesService, never()).cancelProductSales(anyLong());
}
}
diff --git a/yudao-module-mes/src/test/resources/sql/create_tables.sql b/yudao-module-mes/src/test/resources/sql/create_tables.sql
index f88c563..9cad6df 100644
--- a/yudao-module-mes/src/test/resources/sql/create_tables.sql
+++ b/yudao-module-mes/src/test/resources/sql/create_tables.sql
@@ -475,6 +475,7 @@
CREATE TABLE IF NOT EXISTS "mes_wm_product_sales_line" (
"id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
"sales_id" bigint NOT NULL,
+ "sale_order_item_id" bigint DEFAULT NULL,
"notice_line_id" bigint DEFAULT NULL,
"item_id" bigint NOT NULL,
"quantity" decimal(20,6) NOT NULL,
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/storage/StorageAttachmentApi.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/storage/StorageAttachmentApi.java
index fcd07e6..bf718cf 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/storage/StorageAttachmentApi.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/storage/StorageAttachmentApi.java
@@ -26,4 +26,7 @@
void deleteAttachmentsByRecord(String recordType, Long recordId);
+ /** 浠呯Щ闄ゆ寚瀹氫笟鍔″叧鑱旓紝涓嶅垹闄ゅ叡浜枃浠躲�� */
+ void removeReference(String application, String recordType, Long recordId, Long blobId);
+
}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/storage/StorageAttachmentApiImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/storage/StorageAttachmentApiImpl.java
index 919a93a..3808669 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/storage/StorageAttachmentApiImpl.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/storage/StorageAttachmentApiImpl.java
@@ -18,6 +18,19 @@
@Resource
private SystemStorageAttachmentService systemStorageAttachmentService;
+ @Resource
+ private cn.iocoder.yudao.module.system.dal.mysql.storage.SystemStorageAttachmentMapper attachmentMapper;
+
+ @Override
+ @org.springframework.transaction.annotation.Transactional(rollbackFor = Exception.class)
+ public void removeReference(String application, String recordType, Long recordId, Long blobId) {
+ attachmentMapper.delete(new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<cn.iocoder.yudao.module.system.dal.dataobject.storage.SystemStorageAttachmentDO>()
+ .eq(cn.iocoder.yudao.module.system.dal.dataobject.storage.SystemStorageAttachmentDO::getApplication, application)
+ .eq(cn.iocoder.yudao.module.system.dal.dataobject.storage.SystemStorageAttachmentDO::getRecordType, recordType)
+ .eq(cn.iocoder.yudao.module.system.dal.dataobject.storage.SystemStorageAttachmentDO::getRecordId, recordId)
+ .eq(cn.iocoder.yudao.module.system.dal.dataobject.storage.SystemStorageAttachmentDO::getStorageBlobId, blobId));
+ }
+
@Override
public void bindAttachments(String application, String recordType, Long recordId, List<Long> blobIds) {
if (blobIds == null || blobIds.isEmpty()) {
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageRecordTypeEnum.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageRecordTypeEnum.java
index 2634a20..05a6a4a 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageRecordTypeEnum.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/storage/StorageRecordTypeEnum.java
@@ -67,6 +67,11 @@
MES_PD_DOCUMENT("mes_pd_document", "MES 璁捐璧勬枡"),
MDM_ITEM_TECHNICAL_FILE("mdm_item_technical_file", "MDM 鐗╂枡鎶�鏈枃浠�"),
+ MES_WORK_ORDER_TECHNICAL_FILE("mes_work_order_technical_file", "鐢熶骇宸ュ崟鎶�鏈枃浠跺揩鐓�"),
+ MES_QC_IQC_ATTACHMENT("mes_qc_iqc_attachment", "鏉ユ枡璐ㄦ闄勪欢"),
+ MES_QC_IPQC_ATTACHMENT("mes_qc_ipqc_attachment", "杩囩▼璐ㄦ闄勪欢"),
+ MES_QC_OQC_ATTACHMENT("mes_qc_oqc_attachment", "鍑鸿揣璐ㄦ闄勪欢"),
+ MES_QC_RQC_ATTACHMENT("mes_qc_rqc_attachment", "閫�璐ц川妫�闄勪欢"),
// ===== SRM =====
SRM_SUPPLIER_CERTIFICATE("srm_supplier_certificate", "SRM 渚涘簲鍟嗚祫璐ㄨ瘉涔�"),
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/util/storage/StorageFileUtil.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/util/storage/StorageFileUtil.java
index 111bf6d..6c804e6 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/util/storage/StorageFileUtil.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/util/storage/StorageFileUtil.java
@@ -141,6 +141,14 @@
if (CollUtil.isEmpty(storageBlobIds)) {
return;
}
+ // 鐢熶骇宸ュ崟渚濊禆鍘熷鏂囦欢鍙嶆槧鍘嗗彶鐗堟湰锛屼笉鍏佽閫氳繃鍏朵粬闄勪欢鍏ュ彛鍒犻櫎杩欎簺鍏变韩鏂囦欢銆�
+ Long snapshotReferences = storageAttachmentMapper.selectCount(
+ new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<SystemStorageAttachmentDO>()
+ .eq(SystemStorageAttachmentDO::getRecordType, "mes_work_order_technical_file")
+ .in(SystemStorageAttachmentDO::getStorageBlobId, storageBlobIds));
+ if (snapshotReferences != null && snapshotReferences > 0) {
+ throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400, "鎶�鏈枃浠跺凡琚敓浜у伐鍗曠暀瀛橈紝涓嶈兘鍒犻櫎");
+ }
// 鍚屾椂鍒犻櫎纾佺洏鏂囦欢
List<SystemStorageBlobDO> blobs = storageBlobMapper.selectByIds(storageBlobIds);
for (SystemStorageBlobDO blob : blobs) {
diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index d5de923..492e4c0 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -202,7 +202,7 @@
storage: # 鏂囦欢涓婁紶閰嶇疆
path: D:/uploads # 鏂囦欢瀛樺偍鏍圭洰褰曪紙鎸夊疄闄呮湇鍔″櫒璺緞閰嶇疆锛�
url-prefix: /admin-api/system/storage-blob # URL璺緞鍓嶇紑
- domain: http://192.168.1.6:48080 # 鍩熷悕鍓嶇紑锛堟寜瀹為檯鍩熷悕閰嶇疆锛�
+ domain: http://192.168.0.10:48080 # 鍩熷悕鍓嶇紑锛堟寜瀹為檯鍩熷悕閰嶇疆锛�
expired: 120 # token杩囨湡鏃堕棿锛堝垎閽燂級
use-limit: 10 # token浣跨敤娆℃暟涓婇檺
jwt-secret: abcdefghijklmnopqrstuvwxyz0123456789ABCDEFG # JWT瀵嗛挜锛堣嚦灏�32瀛楃锛�
--
Gitblit v1.9.3