add

src/main/java/com/zfire/jiasm/syncdata/service/impl/RepairProduceDataUploadServiceImpl.java

@@ -1020,21 +1020,23 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
             // 增加初始化处理，不需要事务
             // dataInit(sourceData, newDykh, orderBase);
 
-            itfTblAssignUpload(brand, sysDictRefXLMapXq,taskId, sourceData, newDykh,row, orderBase);
+            if (itfTblAssignUpload(brand, sysDictRefXLMapXq,taskId, sourceData, newDykh,row, orderBase)){
+                return ;
+            }
         }
         // 修改数据上传任务表中的状态   这里固定值 66
         publicService.updateUploadTaskListStatus(row.getOrderNo(),row.getSynReqId(),1,66);
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public void itfTblAssignUpload(Brand brand, Map<String, List<SysDictRef>> sysDictRefXLMapXq,
+    public Boolean itfTblAssignUpload(Brand brand, Map<String, List<SysDictRef>> sysDictRefXLMapXq,
                                            Long taskId, OutJiasmToGreeUploadTaskList sourceData, String newDykh,
                                            OutJiasmToGreeUploadTaskList row, OrderBase orderBase) {
         // 删除工单更新被忽略
         // 接收派工网点为空上传被忽略
         if (StringUtils.isEmpty(orderBase.getReceWebsitId()) || orderBase.getReceWebsitId().equals("0")){
             publicService.updateUploadTaskListStatus(row.getOrderNo(),row.getSynReqId(),1,66);
-            return ;
+            return Boolean.TRUE;
         }
         // 生成待同步的工单主表数据
         getItfTblAssignUpload(brand, sysDictRefXLMapXq, taskId, sourceData, newDykh, orderBase);
@@ -1042,10 +1044,11 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         generateMessage(brand, sourceData, newDykh, orderBase);
         // 检查附件完整性 未同步图片不处理本记录数据同步
         if (checkFile(sourceData.getOrderNo(),row.getSynReqId())){
-            return ;
+            return Boolean.TRUE;
         }
         // 处理采集明细数据(生成维修结算+生成维修现象数据)    TL_PrePareSynDataby_fa_order_repair_detail
         generateRepairDetailOrReason(brand, orderBase);
+        return Boolean.FALSE;
     }
 
     public Boolean dataInit(OutJiasmToGreeUploadTaskList sourceData, String newDykh, OrderBase orderBase) throws IOException {

src/main/java/com/zfire/jiasm/syncdata/service/impl/RepairProduceUploadListServiceImpl.java

@@ -337,8 +337,8 @@ public class RepairProduceUploadListServiceImpl implements RepairProduceUploadLi
 
             // 生成66类型上传任务数据
             // 单号，主键，同步任务生成时间，同步的表名，工单类型，任务类型
-            OutJiasmToGreeUploadTaskList add = publicService.getUploadTaskList(itemOrderNo, itemTableNameId,orderBase.getUpdateTime(), itemTableName,
-                    orderBase.getOrderType(),66);
+            OutJiasmToGreeUploadTaskList add = publicService.getUploadTaskList(itemOrderNo, itemTableNameId,
+                    orderBase.getUpdateTime(), itemTableName,orderBase.getOrderType(),66);
             ojtgutls.add(add);
 
             // 生成661类型上传任务数据