add

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

@@ -320,10 +320,10 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
                                  List<ItfTblAssignFkmxDownload> fkmxd, List<ItfTblAssignSatisfactionDownload> pjups,
                                  List<OrderAppeal> orderAppeal, List<OrderAppraise> oanew, List<FaGreeSms> faGreeSms,
                                  List<OrderInformation> oilist, List<OrderInformation> oilistUp, List<ItfTblAssignAppointmentDownload> upappointds) {
-        if (addmx.size()>0){
+        /*if (addmx.size()>0){
             orderProductService.saveBatch(addmx);
             addmx.clear();
-        }
+        }*/
         if (upMxd.size()>0){
             itfTblAssignMxDownloadService.updateBatchById(upMxd);
             upMxd.clear();

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

@@ -498,12 +498,14 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
                 return Boolean.FALSE;
             }
 
-            // 采集表与采集条码表ID超范围 - 采集表及采集条码明细表中的outid统一修改
+            // 修改采集明细表与采集条码表ID超范围 - 采集表及采集条码明细表中的outid统一修改
+            // 修改采集明细表与采集条码表 outid 依采集明细表的outid为准
             orderBaseInstallCjOrWgService.upOutId(ojtutl.getId());
-            // 采集表中的pgguid 统一改成工单基础表的pgguid
+
+            // 采集明细表中的pgguid 改成工单基础表的pgguid
             upInstallDetailPgguid(orderBase);
 
-            // 修改采集明细的序 pgwcmxid 生成格力总部-采集明细序号
+            // 修改采集明细的序 pgwcmxid(自生成) 生成格力总部-采集明细序号
             upPgwcmxid(ojtutl);
         }
 

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

@@ -973,12 +973,18 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     @Override
     public void upOutId(String orderBaseId) {
         List<OrderInstallDetail> upList = new ArrayList<>();
+        // 查看是否有需要修改的数据
+        List<OrderInstallDetail> oids = orderInstallDetailService.lambdaQuery()
+                .eq(OrderInstallDetail::getOrderBaseId, orderBaseId)
+                .eq(OrderInstallDetail::getOutId, 0)
+                .list();
+
         List<OrderInstallDetail> detaillist = orderInstallDetailService.lambdaQuery()
                 .eq(OrderInstallDetail::getOrderBaseId, orderBaseId)
                 .list();
         // 找出最大的序 默认值为0
         int outId=0;
-        if (CollectionUtils.isNotEmpty(detaillist)){
+        if (CollectionUtils.isNotEmpty(detaillist) && CollectionUtils.isNotEmpty(oids)){
             for (OrderInstallDetail item:detaillist){
                 if (outId<item.getOutId()){
                     outId = item.getOutId();
@@ -1002,7 +1008,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             detaillist.clear();
         }
 
-        // 采集条码码 outid统一修改
+        // 采集条码码 outid统一修改 依采集明细表的outid为准
         // 采集表与采集条码表ID超范围 - 采集表及采集明细表中的outid统一修改
         List<OrderInstallDetailCode> codelist = orderInstallDetailCodeService.lambdaQuery()
                 .eq(OrderInstallDetailCode::getOrderBaseId, orderBaseId)

src/main/resources/bootstrap-dev.properties

@@ -291,7 +291,7 @@ installdownc=FALSE
 installinc=FALSE
 #维修工单下载、入本地表
 repairdownc=FALSE
-repairinc=TRUE
+repairinc=FALSE
 #回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表
 recycledownc=FALSE
 recyclefkdownc=FALSE

src/main/resources/bootstrap.properties

@@ -1,4 +1,4 @@
-spring.profiles.active=dev
+spring.profiles.active=test
 spring.application.name=jiasm-syncdata
 spring.main.allow-bean-definition-overriding=true
 # 修改线程池的拒绝策略