设备管理增加产线代码，备品备件增加低于安全库存筛选

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;
     }

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>

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;
     }