add

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

@@ -113,7 +113,6 @@ public class InstallProduceUploadListServiceImpl implements InstallProduceUpload
                         orderInformationProess(item, itemTableName, itemOrderNo, itemTableNameId);
                     }
                 } catch (Exception ex) {
-                    log.info("需要上传的工单数据 f ");
                     errorMessage = ex.getMessage();
                     updateError(errorMessage, item);
                 } finally {

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

@@ -41,8 +41,6 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
     private String baseurl4pgid;
     @Value("${baseurl}")
     private String baseurl;
-    @Value("${wxuploadyscc}")
-    private String wxuploadyscc = "";
 
 
 
@@ -139,10 +137,6 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
 
     @Override
     public void processRepairProduceDataUpload() throws Exception {
-        if (wxuploadyscc.equals(TaskConfigEnum.FALSE.getCode())){
-            return;
-        }
-
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         // 提取品牌信息
@@ -165,17 +159,10 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
             for (OutJiasmToGreeUploadTaskType taskType:taskTypes){
                 // 任务类型
                 int uploadTaskType = taskType.getUploadTaskType();
-                // 需从格力系统获取的列名
-                String greekeyName = taskType.getGreekeyName();
-                // 获取列名对应的表名
-                String srcTabNameForGreekey = taskType.getSrcTabNameForGreekey();
-                // 列名(greekeyName)的获取方式
-                String greekeyGetMode = taskType.getGreekeyGetMode();
-
-                String greeInsColList = (String) taskType.getGreeInsColList();
-                if (greeInsColList == null) {
-                    greeInsColList = "";
-                }
+                // 需从格力系统获取的列名 taskType.getGreekeyName();
+                // 获取列名对应的表名 taskType.getSrcTabNameForGreekey();
+                // 列名(greekeyName)的获取方式 taskType.getGreekeyGetMode();
+
                 // 2：数据上传任务清单表中提取对应任务类型的需要上传的数据
                 List<OutJiasmToGreeUploadTaskList> result = outJiasmToGreeUploadTaskListService.lambdaQuery()
                         .eq(OutJiasmToGreeUploadTaskList::getSynStatus,0)
@@ -195,9 +182,9 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
 
                         String newDykh = "";
                         // 需从格力总部获取相对列值  维修工单的pgid从格力总部获取
-                        if (greekeyName != null && greekeyName.trim().length() > 0 && srcTabNameForGreekey != null
-                                && srcTabNameForGreekey.trim().length() > 0) {
-                            newDykh = getpgid(token, uploadTaskType, srcTabNameForGreekey, greekeyGetMode, row, newDykh);
+                        if (taskType.getGreekeyName() != null && taskType.getGreekeyName().trim().length() > 0 &&
+                                taskType.getSrcTabNameForGreekey() != null && taskType.getSrcTabNameForGreekey().trim().length() > 0) {
+                            newDykh = getpgid(token, uploadTaskType, taskType.getSrcTabNameForGreekey(), taskType.getGreekeyGetMode(), row, newDykh);
                         }
 
                         // 过程名称，同步任务表中的id,同步任务表中的工单号，同步任务表中的需同步的表的主键，newDykh(pgid-主键)，true
@@ -1606,7 +1593,8 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         }
     }
 
-    private String getpgid(Token token, int uploadTaskType, String srcTabNameForGreekey, String greekeyGetMode, OutJiasmToGreeUploadTaskList row, String newDykh) throws Exception {
+    private String getpgid(Token token, int uploadTaskType, String srcTabNameForGreekey, String greekeyGetMode,
+                           OutJiasmToGreeUploadTaskList row, String newDykh) throws Exception {
         // 获取方式 Qry=从控制表获取 Ins=插入表获取自增列
         String greeKey;
         // 这里仅67满足

src/main/resources/bootstrap-dev.properties

@@ -383,7 +383,7 @@ tmscc=FALSE
 azuploadyscc=FALSE
 azuploadscc=TRUE
 #维修工单上传  生成需要上传的数据、生成上传任务清单列表
-wxuploadyscc=FALSE
+wxuploadyscc=TRUE
 wxuploadscc=FALSE
 #以旧换新 鉴定单、生成条码、条码上传
 yjhxjddc=FALSE