From efe80d28db790c58019f3d0d10b465a619691d3d Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Thu, 4 Sep 2025 16:25:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=A4=87?=
 =?UTF-8?q?=E5=93=81=E5=A4=87=E4=BB=B6=E5=A2=9E=E5=8A=A0=E4=BD=8E=E4=BA=8E?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=BA=93=E5=AD=98=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/op/device/domain/SparePartsLedger.java  | 12 ++++++++++++
 .../mapper/device/SparePartsLedgerMapper.xml         |  2 ++
 .../main/java/com/op/wms/domain/BaseEquipment.java   | 11 +++++++++++
 3 files changed, 25 insertions(+)

diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/SparePartsLedger.java b/op-modules/op-device/src/main/java/com/op/device/domain/SparePartsLedger.java
index e68f6be58..42634345c 100644
--- a/op-modules/op-device/src/main/java/com/op/device/domain/SparePartsLedger.java
+++ b/op-modules/op-device/src/main/java/com/op/device/domain/SparePartsLedger.java
@@ -124,6 +124,8 @@ public class SparePartsLedger extends BaseEntity {
     @Excel(name = "冻结数量", readConverterExp = "预=留")
     private BigDecimal storageAmount;
 
+
+
     //虚拟字段
     /** 库存可用数量 */
 //	@Excel(name = "库存可用数量")
@@ -203,9 +205,19 @@ public class SparePartsLedger extends BaseEntity {
 
     @Excel(name = "备件类型")
     private String spareType;
+    private String isLow;
 
 //////////////////////////////////////////////////////////附属表
 
+
+    public String getIsLow() {
+        return isLow;
+    }
+
+    public void setIsLow(String isLow) {
+        this.isLow = isLow;
+    }
+
     public void setOwnEquipmentName(String ownEquipmentName) {
         this.ownEquipmentName = ownEquipmentName;
     }
diff --git a/op-modules/op-device/src/main/resources/mapper/device/SparePartsLedgerMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/SparePartsLedgerMapper.xml
index 102acc149..6b986a897 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/SparePartsLedgerMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/SparePartsLedgerMapper.xml
@@ -140,6 +140,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="spareInventoryUpper != null  and spareInventoryUpper != ''"> and spare_inventory_upper = #{spareInventoryUpper}</if>
 			<if test="spareType != null  and spareType != ''"> and spare_type = #{spareType}</if>
 			<if test="ownEquipmentName != null  and ownEquipmentName != ''"> and own_equipment_name like concat('%', #{ownEquipmentName}, '%')</if>
+			<if test='isLow ==  "0"'>and TRY_CAST(safe_stock AS DECIMAL(18,2)) &gt; amount</if>
+			<if test='isLow ==  "1"'>and TRY_CAST(safe_stock AS DECIMAL(18,2)) &lt;= amount</if>
 			and del_flag = '0'
 		</where>
 	</select>
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 920c9462e..89bfa4611 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
@@ -242,8 +242,19 @@ public class BaseEquipment extends BaseEntity {
     private String planPerson;//责任人
     private String orderCostTime;//工单用时
     private String orderSignPerson;//签字
+    private String dh;//产线代码
 
     ///////////////////////////////////
+
+
+    public String getDh() {
+        return dh;
+    }
+
+    public void setDh(String dh) {
+        this.dh = dh;
+    }
+
     public void setOrderCode(String orderCode) {
         this.orderCode = orderCode;
     }