yaozhixue vor 1 Jahr
Ursprung
Commit
e7bcd47883

+ 0 - 1
src/main/java/com/zfire/jiasm/syncdata/service/impl/InstallProduceDataUploadServiceImpl.java

@@ -210,7 +210,6 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
                                 if (!orderBaseInstallCjOrWgService.orderBaseInstall(brand, ojtutl, CategoryRefmap)) {
                                     continue;
                                 }
-                                return ;
                             } else if (uploadTaskType==221 || uploadTaskType==222){
                                 cjOrWg="cj";
                                 if (uploadTaskType==222) {

+ 4 - 7
src/main/java/com/zfire/jiasm/syncdata/service/impl/OrderBaseInstallCjOrWgServiceImpl.java

@@ -131,8 +131,6 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
 
 
-
-
     @Override
     public boolean orderBaseInstall(Brand brand, @NotNull OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap){
         OrderBase orderBase = orderBaseService.lambdaQuery()
@@ -301,7 +299,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     }
 
 
-    private Boolean getPJmessage(OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls,Brand brand) {
+    public Boolean getPJmessage(OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls,Brand brand) {
         WebsitSH websitSH = new WebsitSH();
 
         // 生成评价短信 不能写在产品中要写在表头,只写一次 派工状态为4(1304,1309与工单状态相同) 完工或已关闭的单
@@ -394,13 +392,13 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                         continue;
                     }
 
-                    // 获取完工采集明细数据 (家用空调、商用空调、其他)
+                    // 获取完工采集明细数据 (家用空调、商用空调、其他) 内外机条码在这里生成
                     getCJMXData(brand, orderBase, lcls, detail,mainName);
 
-                    // 获取采集附件数据 (家用、商用、其他)
+                    // 获取采集附件数据 (家用、商用、其他)  显示的图片信息在这里生成
                     getcjfjdata(orderBase, detail, mainName);
 
-                    // 生成条码明细数据
+                    // 生成条码明细数据 这里好像并没用可以去掉
                     getDetailCode(orderBase, detail, mainName);
                 }
             }
@@ -490,7 +488,6 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         }
     }
 
-    @Nullable
     public void getCJMXData(Brand brand, OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls,
                              OrderInstallDetail detail,String mainName) {
 

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

@@ -1058,7 +1058,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
     }
 
 
-    private void generateRepairDetailOrReason(Brand brand, OrderBase orderBase) {
+    public void generateRepairDetailOrReason(Brand brand, OrderBase orderBase) {
         List<ItfTblWxjsJyktUpload> jykts = new ArrayList<>();
         List<ItfTblWxjsXxyyJyktUpload>  jyktus = new ArrayList<>();
         List<ItfTblWxjsFjJyktUpload> fjs = new ArrayList<>();
@@ -1539,7 +1539,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         outJiasmToGreeUploadTaskListService.updateById(upoutgultl);
     }
 
-    private void getItfTblAssignUpload(Brand brand, Map<String, List<SysDictRef>> sysDictRefXLMapXq, Long taskId, OutJiasmToGreeUploadTaskList sourceData, String newDykh, OrderBase orderBase) {
+    public void getItfTblAssignUpload(Brand brand, Map<String, List<SysDictRef>> sysDictRefXLMapXq, Long taskId, OutJiasmToGreeUploadTaskList sourceData, String newDykh, OrderBase orderBase) {
         /*// 同步工单的pgid
         upOrderBasePgid(sourceData, orderBase, newDykh);
         // 同步工单的pguuid
@@ -1597,7 +1597,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         faGreeSmsWorkerService.update(up,upWrapper);
     }
 
-    private void generateMessage(Brand brand, OutJiasmToGreeUploadTaskList sourceData, String newDykh, OrderBase orderBase) {
+    public void generateMessage(Brand brand, OutJiasmToGreeUploadTaskList sourceData, String newDykh, OrderBase orderBase) {
         WebsitSH websitSH = new WebsitSH();
 
         if ((orderBase.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G8.getCode()) ||