【科翔】【MES对接】【去掉 object_rrn】

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

@@ -75,15 +75,15 @@ public class EAPIMesBusiness {
             return ApiResponse.failRsp(ErrorMessage.BUSINESS_ILLEGAL.getCode(),apiReq.getRequestId()
                     ,"报废记录明细为空!");
         }
-        List<Integer> object_rrns = new ArrayList<>();
+//        List<Integer> object_rrns = new ArrayList<>();
         for (ScrapRecord g: scrapRecordList) {
             if(!StringUtil.hasText(g.getScrap_code())){
                 return ApiResponse.failRsp(ErrorMessage.BUSINESS_ILLEGAL.getCode(),apiReq.getRequestId(),"报废单号为空！");
             }
-            if(NumberUtil.isEmpty(g.getObject_rrn())){
-                return ApiResponse.failRsp(ErrorMessage.BUSINESS_ILLEGAL.getCode(),apiReq.getRequestId(),"主键：object_rrn为0或者不存在！");
-            }
-            object_rrns.add(Integer.valueOf(g.getObject_rrn()));
+//            if(NumberUtil.isEmpty(g.getObject_rrn())){
+//                return ApiResponse.failRsp(ErrorMessage.BUSINESS_ILLEGAL.getCode(),apiReq.getRequestId(),"主键：object_rrn为0或者不存在！");
+//            }
+//            object_rrns.add(Integer.valueOf(g.getObject_rrn()));
             if(!StringUtil.hasText(g.getLotno())){
                 return ApiResponse.failRsp(ErrorMessage.BUSINESS_ILLEGAL.getCode(),apiReq.getRequestId(),"生产批号为空！");
             }
@@ -105,17 +105,17 @@ public class EAPIMesBusiness {
                 return ApiResponse.failRsp(ErrorMessage.BUSINESS_ILLEGAL.getCode(),apiReq.getRequestId(),"工序代码为空！");
             }
         }
-        List<Integer> object_rrnsL = object_rrns.stream().map(item -> item).distinct().collect(Collectors.toList());
-        if(object_rrnsL.size()!=object_rrns.size()){
-            return ApiResponse.failRsp(ErrorMessage.BUSINESS_ILLEGAL.getCode(),apiReq.getRequestId(),"object_rrn存在重复项！");
-        }
-        Employee emp = apiReq.getEmployee();
+//        List<Integer> object_rrnsL = object_rrns.stream().map(item -> item).distinct().collect(Collectors.toList());
+//        if(object_rrnsL.size()!=object_rrns.size()){
+//            return ApiResponse.failRsp(ErrorMessage.BUSINESS_ILLEGAL.getCode(),apiReq.getRequestId(),"object_rrn存在重复项！");
+//        }
+//        Employee emp = apiReq.getEmployee();
         //object_rrns 校验对接记录是否存在
-        String ids = StringUtils.join(object_rrns.toArray(), ",");
-        SqlRowList checks = baseDao.queryForRowSet("select wm_concat(SOURCEID) object_rrns from (select SOURCEID from (select nvl(SOURCEID,0) SOURCEID from DOCKING_SCRAP_RECORD where SOURCE_ = '"+emp.getEm_name()+"' and nvl(SOURCEID,0) in ("+ids+") order by nvl(SOURCEID,0)) where rownum <= 10) ");
-        if(checks.next() && !"".equals(checks.getGeneralString("object_rrns"))){
-            return ApiResponse.failRsp(ErrorMessage.BUSINESS_ILLEGAL.getCode(),apiReq.getRequestId(),"object_rrn 已存在对接记录："+checks.getGeneralString("object_rrns"));
-        }
+//        String ids = StringUtils.join(object_rrns.toArray(), ",");
+//        SqlRowList checks = baseDao.queryForRowSet("select wm_concat(SOURCEID) object_rrns from (select SOURCEID from (select nvl(SOURCEID,0) SOURCEID from DOCKING_SCRAP_RECORD where SOURCE_ = '"+emp.getEm_name()+"' and nvl(SOURCEID,0) in ("+ids+") order by nvl(SOURCEID,0)) where rownum <= 10) ");
+//        if(checks.next() && !"".equals(checks.getGeneralString("object_rrns"))){
+//            return ApiResponse.failRsp(ErrorMessage.BUSINESS_ILLEGAL.getCode(),apiReq.getRequestId(),"object_rrn 已存在对接记录："+checks.getGeneralString("object_rrns"));
+//        }
         return ApiResponse.successRsp("1", apiReq.getRequestId(), null);
     }
 
@@ -128,10 +128,11 @@ public class EAPIMesBusiness {
         List<String> sqls = new ArrayList<>();
         int size = 0;
         for (ScrapRecord g: scrapRecordList) {
-            if(!baseDao.checkIf("DOCKING_SCRAP_RECORD","SOURCE_ = '"+emp.getEm_name()+"' and nvl(SOURCEID,0) ="+g.getObject_rrn())){
+            g.setObject_rrn(baseDao.getSeqId("DOCKING_SCRAP_RECORD_API_SEQ"));
+//            if(!baseDao.checkIf("DOCKING_SCRAP_RECORD","SOURCE_ = '"+emp.getEm_name()+"' and nvl(SOURCEID,0) ="+g.getObject_rrn())){
                 sqls.addAll(g.getSqls(emp.getEm_name()));
                 size=size+1;
-            }
+//            }
         }
         if(sqls.size() == 0){
             return ApiResponse.failRsp(ErrorMessage.BUSINESS_ILLEGAL.getCode(),apiReq.getRequestId()
@@ -141,9 +142,9 @@ public class EAPIMesBusiness {
 //        System.out.println(sqls.toString());
         baseDao.execute(sqls);
         String scrap_code_min = scrapRecordList.get(0).getScrap_code();
-        int object_rrn_min = scrapRecordList.get(0).getObject_rrn();
+//        int object_rrn_min = scrapRecordList.get(0).getObject_rrn();
         ApiBill apiBill = new ApiBill();
-        apiBill.setId(object_rrn_min);
+        apiBill.setId(0);
         apiBill.setCode(scrap_code_min);
         //记录业务单据编号
         eAPICommonService.logBillCode(mesApiLog, apiBill);