From 437cb0e25918393ce92c5ebfa269d4d20581ab31 Mon Sep 17 00:00:00 2001
From: FCD <2453864257@qq.com>
Date: Thu, 16 Oct 2025 11:54:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E5=93=81=E5=A4=87=E4=BB=B6=E5=87=BA?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=96=B0=E5=A2=9E=E5=8D=95=E4=BB=B7=E4=B8=8E?=
 =?UTF-8?q?=E6=80=BB=E4=BB=B7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/device/domain/EquSparepartsInOut.java  | 22 ++++++++++
 .../device/EquSparepartsInOutMapper.xml       | 42 ++++++++++---------
 2 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquSparepartsInOut.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquSparepartsInOut.java
index ea8ec0ad3..c57ca5f04 100644
--- a/op-modules/op-device/src/main/java/com/op/device/domain/EquSparepartsInOut.java
+++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquSparepartsInOut.java
@@ -36,6 +36,12 @@ public class EquSparepartsInOut extends BaseEntity {
     @Excel(name = "数量")
     private BigDecimal amount;
 
+    @Excel(name = "单价")
+    private BigDecimal unitPrice;
+
+    @Excel(name = "总价")
+    private BigDecimal allPrice;
+
     @Excel(name = "备用1")
     private String attr1;
 
@@ -180,6 +186,22 @@ public class EquSparepartsInOut extends BaseEntity {
         return storageId;
     }
 
+    public BigDecimal getUnitPrice() {
+        return unitPrice;
+    }
+
+    public void setUnitPrice(BigDecimal unitPrice) {
+        this.unitPrice = unitPrice;
+    }
+
+    public BigDecimal getAllPrice() {
+        return allPrice;
+    }
+
+    public void setAllPrice(BigDecimal allPrice) {
+        this.allPrice = allPrice;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquSparepartsInOutMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquSparepartsInOutMapper.xml
index e933ee103..81dc58dbb 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquSparepartsInOutMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquSparepartsInOutMapper.xml
@@ -22,6 +22,8 @@
         <result property="delFlag" column="del_flag"/>
         <result property="factoryCode" column="factory_code"/>
         <result property="nickName"	column="nick_name"	/>
+        <result property="unitPrice" column="unit_price"/>
+        <result property="allPrice" column="allPrice"/>
     </resultMap>
 
     <sql id="selectEquSparepartsInOutVo">
@@ -30,26 +32,28 @@
 
     <select id="selectEquSparepartsInOutList" parameterType="EquSparepartsInOut"  resultMap="EquSparepartsInOutResult">
         SELECT
-        id,
-        in_out_type,
-        order_no,
-        spare_code,
-        spare_name,
-        amount,
-        attr1,
-        attr2,
-        attr3,
-        esio.create_by,
-        esio.create_time,
-        esio.update_by,
-        esio.update_time,
-        esio.del_flag,
-        factory_code,
-        storage_id,
-        su.nick_name
-        FROM
-        equ_spareparts_in_out esio
+            esio.id,
+            esio.in_out_type,
+            esio.order_no,
+            esio.spare_code,
+            esio.spare_name,
+            esio.amount,
+            esio.attr1,
+            esio.attr2,
+            esio.attr3,
+            esio.create_by,
+            esio.create_time,
+            esio.update_by,
+            esio.update_time,
+            esio.del_flag,
+            esio.factory_code,
+            esio.storage_id,
+            su.nick_name,
+            esl.unit_price,
+            (esl.unit_price * esio.amount) allPrice
+        FROM equ_spareparts_in_out esio
         LEFT JOIN lanju_op_cloud.dbo.sys_user su ON esio.create_by = su.user_name
+        LEFT JOIN equ_spareparts_ledger esl ON esio.spare_code = esl.material_code AND esl.del_flag = 0
         <where>
             <if test="inOutType != null  and inOutType != ''">and in_out_type = #{inOutType}</if>
             <if test="orderNo != null  and orderNo != ''">and order_no = #{orderNo}</if>