From 45e06ffad5bde69d7f055a07566412fd43e302f0 Mon Sep 17 00:00:00 2001
From: jiayang yue <jiayang.yue@xujiesoft.com>
Date: Sat, 10 May 2025 19:37:58 +0800
Subject: [PATCH] =?UTF-8?q?2025.5.9=20=E6=96=B0=E5=A2=9E=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=BA=93=E5=AD=98=E6=A0=87=E7=AD=BE=EF=BC=88?=
 =?UTF-8?q?ALL=EF=BC=89=20=E5=8A=9F=E8=83=BD=E4=B8=BB=E8=A6=81=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E5=BA=93=E5=AD=98=E4=B8=BA0=E6=97=B6=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E8=BF=9B=E8=A1=8C=E6=89=93=E5=8D=B0=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DailyPlanController.java       | 15 ++++++
 .../production/dao/DailyPlanMapper.java       |  1 +
 .../production/service/DailyPlanService.java  |  2 +
 .../service/impl/DailyPlanServiceImpl.java    |  5 ++
 .../mapper/production/DailyPlanMapper.xml     | 46 +++++++++++++++++++
 5 files changed, 69 insertions(+)

diff --git a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
index 66afab4..b419fb6 100644
--- a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
+++ b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
@@ -656,6 +656,21 @@ public class DailyPlanController {
         return R.ok().put("rows", resultList).put("total",resultList.size());
     }
 
+    /**
+     * @Description TODO
+     * @Title getStockPrintAll
+     * @param inData
+     * @author yjy
+     * @date 2025/5/09 14:47
+     * @return R
+     * @throw
+     */
+    @PostMapping("/getStockPrintAll")
+    public R getStockPrintAll(@RequestBody StockPrintInData inData){
+        List<StockPrintData> resultList = dailyPlanService.getStockPrintAll(inData);
+        return R.ok().put("rows", resultList).put("total",resultList.size());
+    }
+
     /**
      * @Description 扫描派工单获取数据
      * @Title getStockPrint
diff --git a/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java b/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java
index 109130a..5672ce7 100644
--- a/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java
+++ b/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java
@@ -377,6 +377,7 @@ public interface DailyPlanMapper {
      * @throw
      */
     List<StockPrintData> getStockPrint(StockPrintInData inData);
+    List<StockPrintData> getStockPrintAll(StockPrintInData inData);
     List<SOScheduledRoutingOutData> checkUserSeqNo(@Param("seqNo")Integer seqNo,@Param("userId")String userId);
     List<SORoutingData>  checkLastItemReport(SOScheduledRoutingOutData inData);
     /**
diff --git a/src/main/java/com/heai/modules/production/service/DailyPlanService.java b/src/main/java/com/heai/modules/production/service/DailyPlanService.java
index e3f858d..ed62a4d 100644
--- a/src/main/java/com/heai/modules/production/service/DailyPlanService.java
+++ b/src/main/java/com/heai/modules/production/service/DailyPlanService.java
@@ -482,6 +482,8 @@ public interface DailyPlanService  {
      */
     List<StockPrintData> getStockPrint(StockPrintInData inData);
 
+    List<StockPrintData> getStockPrintAll(StockPrintInData inData);
+
     /**
      * @Description 扫描派工单获取数据
      * @Title searchSeqNo
diff --git a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
index 4dc5c6c..e238201 100644
--- a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
+++ b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
@@ -1306,6 +1306,11 @@ public class DailyPlanServiceImpl implements DailyPlanService {
         return dailyPlanMapper.getStockPrint(inData);
     }
 
+    @Override
+    public List<StockPrintData> getStockPrintAll(StockPrintInData inData){
+        return dailyPlanMapper.getStockPrintAll(inData);
+    }
+
 
     @Override
     public SOScheduledRoutingOutData searchSeqNo(SOScheduledRoutingOutData inData){
diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml
index 3a219e4..15ba95c 100644
--- a/src/main/resources/mapper/production/DailyPlanMapper.xml
+++ b/src/main/resources/mapper/production/DailyPlanMapper.xml
@@ -827,6 +827,52 @@
       order by a.TransDate desc
     </select>
 
+    <select id="getStockPrintAll" resultType="com.heai.modules.production.entity.StockPrintData">
+        select 'N/A' as TransNo
+        , a.Site
+        , a.WareHouseId
+        , a.BatchNo
+        , a.LocationId
+        , a.PartNo
+        , 'N/A' as OrderNo
+        , a.FirstInDate as TransDate
+        , Round(a.QtyOnHand, 3) as  Qty
+        , 'N' as PrintFlag
+        , dbo.Get_PartDesc(a.Site, a.PartNo)           as                   partDesc
+        , Round(dbo.Get_Part_NetWeight(a.Site, a.PartNo) * isnull(Round(a.QtyOnHand, 3), 0)  / 1000, 2) weight
+        , dbo.Get_WareHouseDesc(a.Site, a.WareHouseId) as                   wareHouseDesc
+        , dbo.Get_Part_UMID(a.Site, a.PartNo)                               umid
+        , a.ExpiredDate as           expiredDate
+        , dbo.Get_StorePrintPartStatus(a.Site, a.PartNo, a.BatchNo)         status
+        , isnull(Round(a.QtyOnHand, 3), 0)                                  QtyOnHand
+        from InventoryStock a
+        <where>
+            Round(a.QtyOnHand, 3) > 0
+            <if test="startDate != null ">
+                and a.TransDate >= #{startDate}
+            </if>
+            <if test="endDate != null ">
+                and #{endDate} >= a.TransDate -1
+            </if>
+            <if test="site != null and site != ''">
+                AND a.site = #{site}
+            </if>
+            <if test="orderNo != null and orderNo != ''">
+                AND a.orderNo LIKE  #{orderNo}
+            </if>
+            <if test="seqNo != null and seqNo != ''">
+                AND a.seqNo =  #{seqNo}
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND a.BatchNo LIKE  #{batchNo}
+            </if>
+            <if test="partNo != null and partNo != ''">
+                AND a.PartNo LIKE  #{partNo}
+            </if>
+        </where>
+        order by a.TransDate desc
+    </select>
+
     <update id="updatePrintStock">
         update StockPrint set PrintFlag='Y' where Site=#{site} and TransNo=#{transNo}
     </update>