add

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

@@ -169,11 +169,17 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
         // 特殊安装确认书图从采集明细表中移到附件表中
         addTSHJP(ojtutl, orderBase);
+        log.info("工单 A ：{}",orderBase.getId());
+
         // 上传附件表图片信息
         if (uploadOrderDetailFile(ojtutl, CategoryRefmap, orderBase)){
             publicService.updateUploadTaskLisError(ojtutl,"上传附件表图片信息出错");
+
+            log.info("工单 B ：{}",orderBase.getId());
             return Boolean.FALSE;
         }
+
+        log.info("工单 c ：{}",orderBase.getId());
         // 管理端采集的条码图并没全部给到采集条码表中，这里需要转移到采集条码表中
         details = orderInstallDetailService.lambdaQuery()
                 .eq(OrderInstallDetail::getOrderBaseId, orderBase.getId())
@@ -186,7 +192,6 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         return checkOrderDetailFile(ojtutl);
     }
 
-    @NotNull
     public Boolean checkOrderDetailFile(@NotNull OutJiasmToGreeUploadTaskList ojtutl) {
         List<OrderDetailFile> detailFiles = new ArrayList<>();
         Boolean flag = Boolean.TRUE;
@@ -283,8 +288,6 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                 .one();
 
         if (orderBase !=null  && orderBase.getUploadFlag()){
-
-
             log.info("生成数据前取工单状态值："+ orderBase.getId()+">"+orderBase.getOrderStatus());
 
             // 安装工单产品信息,操作日志,完工明细,完工明细附件
@@ -292,8 +295,11 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             upPgguid(orderBase);
             // 初始化数据
             if (!upInit(ojtutl, CategoryRefmap, orderBase)){
+                log.info("工单 d ：{}",orderBase.getId());
                 return Boolean.FALSE;
             }
+
+            log.info("工单 e ：{}",orderBase.getId());
         }
         return orderInstallCjOrWg(cjOrWg, brand, ojtutl, CategoryRefmap,orderBase);
     }
@@ -735,6 +741,9 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             case 44:
                 result = 8;
                 break;
+            default:
+                result = type;
+                break;
         }
         return result;
     }