add

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

@@ -189,7 +189,7 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
                         .eq(OutJiasmToGreeUploadTaskList::getSynStatus,0)
                         .eq(OutJiasmToGreeUploadTaskList::getUploadTaskType,uploadTaskType)
 
-                        // .eq(OutJiasmToGreeUploadTaskList::getSynReqId,1006L) // 测试用
+                        // .eq(OutJiasmToGreeUploadTaskList::getSynReqId,1019L) // 测试用
                         // .eq(OutJiasmToGreeUploadTaskList::getOrderNo,"A1691659257781723138") // 测试用
                         // .eq(OutJiasmToGreeUploadTaskList::getTableName,"order_base") // 测试用
 
@@ -215,8 +215,10 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
                             } else if (uploadTaskType==221 || uploadTaskType==222){
                                 // 报完工这里执行
                                 cjOrWg="cj";
+                                uploadTaskType = 221;
                                 if (uploadTaskType==222) {
                                     cjOrWg = "wg";
+                                    uploadTaskType = 222;
                                 }
                                 if (!orderBaseInstallCjOrWgService.orderBaseInstallCjOrWg(cjOrWg, brand, ojtutl, CategoryRefmap)) {
                                     continue;

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

@@ -156,7 +156,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
     public Boolean upInit(@NotNull OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap, OrderBase orderBase) {
         List<OrderInstallDetail> details = new ArrayList<>();
-        // 修改采集明细表与采集条码表ID
+        // 修改采集明细表与采集条码表ID OrderInstallDetail.pgwcmxid自生成
         upOutId(ojtutl.getId());
 
         // 采集明细表中的pgguid 改成工单基础表的pgguid
@@ -416,7 +416,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                     // 状态:3=临时保存;2=作废,1=已采集,0=未采集
                     // 临时保存与未采集的记录不处理
                     if (detail.getStatus().equals(0) || detail.getStatus().equals(3)){
-                        continue;
+                        break;
                     }
 
                     // 获取完工采集明细数据 (家用空调、商用空调、其他) 内外机条码在这里生成
@@ -984,6 +984,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     @Transactional(rollbackFor = Exception.class)
     public Boolean orderInstallCjOrWg(String cjOrWg, Brand brand, OutJiasmToGreeUploadTaskList ojtutl,
                                       Map<String, List<SysDictRef>> CategoryRefmap, OrderBase orderBase){
+        // TL_fa_order_install_js
         if (orderBase !=null  && orderBase.getUploadFlag()){
             // 生成待同步的安装工单主表
             ItfTblAzAssignLcLsUpload lcls = getItfTblAzAssignLcLsUpload(brand, orderBase);
@@ -996,11 +997,16 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             List<OrderInstallDetail> details = orderInstallDetailService.lambdaQuery()
                     .eq(OrderInstallDetail::getOrderBaseId, orderBase.getId())
                     .list();
+            // TL_fa_order_install_detail_js
             for (OrderInstallDetail detail:details){
                 // 状态:3=临时保存;2=作废,1=已采集,0=未采集
                 if ((detail.getStatus().equals(1) || detail.getStatus().equals(2)) &&
                         (("cj".equals(cjOrWg) && detail.getIsCjSend().equals("NO")) ||
                                 ("wg".equals(cjOrWg) && detail.getIsWgSend().equals("NO")))) {
+
+log.info("测试信息a   id={} - {}",ojtutl.getSynReqId());
+
+
                     // 生成taskno,pgwcmxid 共用
                     String taskno = IdWorker.getIdStr();
 
@@ -1019,8 +1025,8 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                 }
             }
         }
-        // 修改数据上传任务表中的状态   这里固定值 221
-        publicService.updateUploadTaskListStatus(ojtutl.getOrderNo(),ojtutl.getSynReqId(),1,221);
+        // 修改数据上传任务表中的状态
+        publicService.updateUploadTaskListStatus(ojtutl.getOrderNo(),ojtutl.getSynReqId(),1,ojtutl.getUploadTaskType());
 
         return Boolean.TRUE;
     }
@@ -1135,6 +1141,9 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                 }
             }
         }
+
+        log.info("测试信息b   id={} - {}",ojtutl.getSynReqId());
+
         return Boolean.TRUE;
     }
 
@@ -1976,7 +1985,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                 n.setOutId(outId);
                 // 修改首次提交时间
                 n.setFirstTime(new Date());
-                n.setPgwcmxid(IdWorker.getIdStr());
+                n.setPgwcmxid(UUID.randomUUID().toString());
                 upList.add(n);
             }
             // 修改序