From 46678d76137ae4207af1635dea7cde670436ad92 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Tue, 15 Apr 2025 14:58:23 +0800
Subject: [PATCH] 20250415

---
 .../heai/modules/board/entity/Inventory.java  |  31 ++++-
 .../board/service/impl/BoardServiceImpl.java  |  10 ++
 .../mapper/taskmanage/TaskDatailDao.xml       | 119 +++++++++++-------
 3 files changed, 116 insertions(+), 44 deletions(-)

diff --git a/src/main/java/com/heai/modules/board/entity/Inventory.java b/src/main/java/com/heai/modules/board/entity/Inventory.java
index 36ced9a..2901e82 100644
--- a/src/main/java/com/heai/modules/board/entity/Inventory.java
+++ b/src/main/java/com/heai/modules/board/entity/Inventory.java
@@ -1,6 +1,8 @@
 package com.heai.modules.board.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -20,6 +22,8 @@ public class Inventory {
     private BigDecimal qtyOnHand;
     private String umId;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date firstInDate;
     private String freezeFlag;
 
@@ -29,8 +33,12 @@ public class Inventory {
 
     private String familyName;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date latestOutDate;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date activeDate;
 
     private String partnerId;
@@ -38,8 +46,12 @@ public class Inventory {
 
     private String site;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date manufactureDate;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date expiredDate;
 
     private String demandPartnerId;
@@ -49,6 +61,8 @@ public class Inventory {
     private String latestCountDate;
     private String groupID;
     private String partGroup;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date latestInDate;
     private BigDecimal qtyReserved;
 
@@ -56,8 +70,21 @@ public class Inventory {
     private BigDecimal standartStockValue;
     private BigDecimal actualStockValue;
 
-    private Date finalStartDate;
-    private Date finalEndDate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startFirstInDate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endFirstInDate;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startExpiredDate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endExpiredDate;
 
     private String loginUser;
+
+    private int summaryType;
 }
diff --git a/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java b/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java
index a90a0d7..45cc805 100644
--- a/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java
+++ b/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java
@@ -797,6 +797,16 @@ public class BoardServiceImpl implements BoardService {
     public List<Inventory> queryPartInventory(Inventory inventory) {
         SysUserEntity loginUser =  (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
         inventory.setLoginUser(loginUser.getUsername());
+        if (Objects.nonNull(inventory.getEndFirstInDate())){
+            inventory.getEndFirstInDate().setHours(23);
+            inventory.getEndFirstInDate().setMinutes(59);
+            inventory.getEndFirstInDate().setSeconds(59);
+        }
+        if (Objects.nonNull(inventory.getEndExpiredDate())){
+            inventory.getEndExpiredDate().setHours(23);
+            inventory.getEndExpiredDate().setMinutes(59);
+            inventory.getEndExpiredDate().setSeconds(59);
+        }
         return baseMapper.queryPartInventory(inventory);
     }
 }
diff --git a/src/main/resources/mapper/taskmanage/TaskDatailDao.xml b/src/main/resources/mapper/taskmanage/TaskDatailDao.xml
index 48f5426..a71f7d9 100644
--- a/src/main/resources/mapper/taskmanage/TaskDatailDao.xml
+++ b/src/main/resources/mapper/taskmanage/TaskDatailDao.xml
@@ -216,38 +216,42 @@
     </select>
 
     <select id="queryPartInventory" resultType="com.heai.modules.board.entity.Inventory">
-        Select T.Site,
-               T.PartNo,
-               P.PartDescription,
-               P.Spec,
-               T.WarehouseID,
-               P.UMID,
-               T.LocationID,
-               T.BatchNo,
-               T.FirstInDate,
-               T.LatestCountDate,
-               T.Freezeflag,
-               P.PartType,
-               P.FamilyID,
-               dbo.Get_PartFamilyDesc(P.Site, P.FamilyID)   as FamilyName,
-               P.GroupID,
-               dbo.Get_PartGroupDesc(T.Site, P.GroupID)     as PartGroup,
-               T.LatestOutDate,
-               T.LatestInDate,
-               T.ActiveDate,
-               T.PartnerID,
-               T.PartnerType,
-               T.ManufactureDate,
-               T.ExpiredDate,
-               sum(Round(T.QtyOnHand, 3))                   as QtyOnHand,
-               sum(Round(isnull(T.QtyReserved, 0), 3))      as QtyReserved,
-               sum(Round(isnull(T.InStandardValue, 0), 4) -
-                   Round(isnull(T.OutStandardValue, 0), 4)) as StandartStockValue,
-               sum(Round(isnull(T.InActualValue, 0), 4) -
-                   Round(isnull(T.OutActualValue, 0), 4))   as ActualStockValue,
-               T.DemandPartnerType,
-               T.DemandPartnerID,
-               T.DemandPartnerName
+        Select  T.Site,
+                T.PartNo,
+                P.PartDescription,
+                P.Spec,
+                <if test="summaryType != null and summaryType >= 1">
+                    T.WarehouseID,
+                </if>
+                P.UMID,
+                <if test="summaryType != null and summaryType >= 2">
+                    T.LocationID,
+                </if>
+                <if test="summaryType != null and summaryType >= 3">
+                    T.BatchNo,
+                </if>
+                min(T.FirstInDate) as FirstInDate,
+                max(T.LatestCountDate) as LatestCountDate,
+                min(T.Freezeflag) as Freezeflag,
+                P.PartType,
+                P.FamilyID,
+                dbo.Get_PartFamilyDesc(P.Site, P.FamilyID)   as FamilyName,
+                P.GroupID,
+                dbo.Get_PartGroupDesc(T.Site, P.GroupID)     as PartGroup,
+                max(T.LatestOutDate) as LatestOutDate,
+                max(T.LatestInDate) as LatestInDate,
+                max(T.ActiveDate) as ActiveDate,
+                max(T.PartnerID) as PartnerID,
+                max(T.PartnerType) as PartnerType,
+                min(T.ManufactureDate) as ManufactureDate,
+                max(T.ExpiredDate) as ExpiredDate,
+                sum(Round(T.QtyOnHand, 3))                   as QtyOnHand,
+                sum(Round(isnull(T.QtyReserved, 0), 3))      as QtyReserved,
+                sum(Round(isnull(T.InStandardValue, 0), 4) - Round(isnull(T.OutStandardValue, 0), 4)) as StandartStockValue,
+                sum(Round(isnull(T.InActualValue, 0), 4) - Round(isnull(T.OutActualValue, 0), 4))   as ActualStockValue,
+                max(T.DemandPartnerType) as DemandPartnerType,
+                max(T.DemandPartnerID) as DemandPartnerID,
+                max(T.DemandPartnerName) as DemandPartnerName
         from InventoryStock as T,
              Part as P
         where T.Site = P.Site
@@ -265,24 +269,55 @@
         <if test="site != null and site != ''">
             and T.Site = #{site}
         </if>
+        <if test="partType != null and partType != ''">
+            and P.PartType like #{partType}
+        </if>
         <if test="warehouseId != null and warehouseId != ''">
             and T.WarehouseID = #{warehouseId}
         </if>
-        <if test="locationId != null and locationId != ''">
+        <if test="locationId != null and locationId != '' and summaryType != null and summaryType >= 2">
             and T.LocationID = #{locationId}
         </if>
-        <if test="batchNo != null and batchNo != ''">
+        <if test="batchNo != null and batchNo != '' and summaryType != null and summaryType >= 3">
             and T.BatchNo = #{batchNo}
         </if>
-        <if test="finalStartDate != null">
-            and T.FirstInDate > #{finalStartDate}
+        <if test="familyId != null and familyId != ''">
+            and P.FamilyID like #{familyId}
+        </if>
+        <if test="familyName != null and familyName != ''">
+            and dbo.Get_PartFamilyDesc(P.Site, P.FamilyID)  like #{familyName}
+        </if>
+        <if test="startFirstInDate != null">
+            and T.FirstInDate >= #{startFirstInDate}
         </if>
-        <if test="finalEndDate != null">
-            and #{finalEndDate} > T.FirstInDate
+        <if test="endFirstInDate != null">
+            and #{endFirstInDate} >= T.FirstInDate
         </if>
-        group by T.Site, T.PartNo, P.PartDescription, P.Spec, T.WarehouseID, P.UMID, T.LocationID, T.BatchNo,
-                 T.FirstInDate, T.LatestCountDate, T.Freezeflag, P.PartType, P.FamilyID, P.Site, P.FamilyID, P.GroupID,
-                 T.Site, P.GroupID, T.LatestOutDate, T.LatestInDate, T.ActiveDate, T.PartnerID, T.PartnerType,
-                 T.ManufactureDate, T.ExpiredDate, T.DemandPartnerType, T.DemandPartnerID, T.DemandPartnerName
+        <if test="startExpiredDate != null">
+            and T.ExpiredDate >= #{startExpiredDate}
+        </if>
+        <if test="endExpiredDate != null">
+            and #{endExpiredDate} >= T.ExpiredDate
+        </if>
+        group by
+                T.Site,
+                T.PartNo,
+                P.PartDescription,
+                P.Spec,
+                <if test="summaryType != null and summaryType >= 1">
+                    T.WarehouseID,
+                </if>
+                P.UMID,
+                <if test="summaryType != null and summaryType >= 2">
+                    T.LocationID,
+                </if>
+                <if test="summaryType != null and summaryType >= 3">
+                    T.BatchNo,
+                </if>
+                P.Site,
+                P.FamilyID,
+                P.GroupID,
+                P.PartType
     </select>
+
 </mapper>
\ No newline at end of file