From a4ed0f250009167453ca637ce042ef8e0b69f613 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 24 十月 2026 19:30:00 +0800
Subject: [PATCH] feat(aftersales): 增加售后退货流程管理功能
---
sql/mysql/xgdl_receivable_workflow_seed.sql | 42 +
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java | 76 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java | 8
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableService.java | 12
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/receivable/CrmReceivableMapper.java | 3
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java | 35 +
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordService.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java | 11
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/returnobj/AfterSaleReturnDO.java | 2
yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/dto/MesWmReturnSalesCreateReqDTO.java | 14
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/MesWmReturnSalesApiImpl.java | 27 +
sql/mysql/xgdl_aftersales_return_link_repair_20261024.sql | 10
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleSaveReqVO.java | 17
yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/MesWmReturnSalesApi.java | 3
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java | 130 ++++-
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleMesReturnProgressListener.java | 33 +
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivableController.java | 9
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleRespVO.java | 17
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/returnobj/AfterSaleReturnController.java | 17
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesServiceImpl.java | 67 ++
sql/mysql/hrm_module_init.sql | 19
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java | 2
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleReturnServiceImpl.java | 189 ++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java | 24 +
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/interceptor/ApiAccessLogInterceptor.java | 18
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRecordDO.java | 13
yudao-module-hrm/src/test/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceClockLocationTest.java | 84 +++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java | 2
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/returnobj/AfterSaleReturnMapper.java | 7
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleReturnService.java | 9
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRecordRespVO.java | 23 +
.gitignore | 8
docs/xgdl-business-flow-alignment-20261024.md | 31 +
sql/mysql/hrm_attendance_location_20261024.sql | 53 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesSaveReqVO.java | 5
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/returnobj/vo/AfterSaleReturnRespVO.java | 1
sql/mysql/xgdl_receivable_legacy_repair_20261024.sql | 19
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesDO.java | 2
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleServiceImpl.java | 52 ++
yudao-server/src/main/resources/application-local.yaml | 8
yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/event/MesReturnSalesProgressEvent.java | 8
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceClockReqVO.java | 19
yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java | 6
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceClockRespVO.java | 20
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceClockResult.java | 11
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/returnobj/vo/AfterSaleRefundConfirmReqVO.java | 22 +
sql/mysql/xgdl_aftersales_refund_confirm_20261024.sql | 27 +
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketServiceImpl.java | 19
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/listener/CrmReceivableStatusListener.java | 31 +
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java | 6
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRuleDO.java | 11
51 files changed, 1,179 insertions(+), 112 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6782ea1..b4a2414 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,7 +27,13 @@
*.iml
*.ipr
*.sql
+!sql/mysql/xgdl_receivable_workflow_seed.sql
+!sql/mysql/xgdl_receivable_legacy_repair_20261024.sql
+!sql/mysql/xgdl_aftersales_return_link_repair_20261024.sql
+!sql/mysql/xgdl_aftersales_refund_confirm_20261024.sql
+!sql/mysql/hrm_attendance_location_20261024.sql
*.md
+!docs/xgdl-business-flow-alignment-20261024.md
*.xlsx
*.docx
*.txt
@@ -63,4 +69,4 @@
.claude/worktrees/
.claude/scheduled_tasks.json
-/.export_tmp
\ No newline at end of file
+/.export_tmp
diff --git a/docs/xgdl-business-flow-alignment-20261024.md b/docs/xgdl-business-flow-alignment-20261024.md
new file mode 100644
index 0000000..422dca7
--- /dev/null
+++ b/docs/xgdl-business-flow-alignment-20261024.md
@@ -0,0 +1,31 @@
+# 鏂伴珮鐢靛姏鍏辨�т笟鍔℃祦绋嬪鐓т笌鏈疆淇
+
+渚濇嵁鐢ㄦ埛鎻愪緵鐨勪笟鍔¢渶姹傛埅鍥惧拰 `mom-pro2-after-test/docs/project-business` 娴佺▼鍥炬牳瀵瑰綋鍓嶅疄鐜般�傛祦绋嬪浘鍙綔涓洪渶姹傝祫鏂欙紱浠ヤ唬鐮佸拰 `mom-xgdl` 瀹為檯鏁版嵁涓哄噯銆侫I 鐩稿叧鑳藉姏涓嶇撼鍏ユ湰杞��
+
+| 闇�姹傚煙 | 鍏辨�ф祦绋嬪鐞� | 鏈疆缁撹 |
+| --- | --- | --- |
+| 浜у搧璁捐銆佸伐鑹鸿璁� | 浜у搧妗f銆佸伐鑹鸿矾绾垮睘浜庣幇鏈夊熀纭�鑳藉姏 | 鐢靛姏浜у搧缂栫爜銆佺數鍘嬬瓑绾с�佷緵鐢�/鍙戠數杩愮淮宸ヨ壓灞炰簬瀹氬埗闇�姹傦紝鏈疆鏈紩鍏ラ�氱敤妯″瀷 |
+| 钀ラ攢绠$悊 | 鍚堝悓銆侀攢鍞鍗曘�佸紑绁ㄣ�佸洖娆� | 鍓嶄竴杞慨澶嶅洖娆炬彁浜� BPM 涓庣姸鎬佸洖鍐欙紝骞惰ˉ蹇呰瀹℃壒閰嶇疆锛涙湰杞笉閲嶅鏀瑰姩 |
+| 鍞悗鏈嶅姟 | 宸ュ崟 鈫� 閫�璐х敵璇� 鈫� MES 閿�鍞��璐� 鈫� RQC 鈫� 鍏ュ簱 鈫� 閫�娆�/鎹㈣揣纭 鈫� 宸ュ崟鍏抽棴 | 淇 MES 鍗曟嵁澶翠笌琛屽叧鑱斾涪澶便�佽川妫�/鍏ュ簱鍥炲啓缂哄彛锛涜ˉ鐘舵�佹牎楠屻�佸彇娑堝洖閫�鍜屽嚟璇佺‘璁ゅ叆鍙� |
+| 璁″垝鎺掔▼銆佺敓浜х鎺� | MPS銆佸伐鍗曘�佷换鍔°�佹姤宸� | 鍓嶄竴杞慨澶嶆姤宸ュ悗鐨勪换鍔$姸鎬佷笌鏆傚仠/鎭㈠锛涜涓氳皟搴︾畻娉曟湭绾冲叆鍏辨�ф敼鍔� |
+| 璐ㄩ噺绠$悊 | RQC 璐ㄦ缁撴灉鍥炲啓鍞悗 | MES 璐ㄦ瀹屾垚浜嬩欢鐜板湪鎺ㄨ繘鍞悗鐘舵�侊紱璐ㄦ鍗曚粛鐢辫川妫�浜哄憳鎸夌幇鏈夋ā鏉挎祦绋嬪垱寤哄拰瀹屾垚锛屼笉鑷姩浼�犳楠屾暟鎹� |
+| 浠撳偍鐗╂祦 | 閿�鍞��璐т笂鏋朵骇鐢熷叆搴撲簨鍔� | 鍏ュ簱瀹屾垚浜嬩欢鐜板湪鎺ㄨ繘鍞悗鍒板緟閫�娆撅紱鍘嗗彶鍏宠仈浠呭湪 ID 涓庡崟鍙峰弻閲嶄竴鑷存椂鍥炲~ |
+| 璁惧銆侀噰璐�佷汉鍔涜祫婧愩�佸喅绛栨敮鎸� | 鐜版湁閫氱敤妯″潡 | 鏈疆鏈敼鍏朵笟鍔¤鍒欙紱鎴浘涓殑鐢电綉璧勪骇銆佹姠淇�佽礋鑽烽娴嬬瓑鍦烘櫙闇�鍙﹁瀹氫箟瀛楁鍜岄獙鏀舵爣鍑� |
+
+## 宸茶惤鍦扮殑鍞悗鐘舵�侀摼
+
+1. 鍞悗宸ュ崟澶勪簬鈥滃鐞嗕腑鈥濓紝鏈夐攢鍞鍗曘�佸鎴峰拰鏈夋晥鐗╂枡鏄庣粏鏃跺垱寤洪��璐х敵璇凤紱椤甸潰鍙~鍐欐湰娆$敵璇锋暟閲忓苟鏍¢獙璁㈠崟鏄庣粏锛屽悓涓�宸ュ崟鍙厑璁镐竴涓湭鍙栨秷鐢宠銆�
+2. 瀹℃牳鏅�氶��璐�/鎹㈣揣鏃讹紝MES 鍗曟嵁澶村拰鏄庣粏鍦ㄥ悓涓�浜嬪姟鍒涘缓锛涗粎閫�娆剧敵璇蜂笉浜х敓瀹炵墿鍏ュ簱鍗曘��
+3. MES 閿�鍞��璐ф彁浜ゅ悗鎸夌幇鏈� RQC 妯℃澘鎵ц妫�楠岋紱鍏ㄩ儴妫�瀹屽洖鍐欌�滄楠屽畬鎴愨�濓紝瀹屾垚涓婃灦鍥炲啓鈥滃凡鍏ュ簱鈥濄��
+4. 璐㈠姟鍦ㄥ閮ㄥ畬鎴愰��娆炬垨鎹㈣揣鍚庯紝杈撳叆瀹為檯閲戦鍜屽彲杩芥函鍑瘉鍙风‘璁わ紝鍞悗鐢宠鍙樹负鈥滈��娆�/鎹㈣揣瀹屾垚鈥濓紝宸ュ崟鍙樹负鈥滃凡瀹岀粨鈥濄��
+5. 宸ュ崟鍏抽棴鍚屾鍏抽棴鐢宠銆傚叆搴撳墠鍙栨秷閫�璐т細鍚屾鍙栨秷 MES 鍗曟嵁銆佹仮澶嶅伐鍗曗�滃鐞嗕腑鈥濓紝鍏佽閲嶆柊鐢宠銆�
+
+MES 鎻愪氦銆佹楠屾帹杩涖�佸彇娑堜笌涓婃灦閲囩敤褰撳墠鐘舵�佹潯浠舵洿鏂帮紱骞跺彂閲嶅涓婃灦鍙湁涓�涓姹傚彲鍐欏簱瀛樻祦姘淬��
+
+## 閰嶇疆涓庨獙鏀惰竟鐣�
+
+- `mom-xgdl` 宸查獙璇佸瓨鍦ㄥ綋鍓嶅巻鍙查��璐х墿鏂欑殑 RQC 妯℃澘鍏宠仈锛涙病鏈変负鍏朵粬鐗╂枡鑷嗛�犺川妫�鏍囧噯銆傛柊鐗╂枡椤诲厛閰嶇疆閫傜敤鐨勯��璐ф楠屾ā鏉裤��
+- 宸叉牳瀵规湰鍦板簱鏈� 8 涓粨搴撱��13 涓簱鍖恒��13 涓簱浣嶃��4 濂楀惎鐢ㄨ川妫�妯℃澘鍙� 47 鏉$墿鏂欏叧鑱斻��6 鏉″伐鑹鸿矾绾垮拰 39 鏉� BPM 娴佺▼瀹氫箟锛屽熀纭�鏁版嵁骞堕潪鏁翠綋缂哄け锛涘叿浣撶墿鏂欎笌鍏蜂綋鍗曟嵁浠嶉渶閫愬崟鏍¢獙銆�
+- 閫�娆�/鎹㈣揣纭閲囩敤浜哄伐鍑瘉鐧昏锛涘綋鍓嶄唬鐮佹病鏈夊彲鐩存帴鍏宠仈鍞悗鐢宠鐨� ERP 閫�娆惧崟鑷姩鍥炶皟銆傜‘璁ゆ寜閽彧琛ㄧず澶栭儴涓氬姟宸插畬鎴愶紝涓嶆墽琛岃浆璐︺��
+- 鏈疆 SQL 浣嶄簬 `sql/mysql/xgdl_aftersales_return_link_repair_20261024.sql` 鍜� `sql/mysql/xgdl_aftersales_refund_confirm_20261024.sql`銆傚湪鍏朵粬鐜閮ㄧ讲浠g爜鍓嶉』鍏堟墽琛屽瓧娈典笌鏉冮檺鑴氭湰銆�
+- Maven 缂栬瘧閫氳繃锛涘墠绔叏閲忕被鍨嬫鏌ヤ粛瀛樺湪涓庢湰娆″敭鍚庢枃浠舵棤鍏崇殑鏃㈡湁閿欒銆傚皻鏈畬鎴愭祻瑙堝櫒涓殑鏁撮摼璺笟鍔¢獙鏀躲��
diff --git a/sql/mysql/hrm_attendance_location_20261024.sql b/sql/mysql/hrm_attendance_location_20261024.sql
new file mode 100644
index 0000000..b20172d
--- /dev/null
+++ b/sql/mysql/hrm_attendance_location_20261024.sql
@@ -0,0 +1,53 @@
+-- 鑰冨嫟瀹氫綅瀛楁杩佺Щ銆傛棫瑙勫垯淇濇寔 location_required=0锛屽厛閰嶇疆鍦扮偣鍐嶅惎鐢ㄨ寖鍥撮檺鍒躲��
+DELIMITER $$
+DROP PROCEDURE IF EXISTS xgdl_hrm_attendance_add_column_20261024$$
+CREATE PROCEDURE xgdl_hrm_attendance_add_column_20261024(
+ IN p_table_name VARCHAR(64), IN p_column_name VARCHAR(64), IN p_ddl_sql VARCHAR(1000))
+BEGIN
+ IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+ WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = p_table_name AND COLUMN_NAME = p_column_name) THEN
+ SET @hrm_location_ddl = p_ddl_sql;
+ PREPARE hrm_location_stmt FROM @hrm_location_ddl;
+ EXECUTE hrm_location_stmt;
+ DEALLOCATE PREPARE hrm_location_stmt;
+ END IF;
+END$$
+DELIMITER ;
+
+CALL xgdl_hrm_attendance_add_column_20261024('hrm_attendance_rule','location_name',
+ 'ALTER TABLE hrm_attendance_rule ADD COLUMN location_name varchar(100) NULL');
+CALL xgdl_hrm_attendance_add_column_20261024('hrm_attendance_rule','location_address',
+ 'ALTER TABLE hrm_attendance_rule ADD COLUMN location_address varchar(255) NULL');
+CALL xgdl_hrm_attendance_add_column_20261024('hrm_attendance_rule','longitude',
+ 'ALTER TABLE hrm_attendance_rule ADD COLUMN longitude decimal(10,7) NULL');
+CALL xgdl_hrm_attendance_add_column_20261024('hrm_attendance_rule','latitude',
+ 'ALTER TABLE hrm_attendance_rule ADD COLUMN latitude decimal(10,7) NULL');
+CALL xgdl_hrm_attendance_add_column_20261024('hrm_attendance_rule','radius_meters',
+ 'ALTER TABLE hrm_attendance_rule ADD COLUMN radius_meters int DEFAULT 200');
+CALL xgdl_hrm_attendance_add_column_20261024('hrm_attendance_rule','location_required',
+ 'ALTER TABLE hrm_attendance_rule ADD COLUMN location_required bit(1) NOT NULL DEFAULT b''0''');
+CALL xgdl_hrm_attendance_add_column_20261024('hrm_attendance_rule','coordinate_system',
+ 'ALTER TABLE hrm_attendance_rule ADD COLUMN coordinate_system varchar(20) DEFAULT ''WGS84''');
+
+CALL xgdl_hrm_attendance_add_column_20261024('hrm_attendance_record','clock_in_longitude',
+ 'ALTER TABLE hrm_attendance_record ADD COLUMN clock_in_longitude decimal(10,7) NULL');
+CALL xgdl_hrm_attendance_add_column_20261024('hrm_attendance_record','clock_in_latitude',
+ 'ALTER TABLE hrm_attendance_record ADD COLUMN clock_in_latitude decimal(10,7) NULL');
+CALL xgdl_hrm_attendance_add_column_20261024('hrm_attendance_record','clock_in_accuracy',
+ 'ALTER TABLE hrm_attendance_record ADD COLUMN clock_in_accuracy decimal(8,2) NULL');
+CALL xgdl_hrm_attendance_add_column_20261024('hrm_attendance_record','clock_in_distance',
+ 'ALTER TABLE hrm_attendance_record ADD COLUMN clock_in_distance decimal(10,2) NULL');
+CALL xgdl_hrm_attendance_add_column_20261024('hrm_attendance_record','clock_in_address',
+ 'ALTER TABLE hrm_attendance_record ADD COLUMN clock_in_address varchar(255) NULL');
+CALL xgdl_hrm_attendance_add_column_20261024('hrm_attendance_record','clock_out_longitude',
+ 'ALTER TABLE hrm_attendance_record ADD COLUMN clock_out_longitude decimal(10,7) NULL');
+CALL xgdl_hrm_attendance_add_column_20261024('hrm_attendance_record','clock_out_latitude',
+ 'ALTER TABLE hrm_attendance_record ADD COLUMN clock_out_latitude decimal(10,7) NULL');
+CALL xgdl_hrm_attendance_add_column_20261024('hrm_attendance_record','clock_out_accuracy',
+ 'ALTER TABLE hrm_attendance_record ADD COLUMN clock_out_accuracy decimal(8,2) NULL');
+CALL xgdl_hrm_attendance_add_column_20261024('hrm_attendance_record','clock_out_distance',
+ 'ALTER TABLE hrm_attendance_record ADD COLUMN clock_out_distance decimal(10,2) NULL');
+CALL xgdl_hrm_attendance_add_column_20261024('hrm_attendance_record','clock_out_address',
+ 'ALTER TABLE hrm_attendance_record ADD COLUMN clock_out_address varchar(255) NULL');
+
+DROP PROCEDURE xgdl_hrm_attendance_add_column_20261024;
diff --git a/sql/mysql/hrm_module_init.sql b/sql/mysql/hrm_module_init.sql
index 57c4d35..7981cf4 100644
--- a/sql/mysql/hrm_module_init.sql
+++ b/sql/mysql/hrm_module_init.sql
@@ -202,6 +202,13 @@
`late_allow_minutes` tinyint DEFAULT 0 COMMENT '杩熷埌鍏佽鍒嗛挓鏁�',
`early_allow_minutes` tinyint DEFAULT 0 COMMENT '鏃╅��鍏佽鍒嗛挓鏁�',
`overtime_threshold` decimal(4,2) DEFAULT 1 COMMENT '鍔犵彮璧风畻鏃堕暱锛堝皬鏃讹級',
+ `location_name` varchar(100) DEFAULT NULL COMMENT '鎵撳崱鍦扮偣鍚嶇О',
+ `location_address` varchar(255) DEFAULT NULL COMMENT '鎵撳崱鍦扮偣璇︾粏鍦板潃',
+ `longitude` decimal(10,7) DEFAULT NULL COMMENT '鎵撳崱鍦扮偣缁忓害锛圵GS84锛�',
+ `latitude` decimal(10,7) DEFAULT NULL COMMENT '鎵撳崱鍦扮偣绾害锛圵GS84锛�',
+ `radius_meters` int DEFAULT 200 COMMENT '鍏佽鎵撳崱鍗婂緞锛堢背锛�',
+ `location_required` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍚敤浣嶇疆闄愬埗',
+ `coordinate_system` varchar(20) DEFAULT 'WGS84' COMMENT '鍧愭爣绯�',
`status` tinyint NOT NULL DEFAULT 0 COMMENT '鐘舵�侊細0-鍚敤锛�1-绂佺敤',
`remark` varchar(500) DEFAULT NULL COMMENT '澶囨敞',
`creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
@@ -226,6 +233,16 @@
`work_hours` decimal(4,2) DEFAULT NULL COMMENT '宸ヤ綔鏃堕暱锛堝皬鏃讹級',
`overtime_hours` decimal(4,2) DEFAULT 0 COMMENT '鍔犵彮鏃堕暱锛堝皬鏃讹級',
`location` varchar(200) DEFAULT NULL COMMENT '鎵撳崱鍦扮偣',
+ `clock_in_longitude` decimal(10,7) DEFAULT NULL COMMENT '涓婄彮鎵撳崱缁忓害锛圵GS84锛�',
+ `clock_in_latitude` decimal(10,7) DEFAULT NULL COMMENT '涓婄彮鎵撳崱绾害锛圵GS84锛�',
+ `clock_in_accuracy` decimal(8,2) DEFAULT NULL COMMENT '涓婄彮瀹氫綅绮惧害锛堢背锛�',
+ `clock_in_distance` decimal(10,2) DEFAULT NULL COMMENT '涓婄彮璺濊鍒欏湴鐐硅窛绂伙紙绫筹級',
+ `clock_in_address` varchar(255) DEFAULT NULL COMMENT '涓婄彮瑙勫垯鍦扮偣鍦板潃蹇収',
+ `clock_out_longitude` decimal(10,7) DEFAULT NULL COMMENT '涓嬬彮鎵撳崱缁忓害锛圵GS84锛�',
+ `clock_out_latitude` decimal(10,7) DEFAULT NULL COMMENT '涓嬬彮鎵撳崱绾害锛圵GS84锛�',
+ `clock_out_accuracy` decimal(8,2) DEFAULT NULL COMMENT '涓嬬彮瀹氫綅绮惧害锛堢背锛�',
+ `clock_out_distance` decimal(10,2) DEFAULT NULL COMMENT '涓嬬彮璺濊鍒欏湴鐐硅窛绂伙紙绫筹級',
+ `clock_out_address` varchar(255) DEFAULT NULL COMMENT '涓嬬彮瑙勫垯鍦扮偣鍦板潃蹇収',
`remark` varchar(500) DEFAULT NULL COMMENT '澶囨敞',
`data_source` tinyint DEFAULT 1 COMMENT '鏁版嵁鏉ユ簮锛�1-鎵撳崱锛�2-瀵煎叆',
`creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
@@ -586,4 +603,4 @@
-- =============================================
-- 鎵ц瀹屾垚鎻愮ず
-- =============================================
-SELECT 'HRM 浜哄姏璧勬簮妯″潡 SQL 鍒濆鍖栧畬鎴愶紒' AS result;
\ No newline at end of file
+SELECT 'HRM 浜哄姏璧勬簮妯″潡 SQL 鍒濆鍖栧畬鎴愶紒' AS result;
diff --git a/sql/mysql/xgdl_aftersales_refund_confirm_20261024.sql b/sql/mysql/xgdl_aftersales_refund_confirm_20261024.sql
new file mode 100644
index 0000000..17f1c71
--- /dev/null
+++ b/sql/mysql/xgdl_aftersales_refund_confirm_20261024.sql
@@ -0,0 +1,27 @@
+-- 鍞悗閫�娆�/鎹㈣揣浜哄伐纭闇�瑕佸彲杩芥函鍑瘉鍙婄嫭绔嬫潈闄愩��
+SET @has_refund_voucher := (SELECT COUNT(*) FROM information_schema.COLUMNS
+ WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'after_sale_return' AND COLUMN_NAME = 'refund_voucher_no');
+SET @ddl := IF(@has_refund_voucher = 0,
+ 'ALTER TABLE after_sale_return ADD COLUMN refund_voucher_no varchar(100) NULL COMMENT ''Refund or exchange voucher number'' AFTER actual_refund_price',
+ 'SELECT 1');
+PREPARE stmt FROM @ddl;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+INSERT INTO system_menu (name, permission, type, sort, parent_id, path, icon, component,
+ component_name, status, visible, keep_alive, always_show, creator, updater)
+SELECT CONVERT(0xE7A1AEE8AEA4E98080E6ACBE2FE68DA2E8B4A7 USING utf8mb4), 'aftersales:return:refund', 3, 3, 602589, '', '#', NULL,
+ NULL, 0, b'1', b'0', b'0', 'system', 'system'
+WHERE EXISTS (SELECT 1 FROM system_menu WHERE id = 602589 AND deleted = b'0')
+ AND NOT EXISTS (SELECT 1 FROM system_menu WHERE permission = 'aftersales:return:refund' AND deleted = b'0');
+
+UPDATE system_menu
+SET name = CONVERT(0xE7A1AEE8AEA4E98080E6ACBE2FE68DA2E8B4A7 USING utf8mb4)
+WHERE permission = 'aftersales:return:refund' AND deleted = b'0';
+
+INSERT INTO system_menu (name, permission, type, sort, parent_id, path, icon, component,
+ component_name, status, visible, keep_alive, always_show, creator, updater)
+SELECT CONVERT(0xE58F96E6B688E98080E8B4A7 USING utf8mb4), 'aftersales:return:cancel', 3, 4, 602589, '', '#', NULL,
+ NULL, 0, b'1', b'0', b'0', 'system', 'system'
+WHERE EXISTS (SELECT 1 FROM system_menu WHERE id = 602589 AND deleted = b'0')
+ AND NOT EXISTS (SELECT 1 FROM system_menu WHERE permission = 'aftersales:return:cancel' AND deleted = b'0');
diff --git a/sql/mysql/xgdl_aftersales_return_link_repair_20261024.sql b/sql/mysql/xgdl_aftersales_return_link_repair_20261024.sql
new file mode 100644
index 0000000..ae8ebda
--- /dev/null
+++ b/sql/mysql/xgdl_aftersales_return_link_repair_20261024.sql
@@ -0,0 +1,10 @@
+-- 浠呬慨澶嶅凡鐢卞敭鍚庣敵璇疯褰曚簡 MES 鍗曟嵁 ID銆佸崟鍙蜂笖鍙屾柟涓�鑷寸殑鍘嗗彶鍏宠仈銆�
+-- 涓嶄慨鏀逛笟鍔$姸鎬侊紱閲嶅鎵ц涓嶄細浜х敓鏂板彉鍖栥��
+UPDATE mes_wm_return_sales AS mes
+JOIN after_sale_return AS after_sale
+ ON after_sale.mes_return_id = mes.id
+ AND after_sale.mes_return_code = mes.code
+SET mes.after_sale_return_id = after_sale.id
+WHERE mes.after_sale_return_id IS NULL
+ AND mes.deleted = 0
+ AND after_sale.deleted = 0;
diff --git a/sql/mysql/xgdl_receivable_legacy_repair_20261024.sql b/sql/mysql/xgdl_receivable_legacy_repair_20261024.sql
new file mode 100644
index 0000000..786ed3b
--- /dev/null
+++ b/sql/mysql/xgdl_receivable_legacy_repair_20261024.sql
@@ -0,0 +1,19 @@
+-- mom-xgdl锛氫慨澶嶇敤鎴锋槑纭壒鍑嗙殑鍗曟潯鍘嗗彶鍥炴 HK20261016001锛圛D 5锛夈��
+-- 鏃х増鍒涘缓鍗宠繘鍏ュ鎵逛腑锛屼絾姝ゅ崟鏃犲紑绁ㄣ�佹棤娴佺▼瀹炰緥銆佹棤 BPM 鍘嗗彶銆�
+-- 宸蹭簬 2026-10-24 鎵ц锛屽奖鍝� 1 琛岋紱閲嶅鎵ц涓嶄細鍐嶆淇敼銆�
+START TRANSACTION;
+UPDATE crm_receivable r
+SET r.audit_status = 0, r.update_time = NOW()
+WHERE r.id = 5 AND r.no = 'HK20261016001' AND r.audit_status = 10
+ AND r.invoice_id IS NULL
+ AND (r.process_instance_id IS NULL OR r.process_instance_id = '')
+ AND r.deleted = b'0'
+ AND NOT EXISTS (
+ SELECT 1 FROM ACT_HI_PROCINST h
+ WHERE h.BUSINESS_KEY_ = CAST(r.id AS CHAR)
+ AND h.PROC_DEF_ID_ LIKE 'crm-receivable-audit:%'
+ );
+COMMIT;
+
+SELECT id, no, audit_status, invoice_id, process_instance_id
+FROM crm_receivable WHERE id = 5;
diff --git a/sql/mysql/xgdl_receivable_workflow_seed.sql b/sql/mysql/xgdl_receivable_workflow_seed.sql
new file mode 100644
index 0000000..2a91328
--- /dev/null
+++ b/sql/mysql/xgdl_receivable_workflow_seed.sql
@@ -0,0 +1,42 @@
+-- mom-xgdl锛氬洖娆� BPM 蹇呰閰嶇疆銆備粎鍦ㄧ幇鏈夊紑绁ㄥ鎵归厤缃彲鐢ㄦ椂澶嶇敤鍚屼竴璐㈠姟瀹℃壒浜恒��
+-- 骞傜瓑鎵ц锛涗笉浼氭彃鍏ヤ笟鍔″洖娆俱�佷吉閫犲鎵圭粨鏋滄垨鏀瑰姩瀹氬埗娴佺▼瀹氫箟銆�
+START TRANSACTION;
+
+INSERT INTO system_approval_config
+ (biz_type, biz_name, approval_enabled, remark, creator, create_time, updater, update_time, deleted)
+SELECT 'crm_receivable_approve', '鍥炴瀹℃壒', i.approval_enabled,
+ '鍥炴瀹℃壒澶嶇敤寮�绁ㄨ储鍔″鎵逛汉', '1', NOW(), '1', NOW(), b'0'
+FROM system_approval_config i
+WHERE i.biz_type = 'crm_invoice_approve' AND i.deleted = b'0'
+ AND NOT EXISTS (
+ SELECT 1 FROM system_approval_config c
+ WHERE c.biz_type = 'crm_receivable_approve' AND c.deleted = b'0'
+ )
+LIMIT 1;
+
+INSERT INTO system_approval_config_user
+ (config_id, user_id, sort, creator, create_time, updater, update_time, deleted)
+SELECT r.id, iu.user_id, iu.sort, '1', NOW(), '1', NOW(), b'0'
+FROM system_approval_config r
+JOIN system_approval_config i ON i.biz_type = 'crm_invoice_approve' AND i.deleted = b'0'
+JOIN system_approval_config_user iu ON iu.config_id = i.id AND iu.deleted = b'0'
+WHERE r.biz_type = 'crm_receivable_approve' AND r.deleted = b'0'
+ AND r.remark = '鍥炴瀹℃壒澶嶇敤寮�绁ㄨ储鍔″鎵逛汉'
+ AND NOT EXISTS (
+ SELECT 1 FROM system_approval_config_user existing
+ WHERE existing.config_id = r.id AND existing.deleted = b'0'
+ )
+ AND NOT EXISTS (
+ SELECT 1 FROM system_approval_config_user ru
+ WHERE ru.config_id = r.id AND ru.user_id = iu.user_id AND ru.deleted = b'0'
+ );
+
+COMMIT;
+
+-- 鍙鏍搁獙锛氬洖娆炬祦绋嬪畾涔夊強瀹℃壒閰嶇疆鍧囧簲瀛樺湪涓斿惎鐢ㄣ��
+SELECT KEY_, SUSPENSION_STATE_ FROM ACT_RE_PROCDEF WHERE KEY_ = 'crm-receivable-audit';
+SELECT c.biz_type, c.approval_enabled, COUNT(u.id) AS approver_count
+FROM system_approval_config c
+LEFT JOIN system_approval_config_user u ON u.config_id = c.id AND u.deleted = b'0'
+WHERE c.biz_type = 'crm_receivable_approve' AND c.deleted = b'0'
+GROUP BY c.id, c.biz_type, c.approval_enabled;
diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/interceptor/ApiAccessLogInterceptor.java b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/interceptor/ApiAccessLogInterceptor.java
index f0fa6e7..c41aace 100644
--- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/interceptor/ApiAccessLogInterceptor.java
+++ b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/interceptor/ApiAccessLogInterceptor.java
@@ -6,6 +6,7 @@
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
import cn.iocoder.yudao.framework.common.util.spring.SpringUtils;
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
@@ -43,13 +44,18 @@
// 鎵撳嵃 request 鏃ュ織
if (!SpringUtils.isProd()) {
- Map<String, String> queryString = ServletUtils.getParamMap(request);
- String requestBody = ServletUtils.getBody(request);
- if (CollUtil.isEmpty(queryString) && StrUtil.isEmpty(requestBody)) {
- log.info("[preHandle][寮�濮嬭姹� URL({}) 鏃犲弬鏁癩", request.getRequestURI());
+ ApiAccessLog accessLog = handlerMethod != null ? handlerMethod.getMethodAnnotation(ApiAccessLog.class) : null;
+ if (accessLog != null && !accessLog.requestEnable()) {
+ log.info("[preHandle][寮�濮嬭姹� URL({}) 鏁忔劅璇锋眰鍙傛暟宸查殣钘廬", request.getRequestURI());
} else {
- log.info("[preHandle][寮�濮嬭姹� URL({}) 鍙傛暟({})]", request.getRequestURI(),
- StrUtil.blankToDefault(requestBody, queryString.toString()));
+ Map<String, String> queryString = ServletUtils.getParamMap(request);
+ String requestBody = ServletUtils.getBody(request);
+ if (CollUtil.isEmpty(queryString) && StrUtil.isEmpty(requestBody)) {
+ log.info("[preHandle][寮�濮嬭姹� URL({}) 鏃犲弬鏁癩", request.getRequestURI());
+ } else {
+ log.info("[preHandle][寮�濮嬭姹� URL({}) 鍙傛暟({})]", request.getRequestURI(),
+ StrUtil.blankToDefault(requestBody, queryString.toString()));
+ }
}
// 璁℃椂
StopWatch stopWatch = new StopWatch();
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/returnobj/AfterSaleReturnController.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/returnobj/AfterSaleReturnController.java
index 68ff1d0..fdaf58e 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/returnobj/AfterSaleReturnController.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/returnobj/AfterSaleReturnController.java
@@ -7,6 +7,7 @@
import cn.iocoder.yudao.module.aftersales.controller.admin.returnobj.vo.AfterSaleReturnPageReqVO;
import cn.iocoder.yudao.module.aftersales.controller.admin.returnobj.vo.AfterSaleReturnRespVO;
import cn.iocoder.yudao.module.aftersales.controller.admin.returnobj.vo.AfterSaleReturnSaveReqVO;
+import cn.iocoder.yudao.module.aftersales.controller.admin.returnobj.vo.AfterSaleRefundConfirmReqVO;
import cn.iocoder.yudao.module.aftersales.dal.dataobject.returnobj.AfterSaleReturnDO;
import cn.iocoder.yudao.module.aftersales.dal.dataobject.returnobj.AfterSaleReturnItemDO;
import cn.iocoder.yudao.module.aftersales.dal.dataobject.ticket.AfterSaleTicketDO;
@@ -60,6 +61,22 @@
return success(true);
}
+ @PutMapping("/complete-refund")
+ @Operation(summary = "纭澶栭儴閫�娆�/鎹㈣揣瀹屾垚")
+ @PreAuthorize("@ss.hasPermission('aftersales:return:refund')")
+ public CommonResult<Boolean> completeRefund(@Valid @RequestBody AfterSaleRefundConfirmReqVO reqVO) {
+ returnService.confirmRefundCompleted(reqVO.getId(), reqVO.getActualRefundPrice(), reqVO.getVoucherNo());
+ return success(true);
+ }
+
+ @PutMapping("/cancel")
+ @Operation(summary = "鍙栨秷灏氭湭鍏ュ簱鎴栭��娆剧殑閫�璐х敵璇�")
+ @PreAuthorize("@ss.hasPermission('aftersales:return:cancel')")
+ public CommonResult<Boolean> cancelReturn(@RequestParam("id") Long id) {
+ returnService.cancelReturn(id);
+ return success(true);
+ }
+
@GetMapping("/get")
@Operation(summary = "鑾峰緱閫�璐х敵璇�")
@Parameter(name = "id", description = "閫�璐х敵璇风紪鍙�", required = true, example = "1")
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/returnobj/vo/AfterSaleRefundConfirmReqVO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/returnobj/vo/AfterSaleRefundConfirmReqVO.java
new file mode 100644
index 0000000..1973a82
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/returnobj/vo/AfterSaleRefundConfirmReqVO.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.aftersales.controller.admin.returnobj.vo;
+
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/** 澶栭儴閫�娆�/鎹㈣揣瀹屾垚纭锛涘繀椤绘彁渚涘彲杩芥函鐨勪笟鍔″嚟璇併�� */
+@Data
+public class AfterSaleRefundConfirmReqVO {
+ @NotNull(message = "閫�璐х敵璇� ID 涓嶈兘涓虹┖")
+ private Long id;
+ @NotNull(message = "瀹為檯閫�娆鹃噾棰濅笉鑳戒负绌猴紝鎹㈣揣鍙~ 0")
+ @DecimalMin(value = "0", message = "瀹為檯閫�娆鹃噾棰濅笉鑳戒负璐熸暟")
+ private BigDecimal actualRefundPrice;
+ @NotBlank(message = "閫�娆炬祦姘村彿鎴栨崲璐у崟鍙蜂笉鑳戒负绌�")
+ @Size(max = 100, message = "鍑瘉鍙蜂笉鑳借秴杩� 100 涓瓧绗�")
+ private String voucherNo;
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/returnobj/vo/AfterSaleReturnRespVO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/returnobj/vo/AfterSaleReturnRespVO.java
index c28108b..91bbf1a 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/returnobj/vo/AfterSaleReturnRespVO.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/returnobj/vo/AfterSaleReturnRespVO.java
@@ -49,6 +49,7 @@
@Schema(description = "瀹為��閲戦", example = "950.00")
private BigDecimal actualRefundPrice;
+ private String refundVoucherNo;
@Schema(description = "鐘舵��", example = "10")
private Integer status;
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/returnobj/AfterSaleReturnDO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/returnobj/AfterSaleReturnDO.java
index 776db7f..38c0a63 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/returnobj/AfterSaleReturnDO.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/returnobj/AfterSaleReturnDO.java
@@ -66,6 +66,8 @@
* 瀹為��閲戦
*/
private BigDecimal actualRefundPrice;
+ /** 澶栭儴閫�娆炬祦姘村彿鎴栨崲璐у崟鍙凤紝渚涗汉宸ュ畬鎴愮‘璁ゆ椂杩芥函銆� */
+ private String refundVoucherNo;
/**
* 閫�璐х姸鎬�
*
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/returnobj/AfterSaleReturnMapper.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/returnobj/AfterSaleReturnMapper.java
index eb0ac14..8bbc73d 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/returnobj/AfterSaleReturnMapper.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/returnobj/AfterSaleReturnMapper.java
@@ -6,6 +6,7 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
import cn.iocoder.yudao.module.aftersales.dal.dataobject.returnobj.AfterSaleReturnDO;
+import cn.iocoder.yudao.module.aftersales.enums.AfterSaleReturnStatusEnum;
import cn.iocoder.yudao.module.aftersales.enums.AfterSaleBizTypeEnum;
import cn.iocoder.yudao.module.aftersales.util.AfterSalePermissionUtils;
import org.apache.ibatis.annotations.Mapper;
@@ -24,6 +25,12 @@
return selectOne(AfterSaleReturnDO::getTicketId, ticketId);
}
+ default boolean existsActiveByTicketId(Long ticketId) {
+ return selectCount(new LambdaQueryWrapperX<AfterSaleReturnDO>()
+ .eq(AfterSaleReturnDO::getTicketId, ticketId)
+ .ne(AfterSaleReturnDO::getStatus, AfterSaleReturnStatusEnum.CANCELED.getStatus())) > 0;
+ }
+
default PageResult<AfterSaleReturnDO> selectPage(PageParam pageParam, Long userId, Integer sceneType,
String no, Long ticketId,
Long customerId, Integer status) {
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java
index 267be1a..7e73cf9 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java
@@ -31,6 +31,12 @@
ErrorCode RETURN_ITEM_EMPTY = new ErrorCode(1_022_002_003, "閫�璐ф槑缁嗚涓嶈兘涓虹┖");
ErrorCode RETURN_DELETE_FAIL_NOT_DRAFT = new ErrorCode(1_022_002_004, "閫�璐х敵璇蜂笉鏄崏绋跨姸鎬侊紝鏃犳硶鍒犻櫎");
ErrorCode RETURN_TICKET_SALE_ORDER_REQUIRED = new ErrorCode(1_022_002_005, "鍒涘缓閫�璐х敵璇峰け璐ワ紝鍘熷洜锛氬敭鍚庡伐鍗曟湭鍏宠仈閿�鍞鍗�");
+ ErrorCode RETURN_TICKET_INVALID = new ErrorCode(1_022_002_006, "閫�璐х敵璇蜂笌宸ュ崟鐨勫鎴锋垨鐘舵�佷笉涓�鑷达紝鎴栬宸ュ崟宸叉湁閫�璐х敵璇�");
+ ErrorCode RETURN_ITEM_INVALID = new ErrorCode(1_022_002_007, "閫�璐ф槑缁嗕笌宸ュ崟鐗╂枡涓嶄竴鑷达紝鎴栭��璐ф暟閲忋�侀噾棰濇棤鏁�");
+ ErrorCode RETURN_STATUS_ERROR = new ErrorCode(1_022_002_008, "閫�璐х敵璇峰綋鍓嶇姸鎬佷笉鍏佽姝ゆ搷浣�");
+ ErrorCode RETURN_TICKET_NOT_FINISHED = new ErrorCode(1_022_002_009, "閫�璐у皻鏈畬鎴愬叆搴撳拰閫�娆�/鎹㈣揣锛屽伐鍗曚笉鑳藉畬缁�");
+ ErrorCode RETURN_REFUND_VOUCHER_REQUIRED = new ErrorCode(1_022_002_010, "璇峰~鍐欓��娆炬祦姘村彿鎴栨崲璐у崟鍙�");
+ ErrorCode RETURN_REFUND_EXCEEDS_TOTAL = new ErrorCode(1_022_002_011, "瀹為檯閫�娆鹃噾棰濅笉鑳借秴杩囧簲閫�鎬婚噾棰�");
// ========== 缁翠慨璁板綍 1-022-003-000 ==========
ErrorCode REPAIR_NOT_EXISTS = new ErrorCode(1_022_003_000, "缁翠慨璁板綍涓嶅瓨鍦�");
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleMesReturnProgressListener.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleMesReturnProgressListener.java
new file mode 100644
index 0000000..1c43d2e
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleMesReturnProgressListener.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.aftersales.service.returnobj;
+
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.returnobj.AfterSaleReturnDO;
+import cn.iocoder.yudao.module.aftersales.dal.mysql.returnobj.AfterSaleReturnMapper;
+import cn.iocoder.yudao.module.mes.api.event.MesReturnSalesProgressEvent;
+import jakarta.annotation.Resource;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+
+/** 灏� MES 璐ㄦ銆佸叆搴撶粨鏋滃悓姝ュ埌鍞悗鐢宠銆傚悓姝ョ洃鍚繚璇佷换涓�姝ュけ璐ユ椂鏁翠綋鍥炴粴銆� */
+@Component
+public class AfterSaleMesReturnProgressListener {
+
+ @Resource
+ private AfterSaleReturnMapper returnMapper;
+ @Resource
+ private AfterSaleReturnService returnService;
+
+ @EventListener
+ public void onProgress(MesReturnSalesProgressEvent event) {
+ AfterSaleReturnDO returnDO = returnMapper.selectByMesReturnId(event.mesReturnId());
+ if (returnDO == null) {
+ return;
+ }
+ if (event.stage() == MesReturnSalesProgressEvent.Stage.QUALITY_FINISHED) {
+ returnService.onQualityFinished(returnDO.getId(), event.qualityResult(), null);
+ } else if (event.stage() == MesReturnSalesProgressEvent.Stage.INBOUND_FINISHED) {
+ returnService.onInboundFinished(returnDO.getId());
+ } else if (event.stage() == MesReturnSalesProgressEvent.Stage.CANCELED) {
+ returnService.onMesCanceled(returnDO.getId());
+ }
+ }
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleReturnService.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleReturnService.java
index f3391f1..ee74141 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleReturnService.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleReturnService.java
@@ -32,6 +32,12 @@
*/
void approveReturn(Long id);
+ /** 鍙栨秷灏氭湭鍏ュ簱鎴栭��娆剧殑鐢宠銆� */
+ void cancelReturn(Long id);
+
+ /** MES 渚у彇娑堟椂鍚屾鍥為��鍞悗宸ュ崟銆� */
+ void onMesCanceled(Long returnId);
+
/**
* 鑾峰緱閫�璐х敵璇�
*
@@ -89,4 +95,7 @@
*/
void onRefundCompleted(Long returnId, BigDecimal actualRefundPrice);
+ /** 纭澶栭儴閫�娆炬垨鎹㈣揣宸插畬鎴愶紝鍑瘉鍙峰繀濉�� */
+ void confirmRefundCompleted(Long returnId, BigDecimal actualRefundPrice, String voucherNo);
+
}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleReturnServiceImpl.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleReturnServiceImpl.java
index f165863..6db6bd9 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleReturnServiceImpl.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleReturnServiceImpl.java
@@ -8,9 +8,11 @@
import cn.iocoder.yudao.module.aftersales.dal.dataobject.returnobj.AfterSaleReturnDO;
import cn.iocoder.yudao.module.aftersales.dal.dataobject.returnobj.AfterSaleReturnItemDO;
import cn.iocoder.yudao.module.aftersales.dal.dataobject.ticket.AfterSaleTicketDO;
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.ticket.AfterSaleTicketItemDO;
import cn.iocoder.yudao.module.aftersales.dal.mysql.returnobj.AfterSaleReturnItemMapper;
import cn.iocoder.yudao.module.aftersales.dal.mysql.returnobj.AfterSaleReturnMapper;
import cn.iocoder.yudao.module.aftersales.dal.mysql.ticket.AfterSaleTicketMapper;
+import cn.iocoder.yudao.module.aftersales.dal.mysql.ticket.AfterSaleTicketItemMapper;
import cn.iocoder.yudao.module.aftersales.dal.redis.no.AfterSaleNoRedisDAO;
import cn.iocoder.yudao.module.aftersales.enums.AfterSaleBizTypeEnum;
import cn.iocoder.yudao.module.aftersales.enums.AfterSaleReturnStatusEnum;
@@ -31,6 +33,14 @@
import java.time.LocalDateTime;
import java.util.Collection;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Objects;
+import java.util.HashSet;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.aftersales.enums.ErrorCodeConstants.*;
@@ -49,6 +59,8 @@
private AfterSaleReturnItemMapper returnItemMapper;
@Resource
private AfterSaleTicketMapper ticketMapper;
+ @Resource
+ private AfterSaleTicketItemMapper ticketItemMapper;
@Resource
private AfterSaleNoRedisDAO noRedisDAO;
@@ -69,6 +81,37 @@
}
if (ticket.getSaleOrderId() == null) {
throw exception(RETURN_TICKET_SALE_ORDER_REQUIRED);
+ }
+ if (!AfterSaleTicketStatusEnum.PROCESSING.getStatus().equals(ticket.getStatus())
+ || !Objects.equals(ticket.getCustomerId(), createReqVO.getCustomerId())
+ || ticket.getReturnId() != null || returnMapper.existsActiveByTicketId(ticket.getId())) {
+ throw exception(RETURN_TICKET_INVALID);
+ }
+ if (CollUtil.isEmpty(createReqVO.getItems())) {
+ throw exception(RETURN_ITEM_EMPTY);
+ }
+ if (createReqVO.getReturnType() == null || !List.of(1, 2, 3).contains(createReqVO.getReturnType())) {
+ throw exception(RETURN_ITEM_INVALID);
+ }
+ Map<Long, AfterSaleTicketItemDO> ticketItems = ticketItemMapper.selectListByTicketId(ticket.getId())
+ .stream().collect(Collectors.toMap(AfterSaleTicketItemDO::getId, Function.identity()));
+ Set<Long> usedItems = new HashSet<>();
+ for (AfterSaleReturnSaveReqVO.Item item : createReqVO.getItems()) {
+ AfterSaleTicketItemDO ticketItem = ticketItems.get(item.getTicketItemId());
+ if (ticketItem == null || !usedItems.add(item.getTicketItemId())
+ || item.getItemId() == null || !item.getItemId().equals(ticketItem.getItemId())
+ || (!Integer.valueOf(3).equals(createReqVO.getReturnType())
+ && !Boolean.TRUE.equals(ticketItem.getNeedReturn()))
+ || (ticketItem.getBatchId() != null && !Objects.equals(item.getBatchId(), ticketItem.getBatchId()))
+ || item.getReturnQuantity() == null || item.getReturnQuantity().signum() <= 0
+ || ticketItem.getSaleQuantity() == null
+ || item.getReturnQuantity().compareTo(ticketItem.getSaleQuantity()) > 0
+ || (ticketItem.getReturnQuantity() != null && ticketItem.getReturnQuantity().signum() > 0
+ && item.getReturnQuantity().compareTo(ticketItem.getReturnQuantity()) > 0)
+ || item.getUnitPrice() == null || item.getUnitPrice().signum() < 0
+ || item.getReturnPrice() == null || item.getReturnPrice().signum() < 0) {
+ throw exception(RETURN_ITEM_INVALID);
+ }
}
// 閿�鍞鍗曚互宸ュ崟涓哄噯锛屼繚璇侀��璐у崟涓庡伐鍗曞叧鑱斿悓涓�璁㈠崟
createReqVO.setSaleOrderId(ticket.getSaleOrderId());
@@ -112,9 +155,15 @@
permissionService.createPermission(permBO);
// 7. 鏇存柊宸ュ崟鐘舵�佷负寰呴��璐�
- ticketMapper.updateById(new AfterSaleTicketDO().setId(ticket.getId())
- .setReturnId(returnDO.getId())
- .setStatus(AfterSaleTicketStatusEnum.WAITING_RETURN.getStatus()));
+ int ticketUpdated = ticketMapper.update(null, new LambdaUpdateWrapper<AfterSaleTicketDO>()
+ .eq(AfterSaleTicketDO::getId, ticket.getId())
+ .eq(AfterSaleTicketDO::getStatus, AfterSaleTicketStatusEnum.PROCESSING.getStatus())
+ .isNull(AfterSaleTicketDO::getReturnId)
+ .set(AfterSaleTicketDO::getReturnId, returnDO.getId())
+ .set(AfterSaleTicketDO::getStatus, AfterSaleTicketStatusEnum.WAITING_RETURN.getStatus()));
+ if (ticketUpdated != 1) {
+ throw exception(RETURN_TICKET_INVALID);
+ }
return returnDO.getId();
}
@@ -131,7 +180,20 @@
// 2. 鑾峰彇鍏宠仈宸ュ崟锛堢敤浜庤幏鍙栭攢鍞鍗曞彿绛夊啑浣欎俊鎭級
AfterSaleTicketDO ticket = ticketMapper.selectById(returnDO.getTicketId());
- // 3. 璋冪敤 MES 鍒涘缓閿�鍞��璐у崟
+ // 3. 浠呴��娆句笉浜х敓瀹炵墿鍏ュ簱锛涘叾浣欑被鍨嬪皢鏄庣粏瀹屾暣甯﹀叆 MES
+ if (Integer.valueOf(3).equals(returnDO.getReturnType())) {
+ returnMapper.updateById(new AfterSaleReturnDO().setId(id)
+ .setStatus(AfterSaleReturnStatusEnum.APPROVED.getStatus())
+ .setAuditTime(LocalDateTime.now()));
+ if (ticketMapper.update(null, new LambdaUpdateWrapper<AfterSaleTicketDO>()
+ .eq(AfterSaleTicketDO::getId, returnDO.getTicketId())
+ .eq(AfterSaleTicketDO::getReturnId, id)
+ .eq(AfterSaleTicketDO::getStatus, AfterSaleTicketStatusEnum.WAITING_RETURN.getStatus())
+ .set(AfterSaleTicketDO::getStatus, AfterSaleTicketStatusEnum.WAITING_REFUND.getStatus())) != 1) {
+ throw exception(RETURN_TICKET_INVALID);
+ }
+ return;
+ }
MesWmReturnSalesCreateReqDTO mesReqDTO = new MesWmReturnSalesCreateReqDTO();
mesReqDTO.setCode(returnDO.getNo());
mesReqDTO.setName("鍞悗閫�璐�-" + returnDO.getNo());
@@ -142,6 +204,15 @@
mesReqDTO.setReturnReason(returnDO.getReturnReason());
mesReqDTO.setRemark("鍞悗宸ュ崟閫�璐� - 宸ュ崟鍙�: " + (ticket != null ? ticket.getNo() : ""));
mesReqDTO.setAfterSaleReturnId(returnDO.getId());
+ mesReqDTO.setItems(returnItemMapper.selectListByReturnId(id).stream().map(item -> {
+ MesWmReturnSalesCreateReqDTO.Item line = new MesWmReturnSalesCreateReqDTO.Item();
+ line.setItemId(item.getItemId());
+ line.setQuantity(item.getReturnQuantity());
+ line.setBatchId(item.getBatchId());
+ line.setBatchCode(item.getBatchCode());
+ line.setRemark(item.getRemark());
+ return line;
+ }).toList());
Long mesReturnId = mesWmReturnSalesApi.createReturnSales(mesReqDTO);
// 4. 鏇存柊閫�璐х敵璇风姸鎬�
@@ -150,6 +221,45 @@
.setMesReturnId(mesReturnId)
.setMesReturnCode(returnDO.getNo())
.setAuditTime(LocalDateTime.now()));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void cancelReturn(Long id) {
+ AfterSaleReturnDO returnDO = validateReturnExists(id);
+ if (!List.of(AfterSaleReturnStatusEnum.DRAFT.getStatus(), AfterSaleReturnStatusEnum.APPROVED.getStatus(),
+ AfterSaleReturnStatusEnum.INSPECTING.getStatus(), AfterSaleReturnStatusEnum.INSPECTED.getStatus())
+ .contains(returnDO.getStatus())) {
+ throw exception(RETURN_STATUS_ERROR);
+ }
+ if (returnDO.getMesReturnId() != null) {
+ mesWmReturnSalesApi.cancelReturnSales(returnDO.getMesReturnId());
+ } else {
+ onMesCanceled(id);
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void onMesCanceled(Long returnId) {
+ AfterSaleReturnDO returnDO = validateReturnExists(returnId);
+ if (AfterSaleReturnStatusEnum.CANCELED.getStatus().equals(returnDO.getStatus())) {
+ return;
+ }
+ if (!List.of(AfterSaleReturnStatusEnum.DRAFT.getStatus(), AfterSaleReturnStatusEnum.APPROVED.getStatus(),
+ AfterSaleReturnStatusEnum.INSPECTING.getStatus(), AfterSaleReturnStatusEnum.INSPECTED.getStatus())
+ .contains(returnDO.getStatus())) {
+ throw exception(RETURN_STATUS_ERROR);
+ }
+ returnMapper.updateById(new AfterSaleReturnDO().setId(returnId)
+ .setStatus(AfterSaleReturnStatusEnum.CANCELED.getStatus()));
+ if (ticketMapper.update(null, new LambdaUpdateWrapper<AfterSaleTicketDO>()
+ .eq(AfterSaleTicketDO::getId, returnDO.getTicketId())
+ .eq(AfterSaleTicketDO::getReturnId, returnId)
+ .set(AfterSaleTicketDO::getReturnId, null)
+ .set(AfterSaleTicketDO::getStatus, AfterSaleTicketStatusEnum.PROCESSING.getStatus())) != 1) {
+ throw exception(RETURN_TICKET_INVALID);
+ }
}
@Override
@@ -181,6 +291,15 @@
@Transactional(rollbackFor = Exception.class)
public void onQualityFinished(Long returnId, String qualityResult, String reportUrl) {
AfterSaleReturnDO returnDO = validateReturnExists(returnId);
+ if (List.of(AfterSaleReturnStatusEnum.INSPECTED.getStatus(), AfterSaleReturnStatusEnum.INBOUND.getStatus(),
+ AfterSaleReturnStatusEnum.REFUNDED.getStatus(), AfterSaleReturnStatusEnum.CLOSED.getStatus())
+ .contains(returnDO.getStatus())) {
+ return;
+ }
+ if (!AfterSaleReturnStatusEnum.APPROVED.getStatus().equals(returnDO.getStatus())
+ && !AfterSaleReturnStatusEnum.INSPECTING.getStatus().equals(returnDO.getStatus())) {
+ throw exception(RETURN_STATUS_ERROR);
+ }
returnMapper.updateById(new AfterSaleReturnDO().setId(returnId)
.setQualityResult(qualityResult)
.setQualityReportUrl(reportUrl)
@@ -191,25 +310,77 @@
@Transactional(rollbackFor = Exception.class)
public void onInboundFinished(Long returnId) {
AfterSaleReturnDO returnDO = validateReturnExists(returnId);
+ if (List.of(AfterSaleReturnStatusEnum.INBOUND.getStatus(), AfterSaleReturnStatusEnum.REFUNDED.getStatus(),
+ AfterSaleReturnStatusEnum.CLOSED.getStatus()).contains(returnDO.getStatus())) {
+ return;
+ }
+ if (!AfterSaleReturnStatusEnum.INSPECTED.getStatus().equals(returnDO.getStatus())) {
+ throw exception(RETURN_STATUS_ERROR);
+ }
returnMapper.updateById(new AfterSaleReturnDO().setId(returnId)
.setStatus(AfterSaleReturnStatusEnum.INBOUND.getStatus())
.setReturnInboundTime(LocalDateTime.now()));
+ if (ticketMapper.update(null, new LambdaUpdateWrapper<AfterSaleTicketDO>()
+ .eq(AfterSaleTicketDO::getId, returnDO.getTicketId())
+ .eq(AfterSaleTicketDO::getReturnId, returnId)
+ .eq(AfterSaleTicketDO::getStatus, AfterSaleTicketStatusEnum.WAITING_RETURN.getStatus())
+ .set(AfterSaleTicketDO::getStatus, AfterSaleTicketStatusEnum.WAITING_REFUND.getStatus())) != 1) {
+ throw exception(RETURN_TICKET_INVALID);
+ }
}
@Override
@Transactional(rollbackFor = Exception.class)
public void onRefundCompleted(Long returnId, BigDecimal actualRefundPrice) {
+ completeRefund(returnId, actualRefundPrice, null, false);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void confirmRefundCompleted(Long returnId, BigDecimal actualRefundPrice, String voucherNo) {
+ if (StrUtil.isBlank(voucherNo)) {
+ throw exception(RETURN_REFUND_VOUCHER_REQUIRED);
+ }
+ completeRefund(returnId, actualRefundPrice, voucherNo.trim(), true);
+ }
+
+ private void completeRefund(Long returnId, BigDecimal actualRefundPrice, String voucherNo, boolean manual) {
AfterSaleReturnDO returnDO = validateReturnExists(returnId);
+ if (List.of(AfterSaleReturnStatusEnum.REFUNDED.getStatus(), AfterSaleReturnStatusEnum.CLOSED.getStatus())
+ .contains(returnDO.getStatus())) {
+ return;
+ }
+ boolean refundOnly = Integer.valueOf(3).equals(returnDO.getReturnType());
+ if (!(refundOnly && AfterSaleReturnStatusEnum.APPROVED.getStatus().equals(returnDO.getStatus()))
+ && !AfterSaleReturnStatusEnum.INBOUND.getStatus().equals(returnDO.getStatus())) {
+ throw exception(RETURN_STATUS_ERROR);
+ }
+ if (actualRefundPrice == null || actualRefundPrice.signum() < 0) {
+ throw exception(RETURN_ITEM_INVALID);
+ }
+ if (manual && returnDO.getTotalReturnPrice() != null
+ && actualRefundPrice.compareTo(returnDO.getTotalReturnPrice()) > 0) {
+ throw exception(RETURN_REFUND_EXCEEDS_TOTAL);
+ }
+ if (manual && !Integer.valueOf(2).equals(returnDO.getReturnType())
+ && returnDO.getTotalReturnPrice() != null && returnDO.getTotalReturnPrice().signum() > 0
+ && actualRefundPrice.signum() == 0) {
+ throw exception(RETURN_ITEM_INVALID);
+ }
returnMapper.updateById(new AfterSaleReturnDO().setId(returnId)
.setActualRefundPrice(actualRefundPrice)
+ .setRefundVoucherNo(voucherNo)
.setStatus(AfterSaleReturnStatusEnum.REFUNDED.getStatus())
.setRefundTime(LocalDateTime.now()));
- // 鏇存柊鍏宠仈宸ュ崟鐘舵�佷负寰呴��娆�/鎹㈣揣瀹屾垚
- AfterSaleTicketDO ticket = ticketMapper.selectById(returnDO.getTicketId());
- if (ticket != null) {
- ticketMapper.updateById(new AfterSaleTicketDO().setId(ticket.getId())
- .setStatus(AfterSaleTicketStatusEnum.WAITING_REFUND.getStatus()));
+ // 閫�娆炬垨鎹㈣揣瀹屾垚鍚庡伐鍗曟墠鑳藉畬缁�
+ if (ticketMapper.update(null, new LambdaUpdateWrapper<AfterSaleTicketDO>()
+ .eq(AfterSaleTicketDO::getId, returnDO.getTicketId())
+ .eq(AfterSaleTicketDO::getReturnId, returnId)
+ .eq(AfterSaleTicketDO::getStatus, AfterSaleTicketStatusEnum.WAITING_REFUND.getStatus())
+ .set(AfterSaleTicketDO::getStatus, AfterSaleTicketStatusEnum.COMPLETED.getStatus())
+ .set(AfterSaleTicketDO::getResolvedTime, LocalDateTime.now())) != 1) {
+ throw exception(RETURN_TICKET_INVALID);
}
}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketServiceImpl.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketServiceImpl.java
index c509cce..a5e28fd 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketServiceImpl.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketServiceImpl.java
@@ -6,6 +6,9 @@
import cn.iocoder.yudao.module.aftersales.controller.admin.ticket.vo.ticket.AfterSaleTicketPageReqVO;
import cn.iocoder.yudao.module.aftersales.controller.admin.ticket.vo.ticket.AfterSaleTicketSaveReqVO;
import cn.iocoder.yudao.module.aftersales.dal.dataobject.ticket.AfterSaleTicketDO;
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.returnobj.AfterSaleReturnDO;
+import cn.iocoder.yudao.module.aftersales.dal.mysql.returnobj.AfterSaleReturnMapper;
+import cn.iocoder.yudao.module.aftersales.enums.AfterSaleReturnStatusEnum;
import cn.iocoder.yudao.module.aftersales.dal.dataobject.ticket.AfterSaleTicketItemDO;
import cn.iocoder.yudao.module.aftersales.dal.mysql.ticket.AfterSaleTicketItemMapper;
import cn.iocoder.yudao.module.aftersales.dal.mysql.ticket.AfterSaleTicketMapper;
@@ -41,6 +44,8 @@
private AfterSaleTicketMapper ticketMapper;
@Resource
private AfterSaleTicketItemMapper ticketItemMapper;
+ @Resource
+ private AfterSaleReturnMapper returnMapper;
@Resource
private AfterSaleNoRedisDAO noRedisDAO;
@@ -178,6 +183,12 @@
AfterSaleTicketDO ticket = validateTicketExists(id);
validateTicketStatus(ticket, AfterSaleTicketStatusEnum.PROCESSING,
AfterSaleTicketStatusEnum.WAITING_RETURN, AfterSaleTicketStatusEnum.WAITING_REFUND);
+ if (ticket.getReturnId() != null) {
+ AfterSaleReturnDO returnDO = returnMapper.selectById(ticket.getReturnId());
+ if (returnDO == null || !AfterSaleReturnStatusEnum.REFUNDED.getStatus().equals(returnDO.getStatus())) {
+ throw exception(RETURN_TICKET_NOT_FINISHED);
+ }
+ }
ticketMapper.updateById(new AfterSaleTicketDO().setId(id)
.setStatus(AfterSaleTicketStatusEnum.COMPLETED.getStatus())
.setResolvedTime(LocalDateTime.now()));
@@ -188,6 +199,14 @@
public void closeTicket(Long id) {
AfterSaleTicketDO ticket = validateTicketExists(id);
validateTicketStatus(ticket, AfterSaleTicketStatusEnum.COMPLETED);
+ if (ticket.getReturnId() != null) {
+ AfterSaleReturnDO returnDO = returnMapper.selectById(ticket.getReturnId());
+ if (returnDO == null || !AfterSaleReturnStatusEnum.REFUNDED.getStatus().equals(returnDO.getStatus())) {
+ throw exception(RETURN_TICKET_NOT_FINISHED);
+ }
+ returnMapper.updateById(new AfterSaleReturnDO().setId(returnDO.getId())
+ .setStatus(AfterSaleReturnStatusEnum.CLOSED.getStatus()));
+ }
ticketMapper.updateById(new AfterSaleTicketDO().setId(id)
.setStatus(AfterSaleTicketStatusEnum.CLOSED.getStatus())
.setClosedTime(LocalDateTime.now()));
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivableController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivableController.java
index 57c8fc1..2b7f9fc 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivableController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivableController.java
@@ -176,12 +176,11 @@
});
}
- @PutMapping("/update-status")
- @Operation(summary = "鏇存柊鍥炴鐨勭姸鎬侊紙瀹℃牳/鍙嶅鏍革級")
+ @PutMapping("/submit")
+ @Operation(summary = "鎻愪氦鍥炴瀹℃壒锛堣崏绋�/椹冲洖鈫掑鎵逛腑锛�")
@PreAuthorize("@ss.hasPermission('crm:receivable:update')")
- public CommonResult<Boolean> updateReceivableStatus(@RequestParam("id") Long id,
- @RequestParam("status") Integer status) {
- receivableService.updateReceivableStatus(id, status);
+ public CommonResult<Boolean> submitReceivable(@RequestParam("id") Long id) {
+ receivableService.submitReceivable(id);
return success(true);
}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/receivable/CrmReceivableMapper.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/receivable/CrmReceivableMapper.java
index fa39454..7739e71 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/receivable/CrmReceivableMapper.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/receivable/CrmReceivableMapper.java
@@ -6,7 +6,6 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.receivable.CrmReceivablePageReqVO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.CrmReceivableDO;
import cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum;
import cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum;
@@ -71,7 +70,7 @@
CrmPermissionUtils.appendPermissionCondition(query, CrmBizTypeEnum.CRM_RECEIVABLE.getType(),
CrmReceivableDO::getId, userId, CrmSceneTypeEnum.OWNER.getType());
// 鏈鏍�
- query.eq(CrmContractDO::getAuditStatus, CrmAuditStatusEnum.PROCESS.getStatus());
+ query.eq(CrmReceivableDO::getAuditStatus, CrmAuditStatusEnum.PROCESS.getStatus());
return selectCount(query);
}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
index de79265..24731b9 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
@@ -55,7 +55,7 @@
ErrorCode RECEIVABLE_NOT_EXISTS = new ErrorCode(1_020_004_000, "鍥炴涓嶅瓨鍦�");
ErrorCode RECEIVABLE_UPDATE_FAIL_EDITING_PROHIBITED = new ErrorCode(1_020_004_001, "鏇存柊鍥炴澶辫触锛屽師鍥狅細绂佹缂栬緫");
ErrorCode RECEIVABLE_DELETE_FAIL = new ErrorCode(1_020_004_002, "鍒犻櫎鍥炴澶辫触锛屽師鍥狅細 琚洖娆捐鍒掓墍浣跨敤锛屼笉鍏佽鍒犻櫎");
- ErrorCode RECEIVABLE_SUBMIT_FAIL_NOT_DRAFT = new ErrorCode(1_020_004_003, "鍥炴鎻愪氦瀹℃牳澶辫触锛屽師鍥狅細鍥炴娌″鍦ㄦ湭鎻愪氦鐘舵��");
+ ErrorCode RECEIVABLE_SUBMIT_FAIL_NOT_DRAFT = new ErrorCode(1_020_004_003, "鍥炴鎻愪氦瀹℃牳澶辫触锛屽師鍥狅細鍥炴椤诲浜庤崏绋挎垨瀹℃牳涓嶉�氳繃鐘舵��");
ErrorCode RECEIVABLE_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS = new ErrorCode(1_020_004_004, "鏇存柊鍥炴瀹℃牳鐘舵�佸け璐ワ紝鍘熷洜锛氬洖娆句笉鏄鏍镐腑鐘舵��");
ErrorCode RECEIVABLE_NO_EXISTS = new ErrorCode(1_020_004_005, "鐢熸垚鍥炴搴忓垪鍙烽噸澶嶏紝璇烽噸璇�");
ErrorCode RECEIVABLE_CREATE_FAIL_CONTRACT_NOT_APPROVE = new ErrorCode(1_020_004_006, "鍒涘缓鍥炴澶辫触锛屽師鍥狅細鍚堝悓涓嶆槸瀹℃牳閫氳繃鐘舵��");
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableService.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableService.java
index 55ee80c..b85a810 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableService.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableService.java
@@ -36,13 +36,11 @@
*/
void updateReceivable(@Valid CrmReceivableSaveReqVO updateReqVO);
- /**
- * 鏇存柊鍥炴鐨勭姸鎬侊紙瀹℃牳/鍙嶅鏍革級
- *
- * @param id 缂栧彿
- * @param status 鐘舵��
- */
- void updateReceivableStatus(Long id, Integer status);
+ /** 鎻愪氦鍥炴瀹℃壒銆� */
+ void submitReceivable(Long id);
+
+ /** BPM 瀹℃壒缁撴潫鏃跺洖鍐欏洖娆剧姸鎬併�� */
+ void updateReceivableAuditStatus(Long id, Integer bpmStatus);
/**
* 鍒犻櫎鍥炴
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
index 02dad68..2a6d218 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
@@ -24,13 +24,18 @@
import cn.iocoder.yudao.module.crm.service.invoice.CrmInvoiceService;
import cn.iocoder.yudao.module.crm.service.permission.CrmPermissionService;
import cn.iocoder.yudao.module.crm.service.permission.bo.CrmPermissionCreateReqBO;
+import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
+import cn.iocoder.yudao.module.system.api.approval.ApprovalConfigApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.enums.storage.StorageRecordTypeEnum;
import com.mzt.logapi.context.LogRecordContext;
import com.mzt.logapi.service.impl.DiffParseFunction;
import com.mzt.logapi.starter.annotation.LogRecord;
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;
@@ -40,6 +45,7 @@
import java.util.*;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants.*;
import static cn.iocoder.yudao.module.crm.enums.LogRecordConstants.*;
@@ -50,7 +56,11 @@
*/
@Service
@Validated
+@Slf4j
public class CrmReceivableServiceImpl implements CrmReceivableService {
+
+ private static final String RECEIVABLE_PROCESS_KEY = "crm-receivable-audit";
+ private static final String RECEIVABLE_APPROVE_BIZ_TYPE = "crm_receivable_approve";
@Resource
private CrmReceivableMapper receivableMapper;
@@ -72,6 +82,10 @@
private AdminUserApi adminUserApi;
@Resource
private StorageAttachmentApi storageAttachmentApi;
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
+ @Resource
+ private ApprovalConfigApi approvalConfigApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -92,9 +106,9 @@
throw exception(RECEIVABLE_NO_EXISTS);
}
- // 2.1 鎻掑叆鍥炴锛堝垱寤哄悗鍗充负鏈鏍哥姸鎬侊級
+ // 2.1 鎻掑叆鑽夌锛涙彁浜ゆ椂鍐嶅垱寤� BPM 娴佺▼
CrmReceivableDO receivable = BeanUtils.toBean(createReqVO, CrmReceivableDO.class)
- .setNo(no).setAuditStatus(CrmAuditStatusEnum.PROCESS.getStatus());
+ .setNo(no).setAuditStatus(CrmAuditStatusEnum.DRAFT.getStatus());
receivableMapper.insert(receivable);
// 2.2
@@ -227,8 +241,9 @@
// 1.5 鏍¢獙鍙洖娆鹃噾棰濅笉瓒呰繃璇ュ紑绁ㄥ墿浣欏彲鍥炴閲戦
validateReceivablePriceExceedsInvoiceRemaining(updateReqVO);
- // 1.6 鍙湁鏈鏍革紝鍙互缂栬緫锛�
- if (ObjectUtil.notEqual(oldReceivable.getAuditStatus(), CrmAuditStatusEnum.PROCESS.getStatus())) {
+ // 1.6 鍙湁鑽夌鎴栭┏鍥炲悗鍙互缂栬緫
+ if (ObjectUtil.notEqual(oldReceivable.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus())
+ && ObjectUtil.notEqual(oldReceivable.getAuditStatus(), CrmAuditStatusEnum.REJECT.getStatus())) {
throw exception(RECEIVABLE_UPDATE_FAIL_EDITING_PROHIBITED);
}
@@ -253,20 +268,48 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateReceivableStatus(Long id, Integer status) {
- boolean approve = CrmAuditStatusEnum.APPROVE.getStatus().equals(status);
- // 1.1 鏍¢獙瀛樺湪
+ @CrmPermission(bizType = CrmBizTypeEnum.CRM_RECEIVABLE, bizId = "#id", level = CrmPermissionLevelEnum.WRITE)
+ public void submitReceivable(Long id) {
CrmReceivableDO receivable = validateReceivableExists(id);
- // 1.2 鏍¢獙鐘舵��
- if (receivable.getAuditStatus().equals(status)) {
- throw exception(approve ? RECEIVABLE_APPROVE_FAIL : RECEIVABLE_PROCESS_FAIL);
+ if (ObjectUtil.notEqual(receivable.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus())
+ && ObjectUtil.notEqual(receivable.getAuditStatus(), CrmAuditStatusEnum.REJECT.getStatus())) {
+ throw exception(RECEIVABLE_SUBMIT_FAIL_NOT_DRAFT);
}
-
- // 2. 鏇存柊鐘舵��
+ // 鑽夌鏈熷彲鑳藉凡浜х敓鍏朵粬鍥炴锛屾彁浜ゆ椂閲嶆柊鏍¢獙鍚堝悓鍙婂紑绁ㄩ搴︺��
+ CrmReceivableSaveReqVO req = new CrmReceivableSaveReqVO().setId(id)
+ .setContractId(receivable.getContractId()).setInvoiceId(receivable.getInvoiceId())
+ .setCustomerId(receivable.getCustomerId()).setPrice(receivable.getPrice());
+ validateInvoiceForReceivable(req);
+ validateReceivablePriceExceedsLimit(req);
+ validateReceivablePriceExceedsInvoiceRemaining(req);
+ approvalConfigApi.validateApprovalEnabledAndGetApprovers(RECEIVABLE_APPROVE_BIZ_TYPE);
int updateCount = receivableMapper.updateByIdAndStatus(id, receivable.getAuditStatus(),
- new CrmReceivableDO().setAuditStatus(status));
+ new CrmReceivableDO().setAuditStatus(CrmAuditStatusEnum.PROCESS.getStatus()));
if (updateCount == 0) {
- throw exception(approve ? RECEIVABLE_APPROVE_FAIL : RECEIVABLE_PROCESS_FAIL);
+ throw exception(RECEIVABLE_SUBMIT_FAIL_NOT_DRAFT);
+ }
+ String processInstanceId = bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
+ new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(RECEIVABLE_PROCESS_KEY)
+ .setBusinessKey(String.valueOf(id)));
+ receivableMapper.updateById(new CrmReceivableDO().setId(id).setProcessInstanceId(processInstanceId));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateReceivableAuditStatus(Long id, Integer bpmStatus) {
+ Integer auditStatus;
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
+ auditStatus = CrmAuditStatusEnum.APPROVE.getStatus();
+ } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
+ auditStatus = CrmAuditStatusEnum.REJECT.getStatus();
+ } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmStatus)) {
+ auditStatus = CrmAuditStatusEnum.CANCEL.getStatus();
+ } else {
+ return;
+ }
+ if (receivableMapper.updateByIdAndStatus(id, CrmAuditStatusEnum.PROCESS.getStatus(),
+ new CrmReceivableDO().setAuditStatus(auditStatus)) != 1) {
+ log.warn("[updateReceivableAuditStatus] 鍥炴({}) 宸蹭笉澶勪簬瀹℃壒涓紝蹇界暐 BPM 鐘舵��({})", id, bpmStatus);
}
}
@@ -282,8 +325,9 @@
if (receivable.getPlanId() != null && receivablePlanService.getReceivablePlan(receivable.getPlanId()) != null) {
throw exception(RECEIVABLE_DELETE_FAIL);
}
- // 1.3 瀹℃壒閫氳繃鏃讹紝涓嶅厑璁稿垹闄�
- if (ObjUtil.equal(receivable.getAuditStatus(), CrmAuditStatusEnum.APPROVE.getStatus())) {
+ // 瀹℃壒涓�佸鏍搁�氳繃涓嶅彲鍒犻櫎
+ if (ObjUtil.equal(receivable.getAuditStatus(), CrmAuditStatusEnum.APPROVE.getStatus())
+ || ObjUtil.equal(receivable.getAuditStatus(), CrmAuditStatusEnum.PROCESS.getStatus())) {
throw exception(RECEIVABLE_DELETE_FAIL_IS_APPROVE);
}
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/listener/CrmReceivableStatusListener.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/listener/CrmReceivableStatusListener.java
new file mode 100644
index 0000000..028f05f
--- /dev/null
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/listener/CrmReceivableStatusListener.java
@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.crm.service.receivable.listener;
+
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
+import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
+import cn.iocoder.yudao.module.crm.service.receivable.CrmReceivableService;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/** 鍥炴瀹℃壒缁撴灉鍥炲啓銆� */
+@Component
+@Slf4j
+public class CrmReceivableStatusListener extends BpmProcessInstanceStatusEventListener {
+
+ @Resource
+ private CrmReceivableService receivableService;
+
+ @Override
+ protected String getProcessDefinitionKey() {
+ return "crm-receivable-audit";
+ }
+
+ @Override
+ protected void onEvent(BpmProcessInstanceStatusEvent event) {
+ try {
+ receivableService.updateReceivableAuditStatus(Long.parseLong(event.getBusinessKey()), event.getStatus());
+ } catch (NumberFormatException e) {
+ log.warn("[onEvent] 鏃犳晥鐨勫洖娆句笟鍔$紪鍙�: {}", event.getBusinessKey());
+ }
+ }
+}
diff --git a/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java
index 6411fda..5ccb7b5 100644
--- a/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java
+++ b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java
@@ -95,6 +95,12 @@
ErrorCode ATTENDANCE_RULE_EXISTS = new ErrorCode(1_030_004_024, "宸插瓨鍦ㄨ�冨嫟瑙勫垯銆恵}銆戯紝涓旀湭寮�鍚鐩栵紒");
ErrorCode ATTENDANCE_RULE_DEPT_NOT_EXISTS = new ErrorCode(1_030_004_025, "閮ㄩ棬銆恵}銆戜笉瀛樺湪");
ErrorCode ATTENDANCE_EXCEPTION_TIME_REQUIRED = new ErrorCode(1_030_004_026, "琛ュ崱鐢宠蹇呴』濉啓琛ュ崱鏃堕棿");
+ ErrorCode ATTENDANCE_LOCATION_RULE_INVALID = new ErrorCode(1_030_004_050, "鑰冨嫟瑙勫垯鍦扮偣閰嶇疆涓嶅畬鏁达紝璇疯仈绯荤鐞嗗憳");
+ ErrorCode ATTENDANCE_LOCATION_REQUIRED = new ErrorCode(1_030_004_051, "璇峰紑鍚畾浣嶅苟鎻愪緵缁忕含搴︺�佺簿搴﹀拰鍧愭爣绯诲悗鎵撳崱");
+ ErrorCode ATTENDANCE_LOCATION_COORDINATE_INVALID = new ErrorCode(1_030_004_052, "鎵撳崱缁忕含搴﹁秴鍑烘湁鏁堣寖鍥�");
+ ErrorCode ATTENDANCE_LOCATION_ACCURACY_INVALID = new ErrorCode(1_030_004_053, "瀹氫綅绮惧害椤诲ぇ浜� 0 涓斾笉瓒呰繃 100 绫筹紝璇峰埌寮�闃斾綅缃噸璇�");
+ ErrorCode ATTENDANCE_LOCATION_SYSTEM_INVALID = new ErrorCode(1_030_004_054, "鎵撳崱鍧愭爣绯诲繀椤讳负 WGS84");
+ ErrorCode ATTENDANCE_LOCATION_OUT_OF_RANGE = new ErrorCode(1_030_004_055, "褰撳墠浣嶇疆璺濃�渰}鈥漿}绫筹紝瓒呰繃鍏佽鑼冨洿{}绫�");
// ========== 缁╂晥鑰冩牳 1-030-008-000 ==========
ErrorCode PERFORMANCE_APPRAISE_NOT_EXISTS = new ErrorCode(1_030_008_000, "缁╂晥鑰冩牳鏂规涓嶅瓨鍦�");
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
index 2313305..dad244c 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
@@ -8,6 +8,8 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceMyStatusRespVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceClockReqVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceClockRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRecordImportExcelVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRecordImportReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRecordPageReqVO;
@@ -16,6 +18,7 @@
import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
import cn.iocoder.yudao.module.hrm.enums.HrmAttendanceClockTypeEnum;
import cn.iocoder.yudao.module.hrm.service.attendance.HrmAttendanceRecordService;
+import cn.iocoder.yudao.module.hrm.service.attendance.HrmAttendanceClockResult;
import cn.iocoder.yudao.module.hrm.service.employee.HrmEmployeeService;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
@@ -61,28 +64,34 @@
@PostMapping("/clock-in")
@Operation(summary = "涓婄彮鎵撳崱")
- public CommonResult<HrmAttendanceRecordRespVO> clockIn(@RequestParam("location") String location) {
+ @ApiAccessLog(requestEnable = false)
+ public CommonResult<HrmAttendanceClockRespVO> clockIn(
+ @Valid @RequestBody(required = false) HrmAttendanceClockReqVO reqVO,
+ @RequestParam(value = "location", required = false) String legacyLocation) {
Long loginUserId = getLoginUserId();
HrmEmployeeDO employee = employeeService.getEmployeeByUserId(loginUserId);
if (employee == null) {
throw exception(EMPLOYEE_NOT_EXISTS,
"褰撳墠鐧诲綍璐﹀彿鏈叧鑱斿憳宸ユ。妗堬紝鏃犳硶鎵撳崱銆傝鑱旂郴绠$悊鍛樺湪銆愬憳宸ョ鐞嗐�戜腑灏嗚鐧诲綍璐﹀彿缁戝畾鍒板憳宸ャ��");
}
- HrmAttendanceRecordDO record = attendanceRecordService.clockIn(employee.getId(), LocalDateTime.now(), location);
- return success(buildClockRespVO(record, employee));
+ HrmAttendanceClockResult result = attendanceRecordService.clockIn(employee.getId(), LocalDateTime.now(), reqVO, legacyLocation);
+ return success(buildClockResultVO(result, employee));
}
@PostMapping("/clock-out")
@Operation(summary = "涓嬬彮鎵撳崱")
- public CommonResult<HrmAttendanceRecordRespVO> clockOut(@RequestParam("location") String location) {
+ @ApiAccessLog(requestEnable = false)
+ public CommonResult<HrmAttendanceClockRespVO> clockOut(
+ @Valid @RequestBody(required = false) HrmAttendanceClockReqVO reqVO,
+ @RequestParam(value = "location", required = false) String legacyLocation) {
Long loginUserId = getLoginUserId();
HrmEmployeeDO employee = employeeService.getEmployeeByUserId(loginUserId);
if (employee == null) {
throw exception(EMPLOYEE_NOT_EXISTS,
"褰撳墠鐧诲綍璐﹀彿鏈叧鑱斿憳宸ユ。妗堬紝鏃犳硶鎵撳崱銆傝鑱旂郴绠$悊鍛樺湪銆愬憳宸ョ鐞嗐�戜腑灏嗚鐧诲綍璐﹀彿缁戝畾鍒板憳宸ャ��");
}
- HrmAttendanceRecordDO record = attendanceRecordService.clockOut(employee.getId(), LocalDateTime.now(), location);
- return success(buildClockRespVO(record, employee));
+ HrmAttendanceClockResult result = attendanceRecordService.clockOut(employee.getId(), LocalDateTime.now(), reqVO, legacyLocation);
+ return success(buildClockResultVO(result, employee));
}
@GetMapping("/my-status")
@@ -107,6 +116,18 @@
if (dept != null) {
respVO.setDeptName(dept.getName());
}
+ }
+ return respVO;
+ }
+
+ private HrmAttendanceClockRespVO buildClockResultVO(HrmAttendanceClockResult result, HrmEmployeeDO employee) {
+ HrmAttendanceClockRespVO respVO = new HrmAttendanceClockRespVO();
+ respVO.setRecord(buildClockRespVO(result.record(), employee));
+ respVO.setLocationName(result.rule().getLocationName());
+ if (Boolean.TRUE.equals(result.rule().getLocationRequired())) {
+ respVO.setDistanceMeters(result.distanceMeters());
+ respVO.setRadiusMeters(result.rule().getRadiusMeters());
+ respVO.setWithinRange(true);
}
return respVO;
}
@@ -312,4 +333,4 @@
ExcelUtils.write(response, "鑰冨嫟璁板綍.xls", "鏁版嵁", HrmAttendanceRecordRespVO.class, list);
}
-}
\ No newline at end of file
+}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceClockReqVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceClockReqVO.java
new file mode 100644
index 0000000..594bc07
--- /dev/null
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceClockReqVO.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/** App/Web 鎵撳崱瀹氫綅鍘熷鏁版嵁锛涙槸鍚﹀繀濉敱褰撳墠鐢熸晥瑙勫垯鍐冲畾銆� */
+@Data
+public class HrmAttendanceClockReqVO {
+ @Schema(description = "璁惧缁忓害锛圵GS84锛�")
+ private BigDecimal longitude;
+ @Schema(description = "璁惧绾害锛圵GS84锛�")
+ private BigDecimal latitude;
+ @Schema(description = "瀹氫綅绮惧害锛岀背")
+ private BigDecimal accuracy;
+ @Schema(description = "鍧愭爣绯伙紝浠呮敮鎸� WGS84")
+ private String coordinateSystem;
+}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceClockRespVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceClockRespVO.java
new file mode 100644
index 0000000..8f45c4f
--- /dev/null
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceClockRespVO.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class HrmAttendanceClockRespVO {
+ @Schema(description = "鑰冨嫟璁板綍")
+ private HrmAttendanceRecordRespVO record;
+ @Schema(description = "瑙勫垯鍦扮偣鍚嶇О")
+ private String locationName;
+ @Schema(description = "璺濊鍒欏湴鐐硅窛绂伙紝绫筹紱鏈惎鐢ㄤ綅缃檺鍒舵椂涓虹┖")
+ private BigDecimal distanceMeters;
+ @Schema(description = "鍏佽鍗婂緞锛岀背锛涙湭鍚敤浣嶇疆闄愬埗鏃朵负绌�")
+ private Integer radiusMeters;
+ @Schema(description = "鏄惁鍦ㄥ厑璁歌寖鍥达紱鏈惎鐢ㄤ綅缃檺鍒舵椂涓虹┖")
+ private Boolean withinRange;
+}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRecordRespVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRecordRespVO.java
index aa44d1e..1e4fb0e 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRecordRespVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRecordRespVO.java
@@ -78,6 +78,27 @@
@ExcelProperty("鎵撳崱鍦扮偣")
private String location;
+ @Schema(description = "涓婄彮鎵撳崱缁忓害锛圵GS84锛�")
+ private BigDecimal clockInLongitude;
+ @Schema(description = "涓婄彮鎵撳崱绾害锛圵GS84锛�")
+ private BigDecimal clockInLatitude;
+ @Schema(description = "涓婄彮瀹氫綅绮惧害锛岀背")
+ private BigDecimal clockInAccuracy;
+ @Schema(description = "涓婄彮璺濊鍒欏湴鐐硅窛绂伙紝绫�")
+ private BigDecimal clockInDistance;
+ @Schema(description = "涓婄彮瑙勫垯鍦扮偣鍦板潃蹇収")
+ private String clockInAddress;
+ @Schema(description = "涓嬬彮鎵撳崱缁忓害锛圵GS84锛�")
+ private BigDecimal clockOutLongitude;
+ @Schema(description = "涓嬬彮鎵撳崱绾害锛圵GS84锛�")
+ private BigDecimal clockOutLatitude;
+ @Schema(description = "涓嬬彮瀹氫綅绮惧害锛岀背")
+ private BigDecimal clockOutAccuracy;
+ @Schema(description = "涓嬬彮璺濊鍒欏湴鐐硅窛绂伙紝绫�")
+ private BigDecimal clockOutDistance;
+ @Schema(description = "涓嬬彮瑙勫垯鍦扮偣鍦板潃蹇収")
+ private String clockOutAddress;
+
@Schema(description = "澶囨敞")
@ExcelProperty("澶囨敞")
private String remark;
@@ -91,4 +112,4 @@
@ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
-}
\ No newline at end of file
+}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleRespVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleRespVO.java
index 360c315..6c85005 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleRespVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleRespVO.java
@@ -51,6 +51,21 @@
@ExcelProperty("鍔犵彮璧风畻鏃堕暱")
private BigDecimal overtimeThreshold;
+ @Schema(description = "鎵撳崱鍦扮偣鍚嶇О")
+ private String locationName;
+ @Schema(description = "鎵撳崱鍦扮偣鍦板潃")
+ private String locationAddress;
+ @Schema(description = "鍦扮偣缁忓害锛圵GS84锛�")
+ private BigDecimal longitude;
+ @Schema(description = "鍦扮偣绾害锛圵GS84锛�")
+ private BigDecimal latitude;
+ @Schema(description = "鍏佽鎵撳崱鍗婂緞锛屽崟浣嶇背")
+ private Integer radiusMeters;
+ @Schema(description = "鏄惁鍚敤浣嶇疆闄愬埗")
+ private Boolean locationRequired;
+ @Schema(description = "鍧愭爣绯伙紝浠呮敮鎸� WGS84")
+ private String coordinateSystem;
+
@Schema(description = "鐘舵�侊細0-鍚敤锛�1-绂佺敤")
@ExcelProperty(value = "鐘舵��", converter = DictConvert.class)
@DictFormat("hrm_rule_status")
@@ -64,4 +79,4 @@
@ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
-}
\ No newline at end of file
+}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleSaveReqVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleSaveReqVO.java
index 8c244a8..c14b5ed 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleSaveReqVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleSaveReqVO.java
@@ -39,10 +39,25 @@
@Schema(description = "鍔犵彮璧风畻鏃堕暱锛堝皬鏃讹級", example = "1")
private BigDecimal overtimeThreshold;
+ @Schema(description = "鎵撳崱鍦扮偣鍚嶇О")
+ private String locationName;
+ @Schema(description = "鎵撳崱鍦扮偣鍦板潃")
+ private String locationAddress;
+ @Schema(description = "鍦扮偣缁忓害锛圵GS84锛�")
+ private BigDecimal longitude;
+ @Schema(description = "鍦扮偣绾害锛圵GS84锛�")
+ private BigDecimal latitude;
+ @Schema(description = "鍏佽鎵撳崱鍗婂緞锛屽崟浣嶇背")
+ private Integer radiusMeters;
+ @Schema(description = "鏄惁鍚敤浣嶇疆闄愬埗")
+ private Boolean locationRequired;
+ @Schema(description = "鍧愭爣绯伙紝浠呮敮鎸� WGS84")
+ private String coordinateSystem;
+
@Schema(description = "鐘舵�侊細0-鍚敤锛�1-绂佺敤", example = "0")
private Integer status;
@Schema(description = "澶囨敞", example = "閫傜敤浜庣爺鍙戦儴闂�")
private String remark;
-}
\ No newline at end of file
+}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRecordDO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRecordDO.java
index 47c8845..3e01e8e 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRecordDO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRecordDO.java
@@ -83,6 +83,17 @@
*/
private String location;
+ private BigDecimal clockInLongitude;
+ private BigDecimal clockInLatitude;
+ private BigDecimal clockInAccuracy;
+ private BigDecimal clockInDistance;
+ private String clockInAddress;
+ private BigDecimal clockOutLongitude;
+ private BigDecimal clockOutLatitude;
+ private BigDecimal clockOutAccuracy;
+ private BigDecimal clockOutDistance;
+ private String clockOutAddress;
+
/**
* 澶囨敞
*/
@@ -93,4 +104,4 @@
*/
private Integer dataSource;
-}
\ No newline at end of file
+}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRuleDO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRuleDO.java
index 71bdfdc..deac5a0 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRuleDO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/attendance/HrmAttendanceRuleDO.java
@@ -67,6 +67,15 @@
*/
private BigDecimal overtimeThreshold;
+ /** 鑰冨嫟鍦扮偣涓庡彲鎵撳崱鑼冨洿锛涙棫瑙勫垯榛樿涓嶅惎鐢ㄤ綅缃檺鍒躲�� */
+ private String locationName;
+ private String locationAddress;
+ private BigDecimal longitude;
+ private BigDecimal latitude;
+ private Integer radiusMeters;
+ private Boolean locationRequired;
+ private String coordinateSystem;
+
/**
* 鐘舵�侊細0-鍚敤锛�1-绂佺敤
*/
@@ -77,4 +86,4 @@
*/
private String remark;
-}
\ No newline at end of file
+}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceClockResult.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceClockResult.java
new file mode 100644
index 0000000..26b6ed9
--- /dev/null
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceClockResult.java
@@ -0,0 +1,11 @@
+package cn.iocoder.yudao.module.hrm.service.attendance;
+
+import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceRecordDO;
+import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceRuleDO;
+
+import java.math.BigDecimal;
+
+/** 鎵撳崱淇濆瓨缁撴灉鍜屾湰娆℃牎楠屼娇鐢ㄧ殑瑙勫垯蹇収銆� */
+public record HrmAttendanceClockResult(HrmAttendanceRecordDO record, HrmAttendanceRuleDO rule,
+ BigDecimal distanceMeters) {
+}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordService.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordService.java
index e926eea..f306ae9 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordService.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordService.java
@@ -3,6 +3,7 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceMyStatusRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRecordPageReqVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceClockReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceRecordDO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceExceptionDO;
import jakarta.validation.Valid;
@@ -61,7 +62,8 @@
* @param location 鎵撳崱鍦扮偣
* @return 鑰冨嫟璁板綍
*/
- HrmAttendanceRecordDO clockIn(Long userId, LocalDateTime clockTime, String location);
+ HrmAttendanceClockResult clockIn(Long userId, LocalDateTime clockTime,
+ HrmAttendanceClockReqVO reqVO, String legacyLocation);
/**
* 鎵撳崱锛堜笅鐝墦鍗★級
@@ -71,7 +73,8 @@
* @param location 鎵撳崱鍦扮偣
* @return 鑰冨嫟璁板綍
*/
- HrmAttendanceRecordDO clockOut(Long userId, LocalDateTime clockTime, String location);
+ HrmAttendanceClockResult clockOut(Long userId, LocalDateTime clockTime,
+ HrmAttendanceClockReqVO reqVO, String legacyLocation);
/**
* 琛ュ崱瀹℃壒閫氳繃鍚庢洿鏂拌�冨嫟璁板綍
@@ -87,4 +90,4 @@
*/
void recordOvertime(HrmAttendanceExceptionDO exception);
-}
\ No newline at end of file
+}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java
index 3780f24..8c38076 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java
@@ -6,6 +6,7 @@
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRecordPageReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRecordRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRuleRespVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceClockReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceHolidayDO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceRecordDO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceRuleDO;
@@ -33,6 +34,7 @@
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.List;
+import cn.hutool.core.util.StrUtil;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.hrm.enums.ErrorCodeConstants.*;
@@ -316,7 +318,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public HrmAttendanceRecordDO clockIn(Long userId, LocalDateTime clockTime, String location) {
+ public HrmAttendanceClockResult clockIn(Long userId, LocalDateTime clockTime,
+ HrmAttendanceClockReqVO reqVO, String legacyLocation) {
LocalDate clockDate = clockTime.toLocalDate();
// 1. 鏍¢獙鏄惁宸ヤ綔鏃�
if (!attendanceHolidayService.isWorkDay(clockDate)) {
@@ -336,7 +339,9 @@
if (record != null && record.getClockInTime() != null) {
throw exception(ATTENDANCE_CLOCK_ALREADY_CLOCKED);
}
- // 4. 鍒ゆ柇鎵撳崱绫诲瀷
+ // 4. 鍦ㄤ换浣曞啓搴撴搷浣滃墠鏍¢獙浣嶇疆锛涗笉鑳界敤鏃х増 location 瀛楃涓茬粫杩囪寖鍥撮檺鍒躲��
+ ClockLocation clockLocation = validateClockLocation(rule, reqVO);
+ // 5. 鍒ゆ柇鎵撳崱绫诲瀷
LocalTime workStartTime = rule.getWorkStartTime();
int lateAllowMinutes = rule.getLateAllowMinutes() != null ? rule.getLateAllowMinutes() : 0;
LocalTime lateThreshold = workStartTime.plusMinutes(lateAllowMinutes);
@@ -344,7 +349,7 @@
Integer clockInType = clockTimeOnly.isBefore(lateThreshold) || clockTimeOnly.equals(lateThreshold)
? HrmAttendanceClockTypeEnum.NORMAL.getType()
: HrmAttendanceClockTypeEnum.LATE.getType();
- // 5. 鍒涘缓鎴栨洿鏂拌�冨嫟璁板綍
+ // 6. 鍒涘缓鎴栨洿鏂拌�冨嫟璁板綍
if (record == null) {
record = HrmAttendanceRecordDO.builder()
.userId(userId)
@@ -352,24 +357,24 @@
.date(clockDate)
.clockInTime(clockTime)
.clockInType(clockInType)
- .location(location)
.dataSource(HrmAttendanceDataSourceEnum.CLOCK.getType())
.build();
+ applyClockLocation(record, rule, clockLocation, legacyLocation, true);
attendanceRecordMapper.insert(record);
} else {
record.setClockInTime(clockTime);
record.setClockInType(clockInType);
- if (location != null) {
- record.setLocation(location);
- }
+ applyClockLocation(record, rule, clockLocation, legacyLocation, true);
attendanceRecordMapper.updateById(record);
}
- return record;
+ return new HrmAttendanceClockResult(record, rule,
+ clockLocation != null ? clockLocation.distanceMeters() : null);
}
@Override
@Transactional(rollbackFor = Exception.class)
- public HrmAttendanceRecordDO clockOut(Long userId, LocalDateTime clockTime, String location) {
+ public HrmAttendanceClockResult clockOut(Long userId, LocalDateTime clockTime,
+ HrmAttendanceClockReqVO reqVO, String legacyLocation) {
LocalDate clockDate = clockTime.toLocalDate();
// 1. 鏍¢獙鏄惁宸ヤ綔鏃�
if (!attendanceHolidayService.isWorkDay(clockDate)) {
@@ -386,8 +391,12 @@
}
// 3. 鏌ヨ褰撴棩鑰冨嫟璁板綍
HrmAttendanceRecordDO record = attendanceRecordMapper.selectByUserIdAndDate(userId, clockDate);
+ if (record != null && record.getClockOutTime() != null) {
+ throw exception(ATTENDANCE_CLOCK_ALREADY_CLOCKED);
+ }
+ ClockLocation clockLocation = validateClockLocation(rule, reqVO);
+ // 4. 鏃犱笂鐝崱鏃朵篃鍏堝畬鎴愪綅缃牎楠岋紝鍐嶅垱寤虹己鍗¤褰曘��
if (record == null) {
- // 濡傛灉娌℃湁涓婄彮鎵撳崱璁板綍锛屽垱寤轰竴鏉$己鍗$殑璁板綍
record = HrmAttendanceRecordDO.builder()
.userId(userId)
.deptId(employee.getDeptId())
@@ -395,12 +404,8 @@
.clockInType(HrmAttendanceClockTypeEnum.MISSING.getType())
.dataSource(HrmAttendanceDataSourceEnum.CLOCK.getType())
.build();
- attendanceRecordMapper.insert(record);
}
- if (record.getClockOutTime() != null) {
- throw exception(ATTENDANCE_CLOCK_ALREADY_CLOCKED);
- }
- // 4. 鍒ゆ柇鎵撳崱绫诲瀷
+ // 5. 鍒ゆ柇鎵撳崱绫诲瀷
LocalTime workEndTime = rule.getWorkEndTime();
int earlyAllowMinutes = rule.getEarlyAllowMinutes() != null ? rule.getEarlyAllowMinutes() : 0;
LocalTime earlyThreshold = workEndTime.minusMinutes(earlyAllowMinutes);
@@ -408,12 +413,10 @@
Integer clockOutType = clockTimeOnly.isAfter(earlyThreshold) || clockTimeOnly.equals(earlyThreshold)
? HrmAttendanceClockTypeEnum.NORMAL.getType()
: HrmAttendanceClockTypeEnum.EARLY.getType();
- // 5. 鏇存柊鑰冨嫟璁板綍
+ // 6. 鏇存柊鑰冨嫟璁板綍
record.setClockOutTime(clockTime);
record.setClockOutType(clockOutType);
- if (location != null) {
- record.setLocation(location);
- }
+ applyClockLocation(record, rule, clockLocation, legacyLocation, false);
// 6. 璁$畻宸ヤ綔鏃堕暱
if (record.getClockInTime() != null) {
Duration duration = Duration.between(record.getClockInTime(), clockTime);
@@ -423,8 +426,91 @@
}
// 7. 璁$畻鍔犵彮鏃堕暱锛氳秴杩囪鍒欎笅鐝椂闂寸殑閮ㄥ垎
record.setOvertimeHours(computeOvertimeHours(rule.getWorkEndTime(), clockTimeOnly));
- attendanceRecordMapper.updateById(record);
- return record;
+ if (record.getId() == null) {
+ attendanceRecordMapper.insert(record);
+ } else {
+ attendanceRecordMapper.updateById(record);
+ }
+ return new HrmAttendanceClockResult(record, rule,
+ clockLocation != null ? clockLocation.distanceMeters() : null);
+ }
+
+ record ClockLocation(BigDecimal longitude, BigDecimal latitude, BigDecimal accuracy,
+ BigDecimal distanceMeters) { }
+
+ ClockLocation validateClockLocation(HrmAttendanceRuleDO rule, HrmAttendanceClockReqVO reqVO) {
+ boolean required = Boolean.TRUE.equals(rule.getLocationRequired());
+ if (required && (StrUtil.isBlank(rule.getLocationName()) || rule.getLongitude() == null
+ || rule.getLatitude() == null || rule.getRadiusMeters() == null
+ || rule.getRadiusMeters() < 50 || rule.getRadiusMeters() > 5000
+ || !"WGS84".equalsIgnoreCase(rule.getCoordinateSystem()))) {
+ throw exception(ATTENDANCE_LOCATION_RULE_INVALID);
+ }
+ if (reqVO == null || reqVO.getLongitude() == null || reqVO.getLatitude() == null
+ || reqVO.getAccuracy() == null || StrUtil.isBlank(reqVO.getCoordinateSystem())) {
+ if (required) throw exception(ATTENDANCE_LOCATION_REQUIRED);
+ return null;
+ }
+ boolean coordinatesValid = reqVO.getLongitude().compareTo(BigDecimal.valueOf(-180)) >= 0
+ && reqVO.getLongitude().compareTo(BigDecimal.valueOf(180)) <= 0
+ && reqVO.getLatitude().compareTo(BigDecimal.valueOf(-90)) >= 0
+ && reqVO.getLatitude().compareTo(BigDecimal.valueOf(90)) <= 0;
+ if (!coordinatesValid) {
+ if (required) throw exception(ATTENDANCE_LOCATION_COORDINATE_INVALID);
+ return null;
+ }
+ if (reqVO.getAccuracy().signum() <= 0 || reqVO.getAccuracy().compareTo(BigDecimal.valueOf(100)) > 0) {
+ if (required) throw exception(ATTENDANCE_LOCATION_ACCURACY_INVALID);
+ return null;
+ }
+ if (!"WGS84".equalsIgnoreCase(reqVO.getCoordinateSystem().trim())) {
+ if (required) throw exception(ATTENDANCE_LOCATION_SYSTEM_INVALID);
+ return null;
+ }
+ if (!required) {
+ return new ClockLocation(reqVO.getLongitude(), reqVO.getLatitude(), reqVO.getAccuracy(), null);
+ }
+ double rawDistance = haversineMeters(rule.getLongitude().doubleValue(), rule.getLatitude().doubleValue(),
+ reqVO.getLongitude().doubleValue(), reqVO.getLatitude().doubleValue());
+ BigDecimal roundedDistance = BigDecimal.valueOf(rawDistance).setScale(2, RoundingMode.HALF_UP);
+ if (rawDistance > rule.getRadiusMeters()) {
+ throw exception(ATTENDANCE_LOCATION_OUT_OF_RANGE, rule.getLocationName(),
+ roundedDistance.toPlainString(), rule.getRadiusMeters());
+ }
+ return new ClockLocation(reqVO.getLongitude(), reqVO.getLatitude(), reqVO.getAccuracy(), roundedDistance);
+ }
+
+ static double haversineMeters(double lon1, double lat1, double lon2, double lat2) {
+ double latDelta = Math.toRadians(lat2 - lat1);
+ double lonDelta = Math.toRadians(lon2 - lon1);
+ double a = Math.pow(Math.sin(latDelta / 2), 2)
+ + Math.cos(Math.toRadians(lat1)) * Math.cos(Math.toRadians(lat2))
+ * Math.pow(Math.sin(lonDelta / 2), 2);
+ double bounded = Math.max(0D, Math.min(1D, a));
+ return 6_371_000D * 2D * Math.atan2(Math.sqrt(bounded), Math.sqrt(1D - bounded));
+ }
+
+ private void applyClockLocation(HrmAttendanceRecordDO record, HrmAttendanceRuleDO rule,
+ ClockLocation location, String legacyLocation, boolean clockIn) {
+ if (StrUtil.isNotBlank(rule.getLocationName())) {
+ record.setLocation(rule.getLocationName());
+ } else if (!Boolean.TRUE.equals(rule.getLocationRequired()) && StrUtil.isNotBlank(legacyLocation)) {
+ record.setLocation(legacyLocation);
+ }
+ if (location == null) return;
+ if (clockIn) {
+ record.setClockInLongitude(location.longitude());
+ record.setClockInLatitude(location.latitude());
+ record.setClockInAccuracy(location.accuracy());
+ record.setClockInDistance(location.distanceMeters());
+ record.setClockInAddress(rule.getLocationAddress());
+ } else {
+ record.setClockOutLongitude(location.longitude());
+ record.setClockOutLatitude(location.latitude());
+ record.setClockOutAccuracy(location.accuracy());
+ record.setClockOutDistance(location.distanceMeters());
+ record.setClockOutAddress(rule.getLocationAddress());
+ }
}
/**
@@ -531,4 +617,4 @@
attendanceRecordMapper.updateById(record);
}
-}
\ No newline at end of file
+}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleServiceImpl.java
index c5c2bab..d80627a 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRuleServiceImpl.java
@@ -47,6 +47,7 @@
@Override
public Long createAttendanceRule(HrmAttendanceRuleSaveReqVO createReqVO) {
+ validateLocation(createReqVO);
// 鏍¢獙瑙勫垯鍚嶇О鏄惁閲嶅
validateAttendanceRuleNameUnique(null, createReqVO.getName());
// 鏍¢獙閮ㄩ棬鏄惁宸查厤缃鍒欙紙濡傛灉鎸囧畾浜嗛儴闂級
@@ -73,7 +74,21 @@
@Override
public void updateAttendanceRule(HrmAttendanceRuleSaveReqVO updateReqVO) {
- validateAttendanceRuleExists(updateReqVO.getId());
+ HrmAttendanceRuleDO currentRule = attendanceRuleMapper.selectById(updateReqVO.getId());
+ if (currentRule == null) {
+ throw exception(ATTENDANCE_RULE_NOT_EXISTS);
+ }
+ // 鍏煎灏氭湭浼犲湴鐐瑰瓧娈电殑鏃х鐞嗙锛岄伩鍏嶇紪杈戠彮娆℃椂鎰忓鍏抽棴宸查厤缃殑浣嶇疆闄愬埗銆�
+ if (updateReqVO.getLocationRequired() == null) {
+ updateReqVO.setLocationRequired(currentRule.getLocationRequired());
+ if (updateReqVO.getLocationName() == null) updateReqVO.setLocationName(currentRule.getLocationName());
+ if (updateReqVO.getLocationAddress() == null) updateReqVO.setLocationAddress(currentRule.getLocationAddress());
+ if (updateReqVO.getLongitude() == null) updateReqVO.setLongitude(currentRule.getLongitude());
+ if (updateReqVO.getLatitude() == null) updateReqVO.setLatitude(currentRule.getLatitude());
+ if (updateReqVO.getRadiusMeters() == null) updateReqVO.setRadiusMeters(currentRule.getRadiusMeters());
+ if (updateReqVO.getCoordinateSystem() == null) updateReqVO.setCoordinateSystem(currentRule.getCoordinateSystem());
+ }
+ validateLocation(updateReqVO);
// 鏍¢獙瑙勫垯鍚嶇О鏄惁閲嶅
validateAttendanceRuleNameUnique(updateReqVO.getId(), updateReqVO.getName());
// 鏍¢獙閮ㄩ棬鏄惁宸查厤缃鍒欙紙濡傛灉鎸囧畾浜嗛儴闂級
@@ -93,6 +108,39 @@
private void validateAttendanceRuleExists(Long id) {
if (attendanceRuleMapper.selectById(id) == null) {
throw exception(ATTENDANCE_RULE_NOT_EXISTS);
+ }
+ }
+
+ private void validateLocation(HrmAttendanceRuleSaveReqVO reqVO) {
+ if (reqVO.getLocationRequired() == null) {
+ reqVO.setLocationRequired(false);
+ }
+ if (reqVO.getRadiusMeters() == null) {
+ reqVO.setRadiusMeters(200);
+ }
+ if (StrUtil.isBlank(reqVO.getCoordinateSystem())) {
+ reqVO.setCoordinateSystem("WGS84");
+ } else {
+ reqVO.setCoordinateSystem(reqVO.getCoordinateSystem().trim().toUpperCase(java.util.Locale.ROOT));
+ }
+ if (!"WGS84".equals(reqVO.getCoordinateSystem())) {
+ throw exception(ATTENDANCE_LOCATION_SYSTEM_INVALID);
+ }
+ if (reqVO.getLongitude() != null && (reqVO.getLongitude().compareTo(BigDecimal.valueOf(-180)) < 0
+ || reqVO.getLongitude().compareTo(BigDecimal.valueOf(180)) > 0)) {
+ throw exception(ATTENDANCE_LOCATION_COORDINATE_INVALID);
+ }
+ if (reqVO.getLatitude() != null && (reqVO.getLatitude().compareTo(BigDecimal.valueOf(-90)) < 0
+ || reqVO.getLatitude().compareTo(BigDecimal.valueOf(90)) > 0)) {
+ throw exception(ATTENDANCE_LOCATION_COORDINATE_INVALID);
+ }
+ if (reqVO.getRadiusMeters() < 50 || reqVO.getRadiusMeters() > 5000) {
+ throw exception(ATTENDANCE_LOCATION_RULE_INVALID);
+ }
+ if (Boolean.TRUE.equals(reqVO.getLocationRequired())
+ && (StrUtil.isBlank(reqVO.getLocationName()) || reqVO.getLongitude() == null
+ || reqVO.getLatitude() == null || StrUtil.isBlank(reqVO.getCoordinateSystem()))) {
+ throw exception(ATTENDANCE_LOCATION_RULE_INVALID);
}
}
@@ -235,4 +283,4 @@
}
}
-}
\ No newline at end of file
+}
diff --git a/yudao-module-hrm/src/test/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceClockLocationTest.java b/yudao-module-hrm/src/test/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceClockLocationTest.java
new file mode 100644
index 0000000..53fe048
--- /dev/null
+++ b/yudao-module-hrm/src/test/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceClockLocationTest.java
@@ -0,0 +1,84 @@
+package cn.iocoder.yudao.module.hrm.service.attendance;
+
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceClockReqVO;
+import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceRuleDO;
+import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceRecordDO;
+import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
+import cn.iocoder.yudao.module.hrm.dal.mysql.attendance.HrmAttendanceRecordMapper;
+import cn.iocoder.yudao.module.hrm.service.employee.HrmEmployeeService;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+class HrmAttendanceClockLocationTest {
+
+ private final HrmAttendanceRecordServiceImpl service = new HrmAttendanceRecordServiceImpl();
+
+ private HrmAttendanceRuleDO requiredRule() {
+ return HrmAttendanceRuleDO.builder().locationRequired(true).locationName("鍏徃鍓嶅彴")
+ .longitude(BigDecimal.ZERO).latitude(BigDecimal.ZERO)
+ .radiusMeters(100).coordinateSystem("WGS84").build();
+ }
+
+ private HrmAttendanceClockReqVO position(String latitude, String accuracy) {
+ HrmAttendanceClockReqVO reqVO = new HrmAttendanceClockReqVO();
+ reqVO.setLongitude(BigDecimal.ZERO);
+ reqVO.setLatitude(new BigDecimal(latitude));
+ reqVO.setAccuracy(new BigDecimal(accuracy));
+ reqVO.setCoordinateSystem("WGS84");
+ return reqVO;
+ }
+
+ @Test
+ void oldRuleWithoutLocationStillAcceptsClock() {
+ HrmAttendanceRuleDO rule = HrmAttendanceRuleDO.builder().locationRequired(false).build();
+ assertNull(service.validateClockLocation(rule, null));
+ assertNull(service.validateClockLocation(rule, position("0.0001", "20")).distanceMeters());
+ }
+
+ @Test
+ void requiredLocationValidatesCompletenessCoordinatesAndAccuracy() {
+ HrmAttendanceRuleDO rule = requiredRule();
+ assertThrows(ServiceException.class, () -> service.validateClockLocation(rule, null));
+ assertThrows(ServiceException.class, () -> service.validateClockLocation(rule, position("91", "20")));
+ assertThrows(ServiceException.class, () -> service.validateClockLocation(rule, position("0", "100.01")));
+ assertNotNull(service.validateClockLocation(rule, position("0", "100")));
+ }
+
+ @Test
+ void comparesUnroundedDistanceWithRadius() {
+ HrmAttendanceRuleDO rule = requiredRule();
+ assertTrue(HrmAttendanceRecordServiceImpl.haversineMeters(0, 0, 0, 0.00089) < 100);
+ assertNotNull(service.validateClockLocation(rule, position("0.00089", "20")));
+ assertThrows(ServiceException.class, () -> service.validateClockLocation(rule, position("0.00091", "20")));
+ }
+
+ @Test
+ void invalidClockOutLocationDoesNotCreateMissingClockInRecord() {
+ HrmAttendanceHolidayService holidayService = mock(HrmAttendanceHolidayService.class);
+ HrmEmployeeService employeeService = mock(HrmEmployeeService.class);
+ HrmAttendanceRuleService ruleService = mock(HrmAttendanceRuleService.class);
+ HrmAttendanceRecordMapper mapper = mock(HrmAttendanceRecordMapper.class);
+ ReflectionTestUtils.setField(service, "attendanceHolidayService", holidayService);
+ ReflectionTestUtils.setField(service, "employeeService", employeeService);
+ ReflectionTestUtils.setField(service, "attendanceRuleService", ruleService);
+ ReflectionTestUtils.setField(service, "attendanceRecordMapper", mapper);
+ LocalDateTime clockTime = LocalDateTime.of(2026, 10, 22, 18, 56);
+ when(holidayService.isWorkDay(any(LocalDate.class))).thenReturn(true);
+ HrmEmployeeDO employee = HrmEmployeeDO.builder().id(1L).deptId(2L).build();
+ when(employeeService.getEmployee(1L)).thenReturn(employee);
+ when(ruleService.getAttendanceRuleByDeptId(2L)).thenReturn(requiredRule());
+ assertThrows(ServiceException.class,
+ () -> service.clockOut(1L, clockTime, position("0.00091", "20"), null));
+ verify(mapper, never()).insert(any(HrmAttendanceRecordDO.class));
+ verify(mapper, never()).updateById(any(HrmAttendanceRecordDO.class));
+ }
+}
diff --git a/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/event/MesReturnSalesProgressEvent.java b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/event/MesReturnSalesProgressEvent.java
new file mode 100644
index 0000000..4eaa19d
--- /dev/null
+++ b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/event/MesReturnSalesProgressEvent.java
@@ -0,0 +1,8 @@
+package cn.iocoder.yudao.module.mes.api.event;
+
+/** MES 閿�鍞��璐х殑涓氬姟杩涘害锛涚洃鍚櫒涓� MES 鎿嶄綔澶勪簬鍚屼竴浜嬪姟銆� */
+public record MesReturnSalesProgressEvent(Long mesReturnId, Stage stage, String qualityResult) {
+
+ public enum Stage { QUALITY_FINISHED, INBOUND_FINISHED, CANCELED }
+
+}
diff --git a/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/MesWmReturnSalesApi.java b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/MesWmReturnSalesApi.java
index a2ac506..fbb84af 100644
--- a/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/MesWmReturnSalesApi.java
+++ b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/MesWmReturnSalesApi.java
@@ -17,4 +17,7 @@
*/
Long createReturnSales(MesWmReturnSalesCreateReqDTO reqDTO);
+ /** 鍙栨秷灏氭湭瀹屾垚鍏ュ簱鐨勯攢鍞��璐у崟銆� */
+ void cancelReturnSales(Long id);
+
}
diff --git a/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/dto/MesWmReturnSalesCreateReqDTO.java b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/dto/MesWmReturnSalesCreateReqDTO.java
index ce7e494..f1bc4e3 100644
--- a/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/dto/MesWmReturnSalesCreateReqDTO.java
+++ b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/dto/MesWmReturnSalesCreateReqDTO.java
@@ -4,6 +4,8 @@
import lombok.Data;
import java.time.LocalDate;
+import java.math.BigDecimal;
+import java.util.List;
/**
* MES 閿�鍞��璐у崟鍒涘缓 Request DTO
@@ -41,4 +43,16 @@
@Schema(description = "鍞悗閫�璐х敵璇风紪鍙凤紙鍏宠仈 after_sale_return.id锛�", example = "1")
private Long afterSaleReturnId;
+ /** 瀹℃牳閫氳繃鐨勫敭鍚庨��璐ф槑缁嗭紝鍒涘缓 MES 鍗曟嵁鏃朵竴骞跺甫鍏ャ�� */
+ private List<Item> items;
+
+ @Data
+ public static class Item {
+ private Long itemId;
+ private BigDecimal quantity;
+ private Long batchId;
+ private String batchCode;
+ private String remark;
+ }
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/MesWmReturnSalesApiImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/MesWmReturnSalesApiImpl.java
index a37bba7..e406022 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/MesWmReturnSalesApiImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/returnsales/MesWmReturnSalesApiImpl.java
@@ -3,9 +3,14 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mes.api.returnsales.dto.MesWmReturnSalesCreateReqDTO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.line.MesWmReturnSalesLineSaveReqVO;
import cn.iocoder.yudao.module.mes.service.wm.returnsales.MesWmReturnSalesService;
+import cn.iocoder.yudao.module.mes.service.wm.returnsales.MesWmReturnSalesLineService;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
/**
* MES 閿�鍞��璐у崟 API 瀹炵幇绫�
@@ -17,11 +22,31 @@
@Resource
private MesWmReturnSalesService returnSalesService;
+ @Resource
+ private MesWmReturnSalesLineService returnSalesLineService;
@Override
+ @Transactional(rollbackFor = Exception.class)
public Long createReturnSales(MesWmReturnSalesCreateReqDTO reqDTO) {
MesWmReturnSalesSaveReqVO createReqVO = BeanUtils.toBean(reqDTO, MesWmReturnSalesSaveReqVO.class);
- return returnSalesService.createReturnSales(createReqVO);
+ createReqVO.setAfterSaleReturnId(reqDTO.getAfterSaleReturnId());
+ Long returnId = returnSalesService.createReturnSales(createReqVO);
+ List<MesWmReturnSalesCreateReqDTO.Item> items = reqDTO.getItems();
+ if (items != null) {
+ for (MesWmReturnSalesCreateReqDTO.Item item : items) {
+ MesWmReturnSalesLineSaveReqVO line = new MesWmReturnSalesLineSaveReqVO()
+ .setReturnId(returnId).setItemId(item.getItemId()).setQuantity(item.getQuantity())
+ .setBatchId(item.getBatchId()).setBatchCode(item.getBatchCode())
+ .setRqcCheckFlag(true).setRemark(item.getRemark());
+ returnSalesLineService.createReturnSalesLine(line);
+ }
+ }
+ return returnId;
+ }
+
+ @Override
+ public void cancelReturnSales(Long id) {
+ returnSalesService.cancelReturnSales(id);
}
}
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 b77d34f..433be72 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
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo;
import io.swagger.v3.oas.annotations.media.Schema;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@@ -19,6 +20,10 @@
@Schema(description = "缂栧彿", example = "1024")
private Long id;
+ /** 浠呭唴閮ㄥ敭鍚� API 鍐欏叆锛屽墠绔笉鑳芥寚瀹氭潵婧愮敵璇枫�� */
+ @JsonIgnore
+ private Long afterSaleReturnId;
+
@Schema(description = "閫�璐у崟缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "RS202603010001")
@NotBlank(message = "閫�璐у崟缂栧彿涓嶈兘涓虹┖")
private String code;
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 aa3bb74..bde50bb 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
@@ -30,6 +30,8 @@
*/
@TableId
private Long id;
+ /** 鍏宠仈鐨勫敭鍚庨��璐х敵璇� ID锛涙墜宸ラ攢鍞��璐у崟涓虹┖銆� */
+ private Long afterSaleReturnId;
/**
* 閫�璐у崟缂栧彿
*/
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
index a224153..586c92b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
@@ -52,7 +52,9 @@
MPJLambdaWrapperX<MesProTaskDO> query = new MPJLambdaWrapperX<>();
query.selectAll(MesProTaskDO.class);
// 寰呮姤宸ュ彴璐︼細杩涜涓殑浠诲姟锛堟帓闄ゅ凡瀹屾垚/宸插彇娑堬級锛屼笖浠嶆湁寰呮姤宸ラ噺
- query.in(MesProTaskDO::getStatus, MesProTaskStatusEnum.PREPARE.getStatus(),MesProTaskStatusEnum.PAUSED.getStatus());
+ query.in(MesProTaskDO::getStatus, MesProTaskStatusEnum.PREPARE.getStatus(),
+ MesProTaskStatusEnum.PRODUCING.getStatus(), MesProTaskStatusEnum.PARTIAL_FINISHED.getStatus(),
+ MesProTaskStatusEnum.PAUSED.getStatus());
query.apply("(quantity - IFNULL(produced_quantity, 0)) > 0");
query.likeIfPresent(MesProTaskDO::getCode, reqVO.getCode())
.likeIfPresent(MesProTaskDO::getName, reqVO.getName())
@@ -107,7 +109,12 @@
.eq(MesProTaskDO::getId, id)
.setSql("produced_quantity = IFNULL(produced_quantity, 0) + " + incrProducedQuantity)
.setSql("qualify_quantity = IFNULL(qualify_quantity, 0) + " + incrQualifyQuantity)
- .setSql("unqualify_quantity = IFNULL(unqualify_quantity, 0) + " + incrUnqualifyQuantity));
+ .setSql("unqualify_quantity = IFNULL(unqualify_quantity, 0) + " + incrUnqualifyQuantity)
+ .setSql("status = CASE WHEN IFNULL(produced_quantity, 0) > 0 THEN "
+ + MesProTaskStatusEnum.PARTIAL_FINISHED.getStatus() + " ELSE "
+ + MesProTaskStatusEnum.PRODUCING.getStatus() + " END")
+ .setSql("first_feedback_time = IFNULL(first_feedback_time, NOW())")
+ .setSql("last_feedback_time = NOW()"));
}
}
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 d7a93f2..623140a 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
@@ -700,6 +700,8 @@
ErrorCode WM_RETURN_SALES_NO_LINE = new ErrorCode(1_040_713_005, "閿�鍞��璐у崟鑷冲皯闇�瑕佷竴鏉¤鏁版嵁");
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_AFTERSALE_LINKED = new ErrorCode(1_040_713_008, "璇ラ攢鍞��璐у崟鍏宠仈鍞悗鐢宠锛屼笉鑳界洿鎺ヤ慨鏀瑰崟澶存垨鍒犻櫎锛涢渶瑕佸彇娑堟椂璇疯蛋鍙栨秷娴佺▼");
+ ErrorCode WM_RETURN_SALES_RQC_SOURCE_INVALID = new ErrorCode(1_040_713_009, "閫�璐ф楠屽崟鏉ユ簮琛屼笌閿�鍞��璐у崟涓嶄竴鑷达紝鎴栬琛屽凡瀹屾垚妫�楠�");
ErrorCode WM_RETURN_SALES_LINE_NOT_EXISTS = new ErrorCode(1_040_713_100, "閿�鍞��璐у崟琛屼笉瀛樺湪");
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, "涓婃灦鏄庣粏鎬绘暟閲忎笉鑳借秴杩囬��璐ц鏁伴噺");
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java
index 84331b2..1b7464f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java
@@ -470,7 +470,8 @@
// 1. 鏍¢獙浠诲姟瀛樺湪
MesProTaskDO task = validateTaskExists(pauseReqVO.getId());
// 2. 鏍¢獙鐘舵�佹槸鍚﹀厑璁稿仠宸ワ紙濡傚繀椤绘槸 鐢熶骇涓� 鎴� 閮ㄥ垎瀹屾垚锛�
- if (!ObjectUtils.equalsAny(task.getStatus(), MesProTaskStatusEnum.PREPARE.getStatus())) {
+ if (!ObjectUtils.equalsAny(task.getStatus(), MesProTaskStatusEnum.PRODUCING.getStatus(),
+ MesProTaskStatusEnum.PARTIAL_FINISHED.getStatus())) {
throw exception(PRO_TASK_CANNOT_PAUSE);
}
@@ -500,7 +501,10 @@
}
// 3. 鎭㈠浠诲姟鐘舵��
- Integer resumeStatus = MesProTaskStatusEnum.PREPARE.getStatus();
+ Integer resumeStatus = task.getProducedQuantity() != null
+ && task.getProducedQuantity().signum() > 0
+ ? MesProTaskStatusEnum.PARTIAL_FINISHED.getStatus()
+ : MesProTaskStatusEnum.PRODUCING.getStatus();
taskMapper.updateById(new MesProTaskDO().setId(task.getId()).setStatus(resumeStatus));
// 4. 鏇存柊鏈�鏂扮殑涓�鏉″仠宸ヨ褰�
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..30b1ad6 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
@@ -6,6 +6,7 @@
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.api.event.MesReturnSalesProgressEvent;
import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesLineDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesDO;
@@ -16,6 +17,7 @@
import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
+import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -26,6 +28,7 @@
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.WM_RETURN_SALES_RQC_SOURCE_INVALID;
/**
* MES 閿�鍞��璐у崟琛� Service 瀹炵幇绫�
@@ -49,6 +52,8 @@
@Resource
@Lazy
private MesWmReturnSalesDetailService returnSalesDetailService;
+ @Resource
+ private ApplicationEventPublisher eventPublisher;
@Override
public Long createReturnSalesLine(MesWmReturnSalesLineSaveReqVO createReqVO) {
@@ -172,6 +177,14 @@
public void updateReturnSalesLineWhenRqcFinish(Long sourceLineId, Long sourceDocId, Integer checkResult,
BigDecimal qualifiedQuantity, BigDecimal unqualifiedQuantity) {
MesWmReturnSalesLineDO sourceLine = validateReturnSalesLineExists(sourceLineId);
+ if (sourceDocId != null) {
+ MesWmReturnSalesDO sourceDoc = returnSalesService.validateReturnSalesExists(sourceDocId);
+ if (!sourceDocId.equals(sourceLine.getReturnId())
+ || !MesWmReturnSalesStatusEnum.CONFIRMED.getStatus().equals(sourceDoc.getStatus())
+ || !MesWmQualityStatusEnum.PENDING.getStatus().equals(sourceLine.getQualityStatus())) {
+ throw exception(WM_RETURN_SALES_RQC_SOURCE_INVALID);
+ }
+ }
boolean hasUnqualified = unqualifiedQuantity != null && unqualifiedQuantity.compareTo(BigDecimal.ZERO) > 0;
boolean hasQualified = qualifiedQuantity != null && qualifiedQuantity.compareTo(BigDecimal.ZERO) > 0;
@@ -210,7 +223,16 @@
boolean allInspected = !CollUtil.contains(allLines,
line -> Objects.equals(line.getQualityStatus(), MesWmQualityStatusEnum.PENDING.getStatus()));
if (allInspected) {
- returnSalesService.updateReturnSalesStatus(sourceDocId, MesWmReturnSalesStatusEnum.APPROVING.getStatus());
+ MesWmReturnSalesDO returnSales = returnSalesService.validateReturnSalesExists(sourceDocId);
+ if (MesWmReturnSalesStatusEnum.CONFIRMED.getStatus().equals(returnSales.getStatus())) {
+ returnSalesService.updateReturnSalesStatus(sourceDocId, MesWmReturnSalesStatusEnum.APPROVING.getStatus());
+ if (returnSales.getAfterSaleReturnId() != null) {
+ boolean failed = CollUtil.contains(allLines,
+ line -> MesWmQualityStatusEnum.FAIL.getStatus().equals(line.getQualityStatus()));
+ eventPublisher.publishEvent(new MesReturnSalesProgressEvent(sourceDocId,
+ MesReturnSalesProgressEvent.Stage.QUALITY_FINISHED, failed ? "鍚笉鍚堟牸鍝�" : "鍚堟牸"));
+ }
+ }
}
}
}
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 9bf850d..edc9074 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
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.mes.service.wm.returnsales;
import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
@@ -9,6 +10,7 @@
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.returnsales.vo.MesWmReturnSalesImportExcelVO;
+import cn.iocoder.yudao.module.mes.api.event.MesReturnSalesProgressEvent;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnsales.vo.MesWmReturnSalesSaveReqVO;
@@ -27,6 +29,7 @@
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.context.ApplicationEventPublisher;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@@ -64,6 +67,8 @@
private MesMdmItemService mdmItemService;
@Resource
private MesWmTransactionService wmTransactionService;
+ @Resource
+ private ApplicationEventPublisher eventPublisher;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -73,6 +78,7 @@
// 2. 鎻掑叆涓昏〃
MesWmReturnSalesDO returnSales = BeanUtils.toBean(createReqVO, MesWmReturnSalesDO.class);
+ returnSales.setAfterSaleReturnId(createReqVO.getAfterSaleReturnId());
returnSales.setStatus(MesWmReturnSalesStatusEnum.PREPARE.getStatus());
returnSalesMapper.insert(returnSales);
return returnSales.getId();
@@ -82,12 +88,16 @@
@Transactional(rollbackFor = Exception.class)
public void updateReturnSales(MesWmReturnSalesSaveReqVO updateReqVO) {
// 1.1 鏍¢獙瀛樺湪 + 鍑嗗涓姸鎬�
- validateReturnSalesExistsAndPrepare(updateReqVO.getId());
+ MesWmReturnSalesDO existing = validateReturnSalesExistsAndPrepare(updateReqVO.getId());
+ if (existing.getAfterSaleReturnId() != null) {
+ throw exception(WM_RETURN_SALES_AFTERSALE_LINKED);
+ }
// 1.2 鏍¢獙鍏宠仈鏁版嵁
validateSaveData(updateReqVO);
// 2. 鏇存柊涓昏〃
MesWmReturnSalesDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnSalesDO.class);
+ updateObj.setAfterSaleReturnId(null); // 鏉ユ簮鐢宠涓嶅彲閫氳繃缂栬緫鎺ュ彛鏀圭粦
returnSalesMapper.updateById(updateObj);
}
@@ -95,7 +105,10 @@
@Transactional(rollbackFor = Exception.class)
public void deleteReturnSales(Long id) {
// 1. 鏍¢獙瀛樺湪 + 鍑嗗涓姸鎬�
- validateReturnSalesExistsAndPrepare(id);
+ MesWmReturnSalesDO returnSales = validateReturnSalesExistsAndPrepare(id);
+ if (returnSales.getAfterSaleReturnId() != null) {
+ throw exception(WM_RETURN_SALES_AFTERSALE_LINKED);
+ }
// 2.1 绾ц仈鍒犻櫎鏄庣粏
returnSalesDetailService.deleteReturnSalesDetailByReturnId(id);
@@ -133,8 +146,13 @@
Integer targetStatus = hasPendingQc ? MesWmReturnSalesStatusEnum.CONFIRMED.getStatus()
: MesWmReturnSalesStatusEnum.APPROVING.getStatus();
// 2.2 鎻愪氦锛堣崏绋� -> 寰呮楠�/寰呮墽琛岋級
- returnSalesMapper.updateById(new MesWmReturnSalesDO()
- .setId(id).setStatus(targetStatus));
+ if (updateStatusIfCurrent(id, MesWmReturnSalesStatusEnum.PREPARE.getStatus(), targetStatus) != 1) {
+ throw exception(WM_RETURN_SALES_STATUS_NOT_PREPARE);
+ }
+ if (!hasPendingQc && validateReturnSalesExists(id).getAfterSaleReturnId() != null) {
+ eventPublisher.publishEvent(new MesReturnSalesProgressEvent(id,
+ MesReturnSalesProgressEvent.Stage.QUALITY_FINISHED, "鍏嶆"));
+ }
}
@Override
@@ -151,8 +169,10 @@
throw exception(WM_RETURN_SALES_NO_LINE);
}
// 2. 鎵ц閫�璐э紙寰呮墽琛� -> 寰呬笂鏋讹級
- returnSalesMapper.updateById(new MesWmReturnSalesDO()
- .setId(id).setStatus(MesWmReturnSalesStatusEnum.APPROVED.getStatus()));
+ if (updateStatusIfCurrent(id, MesWmReturnSalesStatusEnum.APPROVING.getStatus(),
+ MesWmReturnSalesStatusEnum.APPROVED.getStatus()) != 1) {
+ throw exception(WM_RETURN_SALES_STATUS_NOT_APPROVING);
+ }
}
@Override
@@ -184,12 +204,16 @@
}
}
- // 2. 閬嶅巻鎵�鏈夋槑缁嗭紝鍒涘缓搴撳瓨浜嬪姟锛堝鍔犲簱瀛� + 璁板綍娴佹按锛�
+ // 鎶㈠崰鐘舵�佸悗鍐嶈搴撳瓨娴佹按锛岄伩鍏嶄袱涓苟鍙戜笂鏋惰姹傞噸澶嶅叆搴擄紱浜嬪姟澶辫触浼氬洖婊氱姸鎬併��
+ if (updateStatusIfCurrent(id, MesWmReturnSalesStatusEnum.APPROVED.getStatus(),
+ MesWmReturnSalesStatusEnum.FINISHED.getStatus()) != 1) {
+ throw exception(WM_RETURN_SALES_STATUS_NOT_APPROVED);
+ }
createTransactionList(returnSales);
-
- // 3. 鏇存柊閫�璐у崟鐘舵��
- returnSalesMapper.updateById(new MesWmReturnSalesDO()
- .setId(id).setStatus(MesWmReturnSalesStatusEnum.FINISHED.getStatus()));
+ if (returnSales.getAfterSaleReturnId() != null) {
+ eventPublisher.publishEvent(new MesReturnSalesProgressEvent(id,
+ MesReturnSalesProgressEvent.Stage.INBOUND_FINISHED, null));
+ }
}
private void createTransactionList(MesWmReturnSalesDO returnSales) {
@@ -216,8 +240,13 @@
}
// 鍙栨秷
- returnSalesMapper.updateById(new MesWmReturnSalesDO()
- .setId(id).setStatus(MesWmReturnSalesStatusEnum.CANCELED.getStatus()));
+ if (updateStatusIfCurrent(id, returnSales.getStatus(), MesWmReturnSalesStatusEnum.CANCELED.getStatus()) != 1) {
+ throw exception(WM_RETURN_SALES_CANCEL_NOT_ALLOWED);
+ }
+ if (returnSales.getAfterSaleReturnId() != null) {
+ eventPublisher.publishEvent(new MesReturnSalesProgressEvent(id,
+ MesReturnSalesProgressEvent.Stage.CANCELED, null));
+ }
}
@Override
@@ -257,8 +286,16 @@
@Override
public void updateReturnSalesStatus(Long id, Integer status) {
- validateReturnSalesExists(id);
- returnSalesMapper.updateById(new MesWmReturnSalesDO().setId(id).setStatus(status));
+ if (updateStatusIfCurrent(id, MesWmReturnSalesStatusEnum.CONFIRMED.getStatus(), status) != 1) {
+ throw exception(WM_RETURN_SALES_RQC_SOURCE_INVALID);
+ }
+ }
+
+ private int updateStatusIfCurrent(Long id, Integer currentStatus, Integer targetStatus) {
+ return returnSalesMapper.update(null, new LambdaUpdateWrapper<MesWmReturnSalesDO>()
+ .eq(MesWmReturnSalesDO::getId, id)
+ .eq(MesWmReturnSalesDO::getStatus, currentStatus)
+ .set(MesWmReturnSalesDO::getStatus, targetStatus));
}
/**
diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index 7324f5c..1a893a0 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -65,17 +65,17 @@
primary: master
datasource:
master:
- url: jdbc:mysql://192.168.197.128:3306/mom-xgdl?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 杩炴帴鐨勭ず渚�
+ url: jdbc:mysql://localhost:3306/mom-xgdl?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 杩炴帴鐨勭ず渚�
username: root
- password: sugaozhixing.cn
+ password: 123456
# Redis 閰嶇疆銆俁edisson 榛樿鐨勯厤缃冻澶熶娇鐢紝涓�鑸笉闇�瑕佽繘琛岃皟浼�
data:
redis:
- host: 192.168.197.128 # 鍦板潃
+ host: localhost # 鍦板潃
port: 6379 # 绔彛
database: 0 # 鏁版嵁搴撶储寮�
- password: sugaozhixing.cn
+# password: sugaozhixing.cn
--- #################### 瀹氭椂浠诲姟鐩稿叧閰嶇疆 ####################
--
Gitblit v1.9.3