From fe1b02a121c173e9b2d56bbe5a1982e0e69e0548 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 28 四月 2026 18:06:08 +0800
Subject: [PATCH] feat(production): 新增生产工单管理功能 - 创建 ProductionOperationTask 实体类定义工单数据结构 - 实现 ProductionOperationTaskController 提供工单的增删改查接口 - 开发 ProductionOperationTaskService 和实现类处理业务逻辑 - 配置 ProductionOperationTaskMapper 及 XML 文件实现数据库操作 - 添加 ProductionOperationTaskVo 视图对象用于数据展示 - 扩展 ProductionOrder 实体类增加生产订单相关属性 - 更新 ProductionOrderMapper.xml 完善订单查询映射配置 - 优化 ProductionOrderPickRecordMapper.xml 记录物料领取明细 - 新增 ProductionOrderRoutingOperationParam 参数配置实体 - 完善 工序参数处理逻辑
---
src/main/java/com/ruoyi/basic/pojo/SupplierManage.java | 62 +++++++++++++++++++++---------
1 files changed, 43 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
index b819cd5..fa10c92 100644
--- a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
+++ b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
@@ -1,9 +1,12 @@
package com.ruoyi.basic.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import java.time.LocalDate;
import java.time.LocalDateTime;
@Data
@@ -11,55 +14,76 @@
public class SupplierManage {
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
- @ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
+ @Schema(description = "渚涘簲鍟嗗悕绉�")
+ @Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
- @ApiModelProperty(value = "绾崇◣浜鸿瘑鍒彿")
+ @Schema(description = "绾崇◣浜鸿瘑鍒彿")
+ @Excel(name = "绾崇◣浜鸿瘑鍒彿")
private String taxpayerIdentificationNum;
- @ApiModelProperty(value = "鍏徃鍦板潃")
+ @Schema(description = "鍏徃鍦板潃")
+ @Excel(name = "鍏徃鍦板潃")
private String companyAddress;
- @ApiModelProperty(value = "鍏徃鐢佃瘽")
+ @Schema(description = "鍏徃鐢佃瘽")
+ @Excel(name = "鍏徃鐢佃瘽")
private String companyPhone;
- @ApiModelProperty(value = "寮�鎴疯")
+ @Schema(description = "寮�鎴疯")
+ @Excel(name = "寮�鎴疯")
private String bankAccountName;
- @ApiModelProperty(value = "璐﹀彿")
+ @Schema(description = "璐﹀彿")
+ @Excel(name = "璐﹀彿")
private String bankAccountNum;
- @ApiModelProperty(value = "鑱旂郴浜�")
+ @Schema(description = "鑱旂郴浜�")
+ @Excel(name = "鑱旂郴浜�")
private String contactUserName;
- @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+ @Schema(description = "鑱旂郴鐢佃瘽")
+ @Excel(name = "鑱旂郴鐢佃瘽")
private String contactUserPhone;
- @ApiModelProperty(value = "缁存姢浜篒D")
+ @Schema(description = "缁存姢浜篒D")
+ @Excel(name = "缁存姢浜�")
private Integer maintainUserId;
- @ApiModelProperty(value = "缁存姢鏃堕棿")
- private LocalDateTime maintainTime;
+ @Schema(description = "缁存姢鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+// @Excel(name = "缁存姢鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ private LocalDate maintainTime;
+ @Excel(name = "鏄惁鐧藉悕鍗�")
+ @Schema(description = "鏄惁鐧藉悕鍗曪紙0鏄� 1鍚︼級")
+ private Integer isWhite;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
- private Integer tenantId;
+ private Long tenantId;
+
+ @Schema(description = "渚涘簲鍟嗙被鍨�")
+ @TableField(value = "supplier_type")
+ private String supplierType;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3