From be5783c8a7e13bbc76d33c95643d75779cce21db Mon Sep 17 00:00:00 2001 From: liyong <18434998025@163.com> Date: 星期六, 18 七月 2026 15:39:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business --- docs/return_issue_integration.md | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 105 insertions(+), 0 deletions(-) diff --git a/docs/return_issue_integration.md b/docs/return_issue_integration.md new file mode 100644 index 0000000..495f006 --- /dev/null +++ b/docs/return_issue_integration.md @@ -0,0 +1,105 @@ +# 鐢熶骇閫�鏂� - 鍓嶇鑱旇皟鏂规 + +## 闂鑳屾櫙 + +閫�鏂欐槑缁嗭紙detail锛夌殑 `warehouseId`/`locationId`/`areaId` 璇箟鍙樻洿锛� +- **鍙樻洿鍓�**锛氭潵婧愪粨搴擄紙浠庡簱瀛樿褰曞甫鍏ワ紝鍗宠櫄鎷熺嚎杈瑰簱锛� +- **鍙樻洿鍚�**锛氫笂鏋剁洰鏍囦粨搴擄紙閫�鏂欒鏀惧洖鐨勫疄闄呬粨搴擄級 + +鍓嶇浼犺櫄鎷熺嚎杈瑰簱淇℃伅 鈫� 鍚庣鍏ュ簱涔熷叆铏氭嫙搴� 鈫� 瀹為檯浠撳簱搴撳瓨娌℃仮澶嶃�� + +## 娑夊強椤甸潰 + +- 鐢熶骇閫�鏂欏崟 - 鏄庣粏鏂板/缂栬緫寮圭獥 +- 鐢熶骇閫�鏂欏崟 - 涓婃灦鎿嶄綔椤甸潰 + +## 鏍稿績鍙樻洿 + +### 閫�鏂欐槑缁嗙殑浠撳簱瀛楁璇箟 + +| 瀛楁 | 鍙樻洿鍓嶈涔� | 鍙樻洿鍚庤涔� | 璇存槑 | +|------|-----------|-----------|------| +| `materialStockId` | 铏氭嫙绾胯竟搴撳簱瀛樿褰� ID | 涓嶅彉 | 鐢ㄤ簬浠庤櫄鎷熺嚎杈瑰簱鍑哄簱 | +| `warehouseId` | 鏉ユ簮浠撳簱锛堣櫄鎷熷簱锛� | **涓婃灦鐩爣浠撳簱锛堝疄闄呬粨搴擄級** | 閫�鏂欏叆搴撶殑鐩爣浠撳簱 | +| `locationId` | 鏉ユ簮搴撳尯 | **涓婃灦鐩爣搴撳尯** | 閫�鏂欏叆搴撶殑鐩爣搴撳尯 | +| `areaId` | 鏉ユ簮搴撲綅 | **涓婃灦鐩爣搴撲綅** | 閫�鏂欏叆搴撶殑鐩爣搴撲綅 | + +### 鍚庣宸插仛鐨勫吋瀹� + +鍚庣 `createTransactionList` 宸插仛鍏滃簳锛� +- 濡傛灉 detail 鐨� `warehouseId` 浠嶆槸铏氭嫙绾胯竟搴擄紙鏃ф暟鎹�/鍓嶇鏈敼锛夛紝浼氳嚜鍔ㄩ�氳繃浜嬪姟娴佹按鍙嶆煡鍘熷浠撳簱 +- 鍓嶇鏀瑰畬鍚庯紝鐩存帴浣跨敤 detail 鐨勪粨搴撲俊鎭綔涓哄叆搴撶洰鏍囷紝涓嶅啀璧板弽鏌� + +## 鍓嶇淇敼鐐� + +### 1. 鏄庣粏鏂板/缂栬緫寮圭獥 - 浠撳簱閫夋嫨閫昏緫 + +**褰撳墠閫昏緫**锛氶�夋嫨铏氭嫙绾胯竟搴撳簱瀛樿褰曞悗锛岃嚜鍔ㄥ甫鍏ヨ搴撳瓨璁板綍鐨� warehouseId/locationId/areaId锛堣櫄鎷熷簱锛� + +**鏀逛负**锛� +- `materialStockId`锛氫粛浠庤櫄鎷熺嚎杈瑰簱搴撳瓨璁板綍鑾峰彇锛堢敤浜庢爣璇嗕粠鍝釜搴撳瓨鍑猴級 +- `warehouseId`/`locationId`/`areaId`锛�**鏀逛负璁╃敤鎴烽�夋嫨涓婃灦鐩爣搴撲綅**锛堝疄闄呬粨搴撶殑搴撲綅锛夛紝涓嶅啀鑷姩浠庡簱瀛樿褰曞甫鍏� + +#### 閫夋嫨搴撳瓨璁板綍鏃� + +``` +閫夋嫨搴撳瓨璁板綍 鈫� 鑷姩甯﹀叆锛歩temId, batchId, batchCode, materialStockId + 涓嶅啀甯﹀叆锛歸arehouseId, locationId, areaId +``` + +#### 涓婃灦鐩爣搴撲綅閫夋嫨 + +鏂板涓�涓簱浣嶉�夋嫨鍣紝璁╃敤鎴烽�夋嫨閫�鏂欒鏀惧洖鐨勫疄闄呬粨搴撳簱浣嶏細 +- 浠撳簱涓嬫媺锛氳繃婊ゆ帀铏氭嫙绾胯竟浠撳簱锛坈ode = `WIP_VIRTUAL_WAREHOUSE`锛� +- 搴撳尯涓嬫媺锛氳仈鍔ㄤ粨搴� +- 搴撲綅涓嬫媺锛氳仈鍔ㄥ簱鍖� + +### 2. 鏁版嵁甯﹀叆璇存槑 + +| 鍦烘櫙 | 浠庡摢甯﹀叆 | 瀛楁 | +|------|---------|------| +| 閫夋嫨搴撳瓨璁板綍 | 铏氭嫙绾胯竟搴撳簱瀛� | materialStockId, itemId, batchId, batchCode | +| 閫夋嫨涓婃灦搴撲綅 | 鐢ㄦ埛鎵嬪姩閫夋嫨 | warehouseId, locationId, areaId | +| 榛樿涓婃灦搴撲綅 | 棰嗘枡鍑哄簱鏃剁殑鍘熷浠撳簱 | warehouseId, locationId, areaId | + +**寤鸿**锛氶�夋嫨搴撳瓨璁板綍鍚庯紝鑷姩鏌ヨ璇ョ墿鏂欑殑棰嗘枡鍑哄簱璁板綍锛屽皢鍘熷鍑哄簱浠撳簱浣滀负榛樿涓婃灦鐩爣搴撲綅锛岀敤鎴峰彲淇敼銆� + +### 3. API 璇存槑 + +淇濆瓨鏄庣粏鐨勬帴鍙d笉鍙橈細 + +| 鏂规硶 | 璺緞 | 璇存槑 | +|------|------|------| +| POST | /mes/wm-return-issue-detail/create | 鏂板鏄庣粏 | +| PUT | /mes/wm-return-issue-detail/update | 淇敼鏄庣粏 | + +**璇锋眰鍙傛暟锛堝悓涔嬪墠锛屼絾璇箟鍙樻洿锛夛細** + +| 鍙傛暟 | 绫诲瀷 | 蹇呭~ | 璇存槑 | +|------|------|------|------| +| materialStockId | Long | 鍚� | 铏氭嫙绾胯竟搴撳簱瀛樿褰� ID锛堟潵婧愶級 | +| warehouseId | Long | 鏄� | **涓婃灦鐩爣浠撳簱 ID**锛堜笉鍐嶆槸鏉ユ簮浠撳簱锛� | +| locationId | Long | 鏄� | **涓婃灦鐩爣搴撳尯 ID** | +| areaId | Long | 鏄� | **涓婃灦鐩爣搴撲綅 ID** | + +### 4. 鍚庣鏍¢獙鍙樻洿 + +鍚庣鏍¢獙宸茶皟鏁达細 +- 鉁� 鏍¢獙 `materialStockId` 瀵瑰簲鐨勫簱瀛樿褰曞瓨鍦ㄣ�佺墿鏂欎竴鑷淬�佸簱瀛樺厖瓒� +- 鉂� 涓嶅啀鏍¢獙 `materialStockId` 鐨勪粨搴撲笌 `warehouseId` 涓�鑷达紙鍥犱负鏉ユ簮鏄櫄鎷熷簱锛岀洰鏍囨槸瀹為檯搴擄級 +- 鉁� 鏍¢獙涓婃灦鐩爣搴撲綅鐨勬贩鏀捐鍒� + +## 涓氬姟瑙勫垯璇存槑 + +| 鍦烘櫙 | 瑙勫垯 | +|------|------| +| 閫�鏂欏嚭搴� | 浠庤櫄鎷熺嚎杈瑰簱鎵e噺锛坈heckFlag=false锛屽厑璁歌礋搴撳瓨锛� | +| 閫�鏂欏叆搴� | 鍏ュ埌鐢ㄦ埛閫夋嫨鐨勫疄闄呬粨搴撳簱浣� | +| 榛樿涓婃灦搴撲綅 | 寤鸿榛樿濉叆棰嗘枡鍑哄簱鏃剁殑鍘熷浠撳簱搴撲綅 | +| 浠撳簱杩囨护 | 涓婃灦鐩爣浠撳簱涓嬫媺搴旀帓闄よ櫄鎷熺嚎杈逛粨搴� | + +## 娉ㄦ剰浜嬮」 + +- 鍚庣宸插仛鍏煎锛氬鏋滃墠绔殏鏃朵笉鏀癸紝鏃ф暟鎹紙warehouseId=铏氭嫙搴擄級浠嶈兘閫氳繃浜嬪姟娴佹按鍙嶆煡鍘熷浠撳簱锛屼笉浼氭姤閿� +- 鍓嶇鏀瑰畬鍚庯紝鏂扮殑閫�鏂欏崟 detail 搴斾紶瀹為檯浠撳簱鐨勫簱浣嶏紝閫昏緫鏇存竻鏅� +- 宸插瓨鍦ㄧ殑鏃ч��鏂欐暟鎹笉鍙楀奖鍝嶏紙鍙嶆煡鍏滃簳锛� -- Gitblit v1.9.3