From 0128967ab90612f3c93c77174880722b999bb643 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 13 Mar 2024 15:02:10 +0800
Subject: [PATCH] =?UTF-8?q?2024-3-13=20=E5=9F=BA=E7=A1=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=AE=A1=E7=90=86-=E8=AE=BE=E5=A4=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E5=A2=9E=E5=8A=A0sap=5Fcode=E5=92=8Csap=5Fname?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/op/wms/domain/BaseEquipment.java | 26 +++++++++++++++++++
 .../mapper/wms/BaseEquipmentMapper.xml        | 15 +++++++++--
 2 files changed, 39 insertions(+), 2 deletions(-)

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 22c81ff6..22ba6574 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
@@ -346,6 +346,16 @@ public class BaseEquipment extends BaseEntity {
     @Excel(name = "计量单位")
     private String unitMeasurement;
 
+    //新增SAP字段
+    /**
+     * SAP线体编码
+     */
+    private String sapCode;
+    /**
+     * SAP线体名称
+     */
+    private String sapName;
+
     private String imageFileList;
 
     private String barCodeFileList;
@@ -1134,6 +1144,22 @@ public class BaseEquipment extends BaseEntity {
         return unitMeasurement;
     }
 
+    //SAP线体编码
+    public void setSapCode(String sapCode) {
+        this.sapCode = sapCode;
+    }
+    public String getSapCode() {
+        return sapCode;
+    }
+
+    //SAP线体名称
+    public void setSapName(String sapName) {
+        this.sapName = sapName;
+    }
+    public String getSapName() {
+        return sapName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
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 a4fbd98f..cf87e858 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
@@ -54,7 +54,8 @@
         <result property="equipmentNumber" column="equipment_number"/>
         <result property="inventoryNumber" column="inventory_number"/>
         <result property="unitMeasurement" column="unit_measurement"/>
-
+        <result property="sapCode" column="sap_code"/>
+        <result property="sapName" column="sap_name"/>
     </resultMap>
 
     <resultMap type="WmsSparePartsLedger" id="WmsSparePartsLedgerResult">
@@ -175,7 +176,9 @@
 			asset_description,
 			equipment_number,
 			inventory_number,
-			unit_measurement
+			unit_measurement,
+			sap_code,
+			sap_name
 			from base_equipment
 	</sql>
 
@@ -251,6 +254,8 @@
             <if test="equipmentNumber != null  and equipmentNumber != ''">and equipment_number = #{equipmentNumber}</if>
             <if test="inventoryNumber != null  and inventoryNumber != ''">and inventory_number = #{inventoryNumber}</if>
             <if test="unitMeasurement != null  and unitMeasurement != ''">and unit_measurement = #{unitMeasurement}</if>
+            <if test="sapCode != null  and sapCode != ''">and sap_code = #{sapCode}</if>
+            <if test="sapName != null  and sapName != ''">and sap_name = #{sapName}</if>
             and del_flag ='0'
         </where>
     </select>
@@ -318,6 +323,8 @@
             <if test="equipmentNumber != null">equipment_number,</if>
             <if test="inventoryNumber != null">inventory_number,</if>
             <if test="unitMeasurement != null">unit_measurement,</if>
+            <if test="sapCode != null">sap_code,</if>
+            <if test="sapName != null">sap_name,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="equipmentCode != null and equipmentCode != ''">#{equipmentCode},</if>
@@ -368,6 +375,8 @@
             <if test="equipmentNumber != null  and equipmentNumber != ''">#{equipmentNumber},</if>
             <if test="inventoryNumber != null  and inventoryNumber != ''">#{inventoryNumber},</if>
             <if test="unitMeasurement != null  and unitMeasurement != ''">#{unitMeasurement},</if>
+            <if test="sapCode != null  and sapCode != ''">#{sapCode},</if>
+            <if test="sapName != null  and sapName != ''">#{sapName},</if>
         </trim>
     </insert>
 
@@ -427,6 +436,8 @@
             <if test="equipmentNumber != null  and equipmentNumber != ''">equipment_number = #{equipmentNumber},</if>
             <if test="inventoryNumber != null  and inventoryNumber != ''">inventory_number = #{inventoryNumber},</if>
             <if test="unitMeasurement != null  and unitMeasurement != ''">unit_measurement = #{unitMeasurement},</if>
+            <if test="sapCode != null  and sapCode != ''">sap_code = #{sapCode},</if>
+            <if test="sapName != null  and sapName != ''">sap_name = #{sapName},</if>
         </trim>
         where equipment_id = #{equipmentId}
     </update>