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/procurementrecord/dto/ProcurementPageDtoCopy.java |   43 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 43 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
index f2e214e..0bf8547 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -25,10 +26,28 @@
     @Excel(name = "鍏ュ簱鎵规")
     private String inboundBatches;
 
+    private BigDecimal warnNum;
+
     /**
      * 鍚堝悓鍙�
      */
     private String purchaseContractNumber;
+
+
+    /**
+     * 閿�鍞悎鍚屽彿
+     */
+    private String salesContractNo;
+
+    /**
+     * 瀹㈡埛鍚堝悓鍙�
+     */
+    private String customerContractNo;
+
+    /**
+     * 瀹㈡埛鍚嶇О
+     */
+    private String customerName;
 
     private String salesLedgerProductId;
 
@@ -39,10 +58,29 @@
     private BigDecimal inboundNum;
 
     /**
+     * 鍏ュ簱鍗曚环
+     */
+    @ApiModelProperty(value = "鍏ュ簱鍗曚环")
+    @Excel(name = "鍏ュ簱鍗曚环")
+    private BigDecimal unitPrice;
+
+    /**
+     * 鍏ュ簱鎬讳环
+     */
+    @ApiModelProperty(value = "鍏ュ簱鎬讳环")
+    @Excel(name = "鍏ュ簱鎬讳环")
+    private BigDecimal totalPrice;
+
+    /**
      * 寰呭嚭搴撴暟閲�
      */
     @Excel(name = "寰呭嚭搴撴暟閲�")
     private BigDecimal inboundNum0;
+    /**
+     * 鍑哄簱鏁伴噺
+     */
+    @Excel(name = "鍑哄簱鏁伴噺")
+    private BigDecimal totalInboundNum = BigDecimal.ZERO;
 
     /**
      * 鏈�浣庡簱瀛樻暟閲�
@@ -93,6 +131,11 @@
      */
     @Excel(name = "浜у搧澶х被")
     private String productCategory;
+     /**
+     * 浜у搧id
+     */
+    @Excel(name = "浜у搧id")
+    private Long productId;
 
     /**
      * 瑙勬牸鍨嬪彿

--
Gitblit v1.9.3