【功能完善】【生产报废单，存在MES单号返回成功，提示ERP单号】

src/main/java/com/uas/eis/service/Impl/MESServiceImpl.java

@@ -444,9 +444,9 @@ public class MESServiceImpl implements MESService {
             }
             int count = baseDao.getCount("select count(1) from MakeScrap where ms_class='" + msclass + "' and ms_mescode='" + fSelBillNo + "'");
             if (count>0){
-                /*Object co = baseDao.getFieldDataByCondition("MakeScrap", "ms_code", "ms_class='" + msclass + "' and ms_mescode='" + fSelBillNo + "'");
-                return ApiResponse.failRsp("10024",requestId,"MES单号："+fSelBillNo+"已存在，请在ERP查看"+msclass+"，单据编号："+co);*/
-                return ApiResponse.failRsp("10024",requestId,"0");
+                Object co = baseDao.getFieldDataByCondition("MakeScrap", "ms_code", "ms_class='" + msclass + "' and ms_mescode='" + fSelBillNo + "'");
+                /*return ApiResponse.failRsp("10024",requestId,"MES单号："+fSelBillNo+"已存在，请在ERP查看"+msclass+"，单据编号："+co);*/
+                return ApiResponse.successRsp("0",requestId,"报废单【"+co+"】已存在，请在ERP查看！");
             }
             //临时逻辑  工单结案直接返回成功
             if (baseDao.isDBSetting("MakeScrap","overSuccess")) {