add

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

@@ -556,14 +556,16 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
         List<OrderDetailFile> detailFiles = new ArrayList<>();
         installCJDetailFile.setOrderNo(ojtutl.getId());
         detailFiles = orderDetailFileService.lambdaQuery()
-                .eq(OrderDetailFile::getOrderBaseId, ojtutl.getId())
-                .eq(OrderDetailFile::getBrandFilePath,"").list();
+                .eq(OrderDetailFile::getOrderBaseId, ojtutl.getId()).list();
         for (OrderDetailFile file:detailFiles){
             // 工单号， file的id即附件表的id,uuid统一值
             // path未准备上传被忽略
             if (StringUtils.isEmpty(file.getFilePath())){
                 continue;
             }
+            if (StringUtils.isNotEmpty(file.getBrandFilePath())){
+                continue;
+            }
             // 品牌方fileindex未获取上传被忽略
             if (StringUtils.isEmpty(file.getBrandFilePath())){
                 // 上传图片

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

@@ -169,17 +169,11 @@ 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())
@@ -294,11 +288,8 @@ 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);
     }
@@ -797,16 +788,12 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
     public Boolean uploadOrderDetailFile(@NotNull OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap, OrderBase orderBase) {
         try{
-            log.info("工单 A1 ：{}",orderBase.getId());
             // 修改序 outid
             upOrderDetailFileOutId(ojtutl);
-            log.info("工单 A2 ：{}",orderBase.getId());
             // 上传图片
             uploadOrderDetailFilePiture(ojtutl, CategoryRefmap, orderBase);
-            log.info("工单 A3 ：{}",orderBase.getId());
             return Boolean.FALSE;
         } catch (Exception ex) {
-            log.info("工单 A5 ：{}",orderBase.getId());
             return Boolean.TRUE;
         }
     }
@@ -819,22 +806,19 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         InstallCJDetailFile installCJDetailFile = new InstallCJDetailFile();
         List<OrderDetailFile> detailFiles = new ArrayList<>();
         installCJDetailFile.setOrderNo(ojtutl.getId());
-        detailFiles = orderDetailFileService.lambdaQuery()
-                .eq(OrderDetailFile::getOrderBaseId, ojtutl.getId())
-                .eq(OrderDetailFile::getBrandFilePath,"").list();
 
-        log.info("工单 a detailFiles ：{}",detailFiles.size());
         detailFiles = orderDetailFileService.lambdaQuery()
                 .eq(OrderDetailFile::getOrderBaseId, ojtutl.getId()).list();
 
-        log.info("工单 b detailFiles ：{}",detailFiles.size());
-
         for (OrderDetailFile file:detailFiles){
             // 工单号， file的id即附件表的id,uuid统一值
             // path未准备上传被忽略
             if (StringUtils.isEmpty(file.getFilePath())){
                 continue;
             }
+            if (StringUtils.isNotEmpty(file.getBrandFilePath())){
+                continue;
+            }
             // 品牌方fileindex未获取上传被忽略
             if (StringUtils.isEmpty(file.getBrandFilePath())){
                 // 上传图片

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

@@ -1049,8 +1049,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         List<OrderDetailFile> detailFiles = new ArrayList<>();
         Boolean flag = Boolean.TRUE;
         detailFiles = orderDetailFileService.lambdaQuery()
-                .eq(OrderDetailFile::getOrderBaseId, id)
-                .eq(OrderDetailFile::getBrandFilePath,"").list();
+                .eq(OrderDetailFile::getOrderBaseId, id).list();
         for (OrderDetailFile file:detailFiles){
             // 工单号， file的id即附件表的id,uuid统一值
             // path未准备上传被忽略