From 6923315545b3f97c86719148f85dac1220a14a63 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期三, 14 一月 2026 19:23:54 +0800
Subject: [PATCH] agv空托入库接口以及机器人组站点配置
---
src/main/java/com/zy/asrs/entity/OrderPakout.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakout.java b/src/main/java/com/zy/asrs/entity/OrderPakout.java
index a9ee821..5d85ff9 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakout.java
@@ -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";
--
Gitblit v1.9.1