From d80fa460742ddf052844746482801de355e85528 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 07 十一月 2026 14:24:30 +0800
Subject: [PATCH] feat(qc): 拆分部门审批流程并支持扫码自动识别
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/MesQcSeedQualityController.java | 2
yudao-module-mes/src/main/resources/bpm/mes_seed_quality_sales_line_approve.bpmn20.xml | 31 +++++++
docs/wm_transaction_unit_measure_integration.md | 62 +++++++++++++++
yudao-module-mes/src/main/resources/bpm/mes_seed_quality_line_approve.bpmn20.xml | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/vo/MesWmTransactionRespVO.java | 3
docs/qc_bpm_migration_plan.md | 5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java | 10 ++
scripts/deploy-seed-quality-bpm.ps1 | 1
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/listener/MesQcSeedLineStatusListener.java | 34 ++++---
docs/qc_seed_quality_dual_line_integration.md | 6 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityServiceImpl.java | 69 ++++++++++++++---
11 files changed, 193 insertions(+), 34 deletions(-)
diff --git a/docs/qc_bpm_migration_plan.md b/docs/qc_bpm_migration_plan.md
index 9e81a8b..7eb1c41 100644
--- a/docs/qc_bpm_migration_plan.md
+++ b/docs/qc_bpm_migration_plan.md
@@ -13,11 +13,12 @@
- 鍒濇鍚堟牸杩涘叆閮ㄩ棬瀹℃壒锛屽垵妫�涓嶅悎鏍煎厛澶嶆锛涢儴闂ㄥ鎵瑰畬鎴愬悗锛屼袱鏉$嚎姹囧悎鍒板叕鍙歌川妫�瀹℃壒銆傞��璐у妫�缁撴灉杩涘叆閿�鍞儴瀹℃壒銆�
- BPM 鍥炶皟鎸夋祦绋嬪疄渚嬬紪鍙峰尮閰嶈褰曪紝瀹℃壒椹冲洖鍚庢竻鐞嗗搴斿疄渚嬬紪鍙凤紝浠ヤ究閲嶆鍚庨噸鏂板彂璧枫��
- 璐ㄦ璁板綍椤垫彁渚� BPM 璇︽儏鍏ュ彛锛涙祦绋嬪惎鍔ㄥけ璐ユ椂鍙璇ヨ褰曢噸鏂板彂璧枫��
-- 涓変唤 BPMN 妯″瀷鏂囦欢浣嶄簬 `yudao-module-mes/src/main/resources/bpm/`锛屽�欓�変汉鏆備负褰撳墠鏁版嵁搴撻粯璁� admin 鐢ㄦ埛 ID 1銆�
+- 閮ㄩ棬瀹℃壒鎷嗗垎涓哄姞宸ラ儴銆侀攢鍞儴涓や釜鐙珛娴佺▼妯″瀷锛氬姞宸ラ儴娌跨敤 `mes_seed_quality_line_approve`锛岄攢鍞儴鏂板 `mes_seed_quality_sales_line_approve`锛屽彂璧峰鎵规椂鎸� `qcLine` 閫夋嫨瀵瑰簲娴佺▼瀹氫箟銆�
+- 鍥涗唤 BPMN 妯″瀷鏂囦欢浣嶄簬 `yudao-module-mes/src/main/resources/bpm/`锛屽�欓�変汉鏆備负褰撳墠鏁版嵁搴撻粯璁� admin 鐢ㄦ埛 ID 1銆�
## 涓婄嚎鍓嶇疆宸ヤ綔
-- 鍦� BPM 娴佺▼妯″瀷绠$悊涓鍏ュ苟鍙戝竷涓変唤 BPMN 鏂囦欢锛屾祦绋嬪畾涔� key 蹇呴』涓庢枃浠朵腑 `process id` 涓�鑷淬�傚彲鐢� `scripts/deploy-seed-quality-bpm.ps1 -ApiBaseUrl <绠$悊鍚庡彴 API 鏍瑰湴鍧�> -AccessToken <admin 浠ょ墝>` 鍒涘缓鎴栨洿鏂板苟鍙戝竷銆傝剼鏈樉寮忚缃� admin锛堢敤鎴� ID 1锛変负瀹℃壒浜轰笖绂佺敤鑷姩瀹℃壒锛涚洰鏍囩幆澧冧腑搴斿厛纭 admin 鐨� ID 涓� 1銆�
+- 鍦� BPM 娴佺▼妯″瀷绠$悊涓鍏ュ苟鍙戝竷鍥涗唤 BPMN 鏂囦欢锛屾祦绋嬪畾涔� key 蹇呴』涓庢枃浠朵腑 `process id` 涓�鑷淬�傚彲鐢� `scripts/deploy-seed-quality-bpm.ps1 -ApiBaseUrl <绠$悊鍚庡彴 API 鏍瑰湴鍧�> -AccessToken <admin 浠ょ墝>` 鍒涘缓鎴栨洿鏂板苟鍙戝竷銆傝剼鏈樉寮忚缃� admin锛堢敤鎴� ID 1锛変负瀹℃壒浜轰笖绂佺敤鑷姩瀹℃壒锛涚洰鏍囩幆澧冧腑搴斿厛纭 admin 鐨� ID 涓� 1銆�
- 鎵ц `sql/mysql/mes_seed_quality_dual_line_20261105.sql`锛岀‘淇� `qc_line`銆乣biz_type`銆佹祦绋嬪疄渚嬪瓧娈靛拰鍙岀嚎鍞竴绱㈠紩宸插氨缁��
- 澶勭悊鏃х殑鍦ㄩ�斾汉宸ュ鎵硅褰曞強宸茬粡浜х敓鐨� BPM 娴佺▼瀹炰緥锛岄伩鍏嶆柊鏃х姸鎬佹贩鐢ㄣ��
- 涓変釜 BPM 娴佺▼鍙戝竷骞跺畬鎴愬湪閫旀暟鎹鐞嗗悗锛屾墽琛� `sql/mysql/mes_qc_approver_menu_retire_20261106.sql` 闅愯棌鏃у鏍镐汉閰嶇疆鑿滃崟銆傚巻鍙查厤缃暟鎹笉鍒犻櫎銆�
diff --git a/docs/qc_seed_quality_dual_line_integration.md b/docs/qc_seed_quality_dual_line_integration.md
index 857f89c..f71bb3e 100644
--- a/docs/qc_seed_quality_dual_line_integration.md
+++ b/docs/qc_seed_quality_dual_line_integration.md
@@ -11,7 +11,7 @@
1. 鍔犲伐閮ㄥ紑閿�鍞叆搴擄細琚嬬爜鍏ュ簱鍚庡彲鎵爜璐ㄦ锛屾墭鐩樼爜姣� 48 琚嬫垨 100 琚嬬敓鎴愶紝鎵规鐮佸甫鍑烘暣鎵硅鏁般��
2. **涓�娆$瀛愯川妫�鎻愪氦鍗冲悓鏃剁敓鎴愪袱鏉¤川妫�璁板綍**锛歚qcLine=1`锛堝姞宸ラ儴锛変笌 `qcLine=2`锛堥攢鍞儴锛夛紝涓ゆ潯璁板綍鐨勬寚鏍囥�佺粨璁哄畬鍏ㄤ竴鑷达紱鍚庣画澶嶆銆佸鎵瑰垎鍒寜璐ㄦ绾跨嫭绔嬭繘琛屻��
3. 鍒濇鍚堟牸鐩存帴杩涘叆鏈嚎棰嗗 BPM 瀹℃壒锛涘垵妫�涓嶅悎鏍煎厛澶嶆锛屽啀杩涘叆鏈嚎棰嗗瀹℃壒銆傞儴闂ㄥ鎵归┏鍥炲悗閲嶆柊鍒濇銆�
-4. 涓ゆ潯绾垮垎鍒娇鐢ㄦ祦绋嬪畾涔� `mes_seed_quality_line_approve`锛宐usinessKey 涓� `璐ㄦ绾�#鐢熶骇鎵规鍙穈锛涘鎵归�氳繃鍚庤繘鍏ュ叕鍙歌川妫�寰呭鐘舵�併��
+4. 涓ゆ潯绾夸娇鐢ㄥ悇鑷殑娴佺▼瀹氫箟锛氬姞宸ラ儴 `mes_seed_quality_line_approve`銆侀攢鍞儴 `mes_seed_quality_sales_line_approve`锛宐usinessKey 鍧囦负 `璐ㄦ绾�#鐢熶骇鎵规鍙穈锛涘鎵归�氳繃鍚庤繘鍏ュ叕鍙歌川妫�寰呭鐘舵�併��
5. 鍚屼竴鐢熶骇鎵规鍐呮墍鏈夎鐨勪袱鏉$嚎閮藉畬鎴愰儴闂ㄥ鎵瑰悗锛岀郴缁熻嚜鍔ㄥ彂璧�**涓�娆�**鍏徃璐ㄦ瀹℃壒锛堟祦绋嬪畾涔� `mes_seed_quality_company_approve`锛宐usinessKey 涓�**鐢熶骇鎵规鍙�**锛夈�傚叕鍙稿鎵�**鎸夋壒娆″彂璧枫�佹寜琚嬭惤搴�**锛氭瘡涓涓ゆ潯绾块兘涓哄悎鏍兼墠鏀捐鍏ュ簱锛屼换涓�鏉′笉鍚堟牸鍒欒琚嬫姤搴燂紱椹冲洖鍒欐暣鎵逛袱鏉$嚎涓�璧烽��鍥炲緟澶嶆銆�
6. 鏀捐鍚庝骇鍝佹寮忓叆搴擄紝鍚庣画搴撶鎵爜鍑哄簱銆侀攢鍞浆绉荤粡閿�鍟嗐�佺粓绔啘鎴锋壂鐮佹函婧愩��
7. 缁忛攢鍟嗛��璐у垎鏀細閿�鍞��璐у崟纭鍚庡彂璧烽��璐ц川妫� 鈫� 澶嶆 鈫� 閿�鍞儴棰嗗瀹℃壒锛涗笉鍚堟牸鍒欓��璐у崟鑷姩鍙栨秷銆佷笉浜堥��璐у苟淇濈暀妫�楠岃褰曘��
@@ -99,10 +99,12 @@
| 娴佺▼瀹氫箟 key | businessKey | 娴佺▼鍙橀噺 |
|---|---|---|
| `mes_seed_quality_line_approve` | `{qcLine}#{鐢熶骇鎵规鍙穧` | `qcLine`銆乣batchCode` |
+| `mes_seed_quality_sales_line_approve` | `{qcLine}#{鐢熶骇鎵规鍙穧` | `qcLine`銆乣batchCode` |
| `mes_seed_quality_company_approve` | 鐢熶骇鎵规鍙� | `batchCode`銆乣code`锛堝吋瀹规棫娴佺▼锛夈�乣passed` |
| `mes_seed_return_approve` | 閿�鍞��璐у崟缂栧彿 | `returnSalesId`銆乣returnSalesCode`銆乣code` |
-- 娴佺▼鐩戝惉鍣ㄥ湪娴佺▼缁撴潫锛堥�氳繃/椹冲洖锛夋椂鍥炲啓璐ㄦ鐘舵�侊紱鍙栨秷锛圕ANCEL锛変笉鏀瑰彉涓氬姟鐘舵�併��
+- 娴佺▼鐩戝惉鍣ㄥ悓鏃剁洃鍚姞宸ラ儴涓庨攢鍞儴涓や釜娴佺▼瀹氫箟锛屾祦绋嬬粨鏉燂紙閫氳繃/椹冲洖锛夋椂鍥炲啓璐ㄦ鐘舵�侊紱鍙栨秷锛圕ANCEL锛変笉鏀瑰彉涓氬姟鐘舵�併��
+- 娴佺▼璇︽儏椤碉紙`views/mes/qc/seedQuality/process-detail.vue`锛夊凡璇嗗埆鏂板鐨� `mes_seed_quality_sales_line_approve`锛屽苟鎸夎川妫�绾垮睍绀恒�屽姞宸ラ儴瀹℃壒 / 閿�鍞儴瀹℃壒銆嶆爣棰樸��
- 鑻� BPM 娴佺▼瀹氫箟鏈儴缃诧紝鍙戣捣娴佺▼浼氬け璐ュ苟璁板綍鏃ュ織锛涗慨澶嶉厤缃悗鍙�氳繃璐ㄦ璁板綍椤电殑鈥滈噸鏂板彂璧峰鎵光�濇仮澶嶃�傛柊鍙岀嚎璁板綍涓嶈兘浣跨敤浜哄伐瀹℃壒鎺ュ彛銆�
## 瀛楁灞曠ず瑙勫垯
diff --git a/docs/wm_transaction_unit_measure_integration.md b/docs/wm_transaction_unit_measure_integration.md
new file mode 100644
index 0000000..a37680d
--- /dev/null
+++ b/docs/wm_transaction_unit_measure_integration.md
@@ -0,0 +1,62 @@
+# 搴撳瓨浜嬪姟娴佹按璁¢噺鍗曚綅锛堣鏍硷級鑱旇皟鏂规
+
+## 娑夊強椤甸潰
+
+- 浠撳偍鐗╂祦 -> 搴撳瓨浜嬪姟娴佹按
+- 浠撳偍鐗╂祦 -> 搴撳瓨鐜版湁閲忥紙瀛楁鍛藉悕淇濇寔涓�鑷达級
+
+## 涓氬姟鑳屾櫙
+
+鎸夐渶姹傘�屽簱瀛樻祦姘村鍔犺鏍煎瓧娈碉紱搴撳瓨鐜版湁閲忋�庡崟浣嶃�忔敼涓恒�庤鏍笺�忋�併�庤鏍煎瀷鍙枫�忔敼涓恒�庣被鍒�忋�嶏細
+
+- 瑙勬牸鍒楀睍绀虹墿鏂欑殑璁¢噺鍗曚綅鍚嶇О锛堝 `48鍗冨厠`銆乣100鍗冨厠`锛夛紝鏁版嵁鏉ユ簮涓� MDM 璁¢噺鍗曚綅銆�
+- 绫诲埆鍒楀睍绀虹墿鏂欑殑瑙勬牸鍨嬪彿锛堝 `澶х敯鐢ㄧ`锛夈��
+
+## API
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|------|------|------|
+| GET | /mes/wm/transaction/page | 搴撳瓨浜嬪姟娴佹按鍒嗛〉锛堝搷搴旀柊澧炲瓧娈碉級 |
+
+**鍝嶅簲瀛楁鏂板锛�**
+
+| 瀛楁 | 绫诲瀷 | 璇存槑 |
+|------|------|------|
+| unitMeasureName | String | 璁¢噺鍗曚綅鍚嶇О锛屾寜鐗╂枡 `unitMeasureId` 鍏宠仈 MDM 璁¢噺鍗曚綅寰楀埌锛涙湭缁存姢鏃朵负绌� |
+
+**鍝嶅簲绀轰緥锛�**
+
+```json
+{
+ "code": 0,
+ "data": {
+ "list": [
+ {
+ "id": 1,
+ "itemId": 1,
+ "itemCode": "9335999888099723",
+ "itemName": "濉旀渤4鍙�",
+ "unitMeasureName": "48鍗冨厠",
+ "specification": null,
+ "itemTypeName": null,
+ "quantity": 1.00
+ }
+ ],
+ "total": 1
+ }
+}
+```
+
+## 瀛楁灞曠ず瑙勫垯
+
+| 瀛楁 | 灞曠ず浣嶇疆 | 鍒楁爣棰� | 璇存槑 |
+|------|----------|--------|------|
+| unitMeasureName | 搴撳瓨浜嬪姟娴佹按銆佸簱瀛樼幇鏈夐噺銆佸簱瀛橀�夋嫨寮圭獥 | 瑙勬牸 | 璁¢噺鍗曚綅鍚嶇О |
+| specification | 搴撳瓨浜嬪姟娴佹按銆佸簱瀛樼幇鏈夐噺銆佸簱瀛橀�夋嫨寮圭獥 | 绫诲埆 | 鐗╂枡瑙勬牸鍨嬪彿 |
+| itemTypeName | 涓嶅啀灞曠ず | - | 鎺ュ彛浠嶈繑鍥烇紝鍏煎鏃ц皟鐢� |
+
+## 娉ㄦ剰浜嬮」
+
+- `unitMeasureName` 涓虹┖琛ㄧず鐗╂枡鏈淮鎶よ閲忓崟浣嶏紝璇峰厛鍦� MDM 鐗╂枡鎴� MES 鍝佺涓淮鎶ゃ��
+- 搴撳瓨鐜版湁閲忔帴鍙� `/mes/wm/material-stock/page` 鍘熸湰宸茶繑鍥� `unitMeasureName`锛屾湰娆′粎璋冩暣鍓嶇鍒楁槧灏勶紝鏃犳帴鍙e彉鍖栥��
+- 鏈涓哄悜鍚庡吋瀹圭殑鍝嶅簲瀛楁鏂板锛屼笉娑夊強鏁版嵁搴撶粨鏋勫彉鏇淬��
diff --git a/scripts/deploy-seed-quality-bpm.ps1 b/scripts/deploy-seed-quality-bpm.ps1
index 776b424..017c651 100644
--- a/scripts/deploy-seed-quality-bpm.ps1
+++ b/scripts/deploy-seed-quality-bpm.ps1
@@ -13,6 +13,7 @@
# 涓枃鍛藉悕缁熶竴浠� BPMN 鏂囦欢璇诲彇锛岄伩鍏� Windows PowerShell 5.1 鎸� ANSI 瑙f瀽鑴氭湰瀵艰嚧涔辩爜
$models = @(
'mes_seed_quality_line_approve',
+ 'mes_seed_quality_sales_line_approve',
'mes_seed_quality_company_approve',
'mes_seed_return_approve'
)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/MesQcSeedQualityController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/MesQcSeedQualityController.java
index 771a109..71e3d22 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/MesQcSeedQualityController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/seedquality/MesQcSeedQualityController.java
@@ -86,7 +86,7 @@
@GetMapping("/resolve")
@Operation(summary = "瑙f瀽寰呰川妫�琚嬬爜鍙婄‘璁よ琚嬭川妫�缁撴灉")
@PreAuthorize("@ss.hasAnyPermissions('mes:qc-seed-quality:submit', 'mes:qc-seed-quality:retest', 'mes:qc-seed-quality:process-approve', 'mes:qc-seed-quality:company-approve')")
- public CommonResult<java.util.Map<String, Object>> resolve(@RequestParam String code, @RequestParam(defaultValue = "BAG") String scanType,
+ public CommonResult<java.util.Map<String, Object>> resolve(@RequestParam String code, @RequestParam(defaultValue = "AUTO") String scanType,
@RequestParam(defaultValue = "1") Integer qcLine) {
return success(service.resolveScan(code, scanType, qcLine));
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java
index 8f9469e..ca5ebef 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/MesWmTransactionController.java
@@ -22,7 +22,9 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemTypeService;
+import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
@@ -73,6 +75,7 @@
@Resource private MesWmProductSalesDetailMapper salesDetailMapper;
@Resource private MesMdItemMapper mesMdItemMapper;
@Resource private MesMdItemTypeService mesMdItemTypeService;
+ @Resource private MesMdUnitMeasureService unitMeasureService;
@GetMapping("/page")
@Operation(summary = "鑾峰彇搴撳瓨浜嬪姟娴佹按鍒嗛〉")
@@ -100,6 +103,9 @@
mesItemTypeIds.remove(null);
Map<Long, MesMdItemTypeDO> mesItemTypeMap = mesItemTypeIds.isEmpty() ? Map.of()
: mesMdItemTypeService.getItemTypeMap(mesItemTypeIds);
+ // 鍏宠仈鏌ヨ璁¢噺鍗曚綅锛岃鏍煎垪灞曠ず璁¢噺鍗曚綅鍚嶇О
+ Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
+ convertSet(itemMap.values(), MesMdmItemDO::getUnitMeasureId));
// 鍏宠仈鏌ヨ浠撳簱淇℃伅
Map<Long, MesWmWarehouseDO> warehouseMap = warehouseService.getWarehouseMap(
convertSet(pageResult.getList(), MesWmTransactionDO::getWarehouseId));
@@ -152,6 +158,10 @@
// 瑙勬牸锛氬搧绉嶇鐞嗘湭缁存姢鏃讹紝鍥為��鍙� MES 鐗╂枡瑙勬牸鍨嬪彿
vo.setSpecification(StrUtil.blankToDefault(item.getSpecification(),
mesItem != null ? mesItem.getSpecification() : null));
+ MesMdUnitMeasureDO unitMeasure = unitMeasureMap.get(item.getUnitMeasureId());
+ if (unitMeasure != null) {
+ vo.setUnitMeasureName(unitMeasure.getName());
+ }
// 绫诲埆锛氫紭鍏堝搧绉嶅垎绫伙紝鍏舵 MES 鐗╂枡鍒嗙被
MdmItemCategoryRespDTO category = itemCategoryMap.get(item.getCategoryId());
String itemTypeName = category != null ? category.getName() : null;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/vo/MesWmTransactionRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/vo/MesWmTransactionRespVO.java
index cbcc426..1ca3326 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/vo/MesWmTransactionRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transaction/vo/MesWmTransactionRespVO.java
@@ -45,6 +45,9 @@
@Schema(description = "瑙勬牸鍨嬪彿", example = "10mm*100mm")
private String specification;
+ @Schema(description = "璁¢噺鍗曚綅鍚嶇О", example = "48鍗冨厠")
+ private String unitMeasureName;
+
@Schema(description = "鐗╂枡绫诲埆鍚嶇О", example = "浜旈噾閰嶄欢")
private String itemTypeName;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityServiceImpl.java
index f8ac385..dc95b1d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityServiceImpl.java
@@ -12,9 +12,11 @@
import cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualitySubmitReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedReturnQualitySubmitReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
+import cn.iocoder.yudao.module.mes.framework.qrcode.MesTraceCodeUtils;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.bagcode.MesProBagCodeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.batch.MesProBatchDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.pallet.MesProPalletDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.seedquality.*;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDO;
@@ -78,8 +80,10 @@
private static final int QC_LINE_PROCESS = 1, QC_LINE_SALES = 2;
/** 涓氬姟绫诲瀷锛�1 鐢熶骇鍏ュ簱璐ㄦ锛�2 缁忛攢鍟嗛��璐ц川妫� */
private static final int BIZ_TYPE_PRODUCTION = 1, BIZ_TYPE_RETURN = 2;
- /** 鏈嚎棰嗗瀹℃壒娴佺▼瀹氫箟鏍囪瘑 */
+ /** 鍔犲伐閮ㄩ瀵煎鎵规祦绋嬪畾涔夋爣璇� */
private static final String LINE_PROCESS_KEY = "mes_seed_quality_line_approve";
+ /** 閿�鍞儴棰嗗瀹℃壒娴佺▼瀹氫箟鏍囪瘑 */
+ private static final String SALES_LINE_PROCESS_KEY = "mes_seed_quality_sales_line_approve";
/** 鍏徃璐ㄦ瀹℃壒娴佺▼瀹氫箟鏍囪瘑 */
private static final String COMPANY_PROCESS_KEY = "mes_seed_quality_company_approve";
/** 缁忛攢鍟嗛��璐ц川妫�瀹℃壒娴佺▼瀹氫箟鏍囪瘑 */
@@ -194,7 +198,7 @@
@Override
public Map<String, Object> resolveScan(String code) {
- MesProBagCodeDO bag = bagCodeMapper.selectByScanCode(code);
+ MesProBagCodeDO bag = bagCodeMapper.selectByScanCode(MesTraceCodeUtils.extractCode(code));
if (bag == null) throw new IllegalArgumentException("鏈В鏋愬埌鏈夋晥琚嬬爜锛岃鎵弿琚嬬爜");
Map<String, Object> result = new HashMap<>();
result.put("code", bag.getCode());
@@ -227,28 +231,66 @@
return result;
}
- private record Scope(String code, String businessCode, String batchCode, boolean canceled, List<MesProBagCodeDO> bags) { }
+ private record Scope(String type, String code, String businessCode, String batchCode, boolean canceled, List<MesProBagCodeDO> bags) { }
+
+ /** 鎵爜绫诲瀷锛氱敱鐮佸�艰嚜鍔ㄨ瘑鍒鐮� / 鎵樼洏鐮� / 鐢熶骇鎵规鐮� */
+ private static final String SCAN_TYPE_AUTO = "AUTO";
private Scope scope(String code, String type, boolean lock) {
+ // 鏍囩浜岀淮鐮佸唴瀹瑰彲鑳芥槸鏁存杩芥函閾炬帴锛屽厛鎷嗚В涓虹函鐮佸�煎啀鍖归厤
+ code = MesTraceCodeUtils.extractCode(code);
+ if (StrUtil.isBlank(type) || SCAN_TYPE_AUTO.equalsIgnoreCase(type)) {
+ return autoScope(code, lock);
+ }
if ("BAG".equals(type)) {
MesProBagCodeDO bag = bagCodeMapper.selectByScanCode(code);
if (bag == null) throw invalidParamException("鏈壘鍒拌鐮侊紝璇锋牳瀵规壂鐮佺被鍨嬪拰鐮佸��");
- return new Scope(bag.getCode(), bag.getBusinessCode(), bag.getBatchCode(), Integer.valueOf(30).equals(bag.getStatus()), List.of(bag));
+ return bagScope(bag);
}
if ("PALLET".equals(type)) {
var pallet = lock ? palletMapper.selectByScanCodeForUpdate(code) : palletMapper.selectByScanCode(code);
if (pallet == null) throw invalidParamException("鏈壘鍒版墭鐩樼爜锛岃鏍稿鎵爜绫诲瀷鍜岀爜鍊�");
- if (pallet.getBatchId() == null) throw invalidParamException("鎵樼洏灏氭湭缁戝畾鐢熶骇鎵规锛屾棤娉曡川妫�");
- return new Scope(StrUtil.blankToDefault(pallet.getCode(), pallet.getTempCode()), pallet.getBusinessCode(), pallet.getBatchCode(),
- Integer.valueOf(20).equals(pallet.getStatus()), lock ? bagCodeMapper.selectListByPalletIdForUpdate(pallet.getId()) : bagCodeMapper.selectListByPalletId(pallet.getId()));
+ return palletScope(pallet, lock);
}
if ("BATCH".equals(type)) {
var batch = lock ? batchMapper.selectByScanCodeForUpdate(code) : batchMapper.selectByScanCode(code);
if (batch == null) throw invalidParamException("鏈壘鍒扮敓浜ф壒娆$爜锛岃鏍稿鎵爜绫诲瀷鍜岀爜鍊�");
- return new Scope(StrUtil.blankToDefault(batch.getCode(), batch.getTempCode()), batch.getBusinessCode(), batch.getCode(),
- Integer.valueOf(40).equals(batch.getStatus()), lock ? bagCodeMapper.selectListByBatchIdForUpdate(batch.getId()) : bagCodeMapper.selectListByBatchId(batch.getId()));
+ return batchScope(batch, lock);
}
throw invalidParamException("涓嶆敮鎸佺殑璐ㄦ鎵爜绫诲瀷");
+ }
+
+ /** 涓庢壂鐮佺粦瀹氭墭鐩樹竴鑷达細鎸夌爜鍊艰嚜鍔ㄨ瘑鍒被鍨嬶紝渚濇灏濊瘯琚嬬爜銆佹墭鐩樼爜銆佺敓浜ф壒娆$爜 */
+ private Scope autoScope(String code, boolean lock) {
+ MesProBagCodeDO bag = bagCodeMapper.selectByScanCode(code);
+ if (bag != null) {
+ return bagScope(bag);
+ }
+ var pallet = lock ? palletMapper.selectByScanCodeForUpdate(code) : palletMapper.selectByScanCode(code);
+ if (pallet != null) {
+ return palletScope(pallet, lock);
+ }
+ var batch = lock ? batchMapper.selectByScanCodeForUpdate(code) : batchMapper.selectByScanCode(code);
+ if (batch != null) {
+ return batchScope(batch, lock);
+ }
+ throw invalidParamException("鏈壘鍒板搴旂殑琚嬬爜銆佹墭鐩樼爜鎴栫敓浜ф壒娆$爜锛岃鏍稿鐮佸��");
+ }
+
+ private Scope bagScope(MesProBagCodeDO bag) {
+ return new Scope("BAG", bag.getCode(), bag.getBusinessCode(), bag.getBatchCode(),
+ Integer.valueOf(30).equals(bag.getStatus()), List.of(bag));
+ }
+
+ private Scope palletScope(MesProPalletDO pallet, boolean lock) {
+ if (pallet.getBatchId() == null) throw invalidParamException("鎵樼洏灏氭湭缁戝畾鐢熶骇鎵规锛屾棤娉曡川妫�");
+ return new Scope("PALLET", StrUtil.blankToDefault(pallet.getCode(), pallet.getTempCode()), pallet.getBusinessCode(), pallet.getBatchCode(),
+ Integer.valueOf(20).equals(pallet.getStatus()), lock ? bagCodeMapper.selectListByPalletIdForUpdate(pallet.getId()) : bagCodeMapper.selectListByPalletId(pallet.getId()));
+ }
+
+ private Scope batchScope(MesProBatchDO batch, boolean lock) {
+ return new Scope("BATCH", StrUtil.blankToDefault(batch.getCode(), batch.getTempCode()), batch.getBusinessCode(), batch.getCode(),
+ Integer.valueOf(40).equals(batch.getStatus()), lock ? bagCodeMapper.selectListByBatchIdForUpdate(batch.getId()) : bagCodeMapper.selectListByBatchId(batch.getId()));
}
@Override
@@ -266,7 +308,8 @@
.filter(q -> !isReturnQuality(q))
.map(MesQcSeedQualityDO::getCode).collect(java.util.stream.Collectors.toSet());
Map<String, Object> result = new HashMap<>();
- result.put("scanType", scanType); result.put("code", scope.code()); result.put("businessCode", scope.businessCode());
+ // 鑷姩璇嗗埆鏃跺洖浼犲疄闄呯爜绫诲瀷锛屽墠绔嵁姝ゅ睍绀哄璞$被鍨嬪苟鐢ㄤ簬鎻愪氦
+ result.put("scanType", scope.type()); result.put("code", scope.code()); result.put("businessCode", scope.businessCode());
result.put("batchCode", scope.batchCode()); result.put("canceled", scope.canceled());
result.put("totalCount", effective.size());
result.put("inbound", !effective.isEmpty() && effective.stream().allMatch(b -> b.getInboundEventId() != null));
@@ -278,7 +321,7 @@
result.put("itemCode", item == null ? null : item.getCode());
result.put("itemName", item == null ? null : item.getName());
result.put("indicators", toRangePayload(itemId));
- if ("BAG".equals(scanType)) {
+ if ("BAG".equals(scope.type())) {
List<MesQcSeedQualityDO> qualities = qualityMapper.selectListByCode(scope.code());
MesQcSeedQualityDO quality = qualities.stream()
.filter(q -> !isReturnQuality(q)).findFirst().orElse(null);
@@ -1076,9 +1119,11 @@
Map<String, Object> variables = new HashMap<>();
variables.put("qcLine", qcLine);
variables.put("batchCode", batchCode);
+ String processDefinitionKey = Objects.equals(qcLine, QC_LINE_SALES)
+ ? SALES_LINE_PROCESS_KEY : LINE_PROCESS_KEY;
String processInstanceId = processInstanceApi.createProcessInstance(operatorId,
new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(LINE_PROCESS_KEY)
+ .setProcessDefinitionKey(processDefinitionKey)
.setBusinessKey(qcLine + "#" + batchCode)
.setVariables(variables));
for (MesQcSeedQualityDO quality : pending) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/listener/MesQcSeedLineStatusListener.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/listener/MesQcSeedLineStatusListener.java
index 1948ab6..ededb08 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/listener/MesQcSeedLineStatusListener.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/listener/MesQcSeedLineStatusListener.java
@@ -1,35 +1,39 @@
package cn.iocoder.yudao.module.mes.service.qc.seedquality.listener;
import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
-import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
import cn.iocoder.yudao.module.mes.service.qc.seedquality.MesQcSeedQualityService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationListener;
import org.springframework.stereotype.Component;
+import java.util.Set;
+
/**
- * 绉嶅瓙璐ㄦ鏈嚎棰嗗瀹℃壒鐘舵�佺洃鍚櫒
+ * 绉嶅瓙璐ㄦ閮ㄩ棬棰嗗瀹℃壒鐘舵�佺洃鍚櫒
*
- * <p>娴佺▼瀹氫箟 key锛歮es_seed_quality_line_approve锛沚usinessKey 鏍煎紡锛歿璐ㄦ绾縸#{鐢熶骇鎵规鍙穧銆�
- * 瀹℃壒閫氳繃鍚庢湰绾胯繘鍏ュ妫�锛岄┏鍥炲悗鏈嚎閲嶆柊鍒濇銆�
+ * <p>鍔犲伐閮ㄣ�侀攢鍞儴鍚勪娇鐢ㄧ嫭绔嬫祦绋嬪畾涔夛紱businessKey 鏍煎紡锛歿璐ㄦ绾縸#{鐢熶骇鎵规鍙穧銆�
+ * 瀹℃壒閫氳繃鍚庢湰绾胯繘鍏ュ叕鍙歌川妫�寰呭锛岄┏鍥炲悗鏈嚎閲嶆柊鍒濇銆�
*/
@Component
@Slf4j
-public class MesQcSeedLineStatusListener extends BpmProcessInstanceStatusEventListener {
+public class MesQcSeedLineStatusListener implements ApplicationListener<BpmProcessInstanceStatusEvent> {
- private static final String BPM_PROCESS_DEFINITION_KEY = "mes_seed_quality_line_approve";
+ /** 鍔犲伐閮ㄩ瀵煎鎵规祦绋嬪畾涔夋爣璇� */
+ private static final String LINE_PROCESS_KEY = "mes_seed_quality_line_approve";
+ /** 閿�鍞儴棰嗗瀹℃壒娴佺▼瀹氫箟鏍囪瘑 */
+ private static final String SALES_LINE_PROCESS_KEY = "mes_seed_quality_sales_line_approve";
+ private static final Set<String> PROCESS_KEYS = Set.of(LINE_PROCESS_KEY, SALES_LINE_PROCESS_KEY);
@Resource
private MesQcSeedQualityService seedQualityService;
@Override
- protected String getProcessDefinitionKey() {
- return BPM_PROCESS_DEFINITION_KEY;
- }
-
- @Override
- protected void onEvent(BpmProcessInstanceStatusEvent event) {
+ public void onApplicationEvent(BpmProcessInstanceStatusEvent event) {
+ if (!PROCESS_KEYS.contains(event.getProcessDefinitionKey())) {
+ return;
+ }
if (!BpmProcessInstanceStatusEnum.isProcessEndStatus(event.getStatus())
|| BpmProcessInstanceStatusEnum.CANCEL.getStatus().equals(event.getStatus())) {
return;
@@ -37,19 +41,19 @@
String businessKey = event.getBusinessKey();
int index = businessKey == null ? -1 : businessKey.indexOf('#');
if (index <= 0 || index == businessKey.length() - 1) {
- log.warn("[onEvent][鏈嚎瀹℃壒 businessKey({}) 鏍煎紡鏃犳晥锛屽簲涓� 璐ㄦ绾�#鎵规鍙穄", businessKey);
+ log.warn("[onApplicationEvent][閮ㄩ棬瀹℃壒 businessKey({}) 鏍煎紡鏃犳晥锛屽簲涓� 璐ㄦ绾�#鎵规鍙穄", businessKey);
return;
}
Integer qcLine;
try {
qcLine = Integer.valueOf(businessKey.substring(0, index));
} catch (NumberFormatException ex) {
- log.warn("[onEvent][鏈嚎瀹℃壒 businessKey({}) 璐ㄦ绾挎棤鏁圿", businessKey);
+ log.warn("[onApplicationEvent][閮ㄩ棬瀹℃壒 businessKey({}) 璐ㄦ绾挎棤鏁圿", businessKey);
return;
}
String batchCode = businessKey.substring(index + 1);
boolean approved = BpmProcessInstanceStatusEnum.APPROVE.getStatus().equals(event.getStatus());
- log.info("[onEvent][鏈嚎瀹℃壒瀹屾垚锛屾壒娆�={} 璐ㄦ绾�={} 缁撴灉={}]", batchCode, qcLine, event.getStatus());
+ log.info("[onApplicationEvent][閮ㄩ棬瀹℃壒瀹屾垚锛屾壒娆�={} 璐ㄦ绾�={} 缁撴灉={}]", batchCode, qcLine, event.getStatus());
seedQualityService.handleLineProcessResult(event.getId(), qcLine, batchCode, approved, event.getReason());
}
}
diff --git a/yudao-module-mes/src/main/resources/bpm/mes_seed_quality_line_approve.bpmn20.xml b/yudao-module-mes/src/main/resources/bpm/mes_seed_quality_line_approve.bpmn20.xml
index 187796c..947a20a 100644
--- a/yudao-module-mes/src/main/resources/bpm/mes_seed_quality_line_approve.bpmn20.xml
+++ b/yudao-module-mes/src/main/resources/bpm/mes_seed_quality_line_approve.bpmn20.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:flowable="http://flowable.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" targetNamespace="http://www.flowable.org/processdef">
- <process id="mes_seed_quality_line_approve" name="绉嶅瓙璐ㄦ閮ㄩ棬瀹℃壒" isExecutable="true">
+ <process id="mes_seed_quality_line_approve" name="绉嶅瓙璐ㄦ鍔犲伐閮ㄥ鎵�" isExecutable="true">
<startEvent id="start" />
<sequenceFlow id="start_to_review" sourceRef="start" targetRef="review" />
- <userTask id="review" name="閮ㄩ棬棰嗗瀹℃壒锛堟殏鐢� admin 澶勭悊锛�" flowable:candidateStrategy="30" flowable:candidateParam="1" />
+ <userTask id="review" name="鍔犲伐閮ㄩ瀵煎鎵癸紙鏆傜敱 admin 澶勭悊锛�" flowable:candidateStrategy="30" flowable:candidateParam="1" />
<sequenceFlow id="review_to_end" sourceRef="review" targetRef="end" />
<endEvent id="end" />
</process>
diff --git a/yudao-module-mes/src/main/resources/bpm/mes_seed_quality_sales_line_approve.bpmn20.xml b/yudao-module-mes/src/main/resources/bpm/mes_seed_quality_sales_line_approve.bpmn20.xml
new file mode 100644
index 0000000..ff802c3
--- /dev/null
+++ b/yudao-module-mes/src/main/resources/bpm/mes_seed_quality_sales_line_approve.bpmn20.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:flowable="http://flowable.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" targetNamespace="http://www.flowable.org/processdef">
+ <process id="mes_seed_quality_sales_line_approve" name="绉嶅瓙璐ㄦ閿�鍞儴瀹℃壒" isExecutable="true">
+ <startEvent id="start" />
+ <sequenceFlow id="start_to_review" sourceRef="start" targetRef="review" />
+ <userTask id="review" name="閿�鍞儴棰嗗瀹℃壒锛堟殏鐢� admin 澶勭悊锛�" flowable:candidateStrategy="30" flowable:candidateParam="1" />
+ <sequenceFlow id="review_to_end" sourceRef="review" targetRef="end" />
+ <endEvent id="end" />
+ </process>
+ <bpmndi:BPMNDiagram id="BPMNDiagram_mes_seed_quality_sales_line_approve">
+ <bpmndi:BPMNPlane bpmnElement="mes_seed_quality_sales_line_approve" id="BPMNPlane_mes_seed_quality_sales_line_approve">
+ <bpmndi:BPMNShape bpmnElement="start" id="BPMNShape_start">
+ <omgdc:Bounds height="36.0" width="36.0" x="160.0" y="182.0"></omgdc:Bounds>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape bpmnElement="review" id="BPMNShape_review">
+ <omgdc:Bounds height="80.0" width="100.0" x="250.0" y="160.0"></omgdc:Bounds>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape bpmnElement="end" id="BPMNShape_end">
+ <omgdc:Bounds height="36.0" width="36.0" x="400.0" y="182.0"></omgdc:Bounds>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge bpmnElement="start_to_review" id="BPMNEdge_start_to_review">
+ <omgdi:waypoint x="196.0" y="200.0"></omgdi:waypoint>
+ <omgdi:waypoint x="250.0" y="200.0"></omgdi:waypoint>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge bpmnElement="review_to_end" id="BPMNEdge_review_to_end">
+ <omgdi:waypoint x="350.0" y="200.0"></omgdi:waypoint>
+ <omgdi:waypoint x="400.0" y="200.0"></omgdi:waypoint>
+ </bpmndi:BPMNEdge>
+ </bpmndi:BPMNPlane>
+ </bpmndi:BPMNDiagram>
+</definitions>
--
Gitblit v1.9.3