From 10b0dccb27336e2f286b5b464d035ead6dee7de9 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 16 十二月 2023 12:57:20 +0800
Subject: [PATCH] #库龄分品号、批次、货主
---
src/main/resources/mapper/ManLocDetlMapper.xml | 7 ++++---
src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java | 19 +++++++++++++++----
2 files changed, 19 insertions(+), 7 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);
}
diff --git a/src/main/resources/mapper/ManLocDetlMapper.xml b/src/main/resources/mapper/ManLocDetlMapper.xml
index 6da6c79..53dffc7 100644
--- a/src/main/resources/mapper/ManLocDetlMapper.xml
+++ b/src/main/resources/mapper/ManLocDetlMapper.xml
@@ -373,16 +373,17 @@
FROM
(
SELECT
- loc_no,
+ DISTINCT loc_no,
locd.matnr,
locd.maktx,
+ locd.owner,
+ locd.batch,
create_time,
locd.specs,
locd.unit,
inventory_max,
inventory_min,
inventory_age_max,
- count_anfme,
DATEDIFF( DAY, create_time, GETDATE( ) ) AS [diff_time]
FROM
man_loc_detl locd
@@ -398,7 +399,7 @@
count_anfme
FROM
man_mat
- RIGHT JOIN ( SELECT matnr, SUM ( anfme ) AS count_anfme FROM man_loc_detl loc GROUP BY matnr ) aa ON aa.matnr = man_mat.matnr
+ RIGHT JOIN ( SELECT matnr,batch,owner, SUM ( anfme ) AS count_anfme FROM man_loc_detl loc GROUP BY matnr,batch,owner ) aa ON aa.matnr = man_mat.matnr
) warn ON locd.matnr = warn.matnr
WHERE
DATEDIFF( DAY, create_time, GETDATE( ) ) > inventory_age_max
--
Gitblit v1.9.1