Procházet zdrojové kódy

【工单批量审核提示优化】

wuyx před 6 roky
rodič
revize
43e4ee7ead

+ 8 - 3
src/com/uas/mes/pm/service/impl/MakeBaseServiceImpl.java

@@ -7,6 +7,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
+import com.uas.mes.core.exception.SystemException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Propagation;
@@ -1853,10 +1854,14 @@ public class MakeBaseServiceImpl implements MakeBaseService {
 				submitMakeBase(id, "Make!Base");
 				submitMakeBase(id, "Make!Base");
 				auditMakeBase(id, "Make!Base");
 				auditMakeBase(id, "Make!Base");
 			}catch(Exception e){
 			}catch(Exception e){
-				if(e.getMessage().contains("工单")){
+				if(e instanceof SystemException){
 					str.append("工单:"+maCode+","+e.getMessage().split(",")[0]).append("</br>");
 					str.append("工单:"+maCode+","+e.getMessage().split(",")[0]).append("</br>");
-				}else {
-					BaseUtil.showError(e.getMessage());
+				}else{
+					if(StringUtil.hasText(e.getMessage())){
+						BaseUtil.showError(e.getMessage());
+					}else{
+						e.printStackTrace();
+					}
 				}
 				}
 			}
 			}
 		}
 		}