From 685fd776aa5e0afefcd233f3ee2e12fc217fda62 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 30 十月 2026 14:55:07 +0800
Subject: [PATCH] feat: 扩展南通苏珩业务需求相关字段

---
 yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/vo/invoice/CrmInvoiceRespVO.java                     |   13 +++
 yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/OaNoticeSaveReqVO.java                                 |    3 
 yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/vo/invoice/CrmInvoiceSaveReqVO.java                  |   18 ++++
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmResignationApplicationRespVO.java             |    8 +
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceSaveReqVO.java         |    3 
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInvoiceDO.java                             |    3 
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmResignationApplicationSaveReqVO.java          |    5 +
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/approval/HrmResignationApplicationDO.java                      |    6 +
 sql/mysql/20261027_business_requirements.sql                                                                                             |   93 +++++++++++++++++++++++
 yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/vo/ticket/AfterSaleTicketRespVO.java    |    6 +
 yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/vo/ticket/AfterSaleTicketSaveReqVO.java |    6 +
 yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/invoice/CrmInvoiceDO.java                                      |   11 ++
 yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/OaNoticeRespVO.java                                    |    4 +
 yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/OaNoticeServiceImpl.java                                           |    7 +
 yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/ticket/AfterSaleTicketDO.java                    |    6 +
 yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOANoticeController.java                                |    8 +
 16 files changed, 197 insertions(+), 3 deletions(-)

