From 648197b52aad613036630abc596bf884a2de9b4f Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 16 十二月 2023 12:49:28 +0800
Subject: [PATCH] #库龄分品号、批次、货主

---
 src/main/webapp/static/js/locDetlWarning/locDetlWarning.js |    1 +
 src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java    |   14 ++++++++++++++
 src/main/resources/mapper/LocDetlMapper.xml                |   14 ++++++++------
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java b/src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java
index 26bdcc6..a2ab1c4 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
+import com.zy.asrs.service.LocOwnerService;
 import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
@@ -31,6 +32,10 @@
     private Date createTime;
     @ExcelProperty("瑙勬牸")
     private String specs;
+    @ExcelProperty("鎵规")
+    private String batch;
+    @ExcelProperty("璐т富")
+    private String owner;
     @ExcelProperty("搴撳瓨涓婇檺")
     private String inventoryMax;
     @ExcelProperty("搴撳瓨涓嬮檺")
@@ -49,6 +54,15 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
     }
 
+    public String getOwner$(){
+        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/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 49d29d1..cfea807 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -688,16 +688,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
@@ -713,7 +714,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
@@ -735,16 +736,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
@@ -760,7 +762,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
diff --git a/src/main/webapp/static/js/locDetlWarning/locDetlWarning.js b/src/main/webapp/static/js/locDetlWarning/locDetlWarning.js
index 20ec4f8..9b07864 100644
--- a/src/main/webapp/static/js/locDetlWarning/locDetlWarning.js
+++ b/src/main/webapp/static/js/locDetlWarning/locDetlWarning.js
@@ -38,6 +38,7 @@
             ,{field: 'createTime$', align: 'center',title: '鍏ュ簱鏃堕棿'}
             ,{field: 'specs', align: 'center',title: '瑙勬牸'}
             ,{field: 'batch', align: 'center',title: '鎵规'}
+            ,{field: 'owner$', align: 'center',title: '璐т富'}
 
         ]
         ],

--
Gitblit v1.9.1