From 407a9d87ba0bd58e7795ff5387b0cb005d630bed Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 27 五月 2026 16:45:30 +0800
Subject: [PATCH] 生产入库逻辑修改，只有最后一道工序的报工才会入库，只有成品检验和原材料检验入库
---
src/main/java/com/ruoyi/sales/pojo/InvoiceLedger.java | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/InvoiceLedger.java b/src/main/java/com/ruoyi/sales/pojo/InvoiceLedger.java
index 737f41f..efb9b0c 100644
--- a/src/main/java/com/ruoyi/sales/pojo/InvoiceLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/InvoiceLedger.java
@@ -10,7 +10,6 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
-import java.text.Format;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -23,31 +22,22 @@
@TableId(type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "閿�鍞彴璐ales_ledger")
- private Integer salesLedgerId;
-
- @ApiModelProperty(value = "閿�鍞悎鍚屽彿")
- private String salesContractNo;
-
- @ApiModelProperty(value = "瀹㈡埛鍚嶇ОID")
- private Integer customerId;
+ @ApiModelProperty(value = "invoice_registration_product琛ㄤ富閿�")
+ private Integer invoiceRegistrationProductId;
@ApiModelProperty(value = "鍙戠エ鍙�")
private String invoiceNo;
@ApiModelProperty(value = "鍙戠エ閲戦")
- private BigDecimal invoiceAmount;
-
- @ApiModelProperty(value = "绋庣巼")
- private BigDecimal taxRate;
+ private BigDecimal invoiceTotal;
@ApiModelProperty(value = "寮�绁ㄤ汉")
private String invoicePerson;
@ApiModelProperty(value = "寮�绁ㄦ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime invoiceDate;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate invoiceDate;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@@ -67,6 +57,9 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
- private Integer tenantId;
+ private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3