yaozhixue 1 year ago
parent
commit
8680a011cd

+ 1 - 0
src/main/java/com/zfire/jiasm/syncdata/download/order/RepairBusinessApi.java

@@ -81,6 +81,7 @@ public class RepairBusinessApi {
         // 提取待落本地表的数据
         repairRec = itfTblAssignDownloadService.lambdaQuery()
                 .eq(ItfTblAssignDownload::getSynStatus, 0)
+                // .eq(ItfTblAssignDownload::getSynReqId, 1359)// 测试使用
                 .lt(ItfTblAssignDownload::getSynTimes, 6)
                 .orderByAsc(ItfTblAssignDownload::getSynReqId)
                 .list();

+ 5 - 5
src/main/java/com/zfire/jiasm/syncdata/service/impl/AddRepairBusinessServiceImpl.java

@@ -281,7 +281,7 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
     }
 
     @NotNull
-    private Boolean updateRepairApi(ItfTblAssignDownload item, List<OrderProduct> addmx, List<ItfTblAssignMxDownload> upMxd,
+    public Boolean updateRepairApi(ItfTblAssignDownload item, List<OrderProduct> addmx, List<ItfTblAssignMxDownload> upMxd,
                                     List<OrderRepairOperatingLog> orols, List<ItfTblAssignFkmxDownload> fkmxd,
                                     List<ItfTblAssignSatisfactionDownload> pjups, List<OrderAppeal> orderAppeal,
                                     List<OrderAppraise> oanew, List<FaGreeSms> faGreeSms, List<OrderInformation> oilist,
@@ -298,9 +298,9 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
 
         // 工单主表、机型、辅材、清洗、预约改约记录、师傅、创建日志、生成采集数据不要
         getOrderApi(item, addmx, order, orderWorker, or, orderApi, orderProductList, orderMaterialList, orderCleanItems,flag);
-        // log.info("request:{}", JSONObject.toJSONString(order));
+        log.info("修改维修工单 request:{}", JSONObject.toJSONString(order));
         ResponseHelper respone = jiasmApi.orderAdd(orderApi);
-        // log.info("respone:{}", JSONObject.toJSONString(respone));
+        log.info("修改维修工单 respone:{}", JSONObject.toJSONString(respone));
         if (respone.getCode()==200){
             // 同步更新状态
             updateSynStatus(addmx, upMxd, orols, fkmxd, pjups, orderAppeal, oanew, faGreeSms, oilist, oilistUp, upappointds);
@@ -2521,7 +2521,7 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
 
     }
 
-    private void generateMxUpdateApi(Brand brand, ItfTblAssignDownload item, OrderBase order,
+    public void generateMxUpdateApi(Brand brand, ItfTblAssignDownload item, OrderBase order,
                                   Map<String, List<SysDictRef>> sysDictRefDLMap,
                                   Map<String, List<SysDictRef>> sysDictRefXLMap,
                                   Map<String, List<SysDictRef>> sysDictRefXiLieMap,
@@ -2532,7 +2532,7 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
         // 提取明细表数据
         mxRec = itfTblAssignMxDownloadService.lambdaQuery()
                 .eq(ItfTblAssignMxDownload::getDownloadTaskNo, item.getDownloadTaskNo())
-                .eq(ItfTblAssignMxDownload::getSynStatus,0)
+                // .eq(ItfTblAssignMxDownload::getSynStatus,0)
                 .orderByAsc(ItfTblAssignMxDownload::getSynStatus)
                 .list();
 

+ 2 - 2
src/main/resources/bootstrap-dev.properties

@@ -291,7 +291,7 @@ installdownc=FALSE
 installinc=FALSE
 #维修工单下载、入本地表
 repairdownc=FALSE
-repairinc=FALSE
+repairinc=TRUE
 #回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表
 recycledownc=FALSE
 recyclefkdownc=FALSE
@@ -322,7 +322,7 @@ fsxwxgc=FALSE
 fsswxgc=FALSE
 gzxwxgc=FALSE
 gzswxgc=FALSE
-gfwwwc=TRUE
+gfwwwc=FALSE
 #类别大类、小类、系列、机型
 lbdlc=FALSE
 lbxlc=FALSE