From 06ea3e5721995a4a4e1ae0db93d7f7dac1bfa162 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 11 三月 2026 15:20:05 +0800
Subject: [PATCH] 1.成品灌装完成后采集plc反馈的是否贴标信息随工作任务存入数据库中 2.库存查询界面以及出库提取界面新增是否贴标搜索筛选功能
---
src/main/java/com/zy/asrs/entity/TrayCode.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TrayCode.java b/src/main/java/com/zy/asrs/entity/TrayCode.java
index de749c2..cbb30ba 100644
--- a/src/main/java/com/zy/asrs/entity/TrayCode.java
+++ b/src/main/java/com/zy/asrs/entity/TrayCode.java
@@ -6,8 +6,8 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.zy.system.entity.User;
import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -43,7 +43,7 @@
* 缁堟
*/
@ApiModelProperty(value= "缁堟")
- private String end;
+ private String finish;
/**
* 澶囨敞
@@ -81,10 +81,10 @@
public TrayCode() {}
- public TrayCode(String trayNo,String start,String end,String memo,Date modiTime,Long modiUser,Date appeTime,Long appeUser) {
+ public TrayCode(String trayNo,String start,String finish,String memo,Date modiTime,Long modiUser,Date appeTime,Long appeUser) {
this.trayNo = trayNo;
this.start = start;
- this.end = end;
+ this.finish = finish;
this.memo = memo;
this.modiTime = modiTime;
this.modiUser = modiUser;
@@ -127,12 +127,12 @@
this.start = start;
}
- public String getEnd() {
- return end;
+ public String getFinish() {
+ return finish;
}
- public void setEnd(String end) {
- this.end = end;
+ public void setFinish(String finish) {
+ this.finish = finish;
}
public String getMemo() {
--
Gitblit v1.9.1