From 1d56cb54d8e606547ba5e763cade1c3e26c46be9 Mon Sep 17 00:00:00 2001 From: 云 <2163098428@qq.com> Date: 星期一, 07 九月 2026 18:05:50 +0800 Subject: [PATCH] feat(mes): 为MES仓储模块添加BPM审批流程支持 --- docs/wm_bpm_progress.md | 37 ++++++++++++++++++++++++++++++++++--- 1 files changed, 34 insertions(+), 3 deletions(-) diff --git a/docs/wm_bpm_progress.md b/docs/wm_bpm_progress.md index cb115ad..fa29eb9 100644 --- a/docs/wm_bpm_progress.md +++ b/docs/wm_bpm_progress.md @@ -1,7 +1,7 @@ # WM 浠撳偍鍗曟嵁 BPM 瀹℃壒 + 璁惧鑱斿姩 - 瀹炴柦杩涘害 > 璁板綍鏃ユ湡锛�2026-09-07 -> 鐘舵�侊細闃舵1 鍒嗘瀽瀹屾垚锛屽皻鏈敼鐮侊紱闃舵2/3 灏氭湭寮�濮� +> 鐘舵�侊細闃舵1 鏀圭爜瀹屾垚涓� MES 妯″潡缂栬瘧閫氳繃銆佹暟鎹簱瀛楁宸茶ˉ锛涢樁娈�2 宸插畬鎴愪唬鐮佸垎鏋愶紝灏氭湭鏀圭爜锛涢樁娈�3 灏氭湭寮�濮� ## 闇�姹� @@ -9,7 +9,7 @@ 2. 璁惧绠＄悊锛堣澶囧彴璐︼級鍒涘缓鏃惰嚜鍔ㄥ叆搴撹澶囦粨锛屼笌搴撳瓨鑱斿姩銆� 3. 璁惧**澶嶇敤鐗╂枡涓绘暟鎹ā鍨�**锛堝凡纭锛夈�� -## 闃舵1锛氫笁澶у崟鎹ˉ榻� BPM 瀹℃壒闂幆 鈥斺�� 鍒嗘瀽瀹屾垚锛屾湭鏀圭爜 +## 闃舵1锛氫笁澶у崟鎹ˉ榻� BPM 瀹℃壒闂幆 鈥斺�� 鏀圭爜瀹屾垚锛岀紪璇戦�氳繃 ### 宸茬‘璁ょ幇鐘讹紙鍙洿鎺ラ噰淇★級 @@ -37,11 +37,42 @@ 6. 鏂板 3 涓洃鍚櫒锛歚MesWmMiscReceiptStatusListener`/`MesWmMiscIssueStatusListener`/`MesWmReturnVendorStatusListener`锛屽垎绫� `misc_receipt_approve`/`misc_issue_approve`/`return_vendor_approve`銆� 7. 鏁版嵁搴擄細涓変釜琛ㄥ悇鍔� `process_instance_id VARCHAR(64)`锛堥伒瀹� sql-syntax/sql-script 瑙勮寖锛夈�� -## 闃舵2锛氳澶囧彴璐﹁仈鍔ㄨ澶囦粨锛堟湭寮�濮嬫敼鐮侊級 +### 宸插畬鎴愶紙鏀圭爜锛� + +- 鏋氫妇锛歮iscreceipt/miscissue 宸插姞 `APPROVING(MesOrderStatusConstants.APPROVING, "瀹℃壒涓�")`銆� +- DO锛氫笁涓� DO 鍧囧凡鍔� `processInstanceId` 瀛楁銆� +- RespVO锛氫笁涓崟鎹� RespVO 鍧囧凡鍔� `processInstanceId`銆� +- Service 鎺ュ彛 + Impl锛氫笁涓崟鎹凡鍔� `submit<Biz>Approval(id, processDefinitionKey)`銆乣update<Biz>AuditStatus(id, bpmResult)`锛圓PPROVE鈫扐PPROVED, REJECT鈫扨REPARE, CANCEL鈫扖ANCELED锛夈�乣get<Biz>ApprovalProcessDefinitionList()`锛堝鐢� `MesWmItemReceipt` 妯″紡锛岃繃婊ゆ寕璧枫�佸彇鏈�鏂扮増鏈級銆備笁涓柊澧炲父閲忓垎绫伙細`APPROVE_CATEGORY_CODE = misc_receipt_approve / misc_issue_approve / return_vendor_approve`銆� +- Controller锛氫笁涓崟鎹凡鍔� `GET /approval-process-list`锛沗/submit` 鏀逛负甯� `processDefinitionKey`锛岃皟鐢ㄥ鎵规彁浜ゆ柟娉曘�� +- 鐩戝惉鍣細宸叉柊澧� `MesWmMiscReceiptStatusListener`銆乣MesWmMiscIssueStatusListener`銆乣MesWmReturnVendorStatusListener`锛屽悓 `MesWmItemReceiptStatusListener` 椋庢牸銆� +- 缂栬瘧锛歚mvn compile -pl yudao-module-mes -am -q` 閫氳繃銆� +- 鏁版嵁搴擄紙瀹為檯杩愯搴� mom-xgdl锛夛細 + - `mes_wm_misc_receipt`銆乣mes_wm_misc_issue` 鍘熷凡鏈� `process_instance_id`銆� + - `mes_wm_return_vendor` 宸茶ˉ `process_instance_id VARCHAR(64)`锛堝凡楠岃瘉鐢熸晥锛夈�� + +### 鏈畬鎴愶紙闃舵1 鏀跺熬锛� + +- 杈撳嚭鍓嶇鑱旇皟鏂规鏂囨。鍒� `docs/`銆� + +## 闃舵2锛氳澶囧彴璐﹁仈鍔ㄨ澶囦粨锛堝垎鏋愬畬鎴愶紝鏈敼鐮侊級 - 鍏抽敭浜嬪疄锛歚MdmItemApi.createItem(MdmItemCreateReqDTO)` 鍙缓鐗╂枡锛堝繀濉� code/name/categoryId/unitMeasureId/itemType锛夛紱`MesDvMachineryDO` 鏃� item_id锛涘唴缃澶囦粨 id=5 / 搴撳尯 SYS-EQUIP-LOC-01(id=11) / 搴撲綅 SYS-EQUIP-BIN-01(id=10)銆� - 鏂规锛歚createMachinery` 鍔犱簨鍔� 鈫� 寤� MDM 鐗╂枡 鈫� 鎻掕澶囧彴璐�(item_id) 鈫� 鑷姩鐢熸垚鏉＄爜 鈫� `MesWmTransactionService` 鍏ヨ澶囦粨锛圛N, qty=1锛夈�傛洿鏂�/鍒犻櫎/瀵煎叆璺緞鍚屾銆� +### 闃舵2 鐜扮姸涓庡垎鏋愮粨璁猴紙2026-09-07 琛ュ厖锛� + +- 璁惧鍙拌处宸插畾浣嶏細`MesDvMachineryServiceImpl.java`锛堥渶鏀瑰叆鍙ｆ枃浠讹級锛宍createMachinery`/`updateMachinery`/`deleteMachinery` 褰撳墠鍧�**鏃�** `@Transactional`锛涗粎鏈� `importMachineryList` 鏈� `@Transactional`銆� +- 鐜版湁渚濊禆锛歚machineryMapper`銆乣barcodeService`锛堣嚜鍔ㄧ敓鎴愭潯鐮� 鈫� `BarcodeBizTypeEnum.MACHINERY`=DV_MACHINERY=400锛夈�� +- 闇�杩藉姞娉ㄥ叆锛歚MdmItemApi`锛坢es 妯″潡宸蹭緷璧� yudao-module-mdm锛屼笖鏈夌幇鎴愭敞鍏ュ厛渚嬶級銆乣MesWmTransactionService`銆� +-`MdmItemCreateReqDTO` 蹇呭～锛歝ode/name/categoryId/unitMeasureId/itemType锛涘彲閫� warehouseId/warehouseCode/barCode/specification/remark銆�**鏃犺澶囦笓鐢ㄥ瓧娈�**锛岃澶�-鐗╂枡鍏宠仈渚濊禆鏂板 `mes_dv_machinery.item_id` 淇濆瓨杩斿洖鐨� itemId銆� +- `MdmItemCreateReqDTO` 缂哄皯 categoryId/unitMeasureId/itemType 鐨勬潵婧愶細璁惧 SaveReqVO 娌℃湁杩欎簺瀛楁锛�**闇�鏄庣‘榛樿鐗╂枡鍒嗙被銆侀粯璁よ閲忓崟浣嶃�佺墿鏂欑被鍨嬶紙璁惧锛�**鍐嶅疄鐜帮紙妯嚎鐣欏緟纭畾锛夈�� +- 搴撳瓨浜嬪姟 DTO `MesWmTransactionSaveReqDTO` 蹇呭～锛歵ype(IN=姝ｆ暟)/bizType/bizId/bizCode/bizLineId/itemId/quantity/warehouseId/locationId/areaId銆傝澶囧彴璐︽棤鐙珛琛� ID锛宐izLineId 涓氬姟绾﹀畾鐢�**璁惧涓婚敭 id**銆� +- 璁惧 StatusEnum 闇�纭锛堣澶囩姸鎬佸瓧娈� `status` 宸叉湁锛屼絾鍏舵灇涓惧懡鍚嶄笌鍙栧�煎皻鏈牳瀵癸紱鐗╂枡鐘舵�佺敱 MDM 鎺у埗锛夈�� +- 璁惧鐗╂枡绫诲瀷锛氬綋鍓� MDM 鐗╂枡绫诲瀷涓氬姟鏄惁鍏佽璁惧绫诲瀷闇�纭锛岃嫢鍙厑璁� 1/2/3锛屽垯鏂板姝ｅ紡璁惧绫诲瀷鍊煎苟鍚屾瀛楀吀锛堜笉鍦� MES 鍐呴儴纭紪鐮佹湭鐭ョ被鍨嬶級銆� +- 璁惧銆宒eleteMachinery銆嶅凡鏈夌偣妫�/淇濆吇/缁翠慨鍏宠仈鏍￠獙锛屽垹闄ゅ簱瀛樻牎楠屽彲鍦ㄥ簱瀛樹簨鍔″瓨鍦ㄦ�ф牎楠屽琛ュ厖銆� + +锛堥樁娈�2 灏氭湭寮�濮嬫敼鐮侊級 + ## 闃舵3锛氱嫭绔嬭澶囧叆搴撳崟锛堟湭寮�濮嬶級 - 鏂板 `mes_wm_equipment_receipt` 涓昏〃+鏄庣粏琛ㄣ�丏O/Mapper/Service/VO/Controller/鏋氫妇/涓氬姟甯搁噺锛孊PM 闂幆锛屽畬鎴愬叆搴撳啓璁惧浠撱�� -- Gitblit v1.9.3