From b27e18f4035ea4b33d67cf4041760f69ebe26bd5 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 20 Dec 2023 15:21:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=20?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8A=A0=E5=AD=97=E6=AE=B5=20+=20=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=9C=8B=E6=9D=BF=E5=AE=8C=E5=A5=BD=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=AF=94=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/device/DeviceInterfaceMapper.xml   |  2 +-
 .../java/com/op/wms/domain/BaseEquipment.java | 60 +++++++++++++++++++
 .../mapper/wms/BaseEquipmentMapper.xml        | 33 +++++++++-
 3 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml
index 8732c1682..90f2288d3 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml
@@ -79,7 +79,7 @@
     <select id="getEquipmentIntactRate" parameterType="EquOperation" resultType="com.op.device.domain.EquOperation">
         SELECT
             SUM(CASE WHEN equipment_status = '1' or equipment_status = '3' THEN 1 Else 0 END) AS operationEquipment,
-            SUM(CASE WHEN equipment_status = '0' or equipment_status = '0' THEN 1 Else 0 END) AS faultEquipment,
+            SUM(CASE WHEN equipment_status = '0' or equipment_status = '2' THEN 1 Else 0 END) AS faultEquipment,
             COUNT(*) AS totalEquipment,
 		    CAST(SUM(CASE WHEN equipment_status = '1' or equipment_status = '3' THEN 1 Else 0 END)*100.00/COUNT(*) as decimal(18,2)) AS intactRate
         FROM base_equipment
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 5869a1c3e..34486ed0e 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
@@ -215,6 +215,26 @@ public class BaseEquipment extends BaseEntity {
 	@Excel(name = "设备类别")
 	private String equipmentCategory;
 
+	/** 资产分类名称 */
+	@Excel(name = "资产分类名称")
+	private String assetClassificationName;
+
+	/** 资产描述 */
+	@Excel(name = "资产描述")
+	private String assetDescription;
+
+	/** 数量 */
+	@Excel(name = "数量")
+	private String equipmentNumber;
+
+	/** 存货号 */
+	@Excel(name = "存货号")
+	private String inventoryNumber;
+
+	/** 计量单位 */
+	@Excel(name = "计量单位")
+	private String unitMeasurement;
+
 	private String imageFileList;
 
 	private String barCodeFileList;
@@ -663,6 +683,46 @@ public class BaseEquipment extends BaseEntity {
 		return equipmentCategory;
 	}
 
+	//资产分类名称
+	public void setAssetClassificationName(String assetClassificationName) {
+		this.assetClassificationName = assetClassificationName;
+	}
+	public String getAssetClassificationName() {
+		return assetClassificationName;
+	}
+
+	//资产描述
+	public void setAssetDescription(String assetDescription) {
+		this.assetDescription = assetDescription;
+	}
+	public String getAssetDescription() {
+		return assetDescription;
+	}
+
+	//数量
+	public void setEquipmentNumber(String equipmentNumber) {
+		this.equipmentNumber = equipmentNumber;
+	}
+	public String getEquipmentNumber() {
+		return equipmentNumber;
+	}
+
+	//存货号
+	public void setInventoryNumber(String inventoryNumber) {
+		this.inventoryNumber = inventoryNumber;
+	}
+	public String getInventoryNumber() {
+		return inventoryNumber;
+	}
+
+	//计量单位
+	public void setUnitMeasurement(String unitMeasurement) {
+		this.unitMeasurement = unitMeasurement;
+	}
+	public String getUnitMeasurement() {
+		return unitMeasurement;
+	}
+
 	@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 b17b1eadf..37311781a 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
@@ -49,6 +49,12 @@
 		<result property="factoryCode"	column="factory_code"	/>
 		<result property="equipmentStatus"	column="equipment_status"	/>
 		<result property="equipmentCategory"	column="equipment_category"	/>
+		<result property="assetClassificationName"	column="asset_classification_name"	/>
+		<result property="assetDescription"	column="asset_description"	/>
+		<result property="equipmentNumber"	column="equipment_number"	/>
+		<result property="inventoryNumber"	column="inventory_number"	/>
+		<result property="unitMeasurement"	column="unit_measurement"	/>
+
 	</resultMap>
 
 	<resultMap type="WmsSparePartsLedger" id="WmsSparePartsLedgerResult">
@@ -164,7 +170,12 @@
 			equipment_head,
 			factory_code,
 			equipment_status,
-			equipment_category
+			equipment_category,
+			asset_classification_name,
+			asset_description,
+			equipment_number,
+			inventory_number,
+			unit_measurement
 			from base_equipment
 	</sql>
 
@@ -208,6 +219,11 @@
 			<if test="factoryCode != null  and factoryCode != ''"> and factory_code = #{factoryCode}</if>
 			<if test="equipmentStatus != null  and equipmentStatus != ''"> and equipment_status = #{equipmentStatus}</if>
 			<if test="equipmentCategory != null  and equipmentCategory != ''"> and equipment_category = #{equipmentCategory}</if>
+			<if test="assetClassificationName != null  and assetClassificationName != ''"> and asset_classification_name = #{assetClassificationName}</if>
+			<if test="assetDescription != null  and assetDescription != ''"> and asset_description = #{assetDescription}</if>
+			<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>
 			and del_flag ='0'
 		</where>
 	</select>
@@ -263,6 +279,11 @@
 			<if test="factoryCode != null">factory_code,</if>
 			<if test="equipmentStatus != null">equipment_status,</if>
 			<if test="equipmentCategory != null">equipment_category,</if>
+			<if test="assetClassificationName != null">asset_classification_name,</if>
+			<if test="assetDescription != null">asset_description,</if>
+			<if test="equipmentNumber != null">equipment_number,</if>
+			<if test="inventoryNumber != null">inventory_number,</if>
+			<if test="unitMeasurement != null">unit_measurement,</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="equipmentCode != null and equipmentCode != ''">#{equipmentCode},</if>
@@ -307,6 +328,11 @@
 			<if test="factoryCode != null">#{factoryCode},</if>
 			<if test="equipmentStatus != null">#{equipmentStatus},</if>
 			<if test="equipmentCategory != null">#{equipmentCategory},</if>
+			<if test="assetClassificationName != null  and assetClassificationName != ''"> #{assetClassificationName},</if>
+			<if test="assetDescription != null  and assetDescription != ''"> #{assetDescription},</if>
+			<if test="equipmentNumber != null  and equipmentNumber != ''"> #{equipmentNumber},</if>
+			<if test="inventoryNumber != null  and inventoryNumber != ''"> #{inventoryNumber},</if>
+			<if test="unitMeasurement != null  and unitMeasurement != ''"> #{unitMeasurement},</if>
 		</trim>
 	</insert>
 
@@ -355,6 +381,11 @@
 			<if test="factoryCode != null">factory_code = #{factoryCode},</if>
 			<if test="equipmentStatus != null">equipment_status = #{equipmentStatus},</if>
 			<if test="equipmentCategory != null">equipment_category = #{equipmentCategory},</if>
+			<if test="assetClassificationName != null  and assetClassificationName != ''"> asset_classification_name = #{assetClassificationName},</if>
+			<if test="assetDescription != null  and assetDescription != ''"> asset_description = #{assetDescription},</if>
+			<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>
 		</trim>
 		where equipment_id = #{equipmentId}
 	</update>