From 12067f657bc3dc169a7a466e433374368e8daf73 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期日, 18 一月 2026 16:14:27 +0800
Subject: [PATCH] 越库订单逻辑调整
---
src/main/java/com/zy/asrs/entity/OrderPakout.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakout.java b/src/main/java/com/zy/asrs/entity/OrderPakout.java
index 1edce52..5d85ff9 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakout.java
@@ -8,11 +8,11 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderSettleService;
-import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.beans.BeanUtils;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -94,7 +94,7 @@
* 瀹㈡埛缂栧彿
*/
@ApiModelProperty(value = "瀹㈡埛缂栧彿")
- private Long cstmr;
+ private String cstmr;
/**
* 瀹㈡埛
@@ -276,10 +276,24 @@
@TableField("pakin_pakout_status")
private Integer pakinPakoutStatus;
+ /**
+ * 鏈堢粨ID
+ */
+ @ApiModelProperty(value = "鏈堢粨ID")
+ @TableField("monthly_settle_id")
+ private Long monthlySettleId;
+
+ /**
+ * 鏈堢粨缂栧彿
+ */
+ @ApiModelProperty(value = "鏈堢粨缂栧彿")
+ @TableField("monthly_settle_no")
+ private String monthlySettleNo;
+
public OrderPakout() {
}
- public OrderPakout(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ public OrderPakout(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, String cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.uuid = uuid;
this.orderNo = orderNo;
this.orderTime = orderTime;
@@ -414,6 +428,9 @@
}
public String getPakinPakoutStatus$() {
+ if(null == this.pakinPakoutStatus) {
+ return null;
+ }
switch (this.pakinPakoutStatus) {
case 1:
return "Y";
@@ -488,7 +505,7 @@
}
public void sync(Object source) {
- Synchro.Copy(source, this);
+ BeanUtils.copyProperties(source, this);
}
}
--
Gitblit v1.9.1