From 4fc35bc07b14aa6fea89b9ba89141eb69e1caa43 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 04 十二月 2025 15:08:41 +0800
Subject: [PATCH] yys1.协同办公：关闭签字功能，除报销管理外，关闭其余附件功能。 2.营销管理：关闭销售台账附件功能。 3.仓储物料：需增加成品入库 4.生产管控：生产派工需要新增派工产线及生产人 5.设备管理：设备台账关闭设备品牌和存放位置
---
src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java
index a241cca..a92bff2 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java
@@ -1,5 +1,6 @@
package com.ruoyi.production.dto;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,10 +24,14 @@
@ApiModelProperty(value = "鎺掍骇浜篿d")
private Long schedulingUserId;
+ @ApiModelProperty(value = "鐢熶骇浜篿d")
+ private Long productionUserId;
+
/**
* 鎺掍骇浜哄悕绉�
*/
@ApiModelProperty(value = "鎺掍骇浜哄悕绉�")
+ @Excel(name = "鎺掍骇浜�")
private String schedulingUserName;
@@ -34,13 +39,22 @@
* 鎺掍骇鏁伴噺
*/
@ApiModelProperty(value = "鎺掍骇鏁伴噺")
+ @Excel(name = "鎺掍骇鏁伴噺")
private BigDecimal schedulingNum;
/**
* 鐢熶骇鏁伴噺
*/
@ApiModelProperty(value = "鐢熶骇鏁伴噺")
+ @Excel(name = "鐢熶骇鏁伴噺")
private BigDecimal finishedNum;
+
+ /**
+ * 寰呯敓浜ф暟閲�
+ */
+ @ApiModelProperty(value = "寰呯敓浜ф暟閲�")
+ @Excel(name = "寰呯敓浜ф暟閲�")
+ private BigDecimal daiNum;
/**
* 宸ユ椂瀹氶
@@ -52,11 +66,13 @@
* 宸ュ簭
*/
@ApiModelProperty(value = "宸ュ簭")
+ @Excel(name = "宸ュ簭")
private String process;
/**
* 鎺掍骇鏃ユ湡
*/
@ApiModelProperty(value = "鎺掍骇鏃ユ湡")
+ @Excel(name = "鎺掍骇鏃ユ湡")
private String schedulingDate;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@@ -70,4 +86,43 @@
@ApiModelProperty(value = "鎶ュ伐鐘舵��")
private Integer status;
+ @Excel(name = "鐘舵��", readConverterExp = "1=寰呯敓浜�,2=鐢熶骇涓�,3=宸叉姤宸�")
+ private String statusName;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ @Excel(name = "澶囨敞")
+ private String remark;
+
+ /**
+ * 鎹熻��
+ */
+ @ApiModelProperty(value = "鎹熻��")
+ @Excel(name = "鎹熻��")
+ private String loss;
+
+ /**
+ * 缁戝畾鏈哄櫒
+ */
+ @ApiModelProperty(value = "缁戝畾鏈哄櫒")
+ @Excel(name = "缁戝畾鏈哄櫒")
+ private String speculativeTradingName;
+
+ /**
+ * 鍙ｅ懗鍒嗙被
+ */
+ @ApiModelProperty(value = "鍙ｅ懗鍒嗙被")
+ @Excel(name = "鍙ｅ懗鍒嗙被")
+ private String type;
+
+ /**
+ * 棰嗙敤
+ */
+ @ApiModelProperty(value = "棰嗙敤")
+ @Excel(name = "棰嗙敤")
+ private String receive;
+
+
}
--
Gitblit v1.9.3