diff --git a/sql/mysql/20261027_business_requirements.sql b/sql/mysql/20261027_business_requirements.sql
new file mode 100644
index 0000000..352fa99
--- /dev/null
+++ b/sql/mysql/20261027_business_requirements.sql
@@ -0,0 +1,93 @@
+-- 鍗楅�氳嫃鐝╃嚎缂嗕笟鍔¢渶姹傛墿灞�
+-- 鎵ц鍓嶈澶囦唤娴嬭瘯搴撱�傝剼鏈娇鐢ㄤ俊鎭痏schema鍒ゆ柇瀛楁锛屾敮鎸侀噸澶嶆墽琛屻��
+
+SET @db_name = DATABASE();
+
+-- 璐㈠姟鍗曟嵁涓庨噰璐�侀攢鍞�佷粨鍌ㄥ崟鎹叧鑱�
+SET @sql = (SELECT IF(COUNT(*) = 0,
+  'ALTER TABLE erp_purchase_invoice ADD COLUMN arrival_notice_id BIGINT NULL COMMENT ''鍏宠仈鍏ュ簱鍗�'' AFTER purchase_order_id',
+  'SELECT 1') FROM information_schema.columns WHERE table_schema = @db_name AND table_name = 'erp_purchase_invoice' AND column_name = 'arrival_notice_id');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @sql = (SELECT IF(COUNT(*) = 0,
+  'ALTER TABLE crm_invoice ADD COLUMN sale_order_id BIGINT NULL COMMENT ''鍏宠仈閿�鍞鍗�'' AFTER contract_id',
+  'SELECT 1') FROM information_schema.columns WHERE table_schema = @db_name AND table_name = 'crm_invoice' AND column_name = 'sale_order_id');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @sql = (SELECT IF(COUNT(*) = 0,
+  'ALTER TABLE crm_invoice ADD COLUMN sale_out_id BIGINT NULL COMMENT ''鍏宠仈鍑哄簱鍗�'' AFTER sale_order_id',
+  'SELECT 1') FROM information_schema.columns WHERE table_schema = @db_name AND table_name = 'crm_invoice' AND column_name = 'sale_out_id');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @sql = (SELECT IF(COUNT(*) = 0,
+  'ALTER TABLE crm_invoice ADD COLUMN contract_amount DECIMAL(18,2) NULL COMMENT ''鍚堝悓閲戦'' AFTER price',
+  'SELECT 1') FROM information_schema.columns WHERE table_schema = @db_name AND table_name = 'crm_invoice' AND column_name = 'contract_amount');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @sql = (SELECT IF(COUNT(*) = 0,
+  'ALTER TABLE crm_invoice ADD COLUMN prepayment_amount DECIMAL(18,2) NULL COMMENT ''棰勪粯娆鹃噾棰�'' AFTER contract_amount',
+  'SELECT 1') FROM information_schema.columns WHERE table_schema = @db_name AND table_name = 'crm_invoice' AND column_name = 'prepayment_amount');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @sql = (SELECT IF(COUNT(*) = 0,
+  'ALTER TABLE crm_invoice ADD COLUMN delivery_amount DECIMAL(18,2) NULL COMMENT ''鍒拌揣娆鹃噾棰�'' AFTER prepayment_amount',
+  'SELECT 1') FROM information_schema.columns WHERE table_schema = @db_name AND table_name = 'crm_invoice' AND column_name = 'delivery_amount');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @sql = (SELECT IF(COUNT(*) = 0,
+  'ALTER TABLE crm_invoice ADD COLUMN acceptance_amount DECIMAL(18,2) NULL COMMENT ''楠屾敹娆鹃噾棰�'' AFTER delivery_amount',
+  'SELECT 1') FROM information_schema.columns WHERE table_schema = @db_name AND table_name = 'crm_invoice' AND column_name = 'acceptance_amount');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- 姣忎釜浠樻鑺傜偣鐨勬椂闂�
+CREATE TABLE IF NOT EXISTS crm_invoice_payment_node (
+  id BIGINT NOT NULL AUTO_INCREMENT,
+  invoice_id BIGINT NOT NULL COMMENT '寮�绁ㄧ敵璇�/鍙戠エ缂栧彿',
+  node_type TINYINT NOT NULL COMMENT '1棰勪粯娆� 2鍒拌揣娆� 3楠屾敹娆�',
+  amount DECIMAL(18,2) NOT NULL DEFAULT 0,
+  node_time DATETIME NULL,
+  remark VARCHAR(500) DEFAULT '',
+  creator VARCHAR(64) DEFAULT '', create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updater VARCHAR(64) DEFAULT '', update_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  deleted BIT(1) NOT NULL DEFAULT b'0',
+  PRIMARY KEY (id), KEY idx_invoice_node (invoice_id, node_type, deleted)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='閿�鍞彂绁ㄤ粯娆捐妭鐐�';
+
+-- 鍞悗鍙嶉銆佸鐞嗙粨鏋滃拰娴佺▼鐣欑棔
+SET @sql = (SELECT IF(COUNT(*) = 0,
+  'ALTER TABLE after_sale_ticket ADD COLUMN feedback_description TEXT NULL COMMENT ''瀹㈡埛璇夋眰鍙嶉鎻忚堪'' AFTER issue_description',
+  'SELECT 1') FROM information_schema.columns WHERE table_schema = @db_name AND table_name = 'after_sale_ticket' AND column_name = 'feedback_description');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @sql = (SELECT IF(COUNT(*) = 0,
+  'ALTER TABLE after_sale_ticket ADD COLUMN result_description TEXT NULL COMMENT ''澶勭悊缁撴灉鎻忚堪'' AFTER feedback_description',
+  'SELECT 1') FROM information_schema.columns WHERE table_schema = @db_name AND table_name = 'after_sale_ticket' AND column_name = 'result_description');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+CREATE TABLE IF NOT EXISTS after_sale_ticket_process (
+  id BIGINT NOT NULL AUTO_INCREMENT,
+  ticket_id BIGINT NOT NULL,
+  process_type VARCHAR(32) NOT NULL COMMENT '鍙楃悊銆佸鐞嗐�佸鏍搞�佸叧闂瓑',
+  process_status TINYINT NULL,
+  process_description TEXT,
+  attachment_count INT NOT NULL DEFAULT 0,
+  operator_user_id BIGINT NULL,
+  process_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  creator VARCHAR(64) DEFAULT '', create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updater VARCHAR(64) DEFAULT '', update_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  deleted BIT(1) NOT NULL DEFAULT b'0',
+  PRIMARY KEY (id), KEY idx_ticket_process (ticket_id, process_time, deleted)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='鍞悗宸ュ崟娴佽浆璁板綍';
+
+-- 绂昏亴浜ゆ帴锛氬悓鏃惰褰曞憳宸ャ�佺敤鎴峰拰鏁版嵁浜ゆ帴鐘舵��
+SET @sql = (SELECT IF(COUNT(*) = 0,
+  'ALTER TABLE hrm_resignation_application ADD COLUMN handover_employee_id BIGINT NULL COMMENT ''浜ゆ帴鍛樺伐ID'' AFTER handover_user_id',
+  'SELECT 1') FROM information_schema.columns WHERE table_schema = @db_name AND table_name = 'hrm_resignation_application' AND column_name = 'handover_employee_id');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @sql = (SELECT IF(COUNT(*) = 0,
+  'ALTER TABLE hrm_resignation_application ADD COLUMN handover_data_status TINYINT NOT NULL DEFAULT 0 COMMENT ''鐢ㄦ埛鏁版嵁浜ゆ帴鐘舵�侊細0鏈紑濮� 10杩涜涓� 20宸插畬鎴�'' AFTER handover_status',
+  'SELECT 1') FROM information_schema.columns WHERE table_schema = @db_name AND table_name = 'hrm_resignation_application' AND column_name = 'handover_data_status');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- 璁惧鍙拌处宸叉湁 code 瀛楁锛涜閲忓櫒鍏峰凡鏈� Excel 瀵煎叆琛ㄥ崟锛屽叕鍛婇檮浠朵娇鐢ㄧ郴缁熷瓨鍌ㄩ檮浠惰〃缁戝畾銆�
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/vo/ticket/AfterSaleTicketRespVO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/vo/ticket/AfterSaleTicketRespVO.java
index dc16302..a8ec2a6 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/vo/ticket/AfterSaleTicketRespVO.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/vo/ticket/AfterSaleTicketRespVO.java
@@ -54,6 +54,12 @@
     @Schema(description = "闂鎻忚堪", example = "鏀跺埌璐у悗鍙戠幇浜у搧琛ㄩ潰鏈夊垝鐥�")
     private String issueDescription;
 
+    @Schema(description = "瀹㈡埛璇夋眰鍙嶉鎻忚堪")
+    private String feedbackDescription;
+
+    @Schema(description = "澶勭悊缁撴灉鎻忚堪")
+    private String resultDescription;
+
     @Schema(description = "涓ラ噸绋嬪害: 0-杞诲井 1-涓�鑸� 2-涓ラ噸 3-鑷村懡", example = "1")
     private Integer severityLevel;
 
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/vo/ticket/AfterSaleTicketSaveReqVO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/vo/ticket/AfterSaleTicketSaveReqVO.java
index 0152e20..8876d12 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/vo/ticket/AfterSaleTicketSaveReqVO.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/vo/ticket/AfterSaleTicketSaveReqVO.java
@@ -50,6 +50,12 @@
     @Schema(description = "闂鎻忚堪", example = "鏀跺埌璐у悗鍙戠幇浜у搧琛ㄩ潰鏈夊垝鐥�")
     private String issueDescription;
 
+    @Schema(description = "瀹㈡埛璇夋眰鍙嶉鎻忚堪")
+    private String feedbackDescription;
+
+    @Schema(description = "澶勭悊缁撴灉鎻忚堪")
+    private String resultDescription;
+
     @Schema(description = "涓ラ噸绋嬪害: 0-杞诲井 1-涓�鑸� 2-涓ラ噸 3-鑷村懡", example = "1")
     private Integer severityLevel;
 
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/ticket/AfterSaleTicketDO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/ticket/AfterSaleTicketDO.java
index 4f71c3e..0894d44 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/ticket/AfterSaleTicketDO.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/ticket/AfterSaleTicketDO.java
@@ -70,6 +70,12 @@
      * 闂鎻忚堪
      */
     private String issueDescription;
+
+    /** 瀹㈡埛璇夋眰鍙嶉鎻忚堪 */
+    private String feedbackDescription;
+
+    /** 澶勭悊缁撴灉鎻忚堪 */
+    private String resultDescription;
     /**
      * 涓ラ噸绋嬪害: 0-杞诲井 1-涓�鑸� 2-涓ラ噸 3-鑷村懡
      */
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOANoticeController.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOANoticeController.java
index b0ce2fa..7349020 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOANoticeController.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOANoticeController.java
@@ -8,6 +8,7 @@
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.OaNoticeSaveReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.OaNoticeDO;
 import cn.iocoder.yudao.module.bpm.service.oa.OaNoticeService;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -28,6 +29,9 @@
 
     @Resource
     private OaNoticeService oaNoticeService;
+
+    @Resource
+    private StorageAttachmentApi storageAttachmentApi;
 
     @PostMapping("/create")
     @Operation(summary = "鍒涘缓閫氱煡鍏憡")
@@ -65,7 +69,9 @@
     @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
     public CommonResult<OaNoticeRespVO> getNotice(@RequestParam("id") Long id) {
         OaNoticeDO notice = oaNoticeService.getNotice(id, getLoginUserId());
-        return success(BeanUtils.toBean(notice, OaNoticeRespVO.class));
+        OaNoticeRespVO respVO = BeanUtils.toBean(notice, OaNoticeRespVO.class);
+        respVO.setAttachmentList(storageAttachmentApi.listAttachments("oa_notice", id));
+        return success(respVO);
     }
 
     @GetMapping("/my-unread-count")
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/OaNoticeRespVO.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/OaNoticeRespVO.java
index e64f18a..549f730 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/OaNoticeRespVO.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/OaNoticeRespVO.java
@@ -5,6 +5,7 @@
 
 import java.time.LocalDateTime;
 import java.util.List;
+import cn.iocoder.yudao.module.system.api.storage.dto.StorageBlobRespDTO;
 
 @Schema(description = "绠$悊鍚庡彴 - 閫氱煡鍏憡 Response VO")
 @Data
@@ -49,4 +50,7 @@
     @Schema(description = "褰撳墠鐢ㄦ埛鏄惁宸茶", example = "true")
     private Boolean isRead;
 
+    @Schema(description = "闄勪欢鍒楄〃")
+    private List<StorageBlobRespDTO> attachmentList;
+
 }
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/OaNoticeSaveReqVO.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/OaNoticeSaveReqVO.java
index 1f759d0..4b01e2c 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/OaNoticeSaveReqVO.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/OaNoticeSaveReqVO.java
@@ -42,4 +42,7 @@
     @Schema(description = "鎸囧畾鐢ㄦ埛ID鍒楄〃锛坰endScope=2鏃跺繀濉級", example = "[1, 2, 3]")
     private List<Long> userIds;
 
+    @Schema(description = "闄勪欢 BlobId 鍒楄〃")
+    private List<Long> blobIds;
+
 }
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/OaNoticeServiceImpl.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/OaNoticeServiceImpl.java
index 8769325..0b5ad6d 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/OaNoticeServiceImpl.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/OaNoticeServiceImpl.java
@@ -17,6 +17,7 @@
 import cn.iocoder.yudao.module.system.dal.mysql.notify.NotifyMessageMapper;
 import cn.iocoder.yudao.module.system.service.notify.NotifySendService;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -54,6 +55,9 @@
     @Resource
     private NotifyMessageMapper notifyMessageMapper;
 
