diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/device/EquRepairOrderDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/device/EquRepairOrderDTO.java
index 434d10603..fd56d71be 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/device/EquRepairOrderDTO.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/device/EquRepairOrderDTO.java
@@ -12,6 +12,8 @@ public class EquRepairOrderDTO {
     private String userNickName;
     // 联系方式
     private String phoneNumber;
+    // 故障描述
+    private String orderDesc;
 
     public String getUserNickName() {
         return userNickName;
@@ -52,4 +54,12 @@ public class EquRepairOrderDTO {
     public void setEquipmentCode(String equipmentCode) {
         this.equipmentCode = equipmentCode;
     }
+
+    public String getOrderDesc() {
+        return orderDesc;
+    }
+
+    public void setOrderDesc(String orderDesc) {
+        this.orderDesc = orderDesc;
+    }
 }
diff --git a/op-modules/op-energy/src/main/resources/mapper/record/RecordDnbInstantMapper.xml b/op-modules/op-energy/src/main/resources/mapper/record/RecordDnbInstantMapper.xml
index 1305bcbc7..12c387298 100644
--- a/op-modules/op-energy/src/main/resources/mapper/record/RecordDnbInstantMapper.xml
+++ b/op-modules/op-energy/src/main/resources/mapper/record/RecordDnbInstantMapper.xml
@@ -44,7 +44,7 @@
             </if>
             <if test="monitorSubset != null  and monitorSubset != ''">
                 and (record_dnb_instant.monitor_id = #{monitorSubset} OR record_dnb_instant.monitor_id IN
-                (SELECT t.monitor_id FROM base_monitor_info t WHERE FIND_IN_SET(#{monitorSubset}, ancestors)))
+                (SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0))
             </if>
             <if test="vA != null ">and vA = #{vA}</if>
             <if test="vB != null ">and vB = #{vB}</if>
@@ -82,7 +82,7 @@
             <if test="monitorId != null  and monitorId != ''">and rdi.monitor_id = #{monitorId}</if>
             <if test="monitorSubset != null  and monitorSubset != ''">
                 and (rdi.monitor_id = #{monitorSubset} OR rdi.monitor_id IN
-                (SELECT t.monitor_id FROM base_monitor_info t WHERE FIND_IN_SET(#{monitorSubset}, ancestors)))
+                (SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0))
             </if>
             <if test="params.monitorIdList != null  and params.monitorIdList.size > 0">
                 and rdi.monitor_id IN
@@ -93,7 +93,7 @@
         </where>
         group by rdi.monitor_id) md on md.monitor_id = d.monitor_id and md.collect_time = d.collect_time
         left join base_monitor_info m on m.monitor_id = d.monitor_id
-        left join (select rpd.monitor_id, ifnull(sum(rpd.expend), 0) consumption
+        left join (select rpd.monitor_id, isnull(sum(rpd.expend), 0) consumption
         from report_point_dnb rpd
         <if test="params.beginCollectTime != null and params.beginCollectTime != '' and params.endCollectTime != null and params.endCollectTime != ''">
             where rpd.begin_time between #{params.beginCollectTime} and #{params.endCollectTime}
@@ -116,7 +116,7 @@
             <if test="monitorId != null  and monitorId != ''">and bmi.monitor_id = #{monitorId}</if>
             <if test="monitorSubset != null  and monitorSubset != ''">
                 and (bmi.monitor_id = #{monitorSubset} OR bmi.monitor_id IN
-                (SELECT t.monitor_id FROM base_monitor_info t WHERE FIND_IN_SET(#{monitorSubset}, ancestors)))
+                (SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0))
             </if>
         </where>
     </select>
diff --git a/op-modules/op-energy/src/main/resources/mapper/record/RecordWaterInstantMapper.xml b/op-modules/op-energy/src/main/resources/mapper/record/RecordWaterInstantMapper.xml
index b0538665d..8d0f070ba 100644
--- a/op-modules/op-energy/src/main/resources/mapper/record/RecordWaterInstantMapper.xml
+++ b/op-modules/op-energy/src/main/resources/mapper/record/RecordWaterInstantMapper.xml
@@ -35,7 +35,7 @@
             </if>
             <if test="monitorSubset != null  and monitorSubset != ''">
                 and (record_water_instant.monitor_id = #{monitorSubset} OR record_water_instant.monitor_id IN
-                (SELECT t.monitor_id FROM base_monitor_info t WHERE FIND_IN_SET(#{monitorSubset}, ancestors)))
+                (SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0))
             </if>
             <if test="fluxFlow != null ">and flux_flow = #{fluxFlow}</if>
             <if test="waterFlow != null ">and water_flow = #{waterFlow}</if>
@@ -63,7 +63,7 @@
             <if test="monitorId != null  and monitorId != ''">and rdi.monitor_id = #{monitorId}</if>
             <if test="monitorSubset != null  and monitorSubset != ''">
                 and (rdi.monitor_id = #{monitorSubset} OR rdi.monitor_id IN
-                (SELECT t.monitor_id FROM base_monitor_info t WHERE FIND_IN_SET(#{monitorSubset}, ancestors)))
+                (SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0))
             </if>
             <if test="params.monitorIdList != null  and params.monitorIdList.size > 0">
                 and rdi.monitor_id IN
@@ -74,7 +74,7 @@
         </where>
         group by rdi.monitor_id) md on md.monitor_id = d.monitor_id and md.collect_time = d.collect_time
         left join base_monitor_info m on m.monitor_id = d.monitor_id
-        left join (select rpd.monitor_id, ifnull(sum(rpd.expend), 0) consumption
+        left join (select rpd.monitor_id, isnull(sum(rpd.expend), 0) consumption
         from report_point_dnb rpd
         <if test="params.beginCollectTime != null and params.beginCollectTime != '' and params.endCollectTime != null and params.endCollectTime != ''">
             where rpd.begin_time between #{params.beginCollectTime} and #{params.endCollectTime}
@@ -94,7 +94,7 @@
             <if test="monitorId != null  and monitorId != ''">and bmi.monitor_id = #{monitorId}</if>
             <if test="monitorSubset != null  and monitorSubset != ''">
                 and (bmi.monitor_id = #{monitorSubset} OR bmi.monitor_id IN
-                (SELECT t.monitor_id FROM base_monitor_info t WHERE FIND_IN_SET(#{monitorSubset}, ancestors)))
+                (SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0))
             </if>
         </where>
     </select>
diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
index 3f1357c2e..ea98a3c88 100644
--- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
+++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
@@ -282,6 +282,7 @@ public class OpenServiceImpl implements OpenService {
         equRepairOrder.setOrderId(IdUtils.fastSimpleUUID());// id
         equRepairOrder.setEquipmentCode(equRepairOrderDTO.getEquipmentCode());
         equRepairOrder.setOrderSource("上位机");// 故障来源
+        equRepairOrder.setOrderDesc(equRepairOrderDTO.getOrderDesc());//故障描述 新增加的
         equRepairOrder.setOrderTime(DateUtils.getNowDate());// 报修时间
         equRepairOrder.setOrderBreakdownTime(DateUtils.getNowDate());// 故障时间
         if (equRepairOrderDTO.getUserName() != null) {
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
index cf39aaa57..6ba5304ab 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
@@ -525,8 +525,12 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
                 map.put("LGORT", mesReportWork.getWhCode());
                 map.put("QUANTITY", mesReportWork.getQuantityQualified());
                 map.put("ERFME", mesReportWork.getUnit());
-                String batch = mesReportWork.getBatch().substring(12);
-                map.put("BATCH", batch);
+                if (mesReportWork.getBatch().length()>12){
+                    String batch = mesReportWork.getBatch().substring(12);
+                    map.put("BATCH", batch);
+                }else {
+                    map.put("BATCH", mesReportWork.getBatch());
+                }
                 String formattedsDate = mesReportWork.getProductDate().replace("-", "");
                 map.put("HSDAT", formattedsDate);
                 mapList.add(map);