From e235d483194ab95bf62d1cfd343a172ff12781e8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 13 四月 2024 14:58:24 +0800
Subject: [PATCH] 聚乳酸库存明细 1.批号与包号排序需同步,增加水分,挥发段,分解段搜索,按照最大最小范围,包装类型跟托盘类型增加删选功能。 2.已经出库的物料,在明细表里面隐藏掉,但是数据保留。 3.增加二个跟聚乳酸一样的明细表,分改性树脂,纯树脂库存明细表,所有功能跟总的聚乳酸库存明细表一样 4.明细表整体框架调整一下,相对压缩一下,搜索功能框看看能否弄成二行 5.表里面的包装类型与托盘类型这些不主要的信息放到指标后面 6.关于分包再处理,举例原有系统里面销售选定的10包物料,再二次重新弄后,车间打印新标签,使用新的包号,在明细表里面体现原有所有指标信息及批号,包号,牌号跟新的关联 7.出库时候时间可选历史,不要就只能出现4天 8.提取库存里面需要有最大包号跟最小包号选择

---
 src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java b/src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java
index a2ab1c4..665d316 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java
@@ -34,15 +34,17 @@
     private String specs;
     @ExcelProperty("鎵规")
     private String batch;
-    @ExcelProperty("璐т富")
+    @ExcelProperty("璐т富Id")
     private String owner;
-    @ExcelProperty("搴撳瓨涓婇檺")
+    @ExcelProperty("璐т富")
+    private String ownerName;
+//    @ExcelProperty("搴撳瓨涓婇檺")
     private String inventoryMax;
-    @ExcelProperty("搴撳瓨涓嬮檺")
+//    @ExcelProperty("搴撳瓨涓嬮檺")
     private String inventoryMin;
     @ExcelProperty("搴撻緞涓婇檺")
     private String inventoryAgeMax;
-    @ExcelProperty("搴撳瓨鎬绘暟閲�")
+//    @ExcelProperty("搴撳瓨鎬绘暟閲�")
     private Integer countAnfme;
     @ExcelProperty("鍦ㄥ簱澶╂暟")
     private Integer diffTime;
@@ -63,6 +65,15 @@
         return null;
     }
 
+    public String getOwnerName(){
+        LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
+        LocOwner locOwner = service.selectById(this.owner);
+        if (!Cools.isEmpty(locOwner)){
+            return String.valueOf(locOwner.getOwner());
+        }
+        return null;
+    }
+
     public void sync(Object source) {
         Synchro.Copy(source, this);
     }

--
Gitblit v1.9.1