From 0989ec1e6b465141f99ed67e40fa2a0b928dce94 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 29 四月 2026 16:54:51 +0800
Subject: [PATCH] feat(production): 新增生产核算和生产工单功能模块 - 添加生产核算控制器、服务接口及实现类 - 实现生产核算分页查询和工人生产工资信息查询功能 - 添加生产工单控制器、服务接口及实现类 - 实现生产工单的增删改查和状态统计功能 - 集成工单流转卡下载和二维码生成功能 - 添加工单相关的数据传输对象和值对象 - 实现工单与用户关联的分配功能 - 完善工单附件图片处理和展示功能

---
 src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java |   40 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 39 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java b/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java
index 1bdd771..59f1da3 100644
--- a/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java
@@ -1,12 +1,25 @@
 package com.ruoyi.purchase.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.purchase.pojo.TicketRegistration;
+import com.ruoyi.sales.pojo.CommonFile;
 import com.ruoyi.sales.pojo.SalesLedgerProduct;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
+import java.time.LocalDate;
 import java.util.List;
 
+/**
+ * 鏉ョエ鐧昏琛�
+ */
+
 @Data
-public class TicketRegistrationDto {
+@TableName("ticket_registration")
+public class TicketRegistrationDto extends TicketRegistration {
 
     /**
      * 涓婚敭ID
@@ -29,6 +42,14 @@
     private String salesContractNo;
 
     /**
+     * 寮�绁ㄦ棩鏈�
+     */
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate entryDate;
+
+    /**
      * 瀹㈡埛鍚嶇О
      */
     private String customerName;
@@ -37,6 +58,13 @@
      * 涓氬姟鍛�
      */
     private String businessPerson;
+
+
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @TableField(exist = false)
+    private LocalDate enterDate;
 
     /**
      * 涓氬姟鍛榠d
@@ -52,4 +80,14 @@
 
     private Long salesContractNoId;
     private String supplierName;
+
+    private List<String> tempFileIds;
+    private List<CommonFile> CommonFiles;
+
+    private String fileName;
+
+    @TableField(exist = false)
+    private String createdAtStart;
+    @TableField(exist = false)
+    private String createdAtEnd;
 }

--
Gitblit v1.9.3