From 8f903210610b4dc084a72d4ca9f3d8086e5972eb Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 24 三月 2026 15:35:54 +0800
Subject: [PATCH] feat:1.生产报工（销售订单不创建生产订单） 2.报工增加投入总量 3.报工不扣投入库存数量
---
src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java
index 56adc8e..b04e43e 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java
@@ -23,14 +23,27 @@
@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 schedulingDateStart;
+ private String entryDateStart;
@ApiModelProperty(value = "缁撴潫鏃堕棿")
- private String schedulingDateEnd;
+ private String entryDateEnd;
/**
* id
@@ -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