From 756a4f9b80a6d21a1ca9c9c8527db7f01cfdf6e3 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 07 七月 2025 12:47:51 +0800
Subject: [PATCH] #修复入库工作档两条明细数量不累加问题
---
src/main/java/com/zy/asrs/entity/Order.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index a195612..51154e4 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -78,7 +78,6 @@
private String allotItemId;
-
/**
* 鍒濆绁ㄦ嵁鍙凤紝鍏ュ簱浠撳簱id
*/
@@ -270,6 +269,8 @@
@ApiModelProperty(value = "澶囨敞")
private String memo;
+ private String remark;
+
/**
* 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
*/
@@ -283,6 +284,13 @@
@ApiModelProperty(value = "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
@TableField("pakin_pakout_status")
private Integer pakinPakoutStatus;
+
+ /**
+ * 寮�绁ㄥ鎴峰悕绉�
+ */
+ @ApiModelProperty(value = "寮�绁ㄥ鎴峰悕绉�")
+ @TableField("kp_cstmr_name")
+ private String kpCstmrName;
public Order() {
}
@@ -362,6 +370,45 @@
this.pakinPakoutStatus = pakinPakoutStatus;
}
+ public Order(String uuid, String orderNo, String orderTime, Long docType, String itemId, String itemName, String 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, Integer pakinPakoutStatus, String kpCstmrName) {
+ this.uuid = uuid;
+ this.orderNo = orderNo;
+ this.orderTime = orderTime;
+ this.docType = docType;
+ this.itemId = itemId;
+ this.itemName = itemName;
+ this.allotItemId = allotItemId;
+ this.defNumber = defNumber;
+ this.number = number;
+ this.cstmr = cstmr;
+ this.cstmrName = cstmrName;
+ this.tel = tel;
+ this.operMemb = operMemb;
+ this.totalFee = totalFee;
+ this.discount = discount;
+ this.discountFee = discountFee;
+ this.otherFee = otherFee;
+ this.actFee = actFee;
+ this.payType = payType;
+ this.salesman = salesman;
+ this.accountDay = accountDay;
+ this.postFeeType = postFeeType;
+ this.postFee = postFee;
+ this.payTime = payTime;
+ this.sendTime = sendTime;
+ this.shipName = shipName;
+ this.shipCode = shipCode;
+ this.settle = settle;
+ this.status = status;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ this.pakinPakoutStatus = pakinPakoutStatus;
+ this.kpCstmrName = kpCstmrName;
+ }
+
public Order(Order order) {
this.uuid = order.getUuid();
this.orderNo = order.getOrderNo();
--
Gitblit v1.9.1