+    @Resource
+    private StorageAttachmentApi storageAttachmentApi;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createNotice(Long userId, OaNoticeSaveReqVO createReqVO) {
@@ -64,6 +68,7 @@
             notice.setPublishTime(LocalDateTime.now());
         }
         oaNoticeMapper.insert(notice);
+        storageAttachmentApi.bindAttachments("file", "oa_notice", notice.getId(), createReqVO.getBlobIds());
 
         // 鎸囧畾浜哄啓鍏ュ叧鑱旇〃
         if (OaNoticeSendScopeEnum.SPECIFIED.getScope().equals(createReqVO.getSendScope())
@@ -93,6 +98,7 @@
             updateObj.setPublishTime(LocalDateTime.now());
         }
         oaNoticeMapper.updateById(updateObj);
+        storageAttachmentApi.updateAttachments("file", "oa_notice", updateReqVO.getId(), updateReqVO.getBlobIds());
 
         // 鏇存柊鎸囧畾浜哄叧鑱�
         oaNoticeUserMapper.deleteByNoticeId(updateReqVO.getId());
@@ -120,6 +126,7 @@
     public void deleteNotice(Long id) {
         validateNoticeExists(id);
         oaNoticeMapper.deleteById(id);
+        storageAttachmentApi.deleteAttachmentsByRecord("oa_notice", id);
         oaNoticeUserMapper.deleteByNoticeId(id);
     }
 
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/vo/invoice/CrmInvoiceRespVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/vo/invoice/CrmInvoiceRespVO.java
index 57f86c5..8964ba8 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/vo/invoice/CrmInvoiceRespVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/vo/invoice/CrmInvoiceRespVO.java
@@ -44,6 +44,15 @@
     @ExcelProperty("寮�绁ㄩ噾棰�")
     private BigDecimal price;
 
