From 6416b165e4a3c8ecc2d547ceef0fb3962d3c7b56 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 12 一月 2026 14:58:45 +0800
Subject: [PATCH] 1.查询产品信息列表接口，销售台账查询其产品的状态 2.增添不合格现象字段，取消生产状态字段 3.修改发货审批接口,发货审批通过，生产该订单出库记录 4.存在质检记录并已提交的销售台账删除时做出限制 5.生产报工投入，产出2:1调整
---
src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java b/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
index 72c4f00..b22e6a3 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -15,19 +16,24 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "鎶ヤ环鍗曠紪鍙�")
+ @Excel(name = "鎶ヤ环鍗曠紪鍙�")
private String quotationNo;
@ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ @Excel(name = "瀹㈡埛鍚嶇О")
private String customer;
@ApiModelProperty(value = "涓氬姟鍛�")
+ @Excel(name = "涓氬姟鍛�")
private String salesperson;
@ApiModelProperty(value = "鎶ヤ环鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鎶ヤ环鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private LocalDate quotationDate;
@ApiModelProperty(value = "鏈夋晥鏈熻嚦")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鏈夋晥鏈熻嚦", width = 30, dateFormat = "yyyy-MM-dd")
private LocalDate validDate;
@ApiModelProperty(value = "浠樻鏂瑰紡")
private String paymentMethod;
@@ -36,6 +42,7 @@
@ApiModelProperty(value = "鐘舵��")
private String status;
@ApiModelProperty(value = "鎶ヤ环鎬婚噾棰�")
+ @Excel(name = "鎶ヤ环閲戦")
private Double totalAmount;
@ApiModelProperty(value = "澶囨敞")
--
Gitblit v1.9.3