From 43f9cf624b83c9d3d0e2280a1404dcc52695a18d Mon Sep 17 00:00:00 2001
From: IZCD4L12RTSW0VZ\Administrator <skyouc>
Date: 星期一, 29 十二月 2025 16:01:08 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
---
src/main/java/com/zy/asrs/entity/Order.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index 90aac1d..48b034c 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -4,9 +4,11 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.DocTypeService;
+import com.zy.asrs.service.MatService;
import com.zy.asrs.service.OrderSettleService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
@@ -76,6 +78,10 @@
@ApiModelProperty(value= "璋冩嫧椤圭洰缂栧彿")
@TableField("allot_item_id")
private Long allotItemId;
+
+ @ApiModelProperty("鐩爣搴撳尯")
+ @TableField("target_location")
+ private String targetLocation;
/**
* 鍒濆绁ㄦ嵁鍙�
@@ -213,6 +219,10 @@
@ApiModelProperty(value= "鐗╂祦鍗曞彿")
@TableField("ship_code")
private String shipCode;
+
+ @ApiModelProperty("涓婃姤娆℃暟")
+ @TableField("report_once")
+ private Integer reportOnce;
/**
* 璁㈠崟鐘舵��
@@ -473,6 +483,7 @@
}
}
+
public String getPayTime$(){
if (Cools.isEmpty(this.payTime)){
return "";
--
Gitblit v1.9.1