From 7b2233d1dab53574facc66b3bebffcd8ca5919de Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 21 三月 2026 14:27:19 +0800
Subject: [PATCH] yys 1.已退货完毕的出库单号不要展示在关联出库单中 2.退货管理唯一处理 3.生产订单-库存数量回显 4.发货管理回显退货数量 5.发货增加详情接口 6.生产核算清理脏数据 7.生产报工-删除生产报工记录报错 8.筛选客户名称数据展示有误
---
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