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/production/dto/SalesLedgerSchedulingProcessDto.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java
index 45e6148..b04e43e 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java
@@ -23,8 +23,21 @@
     @ApiModelProperty(value = "閿�鍞骇鍝両D")
     private Long salesLedgerProductId;
 
+    @ApiModelProperty(value = "鐢熶骇鎬婚噺(鍗曚綅kg)")
+    private BigDecimal totalProduction;
+
     @ApiModelProperty(value = "閿�鍞彴璐D")
     private Long salesLedgerId;
+
+    /**
+     * 鐢熶骇鐐掓満
+     */
+    @Excel(name = "鐢熶骇鐐掓満")
+    private String speculativeTradingName;
+
+    @ApiModelProperty(value = "浜х嚎")
+    @Excel(name = "浜х嚎")
+    private String productionLine;
 
     @ApiModelProperty(value = "寮�濮嬫椂闂�")
     private String entryDateStart;
@@ -96,9 +109,11 @@
     /**
      * 鐘舵��
      */
-    @Excel(name = "鐘舵��")
     @ApiModelProperty(value = "鐘舵��")
     private Integer status;
+
+    @Excel(name = "鐘舵��", readConverterExp = "1=寰呮帓浜�,2=鎺掍骇涓�,3=宸叉帓浜�")
+    private String statusName;
 
     /**
      * 娲惧伐浜�
@@ -125,6 +140,7 @@
      * 宸叉帓浜ф暟閲�
      */
     @ApiModelProperty(value = "宸叉帓浜ф暟閲�")
+    @Excel(name = "宸叉帓浜ф暟閲�")
     private BigDecimal successNum;
 
     private Long tenantId;

--
Gitblit v1.9.3