From 97e7e60c517f1388e50b63cb438ccfa948ceda73 Mon Sep 17 00:00:00 2001
From: ghm <guanhongming@lanju.cn>
Date: Thu, 18 Jun 2026 10:42:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E8=B5=84=E4=BA=A7=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E7=8E=87=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/op/wms/domain/BaseEquipment.java   | 9 +++++++++
 .../main/resources/mapper/wms/BaseEquipmentMapper.xml    | 7 ++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java
index 89bfa4611..c07114c52 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java
@@ -243,6 +243,7 @@ public class BaseEquipment extends BaseEntity {
     private String orderCostTime;//工单用时
     private String orderSignPerson;//签字
     private String dh;//产线代码
+    private BigDecimal power;//功率(KW)
 
     ///////////////////////////////////
 
@@ -255,6 +256,14 @@ public class BaseEquipment extends BaseEntity {
         this.dh = dh;
     }
 
+    public BigDecimal getPower() {
+        return power;
+    }
+
+    public void setPower(BigDecimal power) {
+        this.power = power;
+    }
+
     public void setOrderCode(String orderCode) {
         this.orderCode = orderCode;
     }
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml
index 7aff77836..276b076bb 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml
@@ -58,6 +58,7 @@
         <result property="sapName" column="sap_name"/>
         <result property="factoryWorkshop" column="factory_workshop"/>
         <result property="dh" column="dh"/>
+        <result property="power" column="power"/>
     </resultMap>
 
     <resultMap type="EquSpareEquipment" id="EquSpareEquipmentResult">
@@ -155,7 +156,8 @@
 			sap_code,
 			sap_name,
 			factory_workshop,
-			dh
+			dh,
+			power
 			from base_equipment
 	</sql>
 
@@ -285,6 +287,7 @@
             <if test="sapName != null">sap_name,</if>
             <if test="factoryWorkshop != null">factory_workshop,</if>
             <if test="dh != null">dh,</if>
+            <if test="power != null">power,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="equipmentCode != null and equipmentCode != ''">#{equipmentCode},</if>
@@ -338,6 +341,7 @@
             <if test="sapName != null  and sapName != ''">#{sapName},</if>
             <if test="factoryWorkshop != null  and factoryWorkshop != ''">#{factoryWorkshop},</if>
             <if test="dh != null  and dh != ''">#{dh},</if>
+            <if test="power != null">#{power},</if>
         </trim>
     </insert>
 
@@ -395,6 +399,7 @@
             <if test="sapName != null">sap_name = #{sapName},</if>
             <if test="factoryWorkshop != null">factory_workshop = #{factoryWorkshop},</if>
             <if test="dh != null">dh = #{dh},</if>
+            <if test="power != null">power = #{power},</if>
         </trim>
         where equipment_id = #{equipmentId}
     </update>