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/ViewWorkInBean.java | 377 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 257 insertions(+), 120 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index 8e5416a..b0e5b47 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -1,10 +1,14 @@
package com.zy.asrs.entity;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasLocType1Service;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.text.SimpleDateFormat;
@@ -12,6 +16,7 @@
/**
* 鍏ュ簱鏄庣粏缁熻
+ *
* @author admin
* @date 2018骞�11鏈�26鏃�
*/
@@ -19,173 +24,305 @@
public class ViewWorkInBean {
- private int pageNumber;
- private int pageSize;
+ @ExcelIgnore
+ private Integer pageNumber;
- private int stay_time;
+ @ExcelIgnore
+ private Integer pageSize;
- private String begin_date;
- private String end_date;
- private String query_date;
+ @ExcelIgnore
+ private int stay_time;
- private Integer row;
+ @ExcelIgnore
+ private String begin_date;
- private String crn_str_time;
- private String crn_end_time;
+ @ExcelIgnore
+ private String end_date;
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- private Integer wrk_no;
+ @ExcelIgnore
+ private String query_date;
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
- private Date io_time;
+ @ExcelIgnore
+ private Integer row;
- @ApiModelProperty(value= "搴撲綅鍙�")
- private String loc_no;
+ @ExcelIgnore
+ private String crn_str_time;
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
- private String zpallet;
+ @ExcelIgnore
+ private String crn_end_time;
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
- @ApiModelProperty(value= "鍗曟嵁鍙�")
- private String matnr;
+ @ColumnWidth(15)
+ @ExcelProperty(value = "閿�鍞崟鍙�")
+ private String three_code;
- @ApiModelProperty(value= "鐗╂枡鍙�")
- private String maktx;
+ @ExcelIgnore
+ @ExcelProperty(value = "宸ヤ綔鍙�")
+ private Integer wrk_no;
- @ApiModelProperty(value= "搴忓垪鐮�")
- private String batch;
+ @ColumnWidth(20)
+ @ExcelProperty(value = "鍏ュ簱鏃堕棿")
+ private Date io_time;
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- private String order_no;
+ @ColumnWidth(20)
+ @ExcelProperty(value = "搴撲綅鍙�")
+ private String loc_no;
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
+ @ExcelProperty(value = "璐ф灦鏉＄爜")
+ private String supp_code;
- @ApiModelProperty(value= "鎵规")
- private String model;
+ @ExcelProperty(value = "璐ф灦鏉＄爜")
+ private String zpallet;
- @ApiModelProperty(value= "棰滆壊")
- private String color;
- @ApiModelProperty(value= "鍝佺墝")
- private String brand;
+ @ExcelIgnore
+ private Long loc_type1;
- @ApiModelProperty(value= "鍗曚綅")
- private String unit;
+ @ExcelProperty(value = "搴撲綅绫诲瀷")
+ private String loc_type1$;
- @ApiModelProperty(value= "鍗曚环")
- private Double price;
+ @ExcelProperty(value = "妤煎眰")
+ private Integer floor;
- @ApiModelProperty(value= "sku")
- private String sku;
- @ApiModelProperty(value= "鍖呮暟")
- private Double units;
+ @ExcelProperty(value = "鏁伴噺")
+ private Double anfme;
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
+ @ColumnWidth(15)
+ @ExcelProperty(value = "鐗╂枡鍙�")
+ private String matnr;
- @ApiModelProperty(value= "鐗╂枡鐘舵��")
- private String origin;
+ @ColumnWidth(35)
+ @ExcelProperty(value = "鐗╂枡鍚嶇О")
+ private String maktx;
- @ApiModelProperty(value= "鍘傚")
- private String manu;
+ @ExcelProperty(value = "搴忓垪鐮�")
+ private String batch;
- @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
- private String manu_date;
+ @ExcelProperty(value = "鍗曟嵁缂栧彿")
+ private String order_no;
- @ApiModelProperty(value= "鍝侀」鏁�")
- private String item_num;
+ @ExcelProperty(value = "瑙勬牸")
+ private String specs;
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
- private Double safe_qty;
+ @ExcelProperty(value = "鎵规")
+ private String model;
- @ApiModelProperty(value= "閲嶉噺")
- private Double weight;
+ @ExcelIgnore
+ private String color;
- @ApiModelProperty(value= "闀垮害")
- private Double length;
+ @ExcelProperty(value = "鍝佺墝")
+ private String brand;
- @ApiModelProperty(value= "浣撶Н")
- private Double volume;
+ @ExcelProperty(value = "鍗曚綅")
+ private String unit;
- @ApiModelProperty(value= "涓夋柟缂栫爜")
- private String three_code;
+ @ExcelIgnore
+ private Double price;
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supp;
+ @ExcelProperty(value = "sku")
+ private String sku;
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
- private String supp_code;
+ @ExcelIgnore
+ private Double units;
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
- private Integer be_batch;
+ @ExcelProperty(value = "鏉＄爜")
+ private String barcode;
- @ApiModelProperty(value= "淇濊川鏈�")
- private String dead_time;
+ @ExcelIgnore
+ private String origin;
- @ApiModelProperty(value= "棰勮澶╂暟")
- private Integer dead_warn;
+ @ExcelIgnore
+ @ExcelProperty(value = "鍘傚")
+ private String manu;
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
- private Integer source;
+ @ExcelProperty(value = "鍗曟嵁鏃堕棿")
+ private String manu_date;
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer inspect;
+ @ExcelProperty(value = "鍝侀」鏁�")
+ private String item_num;
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
- private Integer danger;
+ @ExcelProperty(value = "瀹夊叏搴撳瓨閲�")
+ private Double safe_qty;
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modi_user;
+ @ExcelProperty(value = "閲嶉噺")
+ private Double weight;
+ @ExcelIgnore
+ @ExcelProperty(value = "闀垮害")
+ private Double length;
+ @ExcelIgnore
+ @ExcelProperty(value = "浣撶Н")
+ private Double volume;
- @ApiModelProperty(value= "淇敼鏃堕棿")
- private Object modi_time;
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appe_user;
+ @ExcelProperty(value = "渚涘簲鍟�")
+ private String supp;
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- private Object appe_time;
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
+ @ExcelIgnore
+ @ExcelProperty(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;
- }
+ @ExcelIgnore
+ @ExcelProperty(value = "淇濊川鏈�")
+ private String dead_time;
+ @ExcelIgnore
+ private String deadTime = dead_time;
+ @ExcelIgnore
+ @ExcelProperty(value = "棰勮澶╂暟")
+ private Integer dead_warn;
+ @ExcelIgnore
+ private Integer deadWarn = this.dead_warn;
+ @ExcelIgnore
+ @ExcelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ private Integer source;
+ @ExcelIgnore
+ @ExcelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ private Integer inspect;
+ @ExcelIgnore
+ @ExcelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
- 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;
- }
+ @ExcelProperty(value = "淇敼浜哄憳")
+ private Long modi_user;
- public String getIoTime$(){
- if (Cools.isEmpty(this.io_time)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.io_time);
- }
+ @ExcelProperty(value = "淇敼鏃堕棿")
+ private Date modi_time;
- public void setQuery_date(String query_date) {
- this.query_date = query_date;
- if (query_date.contains(" - ")) {
- String[] dates = query_date.split(" - ");
- this.begin_date = dates[0];
- this.end_date = dates[1];
+ @ExcelProperty(value = "鍒涘缓鑰�")
+ private Long appe_user;
- }
- }
+ @ExcelProperty(value = "娣诲姞鏃堕棿")
+ private Date appe_time;
+
+ @ExcelProperty(value = "澶囨敞")
+ private String memo;
+
+ @ExcelIgnore
+ @ExcelProperty(value = "宸ヤ綔鍙�")
+ // 宸ヤ綔鍙�
+ private Integer wrkNo;
+ @ExcelIgnore
+ @DateTimeFormat(value = "yyyy-MM-dd HH:mm:ss")
+ @ExcelProperty(value = "宸ヤ綔鏃堕棿")
+ // 宸ヤ綔鏃堕棿
+ private Date ioTime;
+ @ExcelIgnore
+ @ExcelProperty(value = "鍗曟嵁缂栧彿")
+ //鍗曟嵁缂栧彿
+ private String orderNo;
+ @ExcelIgnore
+ @ExcelProperty(value = "鍗曟嵁鏃堕棿")
+ //鍗曟嵁鏃堕棿
+ private String manuDate;
+ @ExcelIgnore
+ @ExcelProperty(value = "鍝侀」鏁�")
+ //鍝侀」鏁�
+ private String itemNum;
+ @ExcelIgnore
+ @ExcelProperty(value = "瀹夊叏搴撳瓨閲�")
+ //瀹夊叏搴撳瓨閲�
+ private Double safeQty;
+ @ExcelIgnore
+ @ExcelProperty(value = "閿�鍞崟鍙�")
+ //涓夋柟缂栫爜
+ private String threeCode;
+ @ExcelIgnore
+ @ExcelProperty(value = "渚涘簲鍟嗙紪鐮�")
+ //渚涘簲鍟嗙紪鐮�
+ private String suppCode;
+ @ExcelIgnore
+ @ExcelProperty(value = "甯堝倕鎵规")
+ //鏄惁鎵规 1: 鏄� 0: 鍚�
+ private Integer beBatch;
+ @ExcelIgnore
+ @ExcelProperty(value = "淇敼浜哄憳")
+ // 淇敼浜哄憳
+ private Long modiUser;
+ @ExcelIgnore
+ @ExcelProperty(value = "淇敼鏃堕棿")
+ // 淇敼鏃堕棿
+ private Date modiTime;
+ @ExcelIgnore
+ @ExcelProperty(value = "鍒涘缓鑰�")
+ // 鍒涘缓鑰�
+ private Long appeUser;
+ @ExcelIgnore
+ @ExcelProperty(value = "娣诲姞鏃堕棿")
+ // 娣诲姞鏃堕棿
+ private Date appeTime;
+
+ public void sype() {
+ // 宸ヤ綔鍙�
+ wrkNo = wrk_no;
+ // 宸ヤ綔鏃堕棿
+ ioTime = io_time;
+ //鍗曟嵁缂栧彿
+ orderNo = order_no;
+ //鍗曟嵁鏃堕棿
+ manuDate = manu_date;
+ //鍝侀」鏁�
+ itemNum = item_num;
+ //瀹夊叏搴撳瓨閲�
+ safeQty = safe_qty;
+ //涓夋柟缂栫爜
+ threeCode = three_code;
+ //渚涘簲鍟嗙紪鐮�
+ suppCode = supp_code;
+ //鏄惁鎵规 1: 鏄� 0: 鍚�
+ beBatch = be_batch;
+ // 淇敼浜哄憳
+ modiUser = modi_user;
+ // 淇敼鏃堕棿
+ modiTime = modi_time;
+ // 鍒涘缓鑰�
+ appeUser = appe_user;
+ // 娣诲姞鏃堕棿
+ appeTime = appe_time;
+ }
+
+ public String getLoc_type1$() {
+ BasLocType1Service service = SpringUtils.getBean(BasLocType1Service.class);
+ BasLocType1 basLocType1 = service.selectById(this.loc_type1);
+ if (!Cools.isEmpty(basLocType1)) {
+ return String.valueOf(basLocType1.getLocDesc());
+ }
+ return null;
+ }
+
+ 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 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 getIoTime$() {
+ if (Cools.isEmpty(this.io_time)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.io_time);
+ }
+
+ public void setQuery_date(String query_date) {
+ this.query_date = query_date;
+ if (query_date.contains(" - ")) {
+ String[] dates = query_date.split(" - ");
+ this.begin_date = dates[0];
+ this.end_date = dates[1];
+
+ }
+ }
}
--
Gitblit v1.9.1