+    @Schema(description = "鍚堝悓閲戦")
+    private BigDecimal contractAmount;
+    @Schema(description = "棰勪粯娆鹃噾棰�")
+    private BigDecimal prepaymentAmount;
+    @Schema(description = "鍒拌揣娆鹃噾棰�")
+    private BigDecimal deliveryAmount;
+    @Schema(description = "楠屾敹娆鹃噾棰�")
+    private BigDecimal acceptanceAmount;
+
     @Schema(description = "寮�绁ㄦ棩鏈�", requiredMode = Schema.RequiredMode.REQUIRED, example = "2024-02-02")
     @ExcelProperty("寮�绁ㄦ棩鏈�")
     private LocalDateTime invoiceTime;
@@ -57,6 +66,10 @@
     @Schema(description = "鍚堝悓缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @ExcelProperty("鍚堝悓缂栧彿")
     private Long contractId;
+    @Schema(description = "鍏宠仈閿�鍞鍗�")
+    private Long saleOrderId;
+    @Schema(description = "鍏宠仈鍑哄簱鍗�")
+    private Long saleOutId;
     @Schema(description = "鍚堝悓淇℃伅")
     private CrmContractRespVO contract;
 
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/vo/invoice/CrmInvoiceSaveReqVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/vo/invoice/CrmInvoiceSaveReqVO.java
index 21cf8be..f745006 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/vo/invoice/CrmInvoiceSaveReqVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/invoice/vo/invoice/CrmInvoiceSaveReqVO.java
@@ -25,6 +25,12 @@
     @NotNull(message = "鍚堝悓缂栧彿涓嶈兘涓虹┖")
     private Long contractId;
 
+    @Schema(description = "鍏宠仈閿�鍞鍗�")
+    private Long saleOrderId;
+
+    @Schema(description = "鍏宠仈鍑哄簱鍗�")
+    private Long saleOutId;
+
     @Schema(description = "璐熻矗浜虹紪鍙�", example = "25682")
     private Long ownerUserId;
 
@@ -42,6 +48,18 @@
     @NotNull(message = "寮�绁ㄩ噾棰濅笉鑳戒负绌�")
     private BigDecimal price;
 
+    @Schema(description = "鍚堝悓閲戦")
+    private BigDecimal contractAmount;
+
+    @Schema(description = "棰勪粯娆鹃噾棰�")
+    private BigDecimal prepaymentAmount;
+
+    @Schema(description = "鍒拌揣娆鹃噾棰�")
+    private BigDecimal deliveryAmount;
+
+    @Schema(description = "楠屾敹娆鹃噾棰�")
+    private BigDecimal acceptanceAmount;
+
     @Schema(description = "寮�绁ㄦ棩鏈�", requiredMode = Schema.RequiredMode.REQUIRED, example = "2024-02-02")
     @NotNull(message = "寮�绁ㄦ棩鏈熶笉鑳戒负绌�")
     private LocalDateTime invoiceTime;
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/invoice/CrmInvoiceDO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/invoice/CrmInvoiceDO.java
index 664300d..0f82f8e 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/invoice/CrmInvoiceDO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/invoice/CrmInvoiceDO.java
@@ -49,6 +49,12 @@
      * 鍏宠仈 {@link CrmContractDO#getId()}
      */
     private Long contractId;
+
+    /** 鍏宠仈閿�鍞鍗� */
+    private Long saleOrderId;
+
+    /** 鍏宠仈鍑哄簱鍗� */
+    private Long saleOutId;
     /**
      * 璐熻矗浜虹紪鍙凤紝鍏宠仈 {@link AdminUserRespDTO#getId()}
      */
@@ -72,6 +78,11 @@
      * 寮�绁ㄩ噾棰濓紝鍗曚綅锛氬厓
      */
     private BigDecimal price;
+
+    private BigDecimal contractAmount;
+    private BigDecimal prepaymentAmount;
+    private BigDecimal deliveryAmount;
+    private BigDecimal acceptanceAmount;
     /**
      * 寮�绁ㄦ棩鏈�
      */
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceSaveReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceSaveReqVO.java
index 77a2916..b8880c2 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceSaveReqVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceSaveReqVO.java
@@ -22,6 +22,9 @@
     @NotNull(message = "閲囪喘璁㈠崟缂栧彿涓嶈兘涓虹┖")
     private Long purchaseOrderId;
 
+    @Schema(description = "鍏宠仈鍏ュ簱鍗�")
+    private Long arrivalNoticeId;
+
     @Schema(description = "鍙戠エ鍙风爜", example = "02564178")
     private String invoiceNo;
 
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInvoiceDO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInvoiceDO.java
index 53e1781..48c85f4 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInvoiceDO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInvoiceDO.java
@@ -45,6 +45,9 @@
      * 鍏宠仈 {@link ErpPurchaseOrderDO#getId()}
      */
     private Long purchaseOrderId;
+
+    /** 鍏宠仈鍏ュ簱鍗� */
+    private Long arrivalNoticeId;
     /**
      * 鍙戠エ鍙风爜
      */
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmResignationApplicationRespVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmResignationApplicationRespVO.java
index 3c7aaa6..0fd0c70 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmResignationApplicationRespVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmResignationApplicationRespVO.java
@@ -48,11 +48,17 @@
     @Schema(description = "浜ゆ帴浜篒D", example = "1")
     private Long handoverUserId;
 
+    @Schema(description = "浜ゆ帴鍛樺伐ID")
+    private Long handoverEmployeeId;
+
     @Schema(description = "浜ゆ帴浜哄鍚�", example = "鏉庡洓")
     private String handoverUserName;
 
     @Schema(description = "浜ゆ帴鐘舵��", example = "0")
     private Integer handoverStatus;
+
+    @Schema(description = "鐢ㄦ埛鏁版嵁浜ゆ帴鐘舵�侊細0鏈紑濮� 10杩涜涓� 20宸插畬鎴�")
+    private Integer handoverDataStatus;
 
     @Schema(description = "浜ゆ帴鐘舵�佸悕绉�", example = "鏈紑濮�")
     private String handoverStatusName;
@@ -81,4 +87,4 @@
     @Schema(description = "鍒涘缓鏃堕棿", example = "2024-01-01 09:00:00")
     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/approval/vo/HrmResignationApplicationSaveReqVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmResignationApplicationSaveReqVO.java
index fb19057..040bf71 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmResignationApplicationSaveReqVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/vo/HrmResignationApplicationSaveReqVO.java
@@ -36,6 +36,9 @@
     @Schema(description = "浜ゆ帴浜篒D", example = "1")
     private Long handoverUserId;
 
+    @Schema(description = "浜ゆ帴鍛樺伐ID", example = "1")
+    private Long handoverEmployeeId;
+
     @Schema(description = "浜ゆ帴璇存槑", example = "浜ゆ帴璇存槑")
     private String handoverRemark;
 
@@ -45,4 +48,4 @@
     @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/approval/HrmResignationApplicationDO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/approval/HrmResignationApplicationDO.java
index e2bc15f..178213d 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/approval/HrmResignationApplicationDO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/approval/HrmResignationApplicationDO.java
@@ -78,6 +78,9 @@
      */
     private Long handoverUserId;
 
+    /** 浜ゆ帴鍛樺伐ID */
+    private Long handoverEmployeeId;
+
     /**
      * 浜ゆ帴鐘舵��
      *
@@ -85,6 +88,9 @@
      */
     private Integer handoverStatus;
 
+    /** 鐢ㄦ埛鏁版嵁浜ゆ帴鐘舵�侊細0鏈紑濮� 10杩涜涓� 20宸插畬鎴� */
+    private Integer handoverDataStatus;
+
     /**
      * 浜ゆ帴璇存槑
      */

--
Gitblit v1.9.3