From efb7f3ac8bd451882011410e5d3b5c90c92772d2 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 10 九月 2025 22:44:41 +0800
Subject: [PATCH] 新增堆垛机有出库任务时禁止拣料回库agv搬运
---
src/main/java/com/zy/asrs/entity/Mat.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 8a14362..edeaf84 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -8,6 +8,7 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
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;
@@ -151,7 +152,7 @@
* 鍘傚
*/
@ApiModelProperty(value= "鍘傚")
- @ExcelProperty(value = "鍟嗗搧缂栧彿")
+ @ExcelProperty(value = "鍘傚")
private String manu;
/**
@@ -255,7 +256,7 @@
* 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer check;
+ private Integer inspect;
/**
* 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
@@ -308,7 +309,7 @@
public Mat() {}
- public Mat(String uuid,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer check,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Mat(String uuid,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.tagId = tagId;
this.matnr = matnr;
@@ -338,7 +339,7 @@
this.deadTime = deadTime;
this.deadWarn = deadWarn;
this.source = source;
- this.check = check;
+ this.inspect = inspect;
this.danger = danger;
this.status = status;
this.createBy = createBy;
@@ -423,15 +424,15 @@
}
}
- public String getCheck$(){
- if (null == this.check){ return null; }
- switch (this.check){
+ public String getInspect$(){
+ if (null == this.inspect){ return null; }
+ switch (this.inspect){
case 1:
return "鏄�";
case 0:
return "鍚�";
default:
- return String.valueOf(this.check);
+ return String.valueOf(this.inspect);
}
}
@@ -491,5 +492,8 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
}
--
Gitblit v1.9.1