From 1f20b370fbac4f279339ffba67960252c04f65c4 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 27 Oct 2025 13:40:22 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-27=20=E4=BB=93=E5=BA=93=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse/entity/CountingReport.java      |  6 ++++++
 .../entity/CountingReportDetail.java          | 10 +++++++++
 .../mapper/warehouse/CountingReportMapper.xml | 21 ++++++++++++++++++-
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gaotao/modules/warehouse/entity/CountingReport.java b/src/main/java/com/gaotao/modules/warehouse/entity/CountingReport.java
index 11509fb..a28404a 100644
--- a/src/main/java/com/gaotao/modules/warehouse/entity/CountingReport.java
+++ b/src/main/java/com/gaotao/modules/warehouse/entity/CountingReport.java
@@ -48,6 +48,12 @@ public class CountingReport implements Serializable {
      */
     private String partNo;
 
+    /**
+     * 计划盘点时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date planDate;
+
     /**
      * 创建人账号
      */
diff --git a/src/main/java/com/gaotao/modules/warehouse/entity/CountingReportDetail.java b/src/main/java/com/gaotao/modules/warehouse/entity/CountingReportDetail.java
index b1826ee..4cacb42 100644
--- a/src/main/java/com/gaotao/modules/warehouse/entity/CountingReportDetail.java
+++ b/src/main/java/com/gaotao/modules/warehouse/entity/CountingReportDetail.java
@@ -69,6 +69,16 @@ public class CountingReportDetail implements Serializable {
      */
     private String checkedFlag;
 
+    /**
+     * 盘点状态：正常、盘盈、盘亏
+     */
+    private String checkedStatus;
+
+    /**
+     * 实际盘点数量
+     */
+    private Float checkedQty;
+
     /**
      * 修改人账号
      */
diff --git a/src/main/resources/mapper/warehouse/CountingReportMapper.xml b/src/main/resources/mapper/warehouse/CountingReportMapper.xml
index 45e9c42..44828cf 100644
--- a/src/main/resources/mapper/warehouse/CountingReportMapper.xml
+++ b/src/main/resources/mapper/warehouse/CountingReportMapper.xml
@@ -12,6 +12,7 @@
         <result property="warehouseId" column="warehouse_id"/>
         <result property="locationId" column="location_id"/>
         <result property="partNo" column="part_no"/>
+        <result property="planDate" column="plan_date"/>
         <result property="createBy" column="create_by"/>
         <result property="updateBy" column="update_by"/>
         <result property="createDate" column="create_date"/>
@@ -32,6 +33,8 @@
         <result property="createBy" column="create_by"/>
         <result property="createDate" column="create_date"/>
         <result property="checkedFlag" column="checked_flag"/>
+        <result property="checkedStatus" column="checked_status"/>
+        <result property="checkedQty" column="checked_qty"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateDate" column="update_date"/>
     </resultMap>
@@ -49,6 +52,7 @@
             l.locationName AS locationName,
             cr.part_no AS partNo,
             p.PartDescription AS partDesc,
+            cr.plan_date AS planDate,
             cr.create_by AS createBy,
             cr.update_by AS updateBy,
             cr.create_date AS createDate,
@@ -143,6 +147,7 @@
             warehouse_id,
             location_id,
             part_no,
+            plan_date,
             create_by,
             update_by,
             create_date,
@@ -165,6 +170,7 @@
             warehouse_id,
             location_id,
             part_no,
+            plan_date,
             create_by,
             update_by,
             create_date,
@@ -179,6 +185,7 @@
             #{warehouseId},
             #{locationId},
             #{partNo},
+            #{planDate},
             #{createBy},
             #{updateBy},
             GETDATE(),
@@ -196,6 +203,7 @@
             warehouse_id = #{warehouseId},
             location_id = #{locationId},
             part_no = #{partNo},
+            plan_date = #{planDate},
             update_by = #{updateBy},
             update_date = GETDATE(),
             remark = #{remark}
@@ -258,6 +266,8 @@
             create_by,
             create_date,
             checked_flag,
+            checked_status,
+            checked_qty,
             update_by,
             update_date
         FROM counting_report_detail
@@ -281,6 +291,8 @@
             create_by,
             create_date,
             checked_flag,
+            checked_status,
+            checked_qty,
             update_by,
             update_date
         FROM counting_report_detail
@@ -313,6 +325,8 @@
             create_by,
             create_date,
             checked_flag,
+            checked_status,
+            checked_qty,
             update_by,
             update_date
         ) VALUES
@@ -329,6 +343,8 @@
                 #{item.createBy},
                 GETDATE(),
                 'N',
+                '盘亏',
+                0,
                 #{item.updateBy},
                 GETDATE()
             )
@@ -352,7 +368,10 @@
             a.qty_on_hand AS roll_qty,
             a.label_type,
             a.part_no,
-            p.PartDescription AS part_desc
+            p.PartDescription AS part_desc,
+            'N' AS checked_flag,
+            '盘亏' AS checked_status,
+            0 AS checked_qty
         FROM inventory_stock AS a
         LEFT JOIN part AS p ON a.site = p.site AND a.part_no = p.partNo
         WHERE a.site = #{site}