From dfc9552392f9f973ab52e55d58a7ae2acdaeb1f3 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期日, 09 三月 2025 14:19:43 +0800
Subject: [PATCH] 四期

---
 src/main/java/com/zy/asrs/entity/ViewWorkInBean.java |  710 +++++++++++++++++++++++++---------------------------------
 1 files changed, 310 insertions(+), 400 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index b744cac..b0e5b47 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -1,418 +1,328 @@
 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 lombok.Data;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 /**
  * 鍏ュ簱鏄庣粏缁熻
+ *
  * @author admin
  * @date 2018骞�11鏈�26鏃�
  */
 @Data
 public class ViewWorkInBean {
 
-	private int tbnum;          //杞偍璇锋眰缂栧彿
-	private int tbpos;          //琛岄」鐩�
-	private String zmatid;      //鐗╂枡鏍囩ID
-	
-	private String matnr;      //鐗╂枡
-	private String maktx;      //鐗╂枡鎻忚堪
-	private String werks;      //宸ュ巶
-	private double anfme;	   //鏁伴噺	
-	private String altme;      //鍗曚綅
-	private String zpallet;    //鎵樼洏鏉$爜
-	private String bname;      //鐢ㄦ埛ID
 
-	private String lgnum;    	//瑙勬牸
-	private String type;		// 鍟嗗搧绫诲埆
-	private String mnemonic;	// 鍔╄鐮�
-	private String supplier;	// 渚涘簲鍟�
-	private String warehouse;	// 浠撳簱
-	private String brand;	// 鍝佺墝
-	
-	private String io_time;
-    private String loc_no;
-    private String mat_no;
-    private String mat_name;
-    private String str1;
-    private String str2;
-    private String str3;
-    private String str4;
-    private String str5;
-    private String str6;
-    private String str7;
-    private String str8;
-    private String str9;
-    private String str10;
-    private String str11;
-    private String str12;
-    private String str13;
-    private String str14;
-    private String str15;
-    private String str16;
-    private String str17;
-    private String str18;
-    private String str19;
-    private String str20;
-    private String str21;
-    private String str22;
-    private String str23;
-    private Long ctns;          //绠辨暟
-    private Long qty;           //鏁伴噺
-    private double wt;			//閲嶉噺
-    private int pageNumber;
-    private int pageSize;
+    @ExcelIgnore
+    private Integer pageNumber;
+
+    @ExcelIgnore
+    private Integer pageSize;
+
+    @ExcelIgnore
+    private int stay_time;
+
+    @ExcelIgnore
+    private String begin_date;
+
+    @ExcelIgnore
+    private String end_date;
+
+    @ExcelIgnore
     private String query_date;
-    private String begin_date; //鏌ヨ寮�濮嬫棩鏈�
-    private String end_date;   //鏌ヨ鎴鏃ユ湡
-    private double num1;
-    private double num2;
-    private double num3;
-    private double num4;
-    private double num5;
-    private double num6;
-    private String barcode;
-    private String date1;
+
+    @ExcelIgnore
+    private Integer row;
+
+    @ExcelIgnore
     private String crn_str_time;
+
+    @ExcelIgnore
     private String crn_end_time;
-    
-	public String getLgnum() {
-		return lgnum;
-	}
-	public void setLgnum(String lgnum) {
-		this.lgnum = lgnum;
-	}
-	public int getTbnum() {
-		return tbnum;
-	}
-	public void setTbnum(int tbnum) {
-		this.tbnum = tbnum;
-	}
-	public int getTbpos() {
-		return tbpos;
-	}
-	public void setTbpos(int tbpos) {
-		this.tbpos = tbpos;
-	}
-	public String getZmatid() {
-		return zmatid;
-	}
-	public void setZmatid(String zmatid) {
-		this.zmatid = zmatid;
-	}
-	public String getMatnr() {
-		return matnr;
-	}
-	public void setMatnr(String matnr) {
-		this.matnr = matnr;
-	}
-	public String getMaktx() {
-		return maktx;
-	}
-	public void setMaktx(String maktx) {
-		this.maktx = maktx;
-	}
-	public String getWerks() {
-		return werks;
-	}
-	public void setWerks(String werks) {
-		this.werks = werks;
-	}
-	public double getAnfme() {
-		return anfme;
-	}
-	public void setAnfme(double anfme) {
-		this.anfme = anfme;
-	}
-	public String getAltme() {
-		return altme;
-	}
-	public void setAltme(String altme) {
-		this.altme = altme;
-	}
-	public String getZpallet() {
-		return zpallet;
-	}
-	public void setZpallet(String zpallet) {
-		this.zpallet = zpallet;
-	}
-	public String getBname() {
-		return bname;
-	}
-	public void setBname(String bname) {
-		this.bname = bname;
-	}
-	public String getIo_time() {
-		return io_time.substring(0,19);
-	}
-	public void setIo_time(String io_time) {
-		this.io_time = io_time;
-	}
-	public String getLoc_no() {
-		return loc_no;
-	}
-	public void setLoc_no(String loc_no) {
-		this.loc_no = loc_no;
-	}
-	public String getMat_no() {
-		return mat_no;
-	}
-	public void setMat_no(String mat_no) {
-		this.mat_no = mat_no;
-	}
-	public String getMat_name() {
-		return mat_name;
-	}
-	public void setMat_name(String mat_name) {
-		this.mat_name = mat_name;
-	}
-	public String getStr1() {
-		return str1;
-	}
-	public void setStr1(String str1) {
-		this.str1 = str1;
-	}
-	public String getStr2() {
-		return str2;
-	}
-	public void setStr2(String str2) {
-		this.str2 = str2;
-	}
-	public Long getCtns() {
-		return ctns;
-	}
-	public void setCtns(Long ctns) {
-		this.ctns = ctns;
-	}
-	public Long getQty() {
-		return qty;
-	}
-	public void setQty(Long qty) {
-		this.qty = qty;
-	}
-	public double getWt() {
-		return wt;
-	}
-	public void setWt(double wt) {
-		this.wt = wt;
-	}
-	public int getPageNumber() {
-		return pageNumber;
-	}
-	public void setPageNumber(int pageNumber) {
-		this.pageNumber = pageNumber;
-	}
-	public int getPageSize() {
-		return pageSize;
-	}
-	public void setPageSize(int pageSize) {
-		this.pageSize = pageSize;
-	}
-	public String getBegin_date() {
-		return begin_date;
-	}
-	public void setBegin_date(String begin_date) {
-		this.begin_date = begin_date;
-	}
-	public String getEnd_date() {
-		return end_date;
-	}
-	public void setEnd_date(String end_date) {
-		this.end_date = end_date;
-	}
-	public String getStr3() {
-		return str3;
-	}
-	public void setStr3(String str3) {
-		this.str3 = str3;
-	}
-	public String getStr4() {
-		return str4;
-	}
-	public void setStr4(String str4) {
-		this.str4 = str4;
-	}
-	public String getStr5() {
-		return str5;
-	}
-	public void setStr5(String str5) {
-		this.str5 = str5;
-	}
-	public String getStr6() {
-		return str6;
-	}
-	public void setStr6(String str6) {
-		this.str6 = str6;
-	}
-	public String getStr7() {
-		return str7;
-	}
-	public void setStr7(String str7) {
-		this.str7 = str7;
-	}
-	public String getStr8() {
-		return str8;
-	}
-	public void setStr8(String str8) {
-		this.str8 = str8;
-	}
-	public String getStr9() {
-		return str9;
-	}
-	public void setStr9(String str9) {
-		this.str9 = str9;
-	}
-	public String getStr10() {
-		return str10;
-	}
-	public void setStr10(String str10) {
-		this.str10 = str10;
-	}
-	public String getStr11() {
-		return str11;
-	}
-	public void setStr11(String str11) {
-		this.str11 = str11;
-	}
-	public String getStr12() {
-		return str12;
-	}
-	public void setStr12(String str12) {
-		this.str12 = str12;
-	}
-	public String getStr13() {
-		return str13;
-	}
-	public void setStr13(String str13) {
-		this.str13 = str13;
-	}
-	public String getStr14() {
-		return str14;
-	}
-	public void setStr14(String str14) {
-		this.str14 = str14;
-	}
-	public String getStr15() {
-		return str15;
-	}
-	public void setStr15(String str15) {
-		this.str15 = str15;
-	}
-	public String getStr16() {
-		return str16;
-	}
-	public void setStr16(String str16) {
-		this.str16 = str16;
-	}
-	public String getStr17() {
-		return str17;
-	}
-	public void setStr17(String str17) {
-		this.str17 = str17;
-	}
-	public String getStr18() {
-		return str18;
-	}
-	public void setStr18(String str18) {
-		this.str18 = str18;
-	}
-	public String getStr19() {
-		return str19;
-	}
-	public void setStr19(String str19) {
-		this.str19 = str19;
-	}
-	public String getStr20() {
-		return str20;
-	}
-	public void setStr20(String str20) {
-		this.str20 = str20;
-	}
-	public String getStr21() {
-		return str21;
-	}
-	public void setStr21(String str21) {
-		this.str21 = str21;
-	}
-	public String getStr22() {
-		return str22;
-	}
-	public void setStr22(String str22) {
-		this.str22 = str22;
-	}
-	public String getStr23() {
-		return str23;
-	}
-	public void setStr23(String str23) {
-		this.str23 = str23;
-	}
-	public double getNum1() {
-		return num1;
-	}
-	public void setNum1(double num1) {
-		this.num1 = num1;
-	}
-	public double getNum2() {
-		return num2;
-	}
-	public void setNum2(double num2) {
-		this.num2 = num2;
-	}
-	public double getNum3() {
-		return num3;
-	}
-	public void setNum3(double num3) {
-		this.num3 = num3;
-	}
-	public double getNum4() {
-		return num4;
-	}
-	public void setNum4(double num4) {
-		this.num4 = num4;
-	}
-	public double getNum5() {
-		return num5;
-	}
-	public void setNum5(double num5) {
-		this.num5 = num5;
-	}
-	public double getNum6() {
-		return num6;
-	}
-	public void setNum6(double num6) {
-		this.num6 = num6;
-	}
-	public String getBarcode() {
-		return barcode;
-	}
-	public void setBarcode(String barcode) {
-		this.barcode = barcode;
-	}
-	public String getDate1() {
-		return date1;
-	}
-	public void setDate1(String date1) {
-		this.date1 = date1;
-	}
-	public String getCrn_str_time() {
-		return crn_str_time;
-	}
-	public void setCrn_str_time(String crn_str_time) {
-		this.crn_str_time = crn_str_time;
-	}
-	public String getCrn_end_time() {
-		return crn_end_time;
-	}
-	public void setCrn_end_time(String crn_end_time) {
-		this.crn_end_time = crn_end_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];
 
-		}
-	}
-}
\ No newline at end of file
+    @ColumnWidth(15)
+    @ExcelProperty(value = "閿�鍞崟鍙�")
+    private String three_code;
+
+    @ExcelIgnore
+    @ExcelProperty(value = "宸ヤ綔鍙�")
+    private Integer wrk_no;
+
+    @ColumnWidth(20)
+    @ExcelProperty(value = "鍏ュ簱鏃堕棿")
+    private Date io_time;
+
+    @ColumnWidth(20)
+    @ExcelProperty(value = "搴撲綅鍙�")
+    private String loc_no;
+
+    @ExcelProperty(value = "璐ф灦鏉$爜")
+    private String supp_code;
+
+    @ExcelProperty(value = "璐ф灦鏉$爜")
+    private String zpallet;
+
+
+    @ExcelIgnore
+    private Long loc_type1;
+
+    @ExcelProperty(value = "搴撲綅绫诲瀷")
+    private String loc_type1$;
+
+    @ExcelProperty(value = "妤煎眰")
+    private Integer floor;
+
+
+    @ExcelProperty(value = "鏁伴噺")
+    private Double anfme;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "鐗╂枡鍙�")
+    private String matnr;
+
+    @ColumnWidth(35)
+    @ExcelProperty(value = "鐗╂枡鍚嶇О")
+    private String maktx;
+
+    @ExcelProperty(value = "搴忓垪鐮�")
+    private String batch;
+
+    @ExcelProperty(value = "鍗曟嵁缂栧彿")
+    private String order_no;
+
+    @ExcelProperty(value = "瑙勬牸")
+    private String specs;
+
+    @ExcelProperty(value = "鎵规")
+    private String model;
+
+    @ExcelIgnore
+    private String color;
+
+    @ExcelProperty(value = "鍝佺墝")
+    private String brand;
+
+    @ExcelProperty(value = "鍗曚綅")
+    private String unit;
+
+    @ExcelIgnore
+    private Double price;
+
+    @ExcelProperty(value = "sku")
+    private String sku;
+
+    @ExcelIgnore
+    private Double units;
+
+    @ExcelProperty(value = "鏉$爜")
+    private String barcode;
+
+    @ExcelIgnore
+    private String origin;
+
+    @ExcelIgnore
+    @ExcelProperty(value = "鍘傚")
+    private String manu;
+
+    @ExcelProperty(value = "鍗曟嵁鏃堕棿")
+    private String manu_date;
+
+    @ExcelProperty(value = "鍝侀」鏁�")
+    private String item_num;
+
+    @ExcelProperty(value = "瀹夊叏搴撳瓨閲�")
+    private Double safe_qty;
+
+    @ExcelProperty(value = "閲嶉噺")
+    private Double weight;
+    @ExcelIgnore
+    @ExcelProperty(value = "闀垮害")
+    private Double length;
+    @ExcelIgnore
+    @ExcelProperty(value = "浣撶Н")
+    private Double volume;
+
+
+    @ExcelProperty(value = "渚涘簲鍟�")
+    private String supp;
+
+
+    @ExcelIgnore
+    @ExcelProperty(value = "鏄惁鎵规 1: 鏄�  0: 鍚�  ")
+    private Integer be_batch;
+
+    @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;
+
+    @ExcelProperty(value = "淇敼浜哄憳")
+    private Long modi_user;
+
+    @ExcelProperty(value = "淇敼鏃堕棿")
+    private Date modi_time;
+
+    @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