From e93f13a9296affa2cd7a5b7c667aa5e5a4f5fde6 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 25 四月 2026 10:33:24 +0800
Subject: [PATCH] 订单出库可指定部分出库
---
src/main/java/com/zy/asrs/entity/Mat.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 43cc500..55591a6 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -9,11 +9,11 @@
import com.core.common.SpringUtils;
import com.zy.asrs.enums.ContainerType;
import com.zy.asrs.service.TagService;
-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;
@@ -232,7 +232,7 @@
/**
* 鏄惁鎵规 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "楂樹綆棰� 0: 楂� 1: 浣� ")
@TableField("be_batch")
private Integer beBatch;
@@ -322,12 +322,14 @@
* 搴撳瓨棰勮鏁伴噺涓婇檺
*/
@TableField("store_max")
+ @ExcelProperty(value = "搴撳瓨棰勮鏁伴噺涓婇檺")
private Double storeMax;
/**
* 搴撳瓨棰勮鏁伴噺涓嬮檺
*/
@TableField("store_min")
+ @ExcelProperty(value = "搴撳瓨棰勮鏁伴噺涓嬮檺")
private Double storeMin;
/**
@@ -448,9 +450,9 @@
}
switch (this.beBatch) {
case 1:
- return "鏄�";
+ return "浣庨";
case 0:
- return "鍚�";
+ return "楂橀";
default:
return String.valueOf(this.beBatch);
}
@@ -547,7 +549,7 @@
}
public void sync(Object source) {
- Synchro.Copy(source, this);
+ BeanUtils.copyProperties(source, this);
}
}
--
Gitblit v1.9.1