From e90dba0edc93be26e1509cfb2ec1d0681eb86e48 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 27 八月 2025 08:37:04 +0800
Subject: [PATCH] 合并出库添加日志
---
src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java | 240 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 129 insertions(+), 111 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
index 0a172e0..ae72b77 100644
--- a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
@@ -19,161 +19,179 @@
@Data
public class ViewStayTimeBean {
- private int pageNumber;
- private int pageSize;
+ private int pageNumber;
+ private int pageSize;
- private int stay_time;
+ private int stay_time;
- private String begin_date;
- private String end_date;
+ private String begin_date;
+ private String end_date;
- private Integer row;
+ private Integer row;
- @ApiModelProperty(value= "搴撲綅鍙�")
- private String loc_no;
+ private Double store_max;
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
- private String zpallet;
+ private Double store_min;
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
+ private Integer store_max_date;
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- private String matnr;
+ private Integer sum_qty;
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- private String maktx;
+ @ApiModelProperty(value = "搴撲綅鍙�")
+ private String loc_no;
- @ApiModelProperty(value= "鎵瑰彿")
- private String batch;
+ @ApiModelProperty(value = "璐ф灦鏉＄爜")
+ private String zpallet;
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- @TableField("order_no")
- private String orderNo;
+ @ApiModelProperty(value = "鏁伴噺")
+ private Double anfme;
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
+ @ApiModelProperty(value = "鐗╂枡鍙�")
+ private String matnr;
- @ApiModelProperty(value= "鍨嬪彿")
- private String model;
+ private Integer floor;
- @ApiModelProperty(value= "棰滆壊")
- private String color;
+ private Integer lev1;
- @ApiModelProperty(value= "鍝佺墝")
- private String brand;
+ private Integer locType1;
- @ApiModelProperty(value= "鍗曚綅")
- private String unit;
+ @ApiModelProperty(value = "鐗╂枡鍙�")
+ private String maktx;
- @ApiModelProperty(value= "鍗曚环")
- private Double price;
+ @ApiModelProperty(value = "搴忓垪鐮�")
+ private String batch;
- @ApiModelProperty(value= "sku")
- private String sku;
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
+ @TableField("order_no")
+ private String orderNo;
- @ApiModelProperty(value= "鍗曚綅閲�")
- private Double units;
+ private String order_no;
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
- @ApiModelProperty(value= "浜у湴")
- private String origin;
+ @ApiModelProperty(value = "瑙勬牸")
+ private String specs;
- @ApiModelProperty(value= "鍘傚")
- private String manu;
+ @ApiModelProperty(value = "鎵规")
+ private String model;
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
- private String manu_date;
+ @ApiModelProperty(value = "棰滆壊")
+ private String color;
- @ApiModelProperty(value= "鍝侀」鏁�")
- private String item_num;
+ @ApiModelProperty(value = "鍝佺墝")
+ private String brand;
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
- private Double safe_qty;
+ @ApiModelProperty(value = "鍗曚綅")
+ private String unit;
- @ApiModelProperty(value= "閲嶉噺")
- private Double weight;
+ @ApiModelProperty(value = "鍗曚环")
+ private Double price;
- @ApiModelProperty(value= "闀垮害")
- private Double length;
+ @ApiModelProperty(value = "sku")
+ private String sku;
- @ApiModelProperty(value= "浣撶Н")
- private Double volume;
+ @ApiModelProperty(value = "鍖呮暟")
+ private Double units;
- @ApiModelProperty(value= "涓夋柟缂栫爜")
- private String three_code;
+ @ApiModelProperty(value = "鏉＄爜")
+ private String barcode;
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supp;
+ @ApiModelProperty(value = "鐗╂枡鐘舵��")
+ private String origin;
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
- private String supp_code;
+ @ApiModelProperty(value = "鍘傚")
+ private String manu;
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
- private Integer be_batch;
+ @ApiModelProperty(value = "鍗曟嵁鏃堕棿")
+ private String manu_date;
- @ApiModelProperty(value= "淇濊川鏈�")
- private String dead_time;
+ @ApiModelProperty(value = "鍝侀」鏁�")
+ private String item_num;
- @ApiModelProperty(value= "棰勮澶╂暟")
- private Integer dead_warn;
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
+ private Double safe_qty;
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
- private Integer source;
+ @ApiModelProperty(value = "閲嶉噺")
+ private Double weight;
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer inspect;
+ @ApiModelProperty(value = "闀垮害")
+ private Double length;
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
- private Integer danger;
+ @ApiModelProperty(value = "浣撶Н")
+ private Double volume;
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modi_user;
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
+ private String three_code;
- @ApiModelProperty(value= "淇敼鏃堕棿")
- private Date modi_time;
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appe_user;
+ @ApiModelProperty(value = "渚涘簲鍟�")
+ private String supp;
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- private Date appe_time;
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
+ private String supp_code;
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ private Integer be_batch;
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modi_user);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
+ @ApiModelProperty(value = "淇濊川鏈�")
+ private String dead_time;
- public String getModiTime$(){
- if (Cools.isEmpty(this.modi_time)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modi_time);
- }
+ @ApiModelProperty(value = "棰勮澶╂暟")
+ private Integer dead_warn;
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appe_user);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ private Integer source;
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appe_time)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appe_time);
- }
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ private Integer inspect;
+
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
+
+ @ApiModelProperty(value = "淇敼浜哄憳")
+ private Long modi_user;
+
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ private Date modi_time;
+
+ @ApiModelProperty(value = "鍒涘缓鑰�")
+ private Long appe_user;
+
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
+ private Date appe_time;
+
+ @ApiModelProperty(value = "澶囨敞")
+ private String memo;
+
+ public String getModiUser$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modi_user);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modi_time)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modi_time);
+ }
+
+ public String getAppeUser$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.appe_user);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appe_time)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appe_time);
+ }
}
--
Gitblit v1.9.1