add

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

@@ -29,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.io.File;
+import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
 import java.util.*;
 
@@ -171,8 +172,12 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
         log.info("eee");
         // 上传附件表图片信息
-        uploadOrderDetailFile(ojtutl, CategoryRefmap, orderBase);
+        if (uploadOrderDetailFile(ojtutl, CategoryRefmap, orderBase)){
+            return Boolean.FALSE;
+        }
+
         log.info("fff");
+
         // 管理端采集的条码图并没全部给到采集条码表中，这里需要转移到采集条码表中
         details = orderInstallDetailService.lambdaQuery()
                 .eq(OrderInstallDetail::getOrderBaseId, orderBase.getId())
@@ -285,20 +290,11 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             // 安装工单产品信息,操作日志,完工明细,完工明细附件
             // 预约改约-总部短信发送请求表,派服务人员-短信发送请求表 以主表的pgguid统一修改
             upPgguid(orderBase);
-
-            log.info("ccc");
             // 初始化数据
             if (!upInit(ojtutl, CategoryRefmap, orderBase)){
-
-                log.info("ddd");
                 return Boolean.FALSE;
             }
         }
-
-
-        log.info("ggg");
-
-
         return orderInstallCjOrWg(cjOrWg, brand, ojtutl, CategoryRefmap,orderBase);
     }
 
@@ -791,13 +787,16 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         return Boolean.TRUE;
     }
 
-    public void uploadOrderDetailFile(@NotNull OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap, OrderBase orderBase) {
-
-        // 修改序 outid
-        upOrderDetailFileOutId(ojtutl);
-
-        // 上传图片
-        uploadOrderDetailFilePiture(ojtutl, CategoryRefmap, orderBase);
+    public Boolean uploadOrderDetailFile(@NotNull OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap, OrderBase orderBase) {
+        try{
+            // 修改序 outid
+            upOrderDetailFileOutId(ojtutl);
+            // 上传图片
+            uploadOrderDetailFilePiture(ojtutl, CategoryRefmap, orderBase);
+            return Boolean.FALSE;
+        } catch (Exception ex) {
+            return Boolean.TRUE;
+        }
     }
 
     public void uploadOrderDetailFilePiture(@NotNull OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap, OrderBase orderBase) {