From 5d818f39c862884b7087488d588fef5b7ce47386 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 28 十月 2026 18:33:55 +0800
Subject: [PATCH] feat(mes): 增加销售退货单与出库单关联功能
---
sql/mysql/20261028_return_sales_from_outbound.sql | 12
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java | 180 ++++++++-
docs/sale_return_from_outbound_and_no_qc.md | 185 ++++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesDetailServiceImpl.java | 17
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnsales/MesWmReturnSalesLineMapper.java | 32 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnableProductSalesLineRespVO.java | 53 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesMapper.java | 29 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java | 38 --
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java | 69 +++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityServiceImpl.java | 37 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineService.java | 11
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java | 1
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java | 32 -
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesController.java | 35 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineSaveReqVO.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java | 8
docs/sale_return_from_outbound_frontend.md | 240 +++++++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesSaveReqVO.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineRespVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesRespVO.java | 6
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesService.java | 21 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnableProductSalesRespVO.java | 38 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesDO.java | 11
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesLineDO.java | 7
24 files changed, 967 insertions(+), 110 deletions(-)
diff --git a/docs/sale_return_from_outbound_and_no_qc.md b/docs/sale_return_from_outbound_and_no_qc.md
new file mode 100644
index 0000000..e7bd990
--- /dev/null
+++ b/docs/sale_return_from_outbound_and_no_qc.md
@@ -0,0 +1,185 @@
+# 閿�鍞��璐ф敼閫狅細鎸夐攢鍞嚭搴撳崟閫�璐� + 鍑哄簱娴侀�氬幓璐ㄦ + 鎵规淇濈湡
+
+## 涓�銆侀渶姹�
+
+| 缂栧彿 | 闇�姹� | 鏉ユ簮 |
+|------|------|------|
+| E | 閿�鍞��璐у崟鏀逛负銆岄�夋嫨閿�鍞嚭搴撳崟鍚庨��璐с�嶏紝鐗╂枡銆佹壒娆°�佹暟閲忎笂闄愮敱鍑哄簱鍗曞甫鍏� | 鐢ㄦ埛 |
+| F | 鍑哄簱娴侀�氱鐞嗭紙閿�鍞粨搴擄細鍙戣揣閫氱煡 / 閿�鍞嚭搴� / 閿�鍞��璐э級涓嶉渶瑕佽川妫� | 鐢ㄦ埛 |
+| G | 閫�璐у畬鎴愬悗鍏ュ簱锛屾壒娆″彿涓㈠け | 鐢ㄦ埛鍙嶉 |
+
+涓夊紶鍗曟嵁鐨勮彍鍗曞綊灞烇紙`system_menu`锛夛細
+
+- 浠撳偍鐗╂祦锛�5780锛� > 閿�鍞粨搴擄紙602479, path `sale`锛�
+ - 鍙戣揣閫氱煡锛�5867, `wls/salesnotice/index`锛�
+ - 閿�鍞嚭搴擄紙5970, `wls/productsales/index`锛�
+ - 閿�鍞��璐э紙5847, `wls/returnsales/index`锛�
+
+## 浜屻�佺幇鐘朵笌鏍瑰洜
+
+### 2.1 閫�璐у崟涓庡嚭搴撳崟鏃犲叧鑱�
+
+- `mes_wm_return_sales` 鍙湁 `sale_order_id` / `sale_order_code`锛圗RP 閿�鍞鍗曪級鍜� `after_sale_return_id`锛堝敭鍚庨��璐х敵璇凤級锛�**娌℃湁閿�鍞嚭搴撳崟鍏宠仈瀛楁**銆�
+- `mes_wm_return_sales_line` 鍙湁 `item_id` / `batch_id` / `batch_code`锛�**娌℃湁鍑哄簱鍗曡鍏宠仈瀛楁**銆�
+- 閫�璐ц鐢卞墠绔墜宸ラ�夋嫨鐗╂枡銆佹墜宸ュ~鏁伴噺锛屼笉涓庝换浣曞嚭搴撴暟鎹瘮瀵癸紝鎵�浠ュ彲鑳介�夊嚭鏈嚭搴撹繃鐨勭墿鏂欍��
+
+杩滅搴� `mom-thzynew` 瀹為檯鏁版嵁锛堥��璐у崟 1 / 閿�鍞嚭搴撳崟 5锛夛細
+
+| 鍗曟嵁 | 鐗╂枡 | 鎵规 | 鏁伴噺 |
+|------|------|------|------|
+| 閿�鍞嚭搴撳崟 5080580566370931 | 114 | 4846066734735277 | 1 |
+| 閿�鍞��璐у崟 0325446663418652锛堝凡瀹屾垚锛� | **116** | **绌�** | 1 |
+
+閫�璐ц閫夌殑鏄彟涓�涓墿鏂欙紝涓旀病鏈変换浣曟壒娆♀�斺�旇繖姝f槸闇�姹� E 鍜� G 鐨勭幇璞℃潵婧愩��
+
+### 2.2 鎵规涓轰粈涔堜涪
+
+1. **閫�璐ц琛ㄥ崟鎶婃壒娆¢�夋嫨绂佺敤浜�**锛歚mom-pro2-before/src/views/wls/returnsales/data.ts` 涓� `WmBatchSelect` 鍥哄畾 `disabled: true`锛岀敤鎴锋牴鏈棤娉曢�夋壒娆★紝`batchId` 姘歌繙涓虹┖銆�
+2. **涓婃灦鏄庣粏鐨勬壒娆℃槸鎵嬪~鏂囨湰妗�**锛歚useDetailFormSchema` 鍙湁 `batchCode` 杈撳叆妗嗭紝涓斾笉浼氫粠閫�璐ц甯﹀叆锛涚敤鎴蜂笉濉氨涓虹┖銆�
+3. **鍚庣涓嶅厹搴�**锛歚MesWmReturnSalesDetailServiceImpl.fillBatchId` 浠呭湪 `batchCode` 闈炵┖鏃跺弽鏌� `batchId`锛屼负绌哄垯璺宠繃锛沗stockReturnSales` 鐩存帴鎶婃槑缁嗙殑 `batchId/batchCode` 鍐欏叆搴撳瓨浜嬪姟锛屼簬鏄簱瀛樺拰娴佹按閮芥病鏈夋壒娆°��
+4. 鐗╂枡 116 鐨� `is_batch_managed = 0`锛屾墍浠ョ幇鏈夈�屾壒娆$鐞嗙墿鏂欏繀椤婚�夋壒娆°�嶇殑鏍¢獙娌℃湁鎷︿綇銆�
+
+缁撴灉锛氬簱瀛樹簨鍔� 127锛坄biz_type=120`锛塦batch_id = NULL`銆乣batch_code = ''`锛屽簱瀛樼幇鏈夐噺閲屼篃灏辨病鏈夋壒娆°��
+
+### 2.3 鐜版湁璐ㄦ閾捐矾
+
+- 閫�璐э細琛屽瓧娈� `rqc_check_flag` / `rqc_id` / `quality_status`锛涙彁浜ゆ椂瀛樺湪寰呮琛� 鈫� 鐘舵�� 1锛堝緟妫�楠岋級锛岀敱 RQC 妫�楠屽畬鍥炲啓骞舵媶鍒嗚锛坄updateReturnSalesLineWhenRqcFinish`锛夛紝鍏ㄩ儴妫�瀹屽啀杩� 2锛堝緟鎵ц锛夈��
+- 閿�鍞嚭搴擄細琛屽瓧娈� `oqc_check_flag` / `oqc_id` / `quality_status`锛涙彁浜ゆ椂鎸夎鍒涘缓 OQC锛坄createOqcFromProductSales`锛夛紝鏈� OQC 琛� 鈫� 1锛堝緟妫�娴嬶級锛屾瀹岃繘 2锛堝緟鎷h揣锛夛紱OQC 涓嶅悎鏍间細鐩存帴鍙栨秷鍑哄簱鍗曘��
+- 鍙戣揣閫氱煡锛氳瀛楁 `oqc_check_flag`锛屽垱寤哄嚭搴撳崟鏃跺鍒跺埌鍑哄簱琛屻��
+
+## 涓夈�佹柟妗�
+
+### 3.1 闇�姹� E锛氭寜閿�鍞嚭搴撳崟閫�璐�
+
+#### 3.1.1 鏁版嵁妯″瀷
+
+涓昏〃澧炲姞鍑哄簱鍗曞叧鑱旓紙`product_sales_id` 鍛藉悕涓庤〃鍚� `mes_wm_product_sales` 瀵归綈锛岄伩鍏嶄笌 `sale_order_id` 娣锋穯锛夛細
+
+```sql
+ALTER TABLE mes_wm_return_sales
+ ADD COLUMN product_sales_id BIGINT NULL COMMENT '閿�鍞嚭搴撳崟缂栧彿' AFTER sale_order_id,
+ ADD COLUMN product_sales_code VARCHAR(100) NULL COMMENT '閿�鍞嚭搴撳崟鍙凤紙鍐椾綑锛�' AFTER product_sales_id;
+
+ALTER TABLE mes_wm_return_sales_line
+ ADD COLUMN product_sales_line_id BIGINT NULL COMMENT '閿�鍞嚭搴撳崟琛岀紪鍙�' AFTER return_id;
+
+CREATE INDEX idx_return_sales_product_sales ON mes_wm_return_sales(product_sales_id);
+CREATE INDEX idx_return_sales_line_product_sales_line ON mes_wm_return_sales_line(product_sales_line_id);
+```
+
+- `product_sales_id` 鍏佽涓虹┖锛氬敭鍚庢ā鍧楅�氳繃 RPC锛坄MesWmReturnSalesApi.createReturnSales`锛夊垱寤虹殑閫�璐у崟娌℃湁鍑哄簱鍗曚笂涓嬫枃锛屽繀椤荤户缁彲鐢ㄣ��
+- 绠$悊鍚庡彴鎵嬪伐鍒涘缓閫�璐у崟鏃�**蹇呴』閫夋嫨涓�涓凡瀹屾垚鐘舵�佺殑閿�鍞嚭搴撳崟**锛堟牎楠屽湪鍚庣鍋氾級銆�
+
+#### 3.1.2 鍙��鏁伴噺鍙e緞
+
+```
+鍙��鏁伴噺 = 鍑哄簱琛屾暟閲� 鈭� 危(璇ュ嚭搴撹宸插叧鑱旂殑鏈夋晥閫�璐ц鏁伴噺)
+鏈夋晥閫�璐ц = 鎵�灞為��璐у崟鏈垹闄� 涓� 鐘舵�� 鈮� 宸插彇娑�(5)
+```
+
+娉ㄦ剰锛歊QC 鎷嗗垎浜х敓鐨勮涔熻鍏ワ紝鎵�浠ュ彛寰勫ぉ鐒惰鐩栥�岄儴鍒嗗悎鏍笺�侀儴鍒嗕笉鍚堟牸銆嶇殑鍘嗗彶鍦烘櫙锛堝幓璐ㄦ鍚庝笉鍐嶄骇鐢熸媶鍒嗭級銆�
+
+#### 3.1.3 鏂板鎺ュ彛
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|------|------|------|
+| GET | `/mes/wm/return-sales/returnable-product-sales/page` | 鍙��閿�鍞嚭搴撳崟鍒嗛〉锛屼粎杩斿洖鐘舵��=宸插畬鎴�(4) 涓斿瓨鍦ㄥ彲閫�琛�>0 鐨勫崟鎹� |
+| GET | `/mes/wm/return-sales/returnable-product-sales/line-list` | 鎸囧畾鍑哄簱鍗曠殑鍙��琛屽垪琛紙鍏ュ弬 `salesId`锛� |
+
+鍙��琛岃繑鍥炲瓧娈碉細鍑哄簱琛� ID銆佺墿鏂欑紪鐮�/鍚嶇О/瑙勬牸/鍗曚綅銆佹壒娆″彿銆佸嚭搴撴暟閲忋�佸凡閫�鏁伴噺銆佸彲閫�鏁伴噺銆�
+
+鏉冮檺娌跨敤 `mes:wm-return-sales:query`銆�
+
+#### 3.1.4 淇濆瓨鏍¢獙
+
+鍒涘缓/淇敼閫�璐у崟鏃讹細
+
+1. `product_sales_id` 闈炵┖ 鈫� 鍑哄簱鍗曞繀椤诲瓨鍦ㄣ�乣deleted=0`銆佺姸鎬� = 宸插畬鎴�(4)銆�
+2. 閫�璐у崟 `client_id` 蹇呴』绛変簬鍑哄簱鍗� `client_id`锛堝墠绔甫鍏ュ悗缃负鍙锛屽悗绔己鍒舵牎楠岋級銆�
+3. 琛� `product_sales_line_id` 闈炵┖ 鈫� 璇ヨ蹇呴』灞炰簬鎵�閫夊嚭搴撳崟銆�
+4. 琛� `item_id` / `batch_id` 蹇呴』涓庡嚭搴撹涓�鑷达紝鏁伴噺 `> 0` 涓� `鈮� 鍙��鏁伴噺`锛堣绠楁椂鎺掗櫎褰撳墠閫�璐у崟鑷韩鐨勮锛岄伩鍏嶇紪杈戞椂鑷垜鍗犵敤锛夈��
+5. `product_sales_line_id` 涓虹┖鐨勮锛堜粎鍞悗鍗曟嵁锛夋部鐢ㄧ幇鏈夋墜宸ユ牎楠屻��
+
+鎻愪氦鏃跺啀鏁翠綋澶嶆牳涓�娆″彲閫�鏁伴噺锛岄槻姝㈠苟鍙戝崟鎹秴閫�銆�
+
+#### 3.1.5 鍓嶇浜や簰锛堜笉鏀瑰墠绔紝浠呰鏄庯級
+
+- 琛ㄥご銆岄攢鍞嚭搴撳崟銆嶉�夋嫨妗嗭細鎵撳紑鍙��鍗曞垎椤靛脊绐楋紱閫変腑鍚庡洖濉嚭搴撳崟鍙凤紝骞舵妸瀹㈡埛缃负鍙甯﹀叆銆�
+- 鐗╂枡琛屾敼涓恒�屼粠鍑哄簱琛岄�夋嫨銆嶏細寮圭獥鍒楀嚭鍙��琛岋紝鍕鹃�夊悗甯﹀叆鐗╂枡銆佹壒娆°�乣quantity` 榛樿濉彲閫�鏁伴噺锛涜〃鏍煎鍔犮�屽凡閫�鏁伴噺 / 鍙��鏁伴噺銆嶄袱鍒椼��
+- 鍏佽閮ㄥ垎閫�璐с�佸厑璁稿悓涓�鍑哄簱琛屽垎澶氭閫�璐э紙璺ㄥ崟鎹級銆�
+- 鍒囨崲鍑哄簱鍗曟椂娓呯┖宸叉坊鍔犵殑琛屻��
+
+### 3.2 闇�姹� F锛氬嚭搴撴祦閫氬幓璐ㄦ
+
+鑼冨洿寤鸿瑕嗙洊閿�鍞粨搴撲笁寮犲崟鎹紙鍙戣揣閫氱煡 / 閿�鍞嚭搴� / 閿�鍞��璐э級锛屼笌銆屽嚭搴撴祦閫氱鐞嗐�嶈彍鍗曞彛寰勪竴鑷淬��
+
+| 鍗曟嵁 | 鍘绘帀鐨勫唴瀹� | 鐘舵�佹祦杞彉鍖� |
+|------|-----------|-------------|
+| 鍙戣揣閫氱煡 | 琛屻�屾槸鍚︽楠屻�嶅瓧娈典笌鍒� | 鏃狅紙鍘熸湰涓嶅洜璐ㄦ鏀圭姸鎬侊級 |
+| 閿�鍞嚭搴� | 琛屻�屾槸鍚︽楠� / 鍑哄巶妫�楠屽崟 / 璐ㄩ噺鐘舵�併�嶃�佹彁浜ゆ椂鑷姩鍒涘缓 OQC銆丱QC 鍥炲啓涓庝笉鍚堟牸鍙栨秷閫昏緫 | 鎻愪氦锛�0 鑽夌 鈫� 2 寰呮嫞璐э紙涓嶅啀缁忚繃 1 寰呮娴嬶級 |
+| 閿�鍞��璐� | 琛屻�屾槸鍚﹂渶瑕佽川妫� / 閫�璐ф楠屽崟 / 璐ㄩ噺鐘舵�併�嶃�丷QC 鍥炲啓涓庢媶鍒嗚銆佸垪琛ㄣ�屾墽琛岃川妫�銆嶆寜閽� | 鎻愪氦锛�0 鑽夌 鈫� 2 寰呮墽琛岋紙涓嶅啀缁忚繃 1 寰呮楠岋級 |
+
+澶勭悊鍘熷垯锛�
+
+- **鏁版嵁搴撳垪淇濈暀涓嶅垹**锛屾爣娉ㄥ簾寮冿紝閬垮厤鍘嗗彶鍗曟嵁銆佹姤琛ㄥ拰澶栭儴鎺ュ彛鐩存帴鎶ラ敊锛涘鍚庣画纭褰诲簳娓呯悊锛屽啀鍗曠嫭鍑鸿剼鏈��
+- 鍘嗗彶鍗曟嵁涓凡澶勪簬 1锛堝緟妫�楠�/寰呮娴嬶級鐨勫崟鎹細淇濈暀鐘舵�佹灇涓句笌椤甸潰灞曠ず锛屾墜宸ャ�屾墽琛岃川妫�銆嶅叆鍙gЩ闄ゅ悗闇�瑕佷汉宸ユ妸鍦ㄩ�斿崟鎹帹杩涙垨鍙栨秷锛堜笂绾垮墠鐩樼偣涓�娆★級銆�
+- 宸蹭骇鐢熺殑 OQC/RQC 妫�楠屽崟涓嶅垹闄わ紝浣滀负鍘嗗彶鐣欐。锛涗笉鍐嶆柊寤恒��
+- `MesQcSourceDocTypeEnum` 涓殑 `PRODUCT_SALES` / `RETURN_SALES` 鍒嗘敮淇濈暀锛堝巻鍙叉楠屽崟璇︽儏浠嶈鑳芥墦寮�鏉ユ簮鍗曟嵁锛夛紝浣嗕笉鍐嶆湁鏂版暟鎹骇鐢熴��
+
+### 3.3 闇�姹� G锛氭壒娆′繚鐪�
+
+1. **閫�璐ц鍏佽閫夋壒娆�**锛氳琛ㄥ崟鍘绘帀 `disabled: true`锛屾寜鐗╂枡杩囨护 `WmBatchSelect`锛涢�変腑鍚庣敤鎵规 `code` 鍥炲~ `batchCode`銆�
+2. **鍚庣琛ュ叏鎵规鍙�**锛氳淇濆瓨鏃惰嫢 `batchId` 闈炵┖銆乣batchCode` 涓虹┖锛屾寜 `batchId` 鏌� `mes_wm_batch.code` 鍥炲~锛屼繚璇佽涓婁袱鑰呬竴鑷淬��
+3. **涓婃灦鏄庣粏缁ф壙琛岀殑鎵规**锛氭槑缁嗚〃鍗曠殑鎵规鏀逛负鍙灞曠ず锛涘悗绔繚瀛樻槑缁嗘椂**蹇界暐鍓嶇浼犲叆鐨勬壒娆�**锛屽己鍒� `detail.batchId/batchCode = line.batchId/batchCode`锛屼粠鏍逛笂鏉滅粷涓㈠け銆�
+4. **鎵ц涓婃灦鍓嶇疆鏍¢獙**锛氱敓鎴愬簱瀛樹簨鍔″墠鏍¢獙姣忔潯鏄庣粏鐨勬壒娆′笌鎵�灞炶涓�鑷达紙鎵规绠$悊鐗╂枡蹇呴』闈炵┖锛夛紝涓嶄竴鑷寸洿鎺ユ姤閿欏苟鎸囧嚭鐗╂枡銆�
+5. **鍘嗗彶鏁版嵁**锛氶��璐у崟 1 鐨勭墿鏂欐湰韬�夐敊锛堝嚭搴撴槸 114锛岄��璐ф槸 116锛夛紝寤鸿璇ュ崟鎹彇娑堝悗鎸夋柊娴佺▼閲嶅仛锛涘纭渶淇濈暀锛岄渶浜哄伐鎶婅/鏄庣粏鏀瑰洖鐗╂枡 114 + 鎵规 4846066734735277 骞堕噸绠楀簱瀛樸�傛槸鍚︿慨姝g敱涓氬姟纭銆�
+
+## 鍥涖�佹敼鍔ㄦ竻鍗�
+
+### 4.1 鍚庣锛坹udao-module-mes锛�
+
+| 鏂囦欢 | 鏀瑰姩 |
+|------|------|
+| `dal/dataobject/wm/returnsales/MesWmReturnSalesDO` | 澧炲姞 `productSalesId` / `productSalesCode` |
+| `dal/dataobject/wm/returnsales/MesWmReturnSalesLineDO` | 澧炲姞 `productSalesLineId` |
+| `dal/mysql/wm/returnsales/MesWmReturnSalesLineMapper` | 澧炲姞鎸夊嚭搴撹缁熻宸查��鏁伴噺鐨勬柟娉曘�佹寜鍑哄簱琛屾煡璇㈤��璐ц鐨勬柟娉� |
+| `dal/mysql/wm/productsales/MesWmProductSalesLineMapper` | 澧炲姞 `selectListBySalesIds`锛堟壒閲忥級 |
+| `controller/admin/wm/returnsales/vo/MesWmReturnSalesSaveReqVO` 绛� | 澧炲姞鍑哄簱鍗�/鍑哄簱琛屽瓧娈� |
+| `controller/admin/wm/returnsales/MesWmReturnSalesController` | 鏂板鍙��鍗曞垎椤点�佸彲閫�琛屽垪琛ㄤ袱涓帴鍙� |
+| `controller/admin/wm/returnsales/vo/...`锛堟柊澧烇級 | 鍙��鍗� RespVO銆佸彲閫�琛� RespVO |
+| `service/wm/returnsales/MesWmReturnSalesService(Impl)` | 鍑哄簱鍗曟牎楠屻�佸彲閫�鍒嗛〉銆佹彁浜ゆ椂鏁伴噺澶嶆牳銆佸幓鎺夎川妫�鍒嗘敮 |
+| `service/wm/returnsales/MesWmReturnSalesLineService(Impl)` | 鍑哄簱琛屼竴鑷存�ф牎楠屻�佸彲閫�鏁伴噺鏍¢獙銆佹壒娆″彿琛ュ叏銆佸垹闄� RQC 鍥炲啓鏂规硶 |
+| `service/wm/returnsales/MesWmReturnSalesDetailService(Impl)` | 鏄庣粏鎵规寮哄埗缁ф壙琛屻�佷笂鏋跺墠鎵规鏍¢獙 |
+| `service/wm/productsales/MesWmProductSalesService(Impl)` / `LineServiceImpl` | 鍘绘帀 OQC 鍒涘缓涓庡洖鍐欙紝鎻愪氦鐩存帴杩涘緟鎷h揣 |
+| `service/qc/rqc/MesQcRqcServiceImpl` | 淇濈暀鏉ユ簮鍗曟嵁绫诲瀷鍒嗘敮锛屼笉鍐嶄负閫�璐у崟鍒涘缓 RQC |
+| `enums/wm/MesWmReturnSalesStatusEnum` / `MesWmProductSalesStatusEnum` | 淇濈暀 1锛堝緟妫�楠�/寰呮娴嬶級浠呬綔鍘嗗彶鍏煎锛屾敞閲婃爣娉ㄥ簾寮� |
+| `sql/mysql/20261028_return_sales_from_outbound.sql` | 涓婅堪 DDL |
+
+### 4.2 鍓嶇锛坢om-pro2-before锛屽緟鎺堟潈鍚庝慨鏀癸級
+
+| 鏂囦欢 | 鏀瑰姩 |
+|------|------|
+| `views/wls/returnsales/data.ts` | 琛ㄥご鍔犲嚭搴撳崟閫夋嫨锛涜琛ㄥ崟鏀逛负鍑哄簱琛岄�夋嫨銆佹壒娆¤В绂侊紱鍘绘帀璐ㄦ鍒椾笌寮�鍏筹紱琛ㄦ牸鍔犲凡閫�/鍙��鍒� |
+| `views/wls/returnsales/index.vue` | 鍘绘帀銆屾墽琛岃川妫�銆嶆寜閽笌鎻愮ず锛屽彇娑堟寜閽姸鎬佽寖鍥磋皟鏁� |
+| `views/wls/returnsales/modules/line-list.vue` | 娣诲姞鐗╂枡鏀逛负浠庡嚭搴撹閫夋嫨锛堟垨淇濈暀鎵嬪伐 + 鍑哄簱琛屼笅鎷夛級 |
+| `views/wls/returnsales/modules/detail-form.vue` | 鎵规鍙缁ф壙 |
+| `views/wls/productsales/data.ts`銆乣views/wls/salesnotice/data.ts` 鍙婂搴斿瓙缁勪欢 | 鍘绘帀璐ㄦ鍒�/寮�鍏� |
+| `api/mes/wm/returnsales/*` | 澧炲姞鍙��鍗�/鍙��琛屾帴鍙o紝瀛楁鍚屾 |
+
+## 浜斻�佸疄鏂介『搴�
+
+1. DDL + DO/VO 瀛楁锛堝彲涓庣幇鏈夐�昏緫骞跺瓨锛屼笉鐮村潖绾夸笂锛夈��
+2. 鍙��鍗曞垎椤点�佸彲閫�琛屽垪琛ㄦ帴鍙o紙鍙锛屽厛璁╁墠绔兘鑱旇皟锛夈��
+3. 閫�璐у崟淇濆瓨/鎻愪氦鏍¢獙锛堝嚭搴撳崟銆佽銆佹暟閲忋�佹壒娆★級銆�
+4. 涓婃灦鏄庣粏鎵规缁ф壙 + 鍏ュ簱鍓嶆牎楠岋紙淇鎵规涓㈠け锛夈��
+5. 鍘昏川妫�锛氬厛鍏虫帀鏂板崟鎹殑璐ㄦ鍏ュ彛涓庣姸鎬佸垎鏀紝鍐嶆竻鐞嗗巻鍙插湪閫斿崟鎹��
+6. 鍓嶇鏀归�犱笌鑱旇皟銆�
+
+## 鍏�佸緟纭
+
+1. **鍘昏川妫�鑼冨洿**锛氭槸鍚︾‘璁ゅ悓鏃跺幓鎺夈�岄攢鍞嚭搴� OQC銆嶅拰銆屽彂璐ч�氱煡鏄惁妫�楠屻�嶏紝杩樻槸鍙幓鎺夐攢鍞��璐� RQC锛�
+2. **鍑哄簱鍗曠姸鎬佽寖鍥�**锛氭槸鍚﹀彧鍏佽瀵广�屽凡瀹屾垚(4)銆嶇殑閿�鍞嚭搴撳崟閫�璐э紵鏄惁涔熷厑璁搞�屽緟鎵ц鍑哄簱(3)銆嶉鐧昏锛�
+3. **閫�璐х矑搴�**锛氭寜鍑哄簱琛岋紙鐗╂枡+鎵规+鏁伴噺锛夊嵆鍙紝杩樻槸闇�瑕佹寜鍑哄簱鏄庣粏锛堝惈琚嬬爜銆佸簱鍖哄簱浣嶏級閫愪欢閫�鍥烇紵
+4. **鏁版嵁搴撹川妫�鍒�**锛氫繚鐣欏簾寮冿紙寤鸿锛夎繕鏄垹闄わ紵
+5. **閫�璐у崟 1 鏁版嵁**锛氬彇娑堥噸鍋氾紝杩樻槸浜哄伐淇鐗╂枡涓庢壒娆★紵
+6. 鍞悗妯″潡閫氳繃 RPC 鍒涘缓鐨勯��璐у崟鏄惁鍏佽娌℃湁鍑哄簱鍗曞叧鑱旓紙寤鸿鍏佽锛屽惁鍒欏敭鍚庢祦绋嬩細琚樆鏂級锛�
diff --git a/docs/sale_return_from_outbound_frontend.md b/docs/sale_return_from_outbound_frontend.md
new file mode 100644
index 0000000..73cf835
--- /dev/null
+++ b/docs/sale_return_from_outbound_frontend.md
@@ -0,0 +1,240 @@
+# 閿�鍞��璐ф寜鍑哄簱鍗曢��璐� + 閿�鍞粨搴撳幓璐ㄦ - 鍓嶇鑱旇皟鏂规
+
+## 娑夊強椤甸潰
+
+- 閿�鍞粨搴� / 閿�鍞��璐э細鍒楄〃銆佹柊澧�/缂栬緫銆佽鎯呫�佷笂鏋舵槑缁嗗脊绐�
+- 閿�鍞粨搴� / 閿�鍞嚭搴擄細鍒楄〃銆佹柊澧�/缂栬緫銆佽鎯�
+- 閿�鍞粨搴� / 鍙戣揣閫氱煡锛氬垪琛ㄣ�佹柊澧�/缂栬緫銆佽鎯�
+
+## 涓氬姟娴佺▼涓庢暟鎹甫鍏�
+
+1. 鏂板閫�璐у崟锛氶�夋嫨**閿�鍞嚭搴撳崟**锛堜粎宸插畬鎴愮姸鎬併�佸瓨鍦ㄥ彲閫�琛岋級鈫� 鍑哄簱鍗曞彿銆佸鎴枫�佸彲閫�琛岃嚜鍔ㄥ甫鍏ラ��璐у崟銆�
+2. 鍑哄簱鍗� -> 閫�璐ц锛氱墿鏂欍�佹壒娆°�佹壒娆″彿銆佸嚭搴撴暟閲忋�佸凡閫�鏁伴噺銆佸彲閫�鏁伴噺鍧囨潵鑷嚭搴撹锛岄��璐ф暟閲忛粯璁ょ瓑浜庡彲閫�鏁伴噺銆佷笂闄愪负鍙��鏁伴噺銆�
+3. 閫�璐ц -> 涓婃灦鏄庣粏锛氱墿鏂欍�佹壒娆′笉鍙紪杈戯紝鍏ㄩ儴鐢遍��璐ц甯﹀叆锛涘彧闇�濉啓浠撳簱/搴撳尯/搴撲綅/鏁伴噺銆�
+4. 鎻愪氦閫�璐у崟锛氫笉鍐嶇粡杩囪川妫�锛岀姸鎬佺洿鎺ョ敱銆岃崏绋裤�嶅彉涓恒�屽緟鎵ц銆嶃��
+5. 鎵ц閫�璐� -> 鎵ц涓婃灦锛氫笂鏋舵槑缁嗙殑鎵规涓庨��璐ц鎵规淇濇寔涓�鑷达紝鍏ュ簱娴佹按鎼哄甫鎵规鍙枫��
+
+## API
+
+### 1. 鍙��閿�鍞嚭搴撳崟鍒嗛〉锛堟柊澧烇級
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|------|------|------|
+| GET | `/mes/wm/return-sales/returnable-product-sales-page` | 浠呰繑鍥炲凡瀹屾垚涓斿瓨鍦ㄥ彲閫�琛岋紙鍑哄簱鏁伴噺 > 宸查��鏁伴噺锛夌殑閿�鍞嚭搴撳崟 |
+
+**璇锋眰鍙傛暟锛�**
+
+| 鍙傛暟 | 绫诲瀷 | 蹇呭~ | 璇存槑 |
+|------|------|------|------|
+| pageNo | Integer | 鏄� | 椤电爜 |
+| pageSize | Integer | 鏄� | 姣忛〉鏉℃暟 |
+| code | String | 鍚� | 鍑哄簱鍗曞彿锛堟ā绯婏級 |
+| name | String | 鍚� | 鍑哄簱鍗曞悕绉帮紙妯$硦锛� |
+| clientId | Long | 鍚� | 瀹㈡埛 ID |
+| shipmentDate | Date[] | 鍚� | 鍑哄簱鏃ユ湡鑼冨洿 |
+| outboundTime | DateTime[] | 鍚� | 瀹為檯鍑哄簱鏃堕棿鑼冨洿 |
+
+**鍝嶅簲瀛楁锛�**
+
+| 瀛楁 | 绫诲瀷 | 璇存槑 |
+|------|------|------|
+| id | Long | 閿�鍞嚭搴撳崟 ID |
+| code | String | 鍑哄簱鍗曞彿 |
+| name | String | 鍑哄簱鍗曞悕绉� |
+| clientId | Long | 瀹㈡埛 ID |
+| clientName | String | 瀹㈡埛鍚嶇О |
+| salesDate | DateTime | 鍑哄簱鏃ユ湡 |
+| outboundTime | DateTime | 瀹為檯鍑哄簱鏃堕棿 |
+
+**鍝嶅簲绀轰緥锛�**
+
+```json
+{
+ "code": 0,
+ "data": {
+ "list": [
+ {
+ "id": 1,
+ "code": "PS2026030001",
+ "name": "浜у搧鍑哄簱鍗�",
+ "clientId": 10,
+ "clientName": "XX瀹㈡埛",
+ "salesDate": "2026-03-01 00:00:00",
+ "outboundTime": "2026-03-02 10:00:00"
+ }
+ ],
+ "total": 1
+ }
+}
+```
+
+### 2. 閿�鍞嚭搴撳崟鍙��琛屽垪琛紙鏂板锛�
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|------|------|------|
+| GET | `/mes/wm/return-sales/returnable-product-sales-line-list` | 杩斿洖鎸囧畾鍑哄簱鍗曚腑鍙��鏁伴噺澶т簬 0 鐨勮 |
+
+**璇锋眰鍙傛暟锛�**
+
+| 鍙傛暟 | 绫诲瀷 | 蹇呭~ | 璇存槑 |
+|------|------|------|------|
+| productSalesId | Long | 鏄� | 閿�鍞嚭搴撳崟 ID |
+
+**鍝嶅簲瀛楁锛�**
+
+| 瀛楁 | 绫诲瀷 | 璇存槑 |
+|------|------|------|
+| productSalesLineId | Long | 閿�鍞嚭搴撳崟琛� ID锛堥��璐ц蹇呴』鎼哄甫锛� |
+| salesId | Long | 閿�鍞嚭搴撳崟 ID |
+| itemId | Long | 鐗╂枡 ID |
+| itemCode | String | 鐗╂枡缂栫爜 |
+| itemName | String | 鐗╂枡鍚嶇О |
+| itemSpecification | String | 瑙勬牸鍨嬪彿 |
+| itemUnit | String | 璁¢噺鍗曚綅 |
+| batchId | Long | 鎵规 ID |
+| batchCode | String | 鎵规鍙� |
+| outboundQuantity | BigDecimal | 鍑哄簱鏁伴噺 |
+| returnedQuantity | BigDecimal | 宸查��鏁伴噺锛堜笉鍚凡鍙栨秷閫�璐у崟锛� |
+| returnableQuantity | BigDecimal | 鍙��鏁伴噺 = 鍑哄簱鏁伴噺 - 宸查��鏁伴噺 |
+
+**鍝嶅簲绀轰緥锛�**
+
+```json
+{
+ "code": 0,
+ "data": [
+ {
+ "productSalesLineId": 21,
+ "salesId": 1,
+ "itemId": 114,
+ "itemCode": "M001",
+ "itemName": "鐗╂枡A",
+ "itemSpecification": "100*200",
+ "itemUnit": "涓�",
+ "batchId": 4846066734735277,
+ "batchCode": "4846066734735277",
+ "outboundQuantity": 100.00,
+ "returnedQuantity": 0.00,
+ "returnableQuantity": 100.00
+ }
+ ]
+}
+```
+
+### 3. 閫�璐у崟淇濆瓨锛堝瓧娈垫柊澧烇級
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|------|------|------|
+| POST | `/mes/wm/return-sales/create` | 鍒涘缓閫�璐у崟 |
+| PUT | `/mes/wm/return-sales/update` | 淇敼閫�璐у崟 |
+
+**璇锋眰鍙傛暟鏂板锛�**
+
+| 鍙傛暟 | 绫诲瀷 | 蹇呭~ | 璇存槑 |
+|------|------|------|------|
+| productSalesId | Long | 鍚� | 閿�鍞嚭搴撳崟 ID锛涗紶浜嗗垯蹇呴』浠庤鍑哄簱鍗曠殑鍙��琛屼腑閫夋嫨閫�璐ц |
+
+`productSalesCode` 鐢卞悗绔牴鎹嚭搴撳崟鍥炲~锛屽墠绔棤闇�浼犮��
+
+**鍝嶅簲瀛楁鏂板锛堣鎯�/鍒楄〃锛夛細**
+
+| 瀛楁 | 绫诲瀷 | 璇存槑 |
+|------|------|------|
+| productSalesId | Long | 閿�鍞嚭搴撳崟 ID |
+| productSalesCode | String | 閿�鍞嚭搴撳崟鍙� |
+
+**娉ㄦ剰锛�** 閫�璐у崟宸插瓨鍦ㄩ��璐ц鏃讹紝涓嶅厑璁告洿鎹� `productSalesId`銆�
+
+### 4. 閫�璐ц淇濆瓨锛堝瓧娈垫柊澧�/鍙樻洿锛�
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|------|------|------|
+| POST | `/mes/wm/return-sales-line/create` | 鍒涘缓閫�璐ц |
+| PUT | `/mes/wm/return-sales-line/update` | 淇敼閫�璐ц |
+
+**璇锋眰鍙傛暟鏂板锛�**
+
+| 鍙傛暟 | 绫诲瀷 | 蹇呭~ | 璇存槑 |
+|------|------|------|------|
+| productSalesLineId | Long | 鏉′欢蹇呭~ | 閫�璐у崟鍏宠仈浜嗗嚭搴撳崟鏃跺繀濉� |
+
+**璇锋眰鍙傛暟绉婚櫎锛�**
+
+| 鍙傛暟 | 璇存槑 |
+|------|------|
+| rqcCheckFlag | 閿�鍞粨搴撲笉鍐嶈川妫�锛岄��璐ц涓嶅啀闇�瑕佽瀛楁 |
+
+**瀛楁甯﹀叆瑙勫垯锛�**
+
+| 瀛楁 | 瑙勫垯 |
+|------|------|
+| itemId | 鍚庣浠ュ嚭搴撹鐨勭墿鏂欎负鍑嗭紝鍓嶇浼犲�间細琚鐩� |
+| batchId / batchCode | 鍚庣浠ュ嚭搴撹鐨勬壒娆′负鍑嗭紝鍓嶇浼犲�间細琚鐩� |
+| quantity | 蹇呴』澶т簬 0 涓斾笉瓒呰繃鍙��鏁伴噺 |
+
+### 5. 閫�璐у崟鎻愪氦锛堣涓哄彉鏇达級
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|------|------|------|
+| PUT | `/mes/wm/return-sales/submit` | 鎻愪氦鍚庣姸鎬佺洿鎺ュ彉涓恒�屽緟鎵ц銆嶏紝涓嶅啀缁忚繃銆屽緟妫�楠屻�� |
+
+**鏍¢獙锛�** 鎻愪氦鏃朵細閲嶆柊鏍¢獙閫�璐ц涓庡嚭搴撳崟鐨勫綊灞炲叧绯伙紝浠ュ強鍚勮鏁伴噺涔嬪拰涓嶈秴杩囧彲閫�鏁伴噺锛涜崏绋挎湡闂磋鍏跺畠閫�璐у崟鍗犵敤鏃朵細鎻愮ず銆岄��璐ф暟閲忎笉鑳借秴杩囧彲閫�鏁伴噺銆嶃��
+
+### 6. 涓婃灦鏄庣粏淇濆瓨锛堣涓哄彉鏇达級
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|------|------|------|
+| POST | `/mes/wm/return-sales-detail/create` | 涓婃灦鏄庣粏 |
+| PUT | `/mes/wm/return-sales-detail/update` | 涓婃灦鏄庣粏 |
+
+**瑙勫垯鍙樻洿锛�**
+
+| 瀛楁 | 瑙勫垯 |
+|------|------|
+| itemId | 浠ラ��璐ц涓哄噯锛屽墠绔紶鍊间細琚鐩� |
+| batchId / batchCode | 浠ラ��璐ц涓哄噯锛涗紶鍏ヤ笌琛屼笉涓�鑷寸殑鎵规浼氭姤閿欍�屼笂鏋舵槑缁嗙殑鎵规蹇呴』涓庨��璐ц鎵规涓�鑷淬�� |
+| quantity | 涓嶈秴杩囬��璐ц鏁伴噺 |
+
+涓婃灦鏄庣粏琛ㄥ崟涓殑鎵规搴旀敼涓哄彧璇诲睍绀猴紝涓嶅啀鎻愪緵鎵规閫夋嫨/鎵嬪伐杈撳叆銆�
+
+### 7. 閿�鍞嚭搴� / 鍙戣揣閫氱煡锛堣川妫�鐩稿叧鎺ュ彛淇濈暀浣嗕笉鍐嶄娇鐢級
+
+| 鍦烘櫙 | 鍙樻洿 |
+|------|------|
+| 閿�鍞嚭搴撴彁浜� | 鐩存帴鐢便�岃崏绋裤�嶅彉涓恒�屽緟鎷h揣銆嶏紝涓嶅啀鐢熸垚 OQC 妫�楠屽崟 |
+| 閿�鍞嚭搴撹缂栬緫 | 涓嶅啀鑷姩鍒涘缓 OQC 妫�楠屽崟 |
+| 鍙戣揣閫氱煡鐢熸垚閿�鍞嚭搴� | 涓嶅啀澶嶅埗璐ㄦ鏍囪瘑鍒板嚭搴撹 |
+| 閫�璐у崟鎻愪氦 | 涓嶅啀杩涘叆銆屽緟妫�楠屻�嶏紝涓嶅啀鐢熸垚 RQC 妫�楠屽崟 |
+
+## 瀛楁灞曠ず瑙勫垯
+
+| 瀛楁 | 灞曠ず浣嶇疆 | 璇存槑 |
+|------|----------|------|
+| 閿�鍞嚭搴撳崟鍙� | 閫�璐у崟鍒楄〃銆佽鎯� | 鏂板鍒楋紝灞曠ず `productSalesCode` |
+| 鍑哄簱鍗曢�夋嫨 | 鏂板/缂栬緫閫�璐у崟 | 蹇呭~锛堟柊娴佺▼锛夛紝鍙灞曠ず閫変腑鍑哄簱鍗� |
+| 鍙��琛岄�夋嫨 | 鏂板/缂栬緫閫�璐у崟 | 鐐瑰嚮銆岄�夋嫨鍑哄簱琛屻�嶆墦寮�鍙��琛屽脊绐� |
+| 鍑哄簱鏁伴噺 | 鍙��琛屽脊绐� | 鏉ヨ嚜 `outboundQuantity` |
+| 宸查��鏁伴噺 | 鍙��琛屽脊绐� | 鏉ヨ嚜 `returnedQuantity` |
+| 鍙��鏁伴噺 | 鍙��琛屽脊绐椼�侀��璐ц | 鏉ヨ嚜 `returnableQuantity`锛岄��璐ф暟閲忎笉鑳借秴杩囪鍊� |
+| 鎵规鍙� | 閫�璐ц銆佷笂鏋舵槑缁� | 鍙锛屾潵鑷嚭搴撹 |
+| 璐ㄦ鐘舵�� | 閫�璐у崟銆侀攢鍞嚭搴撳垪琛� | 涓嶅啀灞曠ず璐ㄦ鐘舵�佸垪 |
+
+## 涓氬姟瑙勫垯璇存槑
+
+| 鍦烘櫙 | 瑙勫垯 |
+|------|------|
+| 鍙�夊嚭搴撳崟鑼冨洿 | 浠呫�屽凡瀹屾垚銆嶇姸鎬侊紝涓旇嚦灏戞湁涓�琛屽彲閫�鏁伴噺澶т簬 0 |
+| 鍙��鏁伴噺 | 鍑哄簱琛屾暟閲� - 璇ヨ鎵�鏈夋湭鍙栨秷閫�璐у崟鐨勯��璐ф暟閲忎箣鍜� |
+| 閫�璐ц鏉ユ簮 | 鍏宠仈浜嗗嚭搴撳崟鐨勯��璐у崟锛屾墍鏈夎蹇呴』鏉ヨ嚜璇ュ嚭搴撳崟 |
+| 閲嶅閫�璐� | 澶氭閫�璐х疮璁′笉瓒呰繃鍑哄簱鏁伴噺 |
+| 鎵规娴佽浆 | 鍑哄簱琛屾壒娆� 鈫� 閫�璐ц鎵规 鈫� 涓婃灦鏄庣粏鎵规 鈫� 鍏ュ簱娴佹按鎵规锛屽叏绋嬩竴鑷� |
+| 鐘舵�佹祦杞� | 鑽夌(0) 鈫� 寰呮墽琛�(2) 鈫� 寰呬笂鏋�(3) 鈫� 宸插畬鎴�(4)锛涘彇娑�(5) |
+| 鍞悗鏉ユ簮閫�璐у崟 | 鍞悗妯″潡鍒涘缓鐨勯��璐у崟娌℃湁鍑哄簱鍗曚笂涓嬫枃锛宍productSalesId` 涓虹┖锛屼粛璧板師娴佺▼ |
+
+## 娉ㄦ剰浜嬮」
+
+- 鏂板閫�璐у崟鏃惰嫢鏈�夋嫨閿�鍞嚭搴撳崟锛屽悗绔笉浼氬己鍒惰姹� `productSalesLineId`锛屼絾鍓嶇鏂版祦绋嬪簲寮曞鐢ㄦ埛鍏堥�夊嚭搴撳崟銆�
+- 鍙��琛屽脊绐楁暟鎹渶鍦ㄦ瘡娆℃墦寮�鏃堕噸鏂版媺鍙栵紝閬垮厤鐢ㄦ埛鍋滅暀鏈熼棿琚叾瀹冮��璐у崟鍗犵敤瀵艰嚧鎻愪氦澶辫触銆�
+- 閫�璐ф暟閲忛粯璁ゅ甫鍏ュ彲閫�鏁伴噺锛岀敤鎴峰彲灏忎簬璇ュ�硷紱瓒呰繃浼氬湪淇濆瓨鍜屾彁浜ゆ椂鍚勬牎楠屼竴娆°��
+- 涓婃灦鏄庣粏鐨勬壒娆″瓧娈靛繀椤绘敼涓哄彧璇伙紝閬垮厤鐢ㄦ埛鎵嬪伐濉啓瀵艰嚧鎵规鏍¢獙澶辫触銆�
+- 閿�鍞嚭搴撱�佸彂璐ч�氱煡椤甸潰鐨勮川妫�寮�鍏炽�佽川妫�鐘舵�佸垪銆佽川妫�鍗曞叆鍙i渶瑕佷竴骞剁Щ闄わ紝鍚﹀垯浼氫骇鐢熸案杩滄棤娉曟帹杩涚殑銆屽緟妫�娴嬨�嶇姸鎬佸叆鍙c��
diff --git a/sql/mysql/20261028_return_sales_from_outbound.sql b/sql/mysql/20261028_return_sales_from_outbound.sql
new file mode 100644
index 0000000..3de3da1
--- /dev/null
+++ b/sql/mysql/20261028_return_sales_from_outbound.sql
@@ -0,0 +1,12 @@
+-- 閿�鍞��璐ф敼閫狅細閫�璐у崟鍏宠仈閿�鍞嚭搴撳崟锛堟寜鍑哄簱琛岄��璐э級
+-- 璇存槑锛歱roduct_sales_id 鍏佽涓虹┖锛屽吋瀹瑰敭鍚庢ā鍧楅�氳繃 RPC 鍒涘缓鐨勯��璐у崟
+
+ALTER TABLE mes_wm_return_sales
+ ADD COLUMN product_sales_id BIGINT NULL COMMENT '閿�鍞嚭搴撳崟缂栧彿' AFTER sale_order_id,
+ ADD COLUMN product_sales_code VARCHAR(100) NULL COMMENT '閿�鍞嚭搴撳崟鍙凤紙鍐椾綑锛�' AFTER product_sales_id;
+
+ALTER TABLE mes_wm_return_sales_line
+ ADD COLUMN product_sales_line_id BIGINT NULL COMMENT '閿�鍞嚭搴撳崟琛岀紪鍙�' AFTER return_id;
+
+CREATE INDEX idx_return_sales_product_sales ON mes_wm_return_sales (product_sales_id);
+CREATE INDEX idx_return_sales_line_product_sales_line ON mes_wm_return_sales_line (product_sales_line_id);
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesController.java
index 3738d85..ae596ba 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesController.java
@@ -10,9 +10,13 @@
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
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.controller.admin.wm.productsales.vo.MesWmProductSalesPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnableProductSalesLineRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnableProductSalesRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDO;
import cn.iocoder.yudao.module.mes.service.wm.returnsales.MesWmReturnSalesService;
import io.swagger.v3.oas.annotations.Operation;
@@ -138,6 +142,25 @@
return success(true);
}
+ @GetMapping("/returnable-product-sales-page")
+ @Operation(summary = "鑾峰緱鍙��閿�鍞嚭搴撳崟鍒嗛〉", description = "浠呭凡瀹屾垚鐘舵�侊紝涓斿瓨鍦ㄥ彲閫�鏁伴噺澶т簬 0 鐨勮")
+ @PreAuthorize("@ss.hasPermission('mes:wm-return-sales:query')")
+ public CommonResult<PageResult<MesWmReturnableProductSalesRespVO>> getReturnableProductSalesPage(
+ @Valid MesWmProductSalesPageReqVO pageReqVO) {
+ PageResult<MesWmProductSalesDO> pageResult = returnSalesService.getReturnableProductSalesPage(pageReqVO);
+ List<MesWmReturnableProductSalesRespVO> list = buildReturnableProductSalesRespVOList(pageResult.getList());
+ return success(new PageResult<>(list, pageResult.getTotal()));
+ }
+
+ @GetMapping("/returnable-product-sales-line-list")
+ @Operation(summary = "鑾峰緱閿�鍞嚭搴撳崟鍙��琛屽垪琛�")
+ @Parameter(name = "productSalesId", description = "閿�鍞嚭搴撳崟缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:wm-return-sales:query')")
+ public CommonResult<List<MesWmReturnableProductSalesLineRespVO>> getReturnableProductSalesLineList(
+ @RequestParam("productSalesId") Long productSalesId) {
+ return success(returnSalesService.getReturnableProductSalesLineList(productSalesId));
+ }
+
@GetMapping("/check-quantity")
@Operation(summary = "鏍¢獙閿�鍞��璐у崟鏁伴噺", description = "鏍¢獙姣忚鏄庣粏鏁伴噺涔嬪拰鏄惁绛変簬琛岄��璐ф暟閲�")
@Parameter(name = "id", description = "缂栧彿", required = true)
@@ -161,4 +184,16 @@
vo.setClientName(customer.getName())));
}
+ private List<MesWmReturnableProductSalesRespVO> buildReturnableProductSalesRespVOList(
+ List<MesWmProductSalesDO> list) {
+ if (CollUtil.isEmpty(list)) {
+ return Collections.emptyList();
+ }
+ Map<Long, CrmCustomerRespDTO> customerMap = crmCustomerApi.getCustomerMap(
+ convertSet(list, MesWmProductSalesDO::getClientId));
+ return BeanUtils.toBean(list, MesWmReturnableProductSalesRespVO.class, vo ->
+ MapUtils.findAndThen(customerMap, vo.getClientId(), customer ->
+ vo.setClientName(customer.getName())));
+ }
+
}
\ No newline at end of file
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesRespVO.java
index dbd8d3f..d7c95b7 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesRespVO.java
@@ -30,6 +30,12 @@
@Schema(description = "瀹㈡埛鍚嶇О", example = "XX瀹㈡埛")
private String clientName;
+ @Schema(description = "閿�鍞嚭搴撳崟 ID", example = "1")
+ private Long productSalesId;
+
+ @Schema(description = "閿�鍞嚭搴撳崟鍙�", example = "PS2026030001")
+ private String productSalesCode;
+
@Schema(description = "閫�璐ф棩鏈�")
private LocalDate returnDate;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesSaveReqVO.java
index a267c62..4b98472 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesSaveReqVO.java
@@ -31,6 +31,12 @@
@NotNull(message = "瀹㈡埛 ID 涓嶈兘涓虹┖")
private Long clientId;
+ @Schema(description = "閿�鍞嚭搴撳崟 ID", example = "1")
+ private Long productSalesId;
+
+ @Schema(description = "閿�鍞嚭搴撳崟鍙凤紙鍚庣鏍规嵁鍑哄簱鍗曞洖濉紝鍓嶇鏃犻渶浼狅級", example = "PS2026030001")
+ private String productSalesCode;
+
@Schema(description = "閫�璐ф棩鏈�", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "閫�璐ф棩鏈熶笉鑳戒负绌�")
private LocalDate returnDate;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnableProductSalesLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnableProductSalesLineRespVO.java
new file mode 100644
index 0000000..4a6baf8
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnableProductSalesLineRespVO.java
@@ -0,0 +1,53 @@
+package cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 绠$悊鍚庡彴 - 鍙��閿�鍞嚭搴撳崟琛� Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鍙��閿�鍞嚭搴撳崟琛� Response VO")
+@Data
+public class MesWmReturnableProductSalesLineRespVO {
+
+ @Schema(description = "閿�鍞嚭搴撳崟琛� ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ private Long productSalesLineId;
+
+ @Schema(description = "閿�鍞嚭搴撳崟 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ private Long salesId;
+
+ @Schema(description = "鐗╂枡 ID", example = "1")
+ private Long itemId;
+
+ @Schema(description = "鐗╂枡缂栫爜", example = "M001")
+ private String itemCode;
+
+ @Schema(description = "鐗╂枡鍚嶇О", example = "鐗╂枡A")
+ private String itemName;
+
+ @Schema(description = "瑙勬牸鍨嬪彿", example = "100*200")
+ private String itemSpecification;
+
+ @Schema(description = "璁¢噺鍗曚綅", example = "涓�")
+ private String itemUnit;
+
+ @Schema(description = "鎵规 ID", example = "1")
+ private Long batchId;
+
+ @Schema(description = "鎵规鍙�", example = "B20250101")
+ private String batchCode;
+
+ @Schema(description = "鍑哄簱鏁伴噺", example = "100.00")
+ private BigDecimal outboundQuantity;
+
+ @Schema(description = "宸查��鏁伴噺", example = "10.00")
+ private BigDecimal returnedQuantity;
+
+ @Schema(description = "鍙��鏁伴噺", example = "90.00")
+ private BigDecimal returnableQuantity;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnableProductSalesRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnableProductSalesRespVO.java
new file mode 100644
index 0000000..402af22
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnableProductSalesRespVO.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 绠$悊鍚庡彴 - 鍙��閿�鍞嚭搴撳崟 Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鍙��閿�鍞嚭搴撳崟 Response VO")
+@Data
+public class MesWmReturnableProductSalesRespVO {
+
+ @Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ private Long id;
+
+ @Schema(description = "鍑哄簱鍗曞彿", example = "PS2026030001")
+ private String code;
+
+ @Schema(description = "鍑哄簱鍗曞悕绉�", example = "浜у搧鍑哄簱鍗�")
+ private String name;
+
+ @Schema(description = "瀹㈡埛 ID", example = "1")
+ private Long clientId;
+
+ @Schema(description = "瀹㈡埛鍚嶇О", example = "XX瀹㈡埛")
+ private String clientName;
+
+ @Schema(description = "鍑哄簱鏃ユ湡")
+ private LocalDateTime salesDate;
+
+ @Schema(description = "瀹為檯鍑哄簱鏃堕棿")
+ private LocalDateTime outboundTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineRespVO.java
index 15693e3..3dfec38 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineRespVO.java
@@ -21,6 +21,9 @@
@Schema(description = "閫�璐у崟ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long returnId;
+ @Schema(description = "閿�鍞嚭搴撳崟琛� ID", example = "1")
+ private Long productSalesLineId;
+
@Schema(description = "鐗╂枡ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long itemId;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineSaveReqVO.java
index 07496ac..a4137c5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineSaveReqVO.java
@@ -23,6 +23,9 @@
@NotNull(message = "閫�璐у崟ID涓嶈兘涓虹┖")
private Long returnId;
+ @Schema(description = "閿�鍞嚭搴撳崟琛� ID", example = "1")
+ private Long productSalesLineId;
+
@Schema(description = "鐗╂枡ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "鐗╂枡ID涓嶈兘涓虹┖")
private Long itemId;
@@ -37,9 +40,6 @@
@Schema(description = "鎵规鍙�", example = "B20250101")
private String batchCode;
-
- @Schema(description = "鏄惁闇�瑕佽川妫�", example = "true")
- private Boolean rqcCheckFlag;
@Schema(description = "澶囨敞", example = "澶囨敞")
private String remark;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesDO.java
index d26f69b..8e61aa5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesDO.java
@@ -45,6 +45,17 @@
*/
private Long clientId;
/**
+ * 閿�鍞嚭搴撳崟 ID
+ *
+ * 鍏宠仈 {@link cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO#getId()}
+ * 鍏佽涓虹┖锛氬敭鍚庢ā鍧楀垱寤虹殑閫�璐у崟娌℃湁鍑哄簱鍗曚笂涓嬫枃
+ */
+ private Long productSalesId;
+ /**
+ * 閿�鍞嚭搴撳崟鍙凤紙鍐椾綑锛�
+ */
+ private String productSalesCode;
+ /**
* 閫�璐ф棩鏈�
*/
private LocalDate returnDate;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesLineDO.java
index 648d85c..568aca2 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesLineDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesLineDO.java
@@ -37,6 +37,13 @@
*/
private Long returnId;
/**
+ * 閿�鍞嚭搴撳崟琛� ID
+ *
+ * 鍏宠仈 {@link cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesLineDO#getId()}
+ * 鍏佽涓虹┖锛氬敭鍚庢ā鍧楀垱寤虹殑閫�璐у崟娌℃湁鍑哄簱鍗曚笂涓嬫枃
+ */
+ private Long productSalesLineId;
+ /**
* 鐗╂枡 ID
*
* 鍏宠仈 {@link MesMdItemDO#getId()}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesMapper.java
index 013c8cd..66c4d93 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productsales/MesWmProductSalesMapper.java
@@ -54,6 +54,35 @@
return selectPage(reqVO, wrapper);
}
+ /**
+ * 鍒嗛〉鏌ヨ鍙��閿�鍞嚭搴撳崟锛氫粎宸插畬鎴愮姸鎬侊紝涓斿瓨鍦ㄣ�屽嚭搴撴暟閲� > 宸查��鏁伴噺銆嶇殑琛�
+ */
+ default PageResult<MesWmProductSalesDO> selectReturnablePage(MesWmProductSalesPageReqVO reqVO,
+ Integer finishedStatus, Integer canceledStatus,
+ List<Long> permittedClientIds) {
+ LambdaQueryWrapperX<MesWmProductSalesDO> wrapper = new LambdaQueryWrapperX<MesWmProductSalesDO>()
+ .likeIfPresent(MesWmProductSalesDO::getCode, reqVO.getCode())
+ .likeIfPresent(MesWmProductSalesDO::getName, reqVO.getName())
+ .eqIfPresent(MesWmProductSalesDO::getClientId, reqVO.getClientId())
+ .eq(MesWmProductSalesDO::getStatus, finishedStatus)
+ .betweenIfPresent(MesWmProductSalesDO::getSalesDate, reqVO.getShipmentDate())
+ .betweenIfPresent(MesWmProductSalesDO::getOutboundTime, reqVO.getOutboundTime());
+ if (permittedClientIds != null) {
+ if (CollUtil.isEmpty(permittedClientIds)) {
+ return PageResult.empty();
+ }
+ wrapper.in(MesWmProductSalesDO::getClientId, permittedClientIds);
+ }
+ wrapper.apply("EXISTS (SELECT 1 FROM mes_wm_product_sales_line psl " +
+ "WHERE psl.deleted = 0 AND psl.sales_id = mes_wm_product_sales.id AND psl.quantity > " +
+ "(SELECT IFNULL(SUM(rl.quantity), 0) FROM mes_wm_return_sales_line rl " +
+ "INNER JOIN mes_wm_return_sales rs ON rs.id = rl.return_id AND rs.deleted = 0 " +
+ "WHERE rl.deleted = 0 AND rl.product_sales_line_id = psl.id AND rs.status != {0}))",
+ canceledStatus);
+ wrapper.orderByDesc(MesWmProductSalesDO::getId);
+ return selectPage(reqVO, wrapper);
+ }
+
default MesWmProductSalesDO selectByCode(String code) {
return selectOne(MesWmProductSalesDO::getCode, code);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnsales/MesWmReturnSalesLineMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnsales/MesWmReturnSalesLineMapper.java
index d097aa0..086a34f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnsales/MesWmReturnSalesLineMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnsales/MesWmReturnSalesLineMapper.java
@@ -1,12 +1,17 @@
package cn.iocoder.yudao.module.mes.dal.mysql.wm.returnsales;
+import cn.iocoder.yudao.framework.common.core.KeyValue;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.line.MesWmReturnSalesLinePageReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesLineDO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import java.math.BigDecimal;
+import java.util.Collection;
import java.util.List;
/**
@@ -34,4 +39,31 @@
.eq(MesWmReturnSalesLineDO::getReturnId, returnId));
}
+ default List<MesWmReturnSalesLineDO> selectListByProductSalesLineIds(Collection<Long> productSalesLineIds) {
+ return selectList(new LambdaQueryWrapperX<MesWmReturnSalesLineDO>()
+ .in(MesWmReturnSalesLineDO::getProductSalesLineId, productSalesLineIds));
+ }
+
+ /**
+ * 缁熻姣忎釜閿�鍞嚭搴撹宸茶閫�璐х殑鏁伴噺锛氭帓闄ゅ凡鍙栨秷鐨勯��璐у崟鍜屽凡鍒犻櫎鐨勮
+ *
+ * @param productSalesLineIds 閿�鍞嚭搴撹 ID 闆嗗悎
+ * @param canceledStatus 閫�璐у崟宸插彇娑堢姸鎬�
+ * @param excludeReturnId 闇�瑕佹帓闄ょ殑閫�璐у崟 ID锛堟牎楠屽綋鍓嶉��璐у崟鑷韩鐨勫彲閫�鏁伴噺鏃朵娇鐢級锛屽彲涓虹┖
+ * @return key=閿�鍞嚭搴撹 ID锛寁alue=宸查��鏁伴噺
+ */
+ @Select("<script>" +
+ "SELECT rl.product_sales_line_id AS `key`, IFNULL(SUM(rl.quantity), 0) AS `value` " +
+ "FROM mes_wm_return_sales_line rl " +
+ "INNER JOIN mes_wm_return_sales rs ON rs.id = rl.return_id AND rs.deleted = 0 AND rs.status != #{canceledStatus} " +
+ "<if test='excludeReturnId != null'>AND rs.id != #{excludeReturnId} </if>" +
+ "WHERE rl.deleted = 0 AND rl.product_sales_line_id IN " +
+ "<foreach collection='productSalesLineIds' item='id' open='(' separator=',' close=')'>#{id}</foreach> " +
+ "GROUP BY rl.product_sales_line_id" +
+ "</script>")
+ List<KeyValue<Long, BigDecimal>> selectReturnedQuantityList(
+ @Param("productSalesLineIds") Collection<Long> productSalesLineIds,
+ @Param("canceledStatus") Integer canceledStatus,
+ @Param("excludeReturnId") Long excludeReturnId);
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
index 7bac19f..91fd6d6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
@@ -672,8 +672,16 @@
ErrorCode WM_RETURN_SALES_DETAIL_QUANTITY_MISMATCH = new ErrorCode(1_040_713_006, "閿�鍞��璐у崟琛屾暟閲忎笌鏄庣粏鏁伴噺涓嶄竴鑷�");
ErrorCode WM_RETURN_SALES_CANCEL_NOT_ALLOWED = new ErrorCode(1_040_713_007, "閿�鍞��璐у崟宸插畬鎴愭垨宸插彇娑堬紝鏃犳硶鍙栨秷");
ErrorCode WM_RETURN_SALES_LINE_NOT_EXISTS = new ErrorCode(1_040_713_100, "閿�鍞��璐у崟琛屼笉瀛樺湪");
+ ErrorCode WM_RETURN_SALES_PRODUCT_SALES_NOT_EXISTS = new ErrorCode(1_040_713_008, "閿�鍞嚭搴撳崟涓嶅瓨鍦�");
+ ErrorCode WM_RETURN_SALES_PRODUCT_SALES_NOT_FINISHED = new ErrorCode(1_040_713_009, "鍙湁宸插畬鎴愮姸鎬佺殑閿�鍞嚭搴撳崟鎵嶅厑璁搁��璐�");
+ ErrorCode WM_RETURN_SALES_CLIENT_MISMATCH = new ErrorCode(1_040_713_010, "閫�璐у崟瀹㈡埛涓庨攢鍞嚭搴撳崟瀹㈡埛涓嶄竴鑷�");
+ ErrorCode WM_RETURN_SALES_PRODUCT_SALES_IMMUTABLE = new ErrorCode(1_040_713_011, "宸插瓨鍦ㄩ��璐ц锛屼笉鑳芥洿鎹㈤攢鍞嚭搴撳崟");
+ ErrorCode WM_RETURN_SALES_LINE_PRODUCT_SALES_REQUIRED = new ErrorCode(1_040_713_101, "宸查�夋嫨閿�鍞嚭搴撳崟锛岄��璐ц蹇呴』浠庡嚭搴撳崟琛屼腑閫夋嫨");
+ ErrorCode WM_RETURN_SALES_LINE_PRODUCT_SALES_NOT_MATCH = new ErrorCode(1_040_713_102, "閿�鍞嚭搴撳崟琛屼笉灞炰簬鎵�閫夌殑閿�鍞嚭搴撳崟");
+ ErrorCode WM_RETURN_SALES_LINE_QUANTITY_EXCEED = new ErrorCode(1_040_713_103, "閫�璐ф暟閲忎笉鑳借秴杩囧彲閫�鏁伴噺");
ErrorCode WM_RETURN_SALES_DETAIL_NOT_EXISTS = new ErrorCode(1_040_713_200, "閿�鍞��璐у崟鏄庣粏涓嶅瓨鍦�");
ErrorCode WM_RETURN_SALES_DETAIL_QUANTITY_EXCEED = new ErrorCode(1_040_713_201, "涓婃灦鏄庣粏鎬绘暟閲忎笉鑳借秴杩囬��璐ц鏁伴噺");
+ ErrorCode WM_RETURN_SALES_DETAIL_BATCH_MISMATCH = new ErrorCode(1_040_713_202, "涓婃灦鏄庣粏鐨勬壒娆″繀椤讳笌閫�璐ц鎵规涓�鑷�");
// ========== MES 浠撳簱绠$悊-鐩樼偣鏂规/浠诲姟/缁撴灉锛�1-040-714-100锛� ==========
ErrorCode WM_STOCK_TAKING_PLAN_NOT_EXISTS = new ErrorCode(1_040_714_100, "鐩樼偣鏂规涓嶅瓨鍦�");
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 45248cf..67f0fc5 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
@@ -193,6 +193,8 @@
if (qualifiedWarehouse == null) throw exception(WM_WAREHOUSE_NOT_EXISTS);
if (!MesWmWarehouseTypeEnum.QUALIFIED.getType().equals(qualifiedWarehouse.getType()))
throw exception(WM_WAREHOUSE_TYPE_NOT_QUALIFIED);
+ // 鎻愬墠鏍¢獙鍚堟牸搴撳凡閰嶇疆搴撳尯/搴撲綅锛岄伩鍏嶅妫�瀹℃牳鏀捐鏃舵墠澶辫触
+ resolveQualifiedLocation(qualifiedWarehouse);
LocalDateTime now = LocalDateTime.now();
Long operatorId = getLoginUserId();
@@ -252,6 +254,8 @@
if (!MesWmWarehouseTypeEnum.QUALIFIED.getType().equals(qualifiedWarehouse.getType())) {
throw exception(WM_WAREHOUSE_TYPE_NOT_QUALIFIED);
}
+ // 鎻愬墠鏍¢獙鍚堟牸搴撳凡閰嶇疆搴撳尯/搴撲綅锛岄伩鍏嶅妫�瀹℃牳鏀捐鏃舵墠澶辫触
+ resolveQualifiedLocation(qualifiedWarehouse);
Set<String> codes = new HashSet<>();
boolean passed = true;
MesQcSeedQualityDO quality = MesQcSeedQualityDO.builder().code(bag.getCode()).itemId(batch.getItemId())
@@ -296,12 +300,10 @@
Long qualifiedLocationId = null;
Long qualifiedAreaId = null;
if (passed) {
- List<MesWmWarehouseLocationDO> locations = warehouseLocationService.getWarehouseLocationList(qualifiedWarehouse.getId());
- if (CollUtil.isNotEmpty(locations)) {
- qualifiedLocationId = locations.get(0).getId();
- List<MesWmWarehouseAreaDO> areas = warehouseAreaService.getWarehouseAreaList(qualifiedLocationId);
- if (CollUtil.isNotEmpty(areas)) qualifiedAreaId = areas.get(0).getId();
- }
+ // 搴撳瓨浜嬪姟蹇呴』钀藉埌搴撳尯銆佸簱浣嶏紝鍚堟牸搴撶己灏戦厤缃椂鎻愬墠缁欏嚭鍙搷浣滅殑鎻愮ず
+ Long[] target = resolveQualifiedLocation(qualifiedWarehouse);
+ qualifiedLocationId = target[0];
+ qualifiedAreaId = target[1];
}
// 鎸夎鐮佺矑搴︽祦杞簱瀛橈細閿佸畾璇ヨ鍦ㄦ殏瀛樺簱涓殑娲诲姩鏄庣粏锛岀姝㈡寜鎵规浠绘剰鎵e噺
MesWmMaterialStockBagDO stockBag = materialStockBagMapper.selectActiveByBagCode(bag.getCode());
@@ -688,8 +690,8 @@
*
* @param tempStock 浠庢殏瀛樺簱鎵e噺鍚庤繑鍥炵殑鏆傚瓨璁板綍锛堟惡甯� item/batch/vendor 缁村害锛�
* @param qualifiedWarehouseId 鐩爣鍚堟牸搴撲粨搴撶紪鍙�
- * @param qualifiedLocationId 鐩爣鍚堟牸搴撳簱鍖虹紪鍙凤紙鏈厤缃垯涓� null锛�
- * @param qualifiedAreaId 鐩爣鍚堟牸搴撳簱浣嶇紪鍙凤紙鏈厤缃垯涓� null锛�
+ * @param qualifiedLocationId 鐩爣鍚堟牸搴撳簱鍖虹紪鍙�
+ * @param qualifiedAreaId 鐩爣鍚堟牸搴撳簱浣嶇紪鍙�
*/
private MesWmMaterialStockBagDO getOrCreateStockBag(MesProBagCodeDO bag, MesWmMaterialStockDO tempStock) {
MesWmMaterialStockBagDO stockBag = materialStockBagMapper.selectByBagCode(bag.getCode());
@@ -706,6 +708,25 @@
return stockBag;
}
+ /**
+ * 瑙f瀽鍚堟牸搴撶殑榛樿鍏ュ簱搴撳尯涓庡簱浣嶏細鍙栫涓�涓悓鏃堕厤缃簡搴撲綅鐨勯潪鍐荤粨搴撳尯銆�
+ *
+ * 璐ㄦ鎸変粨搴撶淮搴﹂�夋嫨鍏ュ簱鐩爣锛屽簱鍖�/搴撲綅鐢辩郴缁熻嚜鍔ㄨ惤鐐癸紱鍚堟牸搴撶己灏戝彲鐢ㄥ簱鍖烘垨搴撲綅鏃讹紝
+ * 搴撳瓨浜嬪姟鏃犳硶鍐欏叆锛岀洿鎺ユ彁绀虹鐞嗗憳瀹屽杽浠撳簱閰嶇疆銆�
+ */
+ private Long[] resolveQualifiedLocation(MesWmWarehouseDO qualifiedWarehouse) {
+ List<MesWmWarehouseLocationDO> locations = warehouseLocationService.getWarehouseLocationList(qualifiedWarehouse.getId())
+ .stream().filter(location -> !Boolean.TRUE.equals(location.getFrozen())).toList();
+ if (CollUtil.isEmpty(locations))
+ throw new IllegalArgumentException("鍚堟牸搴撱��" + qualifiedWarehouse.getName() + "銆嶆湭閰嶇疆鍙敤搴撳尯锛岃鍏堝湪浠撳簱绠$悊涓畬鍠勫簱鍖轰笌搴撲綅");
+ for (MesWmWarehouseLocationDO location : locations) {
+ List<MesWmWarehouseAreaDO> areas = warehouseAreaService.getWarehouseAreaList(location.getId())
+ .stream().filter(area -> !Boolean.TRUE.equals(area.getFrozen())).toList();
+ if (CollUtil.isNotEmpty(areas)) return new Long[]{location.getId(), areas.get(0).getId()};
+ }
+ throw new IllegalArgumentException("鍚堟牸搴撱��" + qualifiedWarehouse.getName() + "銆嶆湭閰嶇疆鍙敤搴撲綅锛岃鍏堝湪浠撳簱绠$悊涓畬鍠勫簱鍖轰笌搴撲綅");
+ }
+
private MesWmMaterialStockDO getOrCreateQualifiedStock(MesWmMaterialStockDO tempStock, Long qualifiedWarehouseId,
Long qualifiedLocationId, Long qualifiedAreaId) {
MesWmMaterialStockDO qualified = materialStockMapper.selectQualifiedByCompositeKey(
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java
index 30303e7..48ecdb0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java
@@ -17,7 +17,6 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.salesnotice.MesWmSalesNoticeLineDO;
import cn.iocoder.yudao.module.mes.service.wm.salesnotice.MesWmSalesNoticeLineService;
-import cn.iocoder.yudao.module.mes.service.qc.oqc.MesQcOqcService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
@@ -57,9 +56,6 @@
@Resource
@Lazy
private MesWmSalesNoticeLineService salesNoticeLineService;
- @Resource
- @Lazy
- private MesQcOqcService oqcService;
@Override
public Long createProductSalesLine(MesWmProductSalesLineSaveReqVO createReqVO) {
@@ -83,34 +79,6 @@
// 鏇存柊
MesWmProductSalesLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmProductSalesLineDO.class);
productSalesLineMapper.updateById(updateObj);
-
- // 妫�鏌ユ槸鍚﹂渶瑕佸垱寤� OQC 妫�楠屽崟锛氫粠涓嶉渶瑕佹楠屽彉涓洪渶瑕佹楠�
- if (Boolean.TRUE.equals(updateReqVO.getOqcCheckFlag())
- && !Boolean.TRUE.equals(oldLine.getOqcCheckFlag())) {
- // 鑾峰彇鍑哄簱鍗曚俊鎭�
- MesWmProductSalesDO sales = productSalesService.getProductSales(updateReqVO.getSalesId());
- if (sales == null) {
- log.warn("[updateProductSalesLine] 鍑哄簱鍗曚笉瀛樺湪锛宻alesId={}", updateReqVO.getSalesId());
- return;
- }
-
- // 鏋勫缓鍑哄簱鏄庣粏 DO
- MesWmProductSalesLineDO line = new MesWmProductSalesLineDO();
- line.setId(updateReqVO.getId());
- line.setItemId(updateReqVO.getItemId());
- line.setBatchCode(updateReqVO.getBatchCode());
- line.setQuantity(updateReqVO.getQuantity());
-
- // 鍒涘缓 OQC 妫�楠屽崟锛岃寮傚父鎶涘嚭
- Long oqcId = oqcService.createOqcFromProductSales(
- sales.getId(), line, sales.getCode(), sales.getClientId());
-
- // 鏇存柊鍑哄簱鏄庣粏鐨� oqcId 鍜岃川閲忕姸鎬�
- productSalesLineMapper.updateById(new MesWmProductSalesLineDO()
- .setId(updateReqVO.getId())
- .setOqcId(oqcId)
- .setQualityStatus(MesWmQualityStatusEnum.PENDING.getStatus()));
- }
}
@Override
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java
index b72e8f0..9ea5427 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java
@@ -29,7 +29,6 @@
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.pro.MesProBagCodeQcStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductSalesStatusEnum;
-import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmSalesNoticeStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmStockReserveBizTypeEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
@@ -43,10 +42,8 @@
import cn.iocoder.yudao.module.mes.service.wm.stockreserve.MesWmStockReserveService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
-import cn.iocoder.yudao.module.mes.service.qc.oqc.MesQcOqcService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@@ -103,9 +100,6 @@
private MesWmMaterialStockService materialStockService;
@Resource
private MesWmStockReserveService stockReserveService;
- @Resource
- @Lazy
- private MesQcOqcService oqcService;
@Resource
private MesTraceIntegrityService integrityService;
@@ -179,37 +173,7 @@
}
}
- // 鑾峰彇鍑哄簱鍗曚俊鎭�
- MesWmProductSalesDO sales = productSalesMapper.selectById(id);
-
- // 妫�鏌ユ墍鏈夎鐨� oqcCheckFlag锛氬鏋滄湁闇�瑕� OQC 妫�楠岀殑琛岋紝杩涘叆寰呮娴嬬姸鎬�
- boolean needOqc = CollectionUtils.anyMatch(lines,
- line -> Boolean.TRUE.equals(line.getOqcCheckFlag()));
- if (needOqc) {
- // 涓洪渶瑕� OQC 妫�楠屼笖灏氭湭鍒涘缓妫�楠屽崟鐨勬槑缁嗗垱寤� OQC 妫�楠屽崟
- List<MesWmProductSalesLineDO> oqcLines = CollectionUtils.filterList(lines,
- line -> Boolean.TRUE.equals(line.getOqcCheckFlag()) && line.getOqcId() == null);
- for (MesWmProductSalesLineDO line : oqcLines) {
- // 鐩存帴璋冪敤锛岃寮傚父鎶涘嚭锛屼繚璇佹暟鎹竴鑷存��
- Long oqcId = oqcService.createOqcFromProductSales(
- sales.getId(), line, sales.getCode(), sales.getClientId());
- // 鏇存柊鍑哄簱鏄庣粏鐨� oqcId
- productSalesLineMapper.updateById(new MesWmProductSalesLineDO()
- .setId(line.getId())
- .setOqcId(oqcId));
- }
-
- // 鎵归噺鍒濆鍖� OQC 琛岀殑璐ㄩ噺鐘舵�佷负"寰呮楠�"
- List<Long> oqcLineIds = convertList(
- CollectionUtils.filterList(lines, line -> Boolean.TRUE.equals(line.getOqcCheckFlag())),
- MesWmProductSalesLineDO::getId);
- productSalesLineService.updateProductSalesLineQualityStatus(oqcLineIds, MesWmQualityStatusEnum.PENDING.getStatus());
- // 闇�瑕佹楠岋紝杩涘叆寰呮娴�
- productSalesMapper.updateById(new MesWmProductSalesDO()
- .setId(id).setStatus(MesWmProductSalesStatusEnum.CONFIRMED.getStatus()));
- return;
- }
- // 涓嶉渶瑕佹楠岋紝鐩存帴杩涘叆寰呮嫞璐�
+ // 閿�鍞粨搴撴祦杞笉缁忚繃璐ㄦ锛屾彁浜ゅ悗鐩存帴杩涘叆寰呮嫞璐�
productSalesMapper.updateById(new MesWmProductSalesDO()
.setId(id).setStatus(MesWmProductSalesStatusEnum.APPROVING.getStatus()));
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesDetailServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesDetailServiceImpl.java
index 32f0981..931bbe9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesDetailServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesDetailServiceImpl.java
@@ -139,12 +139,27 @@
// 鏍¢獙浠撳簱銆佸簱鍖恒�佸簱浣嶇殑鍏宠仈鍏崇郴
warehouseAreaService.validateWarehouseAreaExists(
reqVO.getWarehouseId(), reqVO.getLocationId(), reqVO.getAreaId());
+ // 鐗╂枡銆佹壒娆′互閫�璐ц涓哄噯锛堥��璐ф壒娆℃潵鑷攢鍞嚭搴撳崟锛屼笂鏋舵椂涓嶅厑璁稿彉鏇达級
+ reqVO.setItemId(line.getItemId());
+ resolveBatch(reqVO, line);
// 鏍¢獙搴撲綅鐗╂枡/鎵规娣锋斁瑙勫垯
materialStockService.checkAreaMixingRule(reqVO.getAreaId(), reqVO.getItemId(), reqVO.getBatchId());
// 鏍¢獙鏄庣粏鎬绘暟閲忎笉瓒呰繃琛屾暟閲忥紙鎺掗櫎鑷韩锛�
validateDetailQuantityNotExceed(reqVO.getLineId(), reqVO.getQuantity(), reqVO.getId(), line);
+ }
- // 鏍规嵁 batchCode 瑙f瀽 batchId锛堝繀椤诲湪娣锋斁瑙勫垯鏍¢獙涔嬪墠锛屽洜涓哄畠渚濊禆 batchId锛�
+ /**
+ * 瑙f瀽涓婃灦鏄庣粏鎵规锛氳宸叉寚瀹氭壒娆℃椂寮哄埗娌跨敤锛屽惁鍒欐寜鎵规鍙疯В鏋�
+ */
+ private void resolveBatch(MesWmReturnSalesDetailSaveReqVO reqVO, MesWmReturnSalesLineDO line) {
+ if (line.getBatchId() != null) {
+ if (reqVO.getBatchId() != null && ObjUtil.notEqual(reqVO.getBatchId(), line.getBatchId())) {
+ throw exception(WM_RETURN_SALES_DETAIL_BATCH_MISMATCH);
+ }
+ reqVO.setBatchId(line.getBatchId());
+ reqVO.setBatchCode(line.getBatchCode());
+ return;
+ }
fillBatchId(reqVO);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineService.java
index 12e0520..6cc522c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineService.java
@@ -7,7 +7,9 @@
import jakarta.validation.Valid;
import java.math.BigDecimal;
+import java.util.Collection;
import java.util.List;
+import java.util.Map;
/**
* MES 閿�鍞��璐у崟琛� Service 鎺ュ彛
@@ -86,6 +88,15 @@
void updateQualityStatusByReturnId(Long returnId, Integer qualityStatus);
/**
+ * 缁熻閿�鍞嚭搴撹宸查��鏁伴噺锛堟帓闄ゅ凡鍙栨秷鐨勯��璐у崟锛�
+ *
+ * @param productSalesLineIds 閿�鍞嚭搴撹 ID 闆嗗悎
+ * @param excludeReturnId 闇�瑕佹帓闄ょ殑閫�璐у崟 ID锛堟牎楠屽綋鍓嶉��璐у崟鑷韩鏃朵娇鐢級锛屽彲涓虹┖
+ * @return key=閿�鍞嚭搴撹 ID锛寁alue=宸查��鏁伴噺
+ */
+ Map<Long, BigDecimal> getReturnedQuantityMap(Collection<Long> productSalesLineIds, Long excludeReturnId);
+
+ /**
* RQC 妫�楠屽畬鎴愬悗锛屾牴鎹悎鏍煎搧/涓嶅悎鏍煎搧鏁伴噺鏇存柊閿�鍞��璐у崟琛�
*
* <p>鎷嗗垎閫昏緫锛�
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java
index d56b908..d022448 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java
@@ -2,30 +2,36 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.iocoder.yudao.framework.common.core.KeyValue;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.line.MesWmReturnSalesLinePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.line.MesWmReturnSalesLineSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesLineDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesLineDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnsales.MesWmReturnSalesLineMapper;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnSalesStatusEnum;
-import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
+import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesLineService;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
+import java.util.Collection;
+import java.util.Collections;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.MD_ITEM_BATCH_REQUIRED;
-import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_RETURN_SALES_LINE_NOT_EXISTS;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
/**
* MES 閿�鍞��璐у崟琛� Service 瀹炵幇绫�
@@ -43,12 +49,15 @@
@Lazy
private MesWmReturnSalesService returnSalesService;
@Resource
- private MesMdmItemService mdmItemService;
+ private MdmItemApi mdmItemApi;
@Resource
private MesWmBatchService batchService;
@Resource
@Lazy
private MesWmReturnSalesDetailService returnSalesDetailService;
+ @Resource
+ @Lazy
+ private MesWmProductSalesLineService productSalesLineService;
@Override
public Long createReturnSalesLine(MesWmReturnSalesLineSaveReqVO createReqVO) {
@@ -79,12 +88,46 @@
/**
* 鏍¢獙淇濆瓨鏃剁殑鍏宠仈鏁版嵁
+ *
+ * <p>閫�璐у崟鍏宠仈浜嗛攢鍞嚭搴撳崟鏃讹紝鐗╂枡銆佹壒娆′竴寰嬪彇鑷嚭搴撹锛屽苟鏍¢獙鍙��鏁伴噺锛�
+ * 鏈叧鑱斿嚭搴撳崟锛堝鍞悗妯″潡鍒涘缓锛夋椂锛屼繚鎸佸師鏈夌墿鏂�/鎵规鏍¢獙閫昏緫銆�
*/
private void validateLineSaveData(MesWmReturnSalesLineSaveReqVO reqVO) {
// 鏍¢獙閫�璐у崟瀛樺湪 + 鑽夌鐘舵��
- returnSalesService.validateReturnSalesExistsAndPrepare(reqVO.getReturnId());
+ MesWmReturnSalesDO returnSales = returnSalesService.validateReturnSalesExistsAndPrepare(reqVO.getReturnId());
+ if (returnSales.getProductSalesId() != null) {
+ validateOutboundLine(reqVO, returnSales);
+ return;
+ }
// 鏍¢獙鐗╂枡瀛樺湪 + 鎵规绠$悊
validateItemBatchManagement(reqVO.getReturnId(), reqVO.getItemId(), reqVO.getBatchId());
+ }
+
+ /**
+ * 鏍¢獙鍑哄簱琛屽綊灞炰笌鍙��鏁伴噺锛屽苟浠庡嚭搴撹鍥炲~鐗╂枡銆佹壒娆�
+ */
+ private void validateOutboundLine(MesWmReturnSalesLineSaveReqVO reqVO, MesWmReturnSalesDO returnSales) {
+ if (reqVO.getProductSalesLineId() == null) {
+ throw exception(WM_RETURN_SALES_LINE_PRODUCT_SALES_REQUIRED);
+ }
+ MesWmProductSalesLineDO outboundLine =
+ productSalesLineService.validateProductSalesLineExists(reqVO.getProductSalesLineId());
+ if (ObjUtil.notEqual(outboundLine.getSalesId(), returnSales.getProductSalesId())) {
+ throw exception(WM_RETURN_SALES_LINE_PRODUCT_SALES_NOT_MATCH);
+ }
+ // 鐗╂枡銆佹壒娆″繀椤讳笌鍑哄簱琛屼竴鑷�
+ reqVO.setItemId(outboundLine.getItemId());
+ reqVO.setBatchId(outboundLine.getBatchId());
+ reqVO.setBatchCode(outboundLine.getBatchCode());
+
+ // 鍙��鏁伴噺 = 鍑哄簱鏁伴噺 - 鍏跺畠閫�璐у崟宸查��鏁伴噺锛堟帓闄ゅ綋鍓嶉��璐у崟锛�
+ BigDecimal returned = getReturnedQuantityMap(
+ Collections.singletonList(outboundLine.getId()), returnSales.getId())
+ .getOrDefault(outboundLine.getId(), BigDecimal.ZERO);
+ BigDecimal returnable = outboundLine.getQuantity().subtract(returned);
+ if (reqVO.getQuantity().compareTo(returnable) > 0) {
+ throw exception(WM_RETURN_SALES_LINE_QUANTITY_EXCEED);
+ }
}
@Override
@@ -129,6 +172,16 @@
}
@Override
+ public Map<Long, BigDecimal> getReturnedQuantityMap(Collection<Long> productSalesLineIds, Long excludeReturnId) {
+ if (CollUtil.isEmpty(productSalesLineIds)) {
+ return Collections.emptyMap();
+ }
+ List<KeyValue<Long, BigDecimal>> list = returnSalesLineMapper.selectReturnedQuantityList(
+ productSalesLineIds, MesWmReturnSalesStatusEnum.CANCELED.getStatus(), excludeReturnId);
+ return CollectionUtils.convertMap(list, KeyValue::getKey, KeyValue::getValue);
+ }
+
+ @Override
public void updateQualityStatusByReturnId(Long returnId, Integer qualityStatus) {
List<MesWmReturnSalesLineDO> lines = returnSalesLineMapper.selectListByReturnId(returnId);
for (MesWmReturnSalesLineDO line : lines) {
@@ -155,7 +208,7 @@
* @param batchId 鎵规ID
*/
private void validateItemBatchManagement(Long returnId, Long itemId, Long batchId) {
- MesMdmItemDO item = mdmItemService.validateItemExistsAndEnable(itemId);
+ MdmItemRespDTO item = mdmItemApi.validateItemExistsAndEnable(itemId).getCheckedData();
// 濡傛灉鐗╂枡鍚敤浜嗘壒娆$鐞嗭紝鍒欏繀椤婚�夋嫨鎵规
if (Boolean.TRUE.equals(item.getIsBatchManaged()) && batchId == null) {
throw exception(MD_ITEM_BATCH_REQUIRED);
@@ -189,9 +242,11 @@
// 1.C.1 鏂板涓�琛屼笉鍚堟牸鍝�
MesWmReturnSalesLineDO unqualifiedLine = new MesWmReturnSalesLineDO()
.setReturnId(sourceLine.getReturnId())
+ .setProductSalesLineId(sourceLine.getProductSalesLineId())
.setItemId(sourceLine.getItemId())
.setQuantity(unqualifiedQuantity)
.setBatchId(sourceLine.getBatchId())
+ .setBatchCode(sourceLine.getBatchCode())
.setRqcId(sourceLine.getRqcId())
.setRqcCheckFlag(sourceLine.getRqcCheckFlag())
.setQualityStatus(MesWmQualityStatusEnum.FAIL.getStatus())
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesService.java
index 139fad6..da6fd3f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesService.java
@@ -1,10 +1,15 @@
package cn.iocoder.yudao.module.mes.service.wm.returnsales;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnableProductSalesLineRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDO;
import jakarta.validation.Valid;
+
+import java.util.List;
/**
* MES 閿�鍞��璐у崟 Service 鎺ュ彛
@@ -52,6 +57,22 @@
PageResult<MesWmReturnSalesDO> getReturnSalesPage(MesWmReturnSalesPageReqVO pageReqVO);
/**
+ * 鑾峰緱鍙��閿�鍞嚭搴撳崟鍒嗛〉锛氫粎宸插畬鎴愮姸鎬侊紝涓斿瓨鍦ㄥ彲閫�鏁伴噺澶т簬 0 鐨勮
+ *
+ * @param pageReqVO 鍒嗛〉鍙傛暟
+ * @return 閿�鍞嚭搴撳崟鍒嗛〉
+ */
+ PageResult<MesWmProductSalesDO> getReturnableProductSalesPage(MesWmProductSalesPageReqVO pageReqVO);
+
+ /**
+ * 鑾峰緱閿�鍞嚭搴撳崟涓粛鍙��璐х殑琛屽垪琛�
+ *
+ * @param productSalesId 閿�鍞嚭搴撳崟 ID
+ * @return 鍙��琛屽垪琛�
+ */
+ List<MesWmReturnableProductSalesLineRespVO> getReturnableProductSalesLineList(Long productSalesId);
+
+ /**
* 鏍¢獙閿�鍞��璐у崟鏄惁瀛樺湪
*
* @param id 缂栧彿
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java
index bb4fb51..557e623 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java
@@ -5,21 +5,30 @@
import cn.hutool.core.util.ObjUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
+import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.productsales.vo.MesWmProductSalesPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnableProductSalesLineRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesLineDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDetailDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesLineDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productsales.MesWmProductSalesMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnsales.MesWmReturnSalesMapper;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
-import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductSalesStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnSalesStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
-import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
+import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
+import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesLineService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
import jakarta.annotation.Resource;
@@ -29,11 +38,14 @@
import java.math.BigDecimal;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
/**
@@ -55,9 +67,15 @@
@Resource
private CrmCustomerApi customerApi;
@Resource
- private MesMdmItemService mdmItemService;
+ private MdmItemApi mdmItemApi;
+ @Resource
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
@Resource
private MesWmTransactionService wmTransactionService;
+ @Resource
+ private MesWmProductSalesMapper productSalesMapper;
+ @Resource
+ private MesWmProductSalesLineService productSalesLineService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -76,9 +94,14 @@
@Transactional(rollbackFor = Exception.class)
public void updateReturnSales(MesWmReturnSalesSaveReqVO updateReqVO) {
// 1.1 鏍¢獙瀛樺湪 + 鍑嗗涓姸鎬�
- validateReturnSalesExistsAndPrepare(updateReqVO.getId());
+ MesWmReturnSalesDO oldReturnSales = validateReturnSalesExistsAndPrepare(updateReqVO.getId());
// 1.2 鏍¢獙鍏宠仈鏁版嵁
validateSaveData(updateReqVO);
+ // 1.3 宸叉湁閫�璐ц鏃讹紝涓嶅厑璁告洿鎹㈤攢鍞嚭搴撳崟
+ if (ObjUtil.notEqual(oldReturnSales.getProductSalesId(), updateReqVO.getProductSalesId())
+ && CollUtil.isNotEmpty(returnSalesLineService.getReturnSalesLineListByReturnId(updateReqVO.getId()))) {
+ throw exception(WM_RETURN_SALES_PRODUCT_SALES_IMMUTABLE);
+ }
// 2. 鏇存柊涓昏〃
MesWmReturnSalesDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnSalesDO.class);
@@ -111,24 +134,113 @@
}
@Override
+ public PageResult<MesWmProductSalesDO> getReturnableProductSalesPage(MesWmProductSalesPageReqVO pageReqVO) {
+ List<Long> permittedClientIds = customerApi.getPermittedCustomerIds();
+ return productSalesMapper.selectReturnablePage(pageReqVO,
+ MesWmProductSalesStatusEnum.FINISHED.getStatus(),
+ MesWmReturnSalesStatusEnum.CANCELED.getStatus(), permittedClientIds);
+ }
+
+ @Override
+ public List<MesWmReturnableProductSalesLineRespVO> getReturnableProductSalesLineList(Long productSalesId) {
+ if (productSalesId == null) {
+ return Collections.emptyList();
+ }
+ MesWmProductSalesDO productSales = productSalesMapper.selectById(productSalesId);
+ if (productSales == null) {
+ throw exception(WM_RETURN_SALES_PRODUCT_SALES_NOT_EXISTS);
+ }
+ List<MesWmProductSalesLineDO> lines = productSalesLineService.getProductSalesLineListBySalesId(productSalesId);
+ if (CollUtil.isEmpty(lines)) {
+ return Collections.emptyList();
+ }
+ Map<Long, BigDecimal> returnedMap = returnSalesLineService.getReturnedQuantityMap(
+ convertList(lines, MesWmProductSalesLineDO::getId), null);
+ // 浠呬繚鐣欏彲閫�鏁伴噺澶т簬 0 鐨勫嚭搴撹
+ List<MesWmProductSalesLineDO> returnableLines = lines.stream()
+ .filter(line -> line.getQuantity() != null
+ && line.getQuantity().subtract(returnedMap.getOrDefault(line.getId(), BigDecimal.ZERO))
+ .compareTo(BigDecimal.ZERO) > 0)
+ .toList();
+ if (CollUtil.isEmpty(returnableLines)) {
+ return Collections.emptyList();
+ }
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
+ convertSet(returnableLines, MesWmProductSalesLineDO::getItemId));
+ Map<Long, MdmUnitMeasureRespDTO> unitMap = CollectionUtils.convertMap(
+ mdmUnitMeasureApi.getUnitMeasureList(convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId))
+ .getCheckedData(),
+ MdmUnitMeasureRespDTO::getId);
+ return returnableLines.stream().map(line -> {
+ MesWmReturnableProductSalesLineRespVO vo = new MesWmReturnableProductSalesLineRespVO();
+ BigDecimal returned = returnedMap.getOrDefault(line.getId(), BigDecimal.ZERO);
+ vo.setProductSalesLineId(line.getId());
+ vo.setSalesId(line.getSalesId());
+ vo.setItemId(line.getItemId());
+ vo.setBatchId(line.getBatchId());
+ vo.setBatchCode(line.getBatchCode());
+ vo.setOutboundQuantity(line.getQuantity());
+ vo.setReturnedQuantity(returned);
+ vo.setReturnableQuantity(line.getQuantity().subtract(returned));
+ MapUtils.findAndThen(itemMap, line.getItemId(), item -> {
+ vo.setItemCode(item.getCode());
+ vo.setItemName(item.getName());
+ vo.setItemSpecification(item.getSpecification());
+ MapUtils.findAndThen(unitMap, item.getUnitMeasureId(), unit -> vo.setItemUnit(unit.getName()));
+ });
+ return vo;
+ }).toList();
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
public void submitReturnSales(Long id) {
// 1.1 鏍¢獙瀛樺湪 + 鑽夌鐘舵��
- validateReturnSalesExistsAndPrepare(id);
+ MesWmReturnSalesDO returnSales = validateReturnSalesExistsAndPrepare(id);
// 1.2 鏍¢獙鑷冲皯鏈変竴鏉¤
List<MesWmReturnSalesLineDO> lines = returnSalesLineService.getReturnSalesLineListByReturnId(id);
if (CollUtil.isEmpty(lines)) {
throw exception(WM_RETURN_SALES_NO_LINE);
}
+ // 1.3 鍏宠仈鍑哄敭搴撳崟鏃讹紝閲嶆柊鏍¢獙琛屽綊灞炰笌鍙��鏁伴噺锛堣崏绋挎湡闂村彲鑳藉凡琚叾瀹冮��璐у崟鍗犵敤锛�
+ if (returnSales.getProductSalesId() != null) {
+ validateLinesAgainstProductSales(returnSales, lines);
+ }
- // 2.1 纭畾鐩爣鐘舵�侊細1锛夋湁寰呮楠岀墿鏂� 鈫� 寰呮楠岀姸鎬侊紱2锛夋棤寰呮楠岀墿鏂� 鈫� 寰呮墽琛岀姸鎬�
- boolean hasPendingQc = CollUtil.contains(lines,
- line -> MesWmQualityStatusEnum.PENDING.getStatus().equals(line.getQualityStatus()));
- Integer targetStatus = hasPendingQc ? MesWmReturnSalesStatusEnum.CONFIRMED.getStatus()
- : MesWmReturnSalesStatusEnum.APPROVING.getStatus();
- // 2.2 鎻愪氦锛堣崏绋� -> 寰呮楠�/寰呮墽琛岋級
+ // 2. 鎻愪氦锛堣崏绋� -> 寰呮墽琛岋級锛涢攢鍞粨搴撴祦杞笉缁忚繃璐ㄦ
returnSalesMapper.updateById(new MesWmReturnSalesDO()
- .setId(id).setStatus(targetStatus));
+ .setId(id).setStatus(MesWmReturnSalesStatusEnum.APPROVING.getStatus()));
+ }
+
+ /**
+ * 鏍¢獙閫�璐у崟鎵�鏈夎鍧囨潵鑷墍閫夌殑閿�鍞嚭搴撳崟锛屼笖鏈崟鍚勮鏁伴噺涔嬪拰涓嶈秴杩囧彲閫�鏁伴噺
+ */
+ private void validateLinesAgainstProductSales(MesWmReturnSalesDO returnSales,
+ List<MesWmReturnSalesLineDO> lines) {
+ if (CollUtil.contains(lines, line -> line.getProductSalesLineId() == null)) {
+ throw exception(WM_RETURN_SALES_LINE_PRODUCT_SALES_REQUIRED);
+ }
+ Map<Long, MesWmProductSalesLineDO> outboundLineMap = convertMap(
+ productSalesLineService.getProductSalesLineListBySalesId(returnSales.getProductSalesId()),
+ MesWmProductSalesLineDO::getId);
+ // 姹囨�绘湰鍗曟瘡涓嚭搴撹鐨勯��璐ф暟閲�
+ Map<Long, BigDecimal> lineQuantityMap = new HashMap<>();
+ for (MesWmReturnSalesLineDO line : lines) {
+ if (!outboundLineMap.containsKey(line.getProductSalesLineId())) {
+ throw exception(WM_RETURN_SALES_LINE_PRODUCT_SALES_NOT_MATCH);
+ }
+ lineQuantityMap.merge(line.getProductSalesLineId(), line.getQuantity(), BigDecimal::add);
+ }
+ // 宸查��鏁伴噺鎺掗櫎鏈崟锛岄伩鍏嶆妸鏈崟鑷韩璁″叆
+ Map<Long, BigDecimal> returnedMap = returnSalesLineService.getReturnedQuantityMap(
+ convertSet(lines, MesWmReturnSalesLineDO::getProductSalesLineId), returnSales.getId());
+ for (Map.Entry<Long, BigDecimal> entry : lineQuantityMap.entrySet()) {
+ BigDecimal returnable = outboundLineMap.get(entry.getKey()).getQuantity()
+ .subtract(returnedMap.getOrDefault(entry.getKey(), BigDecimal.ZERO));
+ if (entry.getValue().compareTo(returnable) > 0) {
+ throw exception(WM_RETURN_SALES_LINE_QUANTITY_EXCEED);
+ }
+ }
}
@Override
@@ -171,7 +283,7 @@
MesWmReturnSalesDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
// 瀵规瘮琛屾暟閲忎笌鏄庣粏鎬绘暟閲忥紝涓嶆弧瓒崇洿鎺ユ姏鍑�
if (line.getQuantity().compareTo(totalDetailQuantity) > 0) {
- MesMdmItemDO item = mdmItemService.validateItemExistsAndEnable(line.getItemId());
+ MdmItemRespDTO item = mdmItemApi.validateItemExistsAndEnable(line.getItemId()).getCheckedData();
throw exception(WM_RETURN_SALES_DETAIL_QUANTITY_MISMATCH,
item.getCode() + " " + item.getName() + " 鏈畬鎴愪笂鏋�");
}
@@ -188,13 +300,24 @@
private void createTransactionList(MesWmReturnSalesDO returnSales) {
List<MesWmReturnSalesDetailDO> details = returnSalesDetailService.getReturnSalesDetailListByReturnId(returnSales.getId());
- wmTransactionService.createTransactionList(convertList(details, detail -> new MesWmTransactionSaveReqDTO()
- .setType(MesWmTransactionTypeEnum.IN.getType()).setItemId(detail.getItemId())
- .setQuantity(detail.getQuantity()) // 鍏ュ簱鏁伴噺涓烘鏁�
- .setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode())
- .setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId())
- .setBizType(MesBizTypeConstants.WM_RETURN_SALES).setBizId(returnSales.getId())
- .setBizCode(returnSales.getCode()).setBizLineId(detail.getLineId())));
+ // 鏄庣粏鏈甫鎵规鏃跺洖閫�鍒伴��璐ц鎵规锛岄伩鍏嶅巻鍙叉暟鎹叆搴撲涪鎵规
+ Map<Long, MesWmReturnSalesLineDO> lineMap = convertMap(
+ returnSalesLineService.getReturnSalesLineListByReturnId(returnSales.getId()),
+ MesWmReturnSalesLineDO::getId);
+ wmTransactionService.createTransactionList(convertList(details, detail -> {
+ MesWmReturnSalesLineDO line = lineMap.get(detail.getLineId());
+ Long batchId = detail.getBatchId() != null ? detail.getBatchId()
+ : line != null ? line.getBatchId() : null;
+ String batchCode = detail.getBatchCode() != null ? detail.getBatchCode()
+ : line != null ? line.getBatchCode() : null;
+ return new MesWmTransactionSaveReqDTO()
+ .setType(MesWmTransactionTypeEnum.IN.getType()).setItemId(detail.getItemId())
+ .setQuantity(detail.getQuantity()) // 鍏ュ簱鏁伴噺涓烘鏁�
+ .setBatchId(batchId).setBatchCode(batchCode)
+ .setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId())
+ .setBizType(MesBizTypeConstants.WM_RETURN_SALES).setBizId(returnSales.getId())
+ .setBizCode(returnSales.getCode()).setBizLineId(detail.getLineId());
+ }));
}
@Override
@@ -274,6 +397,21 @@
private void validateSaveData(MesWmReturnSalesSaveReqVO reqVO) {
validateCodeUnique(reqVO.getId(), reqVO.getCode());
customerApi.validateCustomer(reqVO.getClientId());
+ // 鍏宠仈閿�鍞嚭搴撳崟鏃讹紝鏍¢獙鍑哄簱鍗曠姸鎬佷笌瀹㈡埛涓�鑷存�э紝骞跺洖濉嚭搴撳崟鍙�
+ if (reqVO.getProductSalesId() == null) {
+ return;
+ }
+ MesWmProductSalesDO productSales = productSalesMapper.selectById(reqVO.getProductSalesId());
+ if (productSales == null) {
+ throw exception(WM_RETURN_SALES_PRODUCT_SALES_NOT_EXISTS);
+ }
+ if (ObjUtil.notEqual(MesWmProductSalesStatusEnum.FINISHED.getStatus(), productSales.getStatus())) {
+ throw exception(WM_RETURN_SALES_PRODUCT_SALES_NOT_FINISHED);
+ }
+ if (ObjUtil.notEqual(productSales.getClientId(), reqVO.getClientId())) {
+ throw exception(WM_RETURN_SALES_CLIENT_MISMATCH);
+ }
+ reqVO.setProductSalesCode(productSales.getCode());
}
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
index 115bebf..bb463d1 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
@@ -308,7 +308,6 @@
salesLine.setQuantity(noticeLine.getQuantity());
salesLine.setBatchId(noticeLine.getBatchId());
salesLine.setBatchCode(noticeLine.getBatchCode());
- salesLine.setOqcCheckFlag(noticeLine.getOqcCheckFlag());
productSalesLineMapper.insert(salesLine);
}
--
Gitblit v1.9.3