Merge remote-tracking branch 'origin/master'

op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java

@@ -473,7 +473,7 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService
             //发企业微信--------------------结束
         }
 
-        return success("提交成功，维修完成！");
+        return success("提交成功！");
     }
 
     //更新运行表 + 设备表
@@ -564,10 +564,15 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService
             throw new NotLoginException("设备表中，此设备状态为空！");
         }
 
-        if (equOperation.getEquStatusDes() == null || equOperation.getEquStatusDes().equals("")) {
-            equOperation.setEquStatusDes(formattedDate + ":"  + equStatus);
-        } else {
-            equOperation.setEquStatusDes(equOperation.getEquStatusDes() + formattedDate + equStatus);//设备状态描述
+        if(equOperation == null){
+            System.out.println(equRepairWorkOrder.getEquipmentCode()+":运行记录为空");
+        }else{
+            if (StringUtils.isBlank(equOperation.getEquStatusDes())) {
+                equOperation.setEquStatusDes(formattedDate + ":"  + equStatus);
+            } else {
+                equOperation.setEquStatusDes(equOperation.getEquStatusDes() + formattedDate + equStatus);//设备状态描述
+            }
+            equOperationMapper.updateEquOperation(equOperation);
         }
 
         if(equ.getEquipmentStatus().equals("0") || equ.getEquipmentStatus().equals("2")|| equ.getEquipmentStatus().equals("1")){
@@ -576,7 +581,6 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService
             equEquipment.setEquipmentStatus("3");
         }
         equRepairWorkOrderMapper.updateEquipmentStatus(equEquipment);
-        equOperationMapper.updateEquOperation(equOperation);
         return msg;
     }
 

op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareDetailMapper.xml

@@ -100,7 +100,7 @@
         where ow.product_date = #{productDateStr}
           and mpd.material_name not like '%白坯%' and mpd.material_name not like '%药液%'
           and mpd.material_code not like '0000000208%'
-          and mpd.recoil = #{recoil} and mp.del_flag = '0' and mpd.del_flag = '0'
+          and mpd.recoil = #{recoil} and mp.del_flag = '0' and mpd.del_flag = '0' and ow.del_flag = '0'
         GROUP BY mpd.material_code,
                  mpd.material_name,
                  mpd.unit,