From 0e420d68f407fde240709ac1800da20b0bb99490 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 09 六月 2026 16:06:16 +0800
Subject: [PATCH] feat：反审核操作。可以对已审核的订单进行反审核，反审核的时候可以选择作废还是重新生成一条，并记录反审核描述。选择作废的话则不生成新增订单。选择重新生成的话则跳转到新增台账页面对反审核的销售产品进行编辑保存重新生成一条新增的订单。反审核的订单即使是发货了还是可以反审核，并且需要将对应的入库、出库、发货进行作废。
---
src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java b/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
index fce7148..82a657c 100644
--- a/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
+++ b/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
@@ -18,13 +18,6 @@
@TableName("shipping_info")
public class ShippingInfo {
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- @ApiModelProperty(value = "閿�鍞彴璐d")
- private Long salesLedgerId;
- @ApiModelProperty(value = "閿�鍞姤浠蜂骇鍝佽〃id")
- private Long salesLedgerProductId;
@TableField(exist = false)
@ApiModelProperty(value = "閿�鍞悎鍚屽彿")
@Excel(name = "閿�鍞悎鍚屽彿")
@@ -35,11 +28,40 @@
@Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty(value = "閿�鍞彴璐d")
+ private Long salesLedgerId;
+
+ @ApiModelProperty(value = "閿�鍞姤浠蜂骇鍝佽〃id")
+ private Long salesLedgerProductId;
+
+ @ApiModelProperty(value = "鐘舵�� 寰呭鏍� 瀹℃牳涓� 锛屽鏍告嫆缁� 瀹℃牳閫氳繃 宸插彂璐�")
+ @Excel(name = "鐘舵��")
+ private String status;
+
@ApiModelProperty(value = "鍙戣揣鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鍙戣揣鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date shippingDate;
+
+ @ApiModelProperty(value = "鍙戣揣缂栧彿")
+ @Excel(name = "鍙戣揣缂栧彿")
+ private String shippingNo;
+
+ @ApiModelProperty(value = "蹇�掑崟鍙�")
+ @Excel(name = "蹇�掑崟鍙�")
+ private String expressNumber;
+
+ @ApiModelProperty(value = "蹇�掑叕鍙�")
+ @Excel(name = "蹇�掑叕鍙�")
+ private String expressCompany;
+
+ @ApiModelProperty(value = "鍙戣揣绫诲瀷")
+ @Excel(name = "鍙戣揣绫诲瀷")
+ private String type;
@ApiModelProperty(value = "鍙戣揣杞︾墝鍙�")
@Excel(name = "鍙戣揣杞︾墝鍙�")
@@ -65,8 +87,5 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "瀹℃壒浜篿d")
- @TableField(exist = false)
- private Integer approverId;
}
--
Gitblit v1.9.3