From e3b783fe002b75cb0569e93e04786e00ac711075 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 24 十月 2026 22:49:54 +0800
Subject: [PATCH] refactor(mes): 重构质检模块物料查询逻辑并优化仓储流程
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java | 12
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java | 4
arrival-state.png | 0
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java | 31 -
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/pendinginspect/MesQcPendingInspectController.java | 12
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateItemServiceImpl.java | 12
po-dialog-fixed.png | 0
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/support/MesQcItemResolver.java | 92 ++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/MesQcNcrController.java | 10
analytics-5668.png | 0
itemreceipt-create.yml | 381 ++++++++++++++++++++
supplier-dialog.png | 0
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptMapper.java | 18
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java | 12
qc-template-fixed.png | 0
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java | 60 --
.playwright-mcp/qc-template-fixed.png | 0
home.png | 0
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java | 13
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineServiceImpl.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java | 14
/dev/null | 46 --
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmItemReceiptStatusEnum.java | 2
form-with-srm-select.png | 0
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java | 9
arrival-current.yml | 373 +++++++++++++++++++
27 files changed, 941 insertions(+), 170 deletions(-)
diff --git a/.playwright-mcp/qc-template-fixed.png b/.playwright-mcp/qc-template-fixed.png
new file mode 100644
index 0000000..fb2c776
--- /dev/null
+++ b/.playwright-mcp/qc-template-fixed.png
Binary files differ
diff --git a/analytics-5668.png b/analytics-5668.png
new file mode 100644
index 0000000..ad78b65
--- /dev/null
+++ b/analytics-5668.png
Binary files differ
diff --git a/arrival-current.yml b/arrival-current.yml
new file mode 100644
index 0000000..cffc2f8
--- /dev/null
+++ b/arrival-current.yml
@@ -0,0 +1,373 @@
+- generic [ref=f13e90]:
+ - complementary [ref=f13e91]:
+ - generic [ref=f13e92]:
+ - generic [ref=f13e93] [cursor=pointer]
+ - link "鏂伴珮鐢靛姏鏅洪�犲钩鍙� 鏂伴珮鐢靛姏鏅洪�犲钩鍙�" [ref=f13e98] [cursor=pointer]:
+ - /url: javascript:void 0
+ - img "鏂伴珮鐢靛姏鏅洪�犲钩鍙�" [ref=f13e101]
+ - generic [ref=f13e102]: 鏂伴珮鐢靛姏鏅洪�犲钩鍙�
+ - menu [ref=f13e105]:
+ - menuitem "棣栭〉" [ref=f13e106] [cursor=pointer]
+ - listitem [ref=f13e113]:
+ - generic [ref=f13e114] [cursor=pointer]: 鐢熶骇绠℃帶
+ - listitem [ref=f13e121]:
+ - generic [ref=f13e122] [cursor=pointer]: 宸ヨ壓璁捐
+ - listitem [ref=f13e129]:
+ - generic [ref=f13e130] [cursor=pointer]: 浜у搧璁捐
+ - listitem [ref=f13e136]:
+ - generic [ref=f13e137] [cursor=pointer]: 钀ラ攢绠$悊
+ - listitem [ref=f13e143]:
+ - generic [ref=f13e144] [cursor=pointer]: 鍞悗鏈嶅姟
+ - listitem [ref=f13e150]:
+ - generic [ref=f13e151] [cursor=pointer]: 璁″垝鎺掔▼
+ - listitem [ref=f13e157]:
+ - generic [ref=f13e158] [cursor=pointer]: 璐ㄩ噺绠$悊
+ - listitem [ref=f13e164]:
+ - generic [ref=f13e165] [cursor=pointer]: 璁惧绠$悊
+ - listitem [ref=f13e172]:
+ - generic [ref=f13e173] [cursor=pointer]: 閲囪喘绠$悊
+ - listitem [ref=f13e179]:
+ - generic [ref=f13e180] [cursor=pointer]: 浠撳偍鐗╂祦
+ - list [ref=f13e3287]:
+ - menuitem "搴撳瓨浜嬪姟娴佹按" [ref=f13e3288] [cursor=pointer]
+ - menuitem "浠撳簱璁剧疆" [ref=f13e3293] [cursor=pointer]
+ - menuitem "搴撳瓨鐜版湁閲�" [ref=f13e3300] [cursor=pointer]
+ - listitem [ref=f13e3305]:
+ - generic [ref=f13e3306] [cursor=pointer]: 閲囪喘浠撳簱
+ - list [ref=f13e3312]:
+ - menuitem "鍒拌揣閫氱煡" [ref=f13e3313] [cursor=pointer]
+ - menuitem "閲囪喘鍏ュ簱" [ref=f13e3318] [cursor=pointer]
+ - menuitem "閲囪喘閫�璐�" [ref=f13e3323] [cursor=pointer]
+ - listitem [ref=f13e3330]:
+ - generic [ref=f13e3331] [cursor=pointer]: 鐢熶骇浠撳簱
+ - listitem [ref=f13e3338]:
+ - generic [ref=f13e3339] [cursor=pointer]: 閿�鍞粨搴�
+ - menuitem "杞Щ璋冩嫧" [ref=f13e3345] [cursor=pointer]
+ - listitem [ref=f13e3350]:
+ - generic [ref=f13e3351] [cursor=pointer]: 搴撳瓨鐩樼偣
+ - menuitem "瑁呯绠$悊" [ref=f13e3357] [cursor=pointer]
+ - menuitem "璧嬭兘绠$悊" [ref=f13e3364] [cursor=pointer]
+ - menuitem "SN 鐮�" [ref=f13e3369] [cursor=pointer]
+ - menuitem "澶栧崗鍙戞枡" [ref=f13e3374] [cursor=pointer]
+ - menuitem "澶栧崗鍏ュ簱" [ref=f13e3379] [cursor=pointer]
+ - menuitem "鏉傞」鍏ュ簱" [ref=f13e3384] [cursor=pointer]
+ - menuitem "鏉傞」鍑哄簱" [ref=f13e3389] [cursor=pointer]
+ - menuitem "璁惧鍏ュ簱" [ref=f13e3394] [cursor=pointer]
+ - listitem [ref=f13e188]:
+ - generic [ref=f13e189] [cursor=pointer]: 浜哄姏璧勬簮
+ - listitem [ref=f13e195]:
+ - generic [ref=f13e196] [cursor=pointer]: 鍐崇瓥鏀寔
+ - listitem [ref=f13e202]:
+ - generic [ref=f13e203] [cursor=pointer]: 鑳借�楃鐞�
+ - listitem [ref=f13e210]:
+ - generic [ref=f13e211] [cursor=pointer]: 鍩虹鏁版嵁
+ - listitem [ref=f13e219]:
+ - generic [ref=f13e220] [cursor=pointer]: 鍗忓悓鍔炲叕
+ - listitem [ref=f13e226]:
+ - generic [ref=f13e227] [cursor=pointer]: 鍩虹璁炬柦
+ - listitem [ref=f13e233]:
+ - generic [ref=f13e234] [cursor=pointer]: 绯荤粺绠$悊
+ - generic [ref=f13e241] [cursor=pointer]
+ - generic [ref=f13e246]:
+ - generic [ref=f13e247]:
+ - banner [ref=f13e248]:
+ - button [ref=f13e249] [cursor=pointer]
+ - button [ref=f13e252] [cursor=pointer]
+ - navigation "breadcrumb" [ref=f13e257]:
+ - list [ref=f13e258]:
+ - listitem [ref=f13e3399]:
+ - link "浠撳偍鐗╂祦" [ref=f13e3400] [cursor=pointer]:
+ - /url: javascript:void 0
+ - listitem [ref=f13e3406]
+ - listitem [ref=f13e3409]:
+ - link "閲囪喘浠撳簱" [ref=f13e3410] [cursor=pointer]:
+ - /url: javascript:void 0
+ - listitem [ref=f13e3414]
+ - listitem [ref=f13e5858]:
+ - link "鍒拌揣閫氱煡" [disabled] [ref=f13e5859]
+ - generic [ref=f13e267]:
+ - generic [ref=f13e269] [cursor=pointer]:
+ - generic [ref=f13e273]: 鎼滅储
+ - generic [ref=f13e274]: Ctrl K
+ - button [ref=f13e276] [cursor=pointer]
+ - button "dark" [ref=f13e281] [cursor=pointer]
+ - button [ref=f13e290] [cursor=pointer]
+ - button [ref=f13e296] [cursor=pointer]
+ - button [ref=f13e299] [cursor=pointer]
+ - button [ref=f13e305] [cursor=pointer]:
+ - button [ref=f13e307]
+ - button "宸ヤ綔鍙�" [ref=f13e311] [cursor=pointer]
+ - button "瓒呯骇绠$悊鍛�" [ref=f13e315] [cursor=pointer]:
+ - img "瓒呯骇绠$悊鍛�" [ref=f13e320]
+ - generic [ref=f13e322]:
+ - generic [ref=f13e327]:
+ - generic [ref=f13e328] [cursor=pointer]: 棣栭〉
+ - generic [ref=f13e729] [cursor=pointer]: 鐢熶骇璁㈠崟
+ - generic [ref=f13e3423] [cursor=pointer]: 鍒拌揣閫氱煡
+ - generic [ref=f13e4865] [cursor=pointer]: 閲囪喘鍏ュ簱
+ - generic [ref=f13e344]:
+ - button [ref=f13e345] [cursor=pointer]
+ - generic [ref=f13e352] [cursor=pointer]
+ - generic [ref=f13e356] [cursor=pointer]
+ - main [ref=f13e363]:
+ - generic [ref=f13e5867]:
+ - generic [ref=f13e5872]:
+ - generic [ref=f13e5873]:
+ - generic [ref=f13e5874]: 閫氱煡鍗曠紪鍙�
+ - textbox "閫氱煡鍗曠紪鍙�" [ref=f13e5880]:
+ - /placeholder: 璇疯緭鍏ラ�氱煡鍗曠紪鍙�
+ - generic [ref=f13e5882]:
+ - generic [ref=f13e5883]: 閫氱煡鍗曞悕绉�
+ - textbox "閫氱煡鍗曞悕绉�" [ref=f13e5889]:
+ - /placeholder: 璇疯緭鍏ラ�氱煡鍗曞悕绉�
+ - generic [ref=f13e5891]:
+ - generic [ref=f13e5892]: 閲囪喘璁㈠崟鍙�
+ - textbox "閲囪喘璁㈠崟鍙�" [ref=f13e5898]:
+ - /placeholder: 璇疯緭鍏ラ噰璐鍗曞彿
+ - generic [ref=f13e5900]:
+ - generic [ref=f13e5901]: 渚涘簲鍟�
+ - textbox "渚涘簲鍟�" [ref=f13e5907]:
+ - /placeholder: 璇疯緭鍏ヤ緵搴斿晢鍚嶇О
+ - generic [ref=f13e5909]:
+ - generic [ref=f13e5910]: 鍒拌揣鏃ユ湡
+ - generic [ref=f13e5915]:
+ - textbox "鍒拌揣鏃ユ湡" [ref=f13e5917]:
+ - /placeholder: 寮�濮嬫椂闂�
+ - generic "to" [ref=f13e5919]:
+ - img "swap-right" [ref=f13e5920]
+ - textbox "缁撴潫鏃堕棿" [ref=f13e5924]
+ - generic:
+ - img "calendar"
+ - generic [ref=f13e5925]:
+ - button "閲� 缃�" [ref=f13e5926] [cursor=pointer]
+ - button "鎼� 绱�" [ref=f13e5928] [cursor=pointer]
+ - generic [ref=f13e5930] [cursor=pointer]: 鏀惰捣
+ - generic [ref=f13e5937]:
+ - generic [ref=f13e5939]:
+ - generic [ref=f13e5940]: 鍒拌揣閫氱煡鍗曞垪琛�
+ - generic [ref=f13e5944]:
+ - generic [ref=f13e5946]:
+ - button "浠庨噰璐鍗曠敓鎴�" [active] [ref=f13e5948] [cursor=pointer]
+ - button "瀵煎叆" [ref=f13e5953] [cursor=pointer]
+ - button "瀵煎嚭" [ref=f13e5958] [cursor=pointer]
+ - button "顫�" [ref=f13e5964] [cursor=pointer]
+ - generic [ref=f13e5966]:
+ - button "瞟�" [ref=f13e5967] [cursor=pointer]
+ - button "顪�" [ref=f13e5969] [cursor=pointer]
+ - button "顦�" [ref=f13e5971] [cursor=pointer]
+ - generic [ref=f13e5979]:
+ - table [ref=f13e5983]:
+ - rowgroup [ref=f13e5994]:
+ - row "閫氱煡鍗曠紪鍙� 閫氱煡鍗曞悕绉� 閲囪喘璁㈠崟鍙� 渚涘簲鍟嗗悕绉� 鑱旂郴浜� 鑱旂郴鏂瑰紡 鍒拌揣鏃ユ湡 鍗曟嵁鐘舵�� 鎿嶄綔" [ref=f13e5995]:
+ - columnheader "閫氱煡鍗曠紪鍙�" [ref=f13e5996]
+ - columnheader "閫氱煡鍗曞悕绉�" [ref=f13e6001]
+ - columnheader "閲囪喘璁㈠崟鍙�" [ref=f13e6006]
+ - columnheader "渚涘簲鍟嗗悕绉�" [ref=f13e6011]
+ - columnheader "鑱旂郴浜�" [ref=f13e6016]
+ - columnheader "鑱旂郴鏂瑰紡" [ref=f13e6021]
+ - columnheader "鍒拌揣鏃ユ湡" [ref=f13e6026]
+ - columnheader "鍗曟嵁鐘舵��" [ref=f13e6031]
+ - columnheader "鎿嶄綔" [ref=f13e6036]
+ - table [ref=f13e6044]:
+ - rowgroup [ref=f13e6055]:
+ - row "AN1792846891133 CGDD20261024000001鍒拌揣閫氱煡 CGDD20261024000001 涔岄瞾鏈ㄩ綈澶╁北閲戝叿鍒堕�犳湁闄愬叕鍙� 2026-10-24 寰呭叆搴� 鎵ц鍏ュ簱" [ref=f13e6056]:
+ - cell "AN1792846891133" [ref=f13e6057]:
+ - button "AN1792846891133" [ref=f13e6060] [cursor=pointer]
+ - cell "CGDD20261024000001鍒拌揣閫氱煡" [ref=f13e6062]
+ - cell "CGDD20261024000001" [ref=f13e6066]
+ - cell "涔岄瞾鏈ㄩ綈澶╁北閲戝叿鍒堕�犳湁闄愬叕鍙�" [ref=f13e6070]
+ - cell [ref=f13e6074]
+ - cell [ref=f13e6078]
+ - cell "2026-10-24" [ref=f13e6082]
+ - cell "寰呭叆搴�" [ref=f13e6086]
+ - cell "鎵ц鍏ュ簱" [ref=f13e6090]:
+ - button "鎵ц鍏ュ簱" [ref=f13e6096] [cursor=pointer]
+ - row "DH261005016 CGDD20260925004 鍒拌揣閫氱煡 CGDD20260925004 涓浗鐭虫补鍏嬫媺鐜涗緷鐭冲寲鍏徃 鑹惧姏姹熉蜂拱涔版彁 13909902018 2026-10-05 宸插畬鎴�" [ref=f13e6098]:
+ - cell "DH261005016" [ref=f13e6099]:
+ - button "DH261005016" [ref=f13e6102] [cursor=pointer]
+ - cell "CGDD20260925004 鍒拌揣閫氱煡" [ref=f13e6104]
+ - cell "CGDD20260925004" [ref=f13e6108]
+ - cell "涓浗鐭虫补鍏嬫媺鐜涗緷鐭冲寲鍏徃" [ref=f13e6112]
+ - cell "鑹惧姏姹熉蜂拱涔版彁" [ref=f13e6116]
+ - cell "13909902018" [ref=f13e6120]
+ - cell "2026-10-05" [ref=f13e6124]
+ - cell "宸插畬鎴�" [ref=f13e6128]
+ - cell [ref=f13e6132]
+ - row "DH260930015 CGDD20260924004 鍒拌揣閫氱煡 CGDD20260924004 娌冲寳纭呰胺鍖栧伐鏈夐檺鍏徃 寮犳捣娑� 13383105672 2026-09-30 宸插畬鎴�" [ref=f13e6134]:
+ - cell "DH260930015" [ref=f13e6135]:
+ - button "DH260930015" [ref=f13e6138] [cursor=pointer]
+ - cell "CGDD20260924004 鍒拌揣閫氱煡" [ref=f13e6140]
+ - cell "CGDD20260924004" [ref=f13e6144]
+ - cell "娌冲寳纭呰胺鍖栧伐鏈夐檺鍏徃" [ref=f13e6148]
+ - cell "寮犳捣娑�" [ref=f13e6152]
+ - cell "13383105672" [ref=f13e6156]
+ - cell "2026-09-30" [ref=f13e6160]
+ - cell "宸插畬鎴�" [ref=f13e6164]
+ - cell [ref=f13e6168]
+ - row "DH260929014 CGDD20260924003 鍒拌揣閫氱煡 CGDD20260924003 鏂扮枂浼楀拰鑲′唤鏈夐檺鍏徃 鏉庣孩姊� 13999902876 2026-09-29 宸插畬鎴�" [ref=f13e6170]:
+ - cell "DH260929014" [ref=f13e6171]:
+ - button "DH260929014" [ref=f13e6174] [cursor=pointer]
+ - cell "CGDD20260924003 鍒拌揣閫氱煡" [ref=f13e6176]
+ - cell "CGDD20260924003" [ref=f13e6180]
+ - cell "鏂扮枂浼楀拰鑲′唤鏈夐檺鍏徃" [ref=f13e6184]
+ - cell "鏉庣孩姊�" [ref=f13e6188]
+ - cell "13999902876" [ref=f13e6192]
+ - cell "2026-09-29" [ref=f13e6196]
+ - cell "宸插畬鎴�" [ref=f13e6200]
+ - cell [ref=f13e6204]
+ - row "DH261005013 CGDD20260925003 鍒拌揣閫氱煡 CGDD20260925003 娌冲寳纭呰胺鍖栧伐鏈夐檺鍏徃 寮犳捣娑� 13383105672 2026-10-05 宸插畬鎴�" [ref=f13e6206]:
+ - cell "DH261005013" [ref=f13e6207]:
+ - button "DH261005013" [ref=f13e6210] [cursor=pointer]
+ - cell "CGDD20260925003 鍒拌揣閫氱煡" [ref=f13e6212]
+ - cell "CGDD20260925003" [ref=f13e6216]
+ - cell "娌冲寳纭呰胺鍖栧伐鏈夐檺鍏徃" [ref=f13e6220]
+ - cell "寮犳捣娑�" [ref=f13e6224]
+ - cell "13383105672" [ref=f13e6228]
+ - cell "2026-10-05" [ref=f13e6232]
+ - cell "宸插畬鎴�" [ref=f13e6236]
+ - cell [ref=f13e6240]
+ - row "DH260930012 CGDD20260925002 鍒拌揣閫氱煡 CGDD20260925002 涔岄瞾鏈ㄩ綈澶╁北閲戝叿鍒堕�犳湁闄愬叕鍙� 涔颁拱鎻惵峰悙灏旈�� 13199876235 2026-09-30 宸插畬鎴�" [ref=f13e6242]:
+ - cell "DH260930012" [ref=f13e6243]:
+ - button "DH260930012" [ref=f13e6246] [cursor=pointer]
+ - cell "CGDD20260925002 鍒拌揣閫氱煡" [ref=f13e6248]
+ - cell "CGDD20260925002" [ref=f13e6252]
+ - cell "涔岄瞾鏈ㄩ綈澶╁北閲戝叿鍒堕�犳湁闄愬叕鍙�" [ref=f13e6256]
+ - cell "涔颁拱鎻惵峰悙灏旈��" [ref=f13e6260]
+ - cell "13199876235" [ref=f13e6264]
+ - cell "2026-09-30" [ref=f13e6268]
+ - cell "宸插畬鎴�" [ref=f13e6272]
+ - cell [ref=f13e6276]
+ - row "DH261004011 CGDD20260925001 鍒拌揣閫氱煡 CGDD20260925001 鐗瑰彉鐢靛伐鏂扮枂鏂拌兘婧愯偂浠芥湁闄愬叕鍙� 椹檽涓� 13609987654 2026-10-04 宸插畬鎴�" [ref=f13e6278]:
+ - cell "DH261004011" [ref=f13e6279]:
+ - button "DH261004011" [ref=f13e6282] [cursor=pointer]
+ - cell "CGDD20260925001 鍒拌揣閫氱煡" [ref=f13e6284]
+ - cell "CGDD20260925001" [ref=f13e6288]
+ - cell "鐗瑰彉鐢靛伐鏂扮枂鏂拌兘婧愯偂浠芥湁闄愬叕鍙�" [ref=f13e6292]
+ - cell "椹檽涓�" [ref=f13e6296]
+ - cell "13609987654" [ref=f13e6300]
+ - cell "2026-10-04" [ref=f13e6304]
+ - cell "宸插畬鎴�" [ref=f13e6308]
+ - cell [ref=f13e6312]
+ - row "DH260930010 CGDD20260924002 鍒拌揣閫氱煡 CGDD20260924002 瑗垮畨瑗跨數楂樺帇鐢电摲鏈夐檺璐d换鍏徃 鍒樺缓鍥� 13572856019 2026-09-30 宸插畬鎴�" [ref=f13e6314]:
+ - cell "DH260930010" [ref=f13e6315]:
+ - button "DH260930010" [ref=f13e6318] [cursor=pointer]
+ - cell "CGDD20260924002 鍒拌揣閫氱煡" [ref=f13e6320]
+ - cell "CGDD20260924002" [ref=f13e6324]
+ - cell "瑗垮畨瑗跨數楂樺帇鐢电摲鏈夐檺璐d换鍏徃" [ref=f13e6328]
+ - cell "鍒樺缓鍥�" [ref=f13e6332]
+ - cell "13572856019" [ref=f13e6336]
+ - cell "2026-09-30" [ref=f13e6340]
+ - cell "宸插畬鎴�" [ref=f13e6344]
+ - cell [ref=f13e6348]
+ - row "DH260929009 CGDD20260924001 鍒拌揣閫氱煡 CGDD20260924001 姝f嘲鐢垫皵鑲′唤鏈夐檺鍏徃 闄堝織杩� 13968801276 2026-09-29 宸插畬鎴�" [ref=f13e6350]:
+ - cell "DH260929009" [ref=f13e6351]:
+ - button "DH260929009" [ref=f13e6354] [cursor=pointer]
+ - cell "CGDD20260924001 鍒拌揣閫氱煡" [ref=f13e6356]
+ - cell "CGDD20260924001" [ref=f13e6360]
+ - cell "姝f嘲鐢垫皵鑲′唤鏈夐檺鍏徃" [ref=f13e6364]
+ - cell "闄堝織杩�" [ref=f13e6368]
+ - cell "13968801276" [ref=f13e6372]
+ - cell "2026-09-29" [ref=f13e6376]
+ - cell "宸插畬鎴�" [ref=f13e6380]
+ - cell [ref=f13e6384]
+ - row "DH261013008 CGDD20261009002 鍒拌揣閫氱煡 CGDD20261009002 棣栭挗鏅烘柊杩佸畨鐢电鏉愭枡鏈夐檺鍏徃 璧靛織寮� 13703158092 2026-10-13 宸插畬鎴�" [ref=f13e6386]:
+ - cell "DH261013008" [ref=f13e6387]:
+ - button "DH261013008" [ref=f13e6390] [cursor=pointer]
+ - cell "CGDD20261009002 鍒拌揣閫氱煡" [ref=f13e6392]
+ - cell "CGDD20261009002" [ref=f13e6396]
+ - cell "棣栭挗鏅烘柊杩佸畨鐢电鏉愭枡鏈夐檺鍏徃" [ref=f13e6400]
+ - cell "璧靛織寮�" [ref=f13e6404]
+ - cell "13703158092" [ref=f13e6408]
+ - cell "2026-10-13" [ref=f13e6412]
+ - cell "宸插畬鎴�" [ref=f13e6416]
+ - cell [ref=f13e6420]
+ - row "DH261015007 CGDD20261012001 鍒拌揣閫氱煡 CGDD20261012001 杩滀笢鐢电紗鏈夐檺鍏徃 鍛ㄦ枃鏂� 13861520873 2026-10-15 宸插畬鎴�" [ref=f13e6422]:
+ - cell "DH261015007" [ref=f13e6423]:
+ - button "DH261015007" [ref=f13e6426] [cursor=pointer]
+ - cell "CGDD20261012001 鍒拌揣閫氱煡" [ref=f13e6428]
+ - cell "CGDD20261012001" [ref=f13e6432]
+ - cell "杩滀笢鐢电紗鏈夐檺鍏徃" [ref=f13e6436]
+ - cell "鍛ㄦ枃鏂�" [ref=f13e6440]
+ - cell "13861520873" [ref=f13e6444]
+ - cell "2026-10-15" [ref=f13e6448]
+ - cell "宸插畬鎴�" [ref=f13e6452]
+ - cell [ref=f13e6456]
+ - row "DH261013006 CGDD20261009001 鍒拌揣閫氱煡 CGDD20261009001 杩滀笢鐢电紗鏈夐檺鍏徃 鍛ㄦ枃鏂� 13861520873 2026-10-13 宸插畬鎴�" [ref=f13e6458]:
+ - cell "DH261013006" [ref=f13e6459]:
+ - button "DH261013006" [ref=f13e6462] [cursor=pointer]
+ - cell "CGDD20261009001 鍒拌揣閫氱煡" [ref=f13e6464]
+ - cell "CGDD20261009001" [ref=f13e6468]
+ - cell "杩滀笢鐢电紗鏈夐檺鍏徃" [ref=f13e6472]
+ - cell "鍛ㄦ枃鏂�" [ref=f13e6476]
+ - cell "13861520873" [ref=f13e6480]
+ - cell "2026-10-13" [ref=f13e6484]
+ - cell "宸插畬鎴�" [ref=f13e6488]
+ - cell [ref=f13e6492]
+ - row "DH260926005 CGDD20260923002 鍒拌揣閫氱煡 CGDD20260923002 涓浗鐭虫补鍏嬫媺鐜涗緷鐭冲寲鍏徃 鑹惧姏姹熉蜂拱涔版彁 13909902018 2026-09-26 宸插畬鎴�" [ref=f13e6494]:
+ - cell "DH260926005" [ref=f13e6495]:
+ - button "DH260926005" [ref=f13e6498] [cursor=pointer]
+ - cell "CGDD20260923002 鍒拌揣閫氱煡" [ref=f13e6500]
+ - cell "CGDD20260923002" [ref=f13e6504]
+ - cell "涓浗鐭虫补鍏嬫媺鐜涗緷鐭冲寲鍏徃" [ref=f13e6508]
+ - cell "鑹惧姏姹熉蜂拱涔版彁" [ref=f13e6512]
+ - cell "13909902018" [ref=f13e6516]
+ - cell "2026-09-26" [ref=f13e6520]
+ - cell "宸插畬鎴�" [ref=f13e6524]
+ - cell [ref=f13e6528]
+ - row "DH260926004 CGDD20260923001 鍒拌揣閫氱煡 CGDD20260923001 娌冲寳纭呰胺鍖栧伐鏈夐檺鍏徃 寮犳捣娑� 13383105672 2026-09-26 宸插畬鎴�" [ref=f13e6530]:
+ - cell "DH260926004" [ref=f13e6531]:
+ - button "DH260926004" [ref=f13e6534] [cursor=pointer]
+ - cell "CGDD20260923001 鍒拌揣閫氱煡" [ref=f13e6536]
+ - cell "CGDD20260923001" [ref=f13e6540]
+ - cell "娌冲寳纭呰胺鍖栧伐鏈夐檺鍏徃" [ref=f13e6544]
+ - cell "寮犳捣娑�" [ref=f13e6548]
+ - cell "13383105672" [ref=f13e6552]
+ - cell "2026-09-26" [ref=f13e6556]
+ - cell "宸插畬鎴�" [ref=f13e6560]
+ - cell [ref=f13e6564]
+ - row "DH260927003 CGDD20260922003 鍒拌揣閫氱煡 CGDD20260922003 棣栭挗鏅烘柊杩佸畨鐢电鏉愭枡鏈夐檺鍏徃 璧靛織寮� 13703158092 2026-09-27 宸插畬鎴�" [ref=f13e6566]:
+ - cell "DH260927003" [ref=f13e6567]:
+ - button "DH260927003" [ref=f13e6570] [cursor=pointer]
+ - cell "CGDD20260922003 鍒拌揣閫氱煡" [ref=f13e6572]
+ - cell "CGDD20260922003" [ref=f13e6576]
+ - cell "棣栭挗鏅烘柊杩佸畨鐢电鏉愭枡鏈夐檺鍏徃" [ref=f13e6580]
+ - cell "璧靛織寮�" [ref=f13e6584]
+ - cell "13703158092" [ref=f13e6588]
+ - cell "2026-09-27" [ref=f13e6592]
+ - cell "宸插畬鎴�" [ref=f13e6596]
+ - cell [ref=f13e6600]
+ - row "DH260926002 CGDD20260922002 鍒拌揣閫氱煡 CGDD20260922002 鏂扮枂浼楀拰鑲′唤鏈夐檺鍏徃 鏉庣孩姊� 13999902876 2026-09-26 宸插畬鎴�" [ref=f13e6602]:
+ - cell "DH260926002" [ref=f13e6603]:
+ - button "DH260926002" [ref=f13e6606] [cursor=pointer]
+ - cell "CGDD20260922002 鍒拌揣閫氱煡" [ref=f13e6608]
+ - cell "CGDD20260922002" [ref=f13e6612]
+ - cell "鏂扮枂浼楀拰鑲′唤鏈夐檺鍏徃" [ref=f13e6616]
+ - cell "鏉庣孩姊�" [ref=f13e6620]
+ - cell "13999902876" [ref=f13e6624]
+ - cell "2026-09-26" [ref=f13e6628]
+ - cell "宸插畬鎴�" [ref=f13e6632]
+ - cell [ref=f13e6636]
+ - row "DH260925001 CGDD20260922001 鍒拌揣閫氱煡 CGDD20260922001 瀹濇闆嗗洟鏂扮枂鍏竴閽㈤搧鏈夐檺鍏徃 鐜嬪缓鍐� 13899112031 2026-09-25 宸插畬鎴�" [ref=f13e6638]:
+ - cell "DH260925001" [ref=f13e6639]:
+ - button "DH260925001" [ref=f13e6642] [cursor=pointer]
+ - cell "CGDD20260922001 鍒拌揣閫氱煡" [ref=f13e6644]
+ - cell "CGDD20260922001" [ref=f13e6648]
+ - cell "瀹濇闆嗗洟鏂扮枂鍏竴閽㈤搧鏈夐檺鍏徃" [ref=f13e6652]
+ - cell "鐜嬪缓鍐�" [ref=f13e6656]
+ - cell "13899112031" [ref=f13e6660]
+ - cell "2026-09-25" [ref=f13e6664]
+ - cell "宸插畬鎴�" [ref=f13e6668]
+ - cell [ref=f13e6672]
+ - generic [ref=f13e6681]:
+ - generic [ref=f13e6682]: 鍏� 17 鏉¤褰�
+ - generic [ref=f13e6684] [cursor=pointer]:
+ - generic "20鏉�/椤�" [ref=f13e6685]:
+ - textbox "璇烽�夋嫨" [ref=f13e6686]: 20鏉�/椤�
+ - generic [ref=f13e6687]: 睿�
+ - button "飱�" [ref=f13e6690]
+ - button "顧�" [ref=f13e6692]
+ - button "顫�" [ref=f13e6694]
+ - button "1" [ref=f13e6697] [cursor=pointer]
+ - button "顫�" [ref=f13e6698]
+ - button "顧�" [ref=f13e6700]
+ - button "顦�" [ref=f13e6702]
\ No newline at end of file
diff --git a/arrival-state.png b/arrival-state.png
new file mode 100644
index 0000000..d771c0e
--- /dev/null
+++ b/arrival-state.png
Binary files differ
diff --git a/form-with-srm-select.png b/form-with-srm-select.png
new file mode 100644
index 0000000..a736e36
--- /dev/null
+++ b/form-with-srm-select.png
Binary files differ
diff --git a/home.png b/home.png
new file mode 100644
index 0000000..5ffa993
--- /dev/null
+++ b/home.png
Binary files differ
diff --git a/itemreceipt-create.yml b/itemreceipt-create.yml
new file mode 100644
index 0000000..21545d8
--- /dev/null
+++ b/itemreceipt-create.yml
@@ -0,0 +1,381 @@
+- generic [ref=f13e1]:
+ - generic [ref=f13e90]:
+ - complementary [ref=f13e91]:
+ - generic [ref=f13e92]:
+ - generic [ref=f13e93] [cursor=pointer]
+ - link "鏂伴珮鐢靛姏鏅洪�犲钩鍙� 鏂伴珮鐢靛姏鏅洪�犲钩鍙�" [ref=f13e98] [cursor=pointer]:
+ - /url: javascript:void 0
+ - img "鏂伴珮鐢靛姏鏅洪�犲钩鍙�" [ref=f13e101]
+ - generic [ref=f13e102]: 鏂伴珮鐢靛姏鏅洪�犲钩鍙�
+ - menu [ref=f13e105]:
+ - menuitem "棣栭〉" [ref=f13e106] [cursor=pointer]
+ - listitem [ref=f13e113]:
+ - generic [ref=f13e114] [cursor=pointer]: 鐢熶骇绠℃帶
+ - listitem [ref=f13e121]:
+ - generic [ref=f13e122] [cursor=pointer]: 宸ヨ壓璁捐
+ - listitem [ref=f13e129]:
+ - generic [ref=f13e130] [cursor=pointer]: 浜у搧璁捐
+ - listitem [ref=f13e136]:
+ - generic [ref=f13e137] [cursor=pointer]: 钀ラ攢绠$悊
+ - listitem [ref=f13e143]:
+ - generic [ref=f13e144] [cursor=pointer]: 鍞悗鏈嶅姟
+ - listitem [ref=f13e150]:
+ - generic [ref=f13e151] [cursor=pointer]: 璁″垝鎺掔▼
+ - listitem [ref=f13e157]:
+ - generic [ref=f13e158] [cursor=pointer]: 璐ㄩ噺绠$悊
+ - listitem [ref=f13e164]:
+ - generic [ref=f13e165] [cursor=pointer]: 璁惧绠$悊
+ - listitem [ref=f13e172]:
+ - generic [ref=f13e173] [cursor=pointer]: 閲囪喘绠$悊
+ - listitem [ref=f13e179]:
+ - generic [ref=f13e180] [cursor=pointer]: 浠撳偍鐗╂祦
+ - list [ref=f13e3287]:
+ - menuitem "搴撳瓨浜嬪姟娴佹按" [ref=f13e3288] [cursor=pointer]
+ - menuitem "浠撳簱璁剧疆" [ref=f13e3293] [cursor=pointer]
+ - menuitem "搴撳瓨鐜版湁閲�" [ref=f13e3300] [cursor=pointer]
+ - listitem [ref=f13e3305]:
+ - generic [ref=f13e3306] [cursor=pointer]: 閲囪喘浠撳簱
+ - list [ref=f13e3312]:
+ - menuitem "鍒拌揣閫氱煡" [ref=f13e3313] [cursor=pointer]
+ - menuitem "閲囪喘鍏ュ簱" [ref=f13e3318] [cursor=pointer]
+ - menuitem "閲囪喘閫�璐�" [ref=f13e3323] [cursor=pointer]
+ - listitem [ref=f13e3330]:
+ - generic [ref=f13e3331] [cursor=pointer]: 鐢熶骇浠撳簱
+ - listitem [ref=f13e3338]:
+ - generic [ref=f13e3339] [cursor=pointer]: 閿�鍞粨搴�
+ - menuitem "杞Щ璋冩嫧" [ref=f13e3345] [cursor=pointer]
+ - listitem [ref=f13e3350]:
+ - generic [ref=f13e3351] [cursor=pointer]: 搴撳瓨鐩樼偣
+ - menuitem "瑁呯绠$悊" [ref=f13e3357] [cursor=pointer]
+ - menuitem "璧嬭兘绠$悊" [ref=f13e3364] [cursor=pointer]
+ - menuitem "SN 鐮�" [ref=f13e3369] [cursor=pointer]
+ - menuitem "澶栧崗鍙戞枡" [ref=f13e3374] [cursor=pointer]
+ - menuitem "澶栧崗鍏ュ簱" [ref=f13e3379] [cursor=pointer]
+ - menuitem "鏉傞」鍏ュ簱" [ref=f13e3384] [cursor=pointer]
+ - menuitem "鏉傞」鍑哄簱" [ref=f13e3389] [cursor=pointer]
+ - menuitem "璁惧鍏ュ簱" [ref=f13e3394] [cursor=pointer]
+ - listitem [ref=f13e188]:
+ - generic [ref=f13e189] [cursor=pointer]: 浜哄姏璧勬簮
+ - listitem [ref=f13e195]:
+ - generic [ref=f13e196] [cursor=pointer]: 鍐崇瓥鏀寔
+ - listitem [ref=f13e202]:
+ - generic [ref=f13e203] [cursor=pointer]: 鑳借�楃鐞�
+ - listitem [ref=f13e210]:
+ - generic [ref=f13e211] [cursor=pointer]: 鍩虹鏁版嵁
+ - listitem [ref=f13e219]:
+ - generic [ref=f13e220] [cursor=pointer]: 鍗忓悓鍔炲叕
+ - listitem [ref=f13e226]:
+ - generic [ref=f13e227] [cursor=pointer]: 鍩虹璁炬柦
+ - listitem [ref=f13e233]:
+ - generic [ref=f13e234] [cursor=pointer]: 绯荤粺绠$悊
+ - generic [ref=f13e241] [cursor=pointer]
+ - generic [ref=f13e246]:
+ - generic [ref=f13e247]:
+ - banner [ref=f13e248]:
+ - button [ref=f13e249] [cursor=pointer]
+ - button [ref=f13e252] [cursor=pointer]
+ - navigation "breadcrumb" [ref=f13e257]:
+ - list [ref=f13e258]:
+ - listitem [ref=f13e3399]:
+ - link "浠撳偍鐗╂祦" [ref=f13e3400] [cursor=pointer]:
+ - /url: javascript:void 0
+ - listitem [ref=f13e3406]
+ - listitem [ref=f13e3409]:
+ - link "閲囪喘浠撳簱" [ref=f13e3410] [cursor=pointer]:
+ - /url: javascript:void 0
+ - listitem [ref=f13e3414]
+ - listitem [ref=f13e4859]:
+ - link "閲囪喘鍏ュ簱" [disabled] [ref=f13e4860]
+ - generic [ref=f13e267]:
+ - generic [ref=f13e269] [cursor=pointer]:
+ - generic [ref=f13e273]: 鎼滅储
+ - generic [ref=f13e274]: Ctrl K
+ - button [ref=f13e276] [cursor=pointer]
+ - button "dark" [ref=f13e281] [cursor=pointer]
+ - button [ref=f13e290] [cursor=pointer]
+ - button [ref=f13e296] [cursor=pointer]
+ - button [ref=f13e299] [cursor=pointer]
+ - button [ref=f13e305] [cursor=pointer]:
+ - button [ref=f13e307]
+ - button "宸ヤ綔鍙�" [ref=f13e311] [cursor=pointer]
+ - button [ref=f13e315] [cursor=pointer]:
+ - img "瓒呯骇绠$悊鍛�" [ref=f13e320]
+ - generic [ref=f13e322]:
+ - generic [ref=f13e327]:
+ - generic [ref=f13e328] [cursor=pointer]: 棣栭〉
+ - generic [ref=f13e729] [cursor=pointer]: 鐢熶骇璁㈠崟
+ - generic [ref=f13e3423] [cursor=pointer]: 鍒拌揣閫氱煡
+ - generic [ref=f13e4865] [cursor=pointer]: 閲囪喘鍏ュ簱
+ - generic [ref=f13e344]:
+ - button [ref=f13e345] [cursor=pointer]
+ - generic [ref=f13e352] [cursor=pointer]
+ - generic [ref=f13e356] [cursor=pointer]
+ - main [ref=f13e363]:
+ - generic [ref=f13e4885]:
+ - generic [ref=f13e4890]:
+ - generic [ref=f13e4891]:
+ - generic [ref=f13e4892]: 鍏ュ簱鍗曠紪鍙�
+ - textbox "鍏ュ簱鍗曠紪鍙�" [ref=f13e4898]:
+ - /placeholder: 璇疯緭鍏ュ叆搴撳崟缂栧彿
+ - generic [ref=f13e4900]:
+ - generic [ref=f13e4901]: 鍏ュ簱鍗曞悕绉�
+ - textbox "鍏ュ簱鍗曞悕绉�" [ref=f13e4907]:
+ - /placeholder: 璇疯緭鍏ュ叆搴撳崟鍚嶇О
+ - generic [ref=f13e4909]:
+ - generic [ref=f13e4910]: 渚涘簲鍟�
+ - textbox "璇烽�夋嫨渚涘簲鍟�" [ref=f13e4917]
+ - generic [ref=f13e4923]:
+ - generic [ref=f13e4924]: 鍏ュ簱鏃ユ湡
+ - generic [ref=f13e4929]:
+ - textbox "鍏ュ簱鏃ユ湡" [ref=f13e4931]:
+ - /placeholder: 寮�濮嬫椂闂�
+ - generic "to" [ref=f13e4933]:
+ - img "swap-right" [ref=f13e4934]
+ - textbox "缁撴潫鏃堕棿" [ref=f13e4938]
+ - generic:
+ - img "calendar"
+ - generic [ref=f13e4939]:
+ - button "閲� 缃�" [ref=f13e4940] [cursor=pointer]
+ - button "鎼� 绱�" [ref=f13e4942] [cursor=pointer]
+ - generic [ref=f13e4944] [cursor=pointer]: 鏀惰捣
+ - generic [ref=f13e4951]:
+ - generic [ref=f13e4953]:
+ - generic [ref=f13e4954]: 閲囪喘鍏ュ簱鍗曞垪琛�
+ - generic [ref=f13e4958]:
+ - generic [ref=f13e4960]:
+ - button "鏂板閲囪喘鍏ュ簱鍗�" [active] [ref=f13e4962] [cursor=pointer]
+ - button "瀵煎叆" [ref=f13e4967] [cursor=pointer]
+ - button "浠庡埌璐ч�氱煡鐢熸垚" [ref=f13e4972] [cursor=pointer]
+ - button "瀵煎嚭" [ref=f13e4977] [cursor=pointer]
+ - button "顫�" [ref=f13e4983] [cursor=pointer]
+ - generic [ref=f13e4985]:
+ - button "瞟�" [ref=f13e4986] [cursor=pointer]
+ - button "顪�" [ref=f13e4988] [cursor=pointer]
+ - button "顦�" [ref=f13e4990] [cursor=pointer]
+ - generic [ref=f13e4998]:
+ - table [ref=f13e5002]:
+ - rowgroup [ref=f13e5011]:
+ - row "鍏ュ簱鍗曠紪鍙� 鍏ュ簱鍗曞悕绉� 閲囪喘璁㈠崟鍙� 渚涘簲鍟嗗悕绉� 鍏ュ簱鏃ユ湡 鍗曟嵁鐘舵�� 鎿嶄綔" [ref=f13e5012]:
+ - columnheader "鍏ュ簱鍗曠紪鍙�" [ref=f13e5013]
+ - columnheader "鍏ュ簱鍗曞悕绉�" [ref=f13e5018]
+ - columnheader "閲囪喘璁㈠崟鍙�" [ref=f13e5023]
+ - columnheader "渚涘簲鍟嗗悕绉�" [ref=f13e5028]
+ - columnheader "鍏ュ簱鏃ユ湡" [ref=f13e5033]
+ - columnheader "鍗曟嵁鐘舵��" [ref=f13e5038]
+ - columnheader "鎿嶄綔" [ref=f13e5043]
+ - table [ref=f13e5051]:
+ - rowgroup [ref=f13e5060]:
+ - row "IR1792846916422 CGDD20261024000001鍒拌揣閫氱煡鍏ュ簱鍗� CGDD20261024000001 涔岄瞾鏈ㄩ綈澶╁北閲戝叿鍒堕�犳湁闄愬叕鍙� 2026-10-24 寰呬笂鏋� 鎵ц涓婃灦 鍙栨秷" [ref=f13e5061]:
+ - cell "IR1792846916422" [ref=f13e5062]:
+ - button "IR1792846916422" [ref=f13e5065] [cursor=pointer]
+ - cell "CGDD20261024000001鍒拌揣閫氱煡鍏ュ簱鍗�" [ref=f13e5067]
+ - cell "CGDD20261024000001" [ref=f13e5071]
+ - cell "涔岄瞾鏈ㄩ綈澶╁北閲戝叿鍒堕�犳湁闄愬叕鍙�" [ref=f13e5075]
+ - cell "2026-10-24" [ref=f13e5079]
+ - cell "寰呬笂鏋�" [ref=f13e5083]
+ - cell "鎵ц涓婃灦 鍙栨秷" [ref=f13e5087]:
+ - generic [ref=f13e5091]:
+ - button "鎵ц涓婃灦" [ref=f13e5093] [cursor=pointer]
+ - button "鍙栨秷" [ref=f13e5096] [cursor=pointer]
+ - row "CGRK261005016 CGDD20260925004 閲囪喘鍏ュ簱 CGDD20260925004 涓浗鐭虫补鍏嬫媺鐜涗緷鐭冲寲鍏徃 2026-10-05 宸插畬鎴�" [ref=f13e5098]:
+ - cell "CGRK261005016" [ref=f13e5099]:
+ - button "CGRK261005016" [ref=f13e5102] [cursor=pointer]
+ - cell "CGDD20260925004 閲囪喘鍏ュ簱" [ref=f13e5104]
+ - cell "CGDD20260925004" [ref=f13e5108]
+ - cell "涓浗鐭虫补鍏嬫媺鐜涗緷鐭冲寲鍏徃" [ref=f13e5112]
+ - cell "2026-10-05" [ref=f13e5116]
+ - cell "宸插畬鎴�" [ref=f13e5120]
+ - cell [ref=f13e5124]
+ - row "CGRK260930015 CGDD20260924004 閲囪喘鍏ュ簱 CGDD20260924004 娌冲寳纭呰胺鍖栧伐鏈夐檺鍏徃 2026-09-30 宸插畬鎴�" [ref=f13e5126]:
+ - cell "CGRK260930015" [ref=f13e5127]:
+ - button "CGRK260930015" [ref=f13e5130] [cursor=pointer]
+ - cell "CGDD20260924004 閲囪喘鍏ュ簱" [ref=f13e5132]
+ - cell "CGDD20260924004" [ref=f13e5136]
+ - cell "娌冲寳纭呰胺鍖栧伐鏈夐檺鍏徃" [ref=f13e5140]
+ - cell "2026-09-30" [ref=f13e5144]
+ - cell "宸插畬鎴�" [ref=f13e5148]
+ - cell [ref=f13e5152]
+ - row "CGRK260929014 CGDD20260924003 閲囪喘鍏ュ簱 CGDD20260924003 鏂扮枂浼楀拰鑲′唤鏈夐檺鍏徃 2026-09-29 宸插畬鎴�" [ref=f13e5154]:
+ - cell "CGRK260929014" [ref=f13e5155]:
+ - button "CGRK260929014" [ref=f13e5158] [cursor=pointer]
+ - cell "CGDD20260924003 閲囪喘鍏ュ簱" [ref=f13e5160]
+ - cell "CGDD20260924003" [ref=f13e5164]
+ - cell "鏂扮枂浼楀拰鑲′唤鏈夐檺鍏徃" [ref=f13e5168]
+ - cell "2026-09-29" [ref=f13e5172]
+ - cell "宸插畬鎴�" [ref=f13e5176]
+ - cell [ref=f13e5180]
+ - row "CGRK261005013 CGDD20260925003 閲囪喘鍏ュ簱 CGDD20260925003 娌冲寳纭呰胺鍖栧伐鏈夐檺鍏徃 2026-10-05 宸插畬鎴�" [ref=f13e5182]:
+ - cell "CGRK261005013" [ref=f13e5183]:
+ - button "CGRK261005013" [ref=f13e5186] [cursor=pointer]
+ - cell "CGDD20260925003 閲囪喘鍏ュ簱" [ref=f13e5188]
+ - cell "CGDD20260925003" [ref=f13e5192]
+ - cell "娌冲寳纭呰胺鍖栧伐鏈夐檺鍏徃" [ref=f13e5196]
+ - cell "2026-10-05" [ref=f13e5200]
+ - cell "宸插畬鎴�" [ref=f13e5204]
+ - cell [ref=f13e5208]
+ - row "CGRK260930012 CGDD20260925002 閲囪喘鍏ュ簱 CGDD20260925002 涔岄瞾鏈ㄩ綈澶╁北閲戝叿鍒堕�犳湁闄愬叕鍙� 2026-09-30 宸插畬鎴�" [ref=f13e5210]:
+ - cell "CGRK260930012" [ref=f13e5211]:
+ - button "CGRK260930012" [ref=f13e5214] [cursor=pointer]
+ - cell "CGDD20260925002 閲囪喘鍏ュ簱" [ref=f13e5216]
+ - cell "CGDD20260925002" [ref=f13e5220]
+ - cell "涔岄瞾鏈ㄩ綈澶╁北閲戝叿鍒堕�犳湁闄愬叕鍙�" [ref=f13e5224]
+ - cell "2026-09-30" [ref=f13e5228]
+ - cell "宸插畬鎴�" [ref=f13e5232]
+ - cell [ref=f13e5236]
+ - row "CGRK261004011 CGDD20260925001 閲囪喘鍏ュ簱 CGDD20260925001 鐗瑰彉鐢靛伐鏂扮枂鏂拌兘婧愯偂浠芥湁闄愬叕鍙� 2026-10-04 宸插畬鎴�" [ref=f13e5238]:
+ - cell "CGRK261004011" [ref=f13e5239]:
+ - button "CGRK261004011" [ref=f13e5242] [cursor=pointer]
+ - cell "CGDD20260925001 閲囪喘鍏ュ簱" [ref=f13e5244]
+ - cell "CGDD20260925001" [ref=f13e5248]
+ - cell "鐗瑰彉鐢靛伐鏂扮枂鏂拌兘婧愯偂浠芥湁闄愬叕鍙�" [ref=f13e5252]
+ - cell "2026-10-04" [ref=f13e5256]
+ - cell "宸插畬鎴�" [ref=f13e5260]
+ - cell [ref=f13e5264]
+ - row "CGRK260930010 CGDD20260924002 閲囪喘鍏ュ簱 CGDD20260924002 瑗垮畨瑗跨數楂樺帇鐢电摲鏈夐檺璐d换鍏徃 2026-09-30 宸插畬鎴�" [ref=f13e5266]:
+ - cell "CGRK260930010" [ref=f13e5267]:
+ - button "CGRK260930010" [ref=f13e5270] [cursor=pointer]
+ - cell "CGDD20260924002 閲囪喘鍏ュ簱" [ref=f13e5272]
+ - cell "CGDD20260924002" [ref=f13e5276]
+ - cell "瑗垮畨瑗跨數楂樺帇鐢电摲鏈夐檺璐d换鍏徃" [ref=f13e5280]
+ - cell "2026-09-30" [ref=f13e5284]
+ - cell "宸插畬鎴�" [ref=f13e5288]
+ - cell [ref=f13e5292]
+ - row "CGRK260929009 CGDD20260924001 閲囪喘鍏ュ簱 CGDD20260924001 姝f嘲鐢垫皵鑲′唤鏈夐檺鍏徃 2026-09-29 宸插畬鎴�" [ref=f13e5294]:
+ - cell "CGRK260929009" [ref=f13e5295]:
+ - button "CGRK260929009" [ref=f13e5298] [cursor=pointer]
+ - cell "CGDD20260924001 閲囪喘鍏ュ簱" [ref=f13e5300]
+ - cell "CGDD20260924001" [ref=f13e5304]
+ - cell "姝f嘲鐢垫皵鑲′唤鏈夐檺鍏徃" [ref=f13e5308]
+ - cell "2026-09-29" [ref=f13e5312]
+ - cell "宸插畬鎴�" [ref=f13e5316]
+ - cell [ref=f13e5320]
+ - row "CGRK261013008 CGDD20261009002 閲囪喘鍏ュ簱 CGDD20261009002 棣栭挗鏅烘柊杩佸畨鐢电鏉愭枡鏈夐檺鍏徃 2026-10-13 宸插畬鎴�" [ref=f13e5322]:
+ - cell "CGRK261013008" [ref=f13e5323]:
+ - button "CGRK261013008" [ref=f13e5326] [cursor=pointer]
+ - cell "CGDD20261009002 閲囪喘鍏ュ簱" [ref=f13e5328]
+ - cell "CGDD20261009002" [ref=f13e5332]
+ - cell "棣栭挗鏅烘柊杩佸畨鐢电鏉愭枡鏈夐檺鍏徃" [ref=f13e5336]
+ - cell "2026-10-13" [ref=f13e5340]
+ - cell "宸插畬鎴�" [ref=f13e5344]
+ - cell [ref=f13e5348]
+ - row "CGRK261015007 CGDD20261012001 閲囪喘鍏ュ簱 CGDD20261012001 杩滀笢鐢电紗鏈夐檺鍏徃 2026-10-15 宸插畬鎴�" [ref=f13e5350]:
+ - cell "CGRK261015007" [ref=f13e5351]:
+ - button "CGRK261015007" [ref=f13e5354] [cursor=pointer]
+ - cell "CGDD20261012001 閲囪喘鍏ュ簱" [ref=f13e5356]
+ - cell "CGDD20261012001" [ref=f13e5360]
+ - cell "杩滀笢鐢电紗鏈夐檺鍏徃" [ref=f13e5364]
+ - cell "2026-10-15" [ref=f13e5368]
+ - cell "宸插畬鎴�" [ref=f13e5372]
+ - cell [ref=f13e5376]
+ - row "CGRK261013006 CGDD20261009001 閲囪喘鍏ュ簱 CGDD20261009001 杩滀笢鐢电紗鏈夐檺鍏徃 2026-10-13 宸插畬鎴�" [ref=f13e5378]:
+ - cell "CGRK261013006" [ref=f13e5379]:
+ - button "CGRK261013006" [ref=f13e5382] [cursor=pointer]
+ - cell "CGDD20261009001 閲囪喘鍏ュ簱" [ref=f13e5384]
+ - cell "CGDD20261009001" [ref=f13e5388]
+ - cell "杩滀笢鐢电紗鏈夐檺鍏徃" [ref=f13e5392]
+ - cell "2026-10-13" [ref=f13e5396]
+ - cell "宸插畬鎴�" [ref=f13e5400]
+ - cell [ref=f13e5404]
+ - row "CGRK260926005 CGDD20260923002 閲囪喘鍏ュ簱 CGDD20260923002 涓浗鐭虫补鍏嬫媺鐜涗緷鐭冲寲鍏徃 2026-09-26 宸插畬鎴�" [ref=f13e5406]:
+ - cell "CGRK260926005" [ref=f13e5407]:
+ - button "CGRK260926005" [ref=f13e5410] [cursor=pointer]
+ - cell "CGDD20260923002 閲囪喘鍏ュ簱" [ref=f13e5412]
+ - cell "CGDD20260923002" [ref=f13e5416]
+ - cell "涓浗鐭虫补鍏嬫媺鐜涗緷鐭冲寲鍏徃" [ref=f13e5420]
+ - cell "2026-09-26" [ref=f13e5424]
+ - cell "宸插畬鎴�" [ref=f13e5428]
+ - cell [ref=f13e5432]
+ - row "CGRK260926004 CGDD20260923001 閲囪喘鍏ュ簱 CGDD20260923001 娌冲寳纭呰胺鍖栧伐鏈夐檺鍏徃 2026-09-26 宸插畬鎴�" [ref=f13e5434]:
+ - cell "CGRK260926004" [ref=f13e5435]:
+ - button "CGRK260926004" [ref=f13e5438] [cursor=pointer]
+ - cell "CGDD20260923001 閲囪喘鍏ュ簱" [ref=f13e5440]
+ - cell "CGDD20260923001" [ref=f13e5444]
+ - cell "娌冲寳纭呰胺鍖栧伐鏈夐檺鍏徃" [ref=f13e5448]
+ - cell "2026-09-26" [ref=f13e5452]
+ - cell "宸插畬鎴�" [ref=f13e5456]
+ - cell [ref=f13e5460]
+ - row "CGRK260927003 CGDD20260922003 閲囪喘鍏ュ簱 CGDD20260922003 棣栭挗鏅烘柊杩佸畨鐢电鏉愭枡鏈夐檺鍏徃 2026-09-27 宸插畬鎴�" [ref=f13e5462]:
+ - cell "CGRK260927003" [ref=f13e5463]:
+ - button "CGRK260927003" [ref=f13e5466] [cursor=pointer]
+ - cell "CGDD20260922003 閲囪喘鍏ュ簱" [ref=f13e5468]
+ - cell "CGDD20260922003" [ref=f13e5472]
+ - cell "棣栭挗鏅烘柊杩佸畨鐢电鏉愭枡鏈夐檺鍏徃" [ref=f13e5476]
+ - cell "2026-09-27" [ref=f13e5480]
+ - cell "宸插畬鎴�" [ref=f13e5484]
+ - cell [ref=f13e5488]
+ - row "CGRK260926002 CGDD20260922002 閲囪喘鍏ュ簱 CGDD20260922002 鏂扮枂浼楀拰鑲′唤鏈夐檺鍏徃 2026-09-26 宸插畬鎴�" [ref=f13e5490]:
+ - cell "CGRK260926002" [ref=f13e5491]:
+ - button "CGRK260926002" [ref=f13e5494] [cursor=pointer]
+ - cell "CGDD20260922002 閲囪喘鍏ュ簱" [ref=f13e5496]
+ - cell "CGDD20260922002" [ref=f13e5500]
+ - cell "鏂扮枂浼楀拰鑲′唤鏈夐檺鍏徃" [ref=f13e5504]
+ - cell "2026-09-26" [ref=f13e5508]
+ - cell "宸插畬鎴�" [ref=f13e5512]
+ - cell [ref=f13e5516]
+ - row "CGRK260925001 CGDD20260922001 閲囪喘鍏ュ簱 CGDD20260922001 瀹濇闆嗗洟鏂扮枂鍏竴閽㈤搧鏈夐檺鍏徃 2026-09-25 宸插畬鎴�" [ref=f13e5518]:
+ - cell "CGRK260925001" [ref=f13e5519]:
+ - button "CGRK260925001" [ref=f13e5522] [cursor=pointer]
+ - cell "CGDD20260922001 閲囪喘鍏ュ簱" [ref=f13e5524]
+ - cell "CGDD20260922001" [ref=f13e5528]
+ - cell "瀹濇闆嗗洟鏂扮枂鍏竴閽㈤搧鏈夐檺鍏徃" [ref=f13e5532]
+ - cell "2026-09-25" [ref=f13e5536]
+ - cell "宸插畬鎴�" [ref=f13e5540]
+ - cell [ref=f13e5544]
+ - generic [ref=f13e5553]:
+ - generic [ref=f13e5554]: 鍏� 17 鏉¤褰�
+ - generic [ref=f13e5556] [cursor=pointer]:
+ - generic "20鏉�/椤�" [ref=f13e5557]:
+ - textbox "璇烽�夋嫨" [ref=f13e5558]: 20鏉�/椤�
+ - generic [ref=f13e5559]: 睿�
+ - button "飱�" [ref=f13e5562]
+ - button "顧�" [ref=f13e5564]
+ - button "顫�" [ref=f13e5566]
+ - button "1" [ref=f13e5569] [cursor=pointer]
+ - button "顫�" [ref=f13e5570]
+ - button "顧�" [ref=f13e5572]
+ - button "顦�" [ref=f13e5574]
+ - dialog [ref=f13e5577]:
+ - heading "鏂板閲囪喘鍏ュ簱鍗�" [level=2] [ref=f13e5579]
+ - generic [ref=f13e5583]:
+ - generic [ref=f13e5584]:
+ - generic [ref=f13e5585]:
+ - generic [ref=f13e5586]: "*"
+ - text: 鍏ュ簱鍗曠紪鍙�
+ - generic [ref=f13e5590]:
+ - textbox "* 鍏ュ簱鍗曠紪鍙�" [ref=f13e5591]:
+ - /placeholder: 璇疯緭鍏ュ叆搴撳崟缂栧彿
+ - button "鐢� 鎴�" [ref=f13e5593] [cursor=pointer]
+ - generic [ref=f13e5595]:
+ - generic [ref=f13e5596]: 鍏ュ簱鍗曞悕绉�
+ - textbox "鍏ュ簱鍗曞悕绉�" [ref=f13e5601]:
+ - /placeholder: 璇疯緭鍏ュ叆搴撳崟鍚嶇О
+ - generic [ref=f13e5602]:
+ - generic [ref=f13e5603]:
+ - generic [ref=f13e5604]: "*"
+ - text: 鍏ュ簱鏃ユ湡
+ - generic [ref=f13e5610]:
+ - textbox "* 鍏ュ簱鏃ユ湡" [ref=f13e5611]:
+ - /placeholder: 璇烽�夋嫨鍏ュ簱鏃ユ湡
+ - generic:
+ - img "calendar"
+ - generic [ref=f13e5612]:
+ - generic [ref=f13e5613]: 鍒拌揣閫氱煡鍗�
+ - textbox "璇烽�夋嫨鍒拌揣閫氱煡鍗�" [ref=f13e5620]
+ - generic [ref=f13e5626]:
+ - generic [ref=f13e5627]:
+ - generic [ref=f13e5628]: "*"
+ - text: 渚涘簲鍟�
+ - textbox "璇烽�夋嫨渚涘簲鍟�" [ref=f13e5635]
+ - generic [ref=f13e5641]:
+ - generic [ref=f13e5642]: 閲囪喘璁㈠崟鍙�
+ - textbox "閲囪喘璁㈠崟鍙�" [ref=f13e5647]:
+ - /placeholder: 璇疯緭鍏ラ噰璐鍗曞彿
+ - generic [ref=f13e5648]:
+ - generic [ref=f13e5649]: 澶囨敞
+ - textbox "澶囨敞" [ref=f13e5654]:
+ - /placeholder: 璇疯緭鍏ュ娉�
+ - button [ref=f13e5655] [cursor=pointer]
+ - generic [ref=f13e5665]:
+ - button "鍙� 娑�" [ref=f13e5666] [cursor=pointer]
+ - button "纭� 璁�" [ref=f13e5668] [cursor=pointer]
+ - button [ref=f13e5670] [cursor=pointer]
\ No newline at end of file
diff --git a/po-dialog-fixed.png b/po-dialog-fixed.png
new file mode 100644
index 0000000..e80f33b
--- /dev/null
+++ b/po-dialog-fixed.png
Binary files differ
diff --git a/qc-template-fixed.png b/qc-template-fixed.png
new file mode 100644
index 0000000..fb2c776
--- /dev/null
+++ b/qc-template-fixed.png
Binary files differ
diff --git a/supplier-dialog.png b/supplier-dialog.png
new file mode 100644
index 0000000..45df43b
--- /dev/null
+++ b/supplier-dialog.png
Binary files differ
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java
index 1bfba68..8607cfb 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java
@@ -12,12 +12,12 @@
import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.MesQcIqcSaveReqVO;
import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.iqc.MesQcIqcDO;
-import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
import cn.iocoder.yudao.module.mes.service.qc.iqc.MesQcIqcService;
+import cn.iocoder.yudao.module.mes.service.qc.support.MesQcItemResolver;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import io.swagger.v3.oas.annotations.Operation;
@@ -56,7 +56,7 @@
@Resource
private SrmSupplierApi srmSupplierApi;
@Resource
- private MesMdItemService itemService;
+ private MesQcItemResolver qcItemResolver;
@Resource
private MesMdUnitMeasureService unitMeasureService;
@@ -135,12 +135,12 @@
Map<Long, SrmSupplierRespDTO> vendorMap = srmSupplierApi.getSupplierList(
convertSet(list, MesQcIqcDO::getVendorId)).getCheckedData().stream()
.collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, s -> s));
- // 鎵归噺鏌ヨ鐗╂枡
- Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
+ // 鎵归噺鏌ヨ鐗╂枡锛堝吋瀹� mdm_item.id / mes_md_item.id锛�
+ Map<Long, MdmItemRespDTO> itemMap = qcItemResolver.getItemMap(
convertSet(list, MesQcIqcDO::getItemId));
// 鎵归噺鏌ヨ璁¢噺鍗曚綅锛堥�氳繃鐗╂枡鐨� unitMeasureId锛�
Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
- convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+ convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId));
// 鎵归噺鏌ヨ妫�娴嬩汉鍛�
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
convertSet(list, MesQcIqcDO::getInspectorUserId));
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/MesQcNcrController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/MesQcNcrController.java
index 89d1e37..a35e5df 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/MesQcNcrController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ncr/MesQcNcrController.java
@@ -8,10 +8,10 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.mes.controller.admin.qc.ncr.vo.*;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ncr.MesQcNcrDO;
-import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.qc.ncr.MesQcNcrService;
+import cn.iocoder.yudao.module.mes.service.qc.support.MesQcItemResolver;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
@@ -49,7 +49,7 @@
private MesQcNcrService ncrService;
@Resource
- private MesMdItemService itemService;
+ private MesQcItemResolver qcItemResolver;
@Resource
private AdminUserApi adminUserApi;
@@ -143,8 +143,8 @@
if (CollUtil.isEmpty(list)) {
return Collections.emptyList();
}
- // 鎵归噺鏌ヨ鐗╂枡
- Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
+ // 鎵归噺鏌ヨ鐗╂枡锛堝吋瀹� mdm_item.id / mes_md_item.id锛�
+ Map<Long, MdmItemRespDTO> itemMap = qcItemResolver.getItemMap(
convertSet(list, MesQcNcrDO::getItemId));
// 鎵归噺鏌ヨ璇勫浜�
Set<Long> reviewerUserIds = convertSet(list, MesQcNcrDO::getReviewerUserId);
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java
index 715afe0..ddaa6c8 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java
@@ -12,13 +12,12 @@
import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcSaveReqVO;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcDO;
-import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
-import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
import cn.iocoder.yudao.module.mes.service.qc.oqc.MesQcOqcService;
+import cn.iocoder.yudao.module.mes.service.qc.support.MesQcItemResolver;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import io.swagger.v3.oas.annotations.Operation;
@@ -56,7 +55,7 @@
@Resource
private CrmCustomerApi customerApi;
@Resource
- private MesMdItemService itemService;
+ private MesQcItemResolver qcItemResolver;
@Resource
private MesMdUnitMeasureService unitMeasureService;
@@ -134,12 +133,12 @@
// 鎵归噺鏌ヨ瀹㈡埛
Map<Long, CrmCustomerRespDTO> clientMap = customerApi.getCustomerMap(
convertSet(list, MesQcOqcDO::getClientId));
- // 鎵归噺鏌ヨ鐗╂枡
- Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
+ // 鎵归噺鏌ヨ鐗╂枡锛堝吋瀹� mdm_item.id / mes_md_item.id锛�
+ Map<Long, MdmItemRespDTO> itemMap = qcItemResolver.getItemMap(
convertSet(list, MesQcOqcDO::getItemId));
// 鎵归噺鏌ヨ璁¢噺鍗曚綅
Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
- convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+ convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId));
// 鎵归噺鏌ヨ妫�娴嬩汉鍛�
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
convertSet(list, MesQcOqcDO::getInspectorUserId));
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/pendinginspect/MesQcPendingInspectController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/pendinginspect/MesQcPendingInspectController.java
index 00fbe2b..a4a1907 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/pendinginspect/MesQcPendingInspectController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/pendinginspect/MesQcPendingInspectController.java
@@ -9,15 +9,15 @@
import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
-import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
import cn.iocoder.yudao.module.mes.service.qc.pendinginspect.MesQcPendingInspectService;
+import cn.iocoder.yudao.module.mes.service.qc.support.MesQcItemResolver;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
@@ -44,7 +44,7 @@
@Resource
private MesQcPendingInspectService pendingInspectService;
@Resource
- private MesMdItemService itemService;
+ private MesQcItemResolver qcItemResolver;
@Resource
private MesMdUnitMeasureService unitMeasureService;
@Resource
@@ -73,12 +73,12 @@
if (CollUtil.isEmpty(list)) {
return;
}
- // 鎵归噺鏌ヨ鐗╂枡
- Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
+ // 鎵归噺鏌ヨ鐗╂枡锛堝吋瀹� mdm_item.id / mes_md_item.id锛�
+ Map<Long, MdmItemRespDTO> itemMap = qcItemResolver.getItemMap(
convertSet(list, MesQcPendingInspectRespVO::getItemId));
// 鎵归噺鏌ヨ璁¢噺鍗曚綅锛堥�氳繃鐗╂枡鐨� unitMeasureId锛�
Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
- convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+ convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId));
// 鎵归噺鏌ヨ渚涘簲鍟嗭紙IQC 鍦烘櫙锛�
Map<Long, SrmSupplierRespDTO> vendorMap = srmSupplierApi.getSupplierList(
convertSet(list, MesQcPendingInspectRespVO::getVendorId)).getCheckedData().stream()
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java
index 2e424d6..4cf5e6e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java
@@ -10,12 +10,12 @@
import cn.iocoder.yudao.module.mes.controller.admin.qc.rqc.vo.MesQcRqcPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.rqc.vo.MesQcRqcRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.rqc.vo.MesQcRqcSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.rqc.MesQcRqcDO;
-import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
import cn.iocoder.yudao.module.mes.service.qc.rqc.MesQcRqcService;
+import cn.iocoder.yudao.module.mes.service.qc.support.MesQcItemResolver;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import io.swagger.v3.oas.annotations.Operation;
@@ -51,7 +51,7 @@
@Resource
private MesQcRqcService rqcService;
@Resource
- private MesMdItemService itemService;
+ private MesQcItemResolver qcItemResolver;
@Resource
private MesMdUnitMeasureService unitMeasureService;
@@ -126,12 +126,12 @@
if (CollUtil.isEmpty(list)) {
return Collections.emptyList();
}
- // 鎵归噺鏌ヨ鐗╂枡
- Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
+ // 鎵归噺鏌ヨ鐗╂枡锛堝吋瀹� mdm_item.id / mes_md_item.id锛�
+ Map<Long, MdmItemRespDTO> itemMap = qcItemResolver.getItemMap(
convertSet(list, MesQcRqcDO::getItemId));
// 鎵归噺鏌ヨ璁¢噺鍗曚綅
Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
- convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+ convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId));
// 鎵归噺鏌ヨ妫�娴嬩汉鍛�
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
convertSet(list, MesQcRqcDO::getInspectorUserId));
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptMapper.java
index ddd321f..6e6352f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemreceipt/MesWmItemReceiptMapper.java
@@ -5,7 +5,6 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptPageReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDO;
-import cn.iocoder.yudao.module.mes.enums.wm.MesWmItemReceiptStatusEnum;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
@@ -80,23 +79,6 @@
.set(MesWmItemReceiptDO::getStatus, status)
.set(MesWmItemReceiptDO::getReviewerId, reviewerId)
.set(MesWmItemReceiptDO::getReviewerName, reviewerName)
- .set(MesWmItemReceiptDO::getReviewTime, LocalDateTime.now())
- .set(MesWmItemReceiptDO::getReviewRemark, reviewRemark));
- }
-
- /**
- * BPM 瀹℃壒缁撴灉鍥炲啓锛氫粎褰撳崟鎹粛澶勪簬瀹℃壒涓椂鏇存柊锛岄伩鍏嶉噸澶� / 杩囨湡浜嬩欢瑕嗙洊浜哄伐瀹℃牳缁撴灉
- *
- * @param id 缂栧彿
- * @param status 鐩爣鐘舵�侊紙寰呮墽琛屽叆搴� / 鑽夌 / 宸插彇娑堬級
- * @param reviewRemark 瀹℃壒鎰忚
- * @return 褰卞搷琛屾暟
- */
- default int updateAuditStatusByBpm(Long id, Integer status, String reviewRemark) {
- return update(null, new LambdaUpdateWrapper<MesWmItemReceiptDO>()
- .eq(MesWmItemReceiptDO::getId, id)
- .eq(MesWmItemReceiptDO::getStatus, MesWmItemReceiptStatusEnum.APPROVING.getStatus())
- .set(MesWmItemReceiptDO::getStatus, status)
.set(MesWmItemReceiptDO::getReviewTime, LocalDateTime.now())
.set(MesWmItemReceiptDO::getReviewRemark, reviewRemark));
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmItemReceiptStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmItemReceiptStatusEnum.java
index 3f2a824..fe5df29 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmItemReceiptStatusEnum.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmItemReceiptStatusEnum.java
@@ -29,7 +29,7 @@
*/
APPROVING(MesOrderStatusConstants.APPROVING, "寰呬笂鏋�"),
/**
- * 寰呭叆搴�
+ * 寰呮墽琛屽叆搴�
*
* 瀵瑰簲 MesWmItemReceiptService#stockItemReceipt 鏂规硶
*/
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 f684ee7..511bbe4 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
@@ -27,6 +27,7 @@
import cn.iocoder.yudao.module.mes.enums.qc.MesQcCheckResultEnum;
import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
@@ -459,7 +460,8 @@
respVO.getFailureCodes().put(key, "鍚堟牸鍝佹暟閲忎笌涓嶅悎鏍煎搧鏁伴噺涔嬪拰蹇呴』绛変簬鏈鎺ユ敹鏁伴噺");
return;
}
- cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO item = itemService.getItemByCode(importItem.getItemCode());
+ // 鏉ユ枡妫�楠屽崟鐨勭墿鏂欎互 MDM 涓哄噯锛屽鍏ユ寜 MDM 鐗╂枡缂栫爜瑙f瀽
+ MdmItemRespDTO item = mdmItemApi.getItemByCode(importItem.getItemCode()).getCheckedData();
if (item == null) {
respVO.getFailureCodes().put(key, "鐗╂枡涓嶅瓨鍦細" + importItem.getItemCode());
return;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java
index ce59c24..a28e0a6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ncr/MesQcNcrServiceImpl.java
@@ -13,6 +13,7 @@
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.mes.service.qc.support.MesQcItemResolver;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
@@ -57,6 +58,9 @@
@Resource
private MdmItemApi mdmItemApi;
+
+ @Resource
+ private MesQcItemResolver qcItemResolver;
@Resource
@Lazy
@@ -208,9 +212,8 @@
* 鏍¢獙鐗╂枡瀛樺湪
*/
private void validateItemExists(Long itemId) {
- if (itemId != null) {
- mdmItemApi.getItem(itemId).getCheckedData();
- }
+ // 涓嶅悎鏍煎搧鍗曠殑鐗╂枡鍙兘鏉ヨ嚜 MDM 鍗曟嵁鎴� MES 宸ュ崟锛岄渶鍏煎涓ゅ ID
+ qcItemResolver.validateItemExists(itemId);
}
/**
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 795b6de..23cf68f 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
@@ -25,6 +25,7 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesLineDO;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
@@ -446,7 +447,8 @@
respVO.getFailureCodes().put(key, "瀹㈡埛涓嶅瓨鍦細" + importItem.getClientName());
return;
}
- cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO item = itemService.getItemByCode(importItem.getItemCode());
+ // 鍑鸿揣妫�楠屽崟鐨勭墿鏂欎互 MDM 涓哄噯锛屽鍏ユ寜 MDM 鐗╂枡缂栫爜瑙f瀽
+ MdmItemRespDTO item = mdmItemApi.getItemByCode(importItem.getItemCode()).getCheckedData();
if (item == null) {
respVO.getFailureCodes().put(key, "鐗╂枡涓嶅瓨鍦細" + importItem.getItemCode());
return;
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 dd20a20..e468b50 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
@@ -3,6 +3,8 @@
import cn.hutool.core.util.ObjUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.rqc.vo.MesQcRqcPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.rqc.vo.MesQcRqcSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO;
@@ -23,6 +25,7 @@
import cn.iocoder.yudao.module.mes.service.wm.returnsales.MesWmReturnSalesLineService;
import cn.iocoder.yudao.module.mes.controller.admin.qc.ncr.vo.MesQcNcrSaveReqVO;
import cn.iocoder.yudao.module.mes.service.qc.ncr.MesQcNcrService;
+import cn.iocoder.yudao.module.mes.service.qc.support.MesQcItemResolver;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcCheckResultEnum;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import jakarta.annotation.Resource;
@@ -68,6 +71,10 @@
@Resource
@Lazy
private MesMdItemService itemService;
+ @Resource
+ private MdmItemApi mdmItemApi;
+ @Resource
+ private MesQcItemResolver qcItemResolver;
@Resource
@Lazy
private MesQcDefectRecordService defectRecordService;
@@ -137,8 +144,8 @@
private void validateRqcSaveData(MesQcRqcSaveReqVO reqVO) {
// 鏍¢獙缂栧彿鍞竴
validateRqcCodeUnique(reqVO.getId(), reqVO.getCode());
- // 鏍¢獙鐗╂枡銆佹娴嬩汉鍛樺瓨鍦�
- itemService.validateItemExists(reqVO.getItemId());
+ // 鏍¢獙鐗╂枡銆佹娴嬩汉鍛樺瓨鍦紙鍏煎 mdm_item.id / mes_md_item.id锛�
+ qcItemResolver.validateItemExists(reqVO.getItemId());
adminUserApi.validateUser(reqVO.getInspectorUserId());
}
@@ -379,7 +386,8 @@
respVO.getFailureCodes().put(key, "妫�娴嬫棩鏈熶笉鑳戒负绌�");
return;
}
- cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO item = itemService.getItemByCode(importItem.getItemCode());
+ // 閫�璐ф楠屽崟鐨勭墿鏂欎互 MDM 涓哄噯锛屽鍏ユ寜 MDM 鐗╂枡缂栫爜瑙f瀽
+ MdmItemRespDTO item = mdmItemApi.getItemByCode(importItem.getItemCode()).getCheckedData();
if (item == null) {
respVO.getFailureCodes().put(key, "鐗╂枡涓嶅瓨鍦細" + importItem.getItemCode());
return;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/support/MesQcItemResolver.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/support/MesQcItemResolver.java
new file mode 100644
index 0000000..82fecbe
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/support/MesQcItemResolver.java
@@ -0,0 +1,92 @@
+package cn.iocoder.yudao.module.mes.service.qc.support;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.MD_ITEM_NOT_EXISTS;
+
+/**
+ * 璐ㄦ鍗曟嵁鐗╂枡 ID 瑙f瀽鍣�
+ *
+ * 璐ㄦ鍗曟嵁鐨勭墿鏂� ID 瀛樺湪涓ゅ鏉ユ簮锛氳川妫�/浠撳偍鍗曟嵁浣跨敤 mdm_item.id锛孭RO 宸ュ崟/浠诲姟浣跨敤 mes_md_item.id銆�
+ * 缁熶竴鍦ㄦ瑙f瀽锛氬厛鎸� mdm_item.id 鏌ヨ锛屾湭鍛戒腑鐨勫啀鎸� mes_md_item.id 鈫� mdm_item.id 鏄犲皠鏌ヨ銆�
+ */
+@Service
+public class MesQcItemResolver {
+
+ @Resource
+ private MesMdItemService mesMdItemService;
+ @Resource
+ private MdmItemApi mdmItemApi;
+
+ /**
+ * 鎵归噺鏌ヨ鐗╂枡淇℃伅锛岃繑鍥炰互璋冪敤鏂逛紶鍏ョ殑鐗╂枡 ID 涓� key 鐨勭粨鏋�
+ */
+ public Map<Long, MdmItemRespDTO> getItemMap(Collection<Long> itemIds) {
+ if (CollUtil.isEmpty(itemIds)) {
+ return Collections.emptyMap();
+ }
+ Set<Long> ids = new HashSet<>();
+ itemIds.forEach(id -> {
+ if (id != null) {
+ ids.add(id);
+ }
+ });
+ if (ids.isEmpty()) {
+ return Collections.emptyMap();
+ }
+ // 1. 鍏堟寜 mdm_item.id 鐩存帴鏌ヨ锛堣川妫�/浠撳偍鍗曟嵁锛�
+ Map<Long, MdmItemRespDTO> result = new HashMap<>(mdmItemApi.getItemMap(ids));
+ // 2. 鏈懡涓殑鍐嶆寜 mes_md_item.id 鈫� mdm_item.id 瑙f瀽锛圥RO 宸ュ崟/浠诲姟锛�
+ Set<Long> missingIds = new HashSet<>(ids);
+ missingIds.removeAll(result.keySet());
+ if (missingIds.isEmpty()) {
+ return result;
+ }
+ Map<Long, MesMdItemDO> mesItemMap = mesMdItemService.getItemMap(missingIds);
+ Map<Long, Long> idToMdmId = new HashMap<>();
+ missingIds.forEach(id -> {
+ MesMdItemDO mesItem = mesItemMap.get(id);
+ if (mesItem != null && mesItem.getMdmItemId() != null) {
+ idToMdmId.put(id, mesItem.getMdmItemId());
+ }
+ });
+ if (idToMdmId.isEmpty()) {
+ return result;
+ }
+ Map<Long, MdmItemRespDTO> fallbackMap = mdmItemApi.getItemMap(idToMdmId.values());
+ idToMdmId.forEach((id, mdmId) -> {
+ MdmItemRespDTO item = fallbackMap.get(mdmId);
+ if (item != null) {
+ result.put(id, item);
+ }
+ });
+ return result;
+ }
+
+ /**
+ * 鏍¢獙鐗╂枡瀛樺湪锛堝吋瀹逛袱濂� ID锛�
+ */
+ public void validateItemExists(Long itemId) {
+ if (itemId == null) {
+ return;
+ }
+ if (!getItemMap(Collections.singleton(itemId)).containsKey(itemId)) {
+ throw exception(MD_ITEM_NOT_EXISTS);
+ }
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateItemServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateItemServiceImpl.java
index 5d6bb01..c46144c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateItemServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateItemServiceImpl.java
@@ -116,9 +116,17 @@
@Override
public MesQcTemplateItemDO getRequiredTemplateByItemIdAndType(Long itemId, Integer qcType) {
+ if (itemId == null) {
+ throw exception(QC_NO_TEMPLATE);
+ }
// 1. 鏌ュ嚭 itemId 鍏宠仈鐨勬墍鏈� templateItem
- MesMdItemDO item1 = mesMdItemService.getItem(itemId);
- List<MesQcTemplateItemDO> templateItems = templateItemMapper.selectListByItemId(item1.getMdmItemId());
+ // 鍏煎涓ゅ鐗╂枡 ID锛氳川妫�/浠撳偍鍗曟嵁浼犲叆 mdm_item.id锛孭RO 宸ュ崟/浠诲姟浼犲叆 mes_md_item.id
+ Long templateItemId = itemId;
+ MesMdItemDO mesItem = mesMdItemService.getItem(itemId);
+ if (mesItem != null && mesItem.getMdmItemId() != null) {
+ templateItemId = mesItem.getMdmItemId();
+ }
+ List<MesQcTemplateItemDO> templateItems = templateItemMapper.selectListByItemId(templateItemId);
if (CollUtil.isEmpty(templateItems)) {
throw exception(QC_NO_TEMPLATE);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineServiceImpl.java
index 6450597..4e27ea5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptLineServiceImpl.java
@@ -48,7 +48,7 @@
@Override
public Long createItemReceiptLine(MesWmItemReceiptLineSaveReqVO createReqVO) {
// 1. 鏍¢獙鐖跺崟鎹瓨鍦ㄤ笖涓哄彲缂栬緫鐘舵��
- MesWmItemReceiptDO receipt = itemReceiptService.validateItemReceiptEditable(createReqVO.getReceiptId());
+ MesWmItemReceiptDO receipt = itemReceiptService.validateItemReceiptLineEditable(createReqVO.getReceiptId());
// 2. 鏍¢獙鏁版嵁
validateItemReceiptLineSaveData(receipt, createReqVO);
@@ -70,7 +70,7 @@
// 1.1 鏍¢獙瀛樺湪
MesWmItemReceiptLineDO line = validateItemReceiptLineExists(updateReqVO.getId());
// 1.2 鏍¢獙鐖跺崟鎹瓨鍦ㄤ笖涓哄彲缂栬緫鐘舵��
- MesWmItemReceiptDO receipt = itemReceiptService.validateItemReceiptEditable(line.getReceiptId());
+ MesWmItemReceiptDO receipt = itemReceiptService.validateItemReceiptLineEditable(line.getReceiptId());
// 1.3 鏍¢獙鏁版嵁
validateItemReceiptLineSaveData(receipt, updateReqVO);
@@ -96,7 +96,7 @@
// 1.1 鏍¢獙瀛樺湪
MesWmItemReceiptLineDO line = validateItemReceiptLineExists(id);
// 1.2 鏍¢獙鐖跺崟鎹瓨鍦ㄤ笖涓哄彲缂栬緫鐘舵��
- itemReceiptService.validateItemReceiptEditable(line.getReceiptId());
+ itemReceiptService.validateItemReceiptLineEditable(line.getReceiptId());
// 2.1 绾ц仈鍒犻櫎鏄庣粏
itemReceiptDetailService.deleteItemReceiptDetailByLineId(id);
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java
index fb637ff..c818aea 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java
@@ -58,20 +58,16 @@
PageResult<MesWmItemReceiptDO> getItemReceiptPage(MesWmItemReceiptPageReqVO pageReqVO);
/**
- * 鎻愪氦閲囪喘鍏ュ簱鍗曞鎵癸紙鑽夌 鈫� 寰呬笂鏋讹級
- *
- * 瀹℃牳浜虹敱銆岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶆寜涓氬姟绫诲瀷缁熶竴閰嶇疆锛堜笟鍔$紪鐮� item_receipt_approve锛夛紝
- * 鎻愪氦鏃舵棤闇�鎸囧畾锛涙湭鍚敤瀹℃壒鎴栨湭閰嶇疆鏈夋晥瀹℃牳浜烘椂鎶涘嚭涓氬姟寮傚父銆�
+ * 鎻愪氦閲囪喘鍏ュ簱鍗曪紙鑽夌 鈫� 寰呬笂鏋讹級
*
* @param id 缂栧彿
*/
void submitItemReceipt(Long id);
/**
- * 鎵ц涓婃灦鏍¢獙锛堜粎鏍¢獙宸插鎵瑰崟鎹殑鏄庣粏鏁伴噺涓�鑷存�э紝涓嶄慨鏀瑰崟鎹姸鎬侊級
+ * 鎵ц涓婃灦锛堝緟涓婃灦 鈫� 寰呮墽琛屽叆搴擄級
*
- * 鍗曟嵁鐘舵�佸彧鑳界敱瀹℃牳锛圓PPROVING 鈫� APPROVED锛変笌鍏ュ簱锛圓PPROVED 鈫� FINISHED锛夋帹杩涳紝
- * 鏈柟娉曚笉寰楁妸鍗曟嵁鐩存帴缃负宸插鎵广��
+ * 鏍¢獙姣忚涓婃灦鏄庣粏鏁伴噺涔嬪拰绛変簬琛屽叆搴撴暟閲忓悗鎺ㄨ繘鍗曟嵁鐘舵�併��
*
* @param id 缂栧彿
*/
@@ -92,12 +88,20 @@
void cancelItemReceipt(Long id);
/**
- * 鏍¢獙閲囪喘鍏ュ簱鍗曞瓨鍦ㄤ笖澶勪簬鍙紪杈戠姸鎬侊紙浠呰崏绋匡級
+ * 鏍¢獙閲囪喘鍏ュ簱鍗曞瓨鍦ㄤ笖澶勪簬鍙紪杈戠姸鎬侊紙鑽夌鎴栧緟涓婃灦锛�
*
* @param id 缂栧彿
* @return 閲囪喘鍏ュ簱鍗�
*/
MesWmItemReceiptDO validateItemReceiptEditable(Long id);
+
+ /**
+ * 鏍¢獙閲囪喘鍏ュ簱鍗曞瓨鍦ㄤ笖琛屾暟鎹彲缂栬緫锛堜粎鑽夌锛�
+ *
+ * @param id 缂栧彿
+ * @return 閲囪喘鍏ュ簱鍗�
+ */
+ MesWmItemReceiptDO validateItemReceiptLineEditable(Long id);
/**
* 鏌ヨ鎸囧畾渚涘簲鍟嗙殑閲囪喘鍏ュ簱鍗曟暟閲�
@@ -161,17 +165,6 @@
* @param reviewRemark 瀹℃牳鎰忚锛屽鏍镐笉閫氳繃鏃跺繀濉�
*/
void auditItemReceipt(Long id, Boolean pass, String reviewRemark);
-
- /**
- * 鍥炲啓 BPM 瀹℃壒缁撴灉锛堜緵 BPM 娴佺▼鐘舵�佺洃鍚櫒璋冪敤锛�
- *
- * 浠呭湪鍗曟嵁澶勪簬瀹℃壒涓椂鐢熸晥锛氶�氳繃=寰呮墽琛屽叆搴� / 涓嶉�氳繃=鑽夌 / 鍙栨秷=宸插彇娑堛��
- *
- * @param id 缂栧彿
- * @param bpmStatus BPM 浠诲姟鐘舵�侊紝瑙� {@link cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum}
- * @param reason 瀹℃壒鎰忚 / 鍙栨秷鍘熷洜
- */
- void updateItemReceiptAuditStatus(Long id, Integer bpmStatus, String reason);
/**
* 瀵煎叆閲囪喘鍏ュ簱鍗�
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
index d7d831a..18bdd6d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
@@ -6,9 +6,6 @@
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
-import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
-import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
-import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptPageReqVO;
@@ -71,16 +68,8 @@
*/
private static final String ITEM_RECEIPT_APPROVE_BIZ_TYPE = "item_receipt_approve";
- /**
- * 閲囪喘鍏ュ簱鍗曞鎵圭殑 BPM 娴佺▼瀹氫箟 Key
- */
- private static final String ITEM_RECEIPT_APPROVE_PROCESS_KEY = "item_receipt_approve";
-
@Resource
private MesWmItemReceiptMapper itemReceiptMapper;
-
- @Resource
- private BpmProcessInstanceApi bpmProcessInstanceApi;
@Resource
private MesWmItemReceiptLineService itemReceiptLineService;
@@ -192,35 +181,8 @@
// 鏍¢獙鐗╂枡鎵规绠$悊锛氬鏋滅墿鏂欏紑鍚壒娆$鐞嗭紝鍒欐槑缁嗙殑鎵规鍙蜂笉鑳戒负绌�
validateBatchManagement(lines);
- // 鏍¢獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鏍镐汉锛堟湭閰嶇疆鏃舵姏鍑哄甫鏄庣‘鎻愮ず鐨勪笟鍔″紓甯革級
- approvalConfigApi.validateApprovalEnabledAndGetApprovers(ITEM_RECEIPT_APPROVE_BIZ_TYPE);
-
// 鎻愪氦锛堣崏绋� 鈫� 寰呬笂鏋讹級锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
itemReceiptMapper.submitAndResetAuditInfo(id, MesWmItemReceiptStatusEnum.APPROVING.getStatus());
- // 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
- bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
- new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(ITEM_RECEIPT_APPROVE_PROCESS_KEY)
- .setBusinessKey(String.valueOf(id)));
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void updateItemReceiptAuditStatus(Long id, Integer bpmStatus, String reason) {
- // BPM 瀹℃壒缁撴灉鏄犲皠涓哄崟鎹姸鎬侊細閫氳繃=寰呮墽琛屽叆搴� / 涓嶉�氳繃=鑽夌 / 鍙栨秷=宸插彇娑�
- Integer status;
- if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
- status = MesWmItemReceiptStatusEnum.APPROVED.getStatus();
- } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
- status = MesWmItemReceiptStatusEnum.PREPARE.getStatus();
- } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmStatus)) {
- status = MesWmItemReceiptStatusEnum.CANCELED.getStatus();
- } else {
- return;
- }
- if (itemReceiptMapper.updateAuditStatusByBpm(id, status, reason) != 1) {
- log.warn("[updateItemReceiptAuditStatus] 閲囪喘鍏ュ簱鍗�({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝蹇界暐 BPM 缁撴灉({})", id, bpmStatus);
- }
}
@Override
@@ -300,9 +262,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void stockItemReceipt(Long id) {
- // 鏍¢獙瀛樺湪 + 宸插鎵癸紙鐘舵�佸彧鑳界敱 audit 鎺ㄨ繘锛欰PPROVING 鈫� APPROVED锛�
+ // 鏍¢獙瀛樺湪 + 寰呬笂鏋�
MesWmItemReceiptDO receipt = validateItemReceiptExists(id);
- if (ObjUtil.notEqual(MesWmItemReceiptStatusEnum.APPROVED.getStatus(), receipt.getStatus())) {
+ if (ObjUtil.notEqual(MesWmItemReceiptStatusEnum.APPROVING.getStatus(), receipt.getStatus())) {
throw exception(WM_ITEM_RECEIPT_STATUS_ERROR);
}
// 鏍¢獙姣忚鏄庣粏鏁伴噺涔嬪拰鏄惁绛変簬琛屽叆搴撴暟閲�
@@ -318,8 +280,9 @@
throw exception(WM_ITEM_RECEIPT_DETAIL_QUANTITY_MISMATCH);
}
}
- // 娉ㄦ剰锛氭湰鏂规硶浠呭仛鏁伴噺涓�鑷存�ф牎楠岋紝涓嶅緱淇敼鍗曟嵁鐘舵�併��
- // 鐘舵�佹祦杞敱 audit锛圓PPROVING 鈫� APPROVED锛変笌 finish锛圓PPROVED 鈫� FINISHED锛夎礋璐c��
+ // 涓婃灦瀹屾垚锛堝緟涓婃灦 鈫� 寰呮墽琛屽叆搴擄級
+ itemReceiptMapper.updateById(new MesWmItemReceiptDO()
+ .setId(id).setStatus(MesWmItemReceiptStatusEnum.APPROVED.getStatus()));
}
@Override
@@ -441,7 +404,18 @@
@Override
public MesWmItemReceiptDO validateItemReceiptEditable(Long id) {
- // 浠呰崏绋跨姸鎬佸厑璁哥紪杈戣/鏄庣粏锛涘鎵逛腑锛圓PPROVING锛夊凡閿佸畾锛岄伩鍏嶇粫杩囧鏍镐慨鏀规暟鎹�
+ // 鑽夌涓庡緟涓婃灦鐘舵�佸厑璁哥紪杈戜笂鏋舵槑缁嗭細鎻愪氦鍚庝粨搴撴墽琛屼笂鏋舵椂褰曞叆搴撲綅/鎵规
+ MesWmItemReceiptDO receipt = validateItemReceiptExists(id);
+ if (ObjUtil.notEqual(MesWmItemReceiptStatusEnum.PREPARE.getStatus(), receipt.getStatus())
+ && ObjUtil.notEqual(MesWmItemReceiptStatusEnum.APPROVING.getStatus(), receipt.getStatus())) {
+ throw exception(WM_ITEM_RECEIPT_STATUS_NOT_PREPARE);
+ }
+ return receipt;
+ }
+
+ @Override
+ public MesWmItemReceiptDO validateItemReceiptLineEditable(Long id) {
+ // 琛屾暟鎹粎鑽夌鍙敼锛氭彁浜ゅ悗琛屾暟鎹攣瀹氾紝閬垮厤涓婃灦闃舵鏀瑰姩鍏ュ簱鏁伴噺
return validateItemReceiptExistsAndDraft(id);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/listener/MesWmItemReceiptStatusListener.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/listener/MesWmItemReceiptStatusListener.java
deleted file mode 100644
index 1a35554..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/listener/MesWmItemReceiptStatusListener.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package cn.iocoder.yudao.module.mes.service.wm.itemreceipt.listener;
-
-import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
-import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
-import cn.iocoder.yudao.module.mes.service.wm.itemreceipt.MesWmItemReceiptService;
-import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * MES 閲囪喘鍏ュ簱鍗曞鎵圭姸鎬佺洃鍚櫒
- *
- * 鐩戝惉 BPM 瀹℃壒缁撴灉锛屽洖鍐欓噰璐叆搴撳崟鐘舵�侊紝浣垮鎵圭粺涓�鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆嶄腑娴佽浆銆�
- */
-@Component
-@Slf4j
-public class MesWmItemReceiptStatusListener extends BpmProcessInstanceStatusEventListener {
-
- private static final String PROCESS_DEFINITION_KEY = "item_receipt_approve";
-
- @Resource
- private MesWmItemReceiptService itemReceiptService;
-
- @Override
- protected String getProcessDefinitionKey() {
- return PROCESS_DEFINITION_KEY;
- }
-
- @Override
- protected void onEvent(BpmProcessInstanceStatusEvent event) {
- Long receiptId;
- try {
- receiptId = Long.parseLong(event.getBusinessKey());
- } catch (NumberFormatException e) {
- log.warn("[onEvent] businessKey({}) 涓嶆槸鏈夋晥鐨勯噰璐叆搴撳崟缂栧彿", event.getBusinessKey());
- return;
- }
- log.info("[onEvent] 鏀跺埌閲囪喘鍏ュ簱鍗曞鎵逛簨浠讹紝receiptId={}, status={}", receiptId, event.getStatus());
- try {
- itemReceiptService.updateItemReceiptAuditStatus(receiptId, event.getStatus(), event.getReason());
- } catch (Exception e) {
- log.error("[onEvent] 鍥炲啓閲囪喘鍏ュ簱鍗曞鎵圭姸鎬佸け璐ワ紝receiptId={}", receiptId, e);
- }
- }
-
-}
--
Gitblit v1.9.3