add

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

@@ -147,6 +147,8 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
     ItfTblAzAssignXzydUploadService itfTblAzAssignXzydUploadService;
     @Resource
     OrderService orderService;
+    @Resource
+    OrderReAppointmentService orderReAppointmentService;
 
 
 
@@ -416,7 +418,12 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
                 .eq(OrderBase::getId, ojtutl.getOrderNo())
                 .last("limit 1")
                 .one();
-        if (orderBase !=null  && orderBase.getUploadFlag()){
+        // 待审批改约时不同步处理
+        OrderReAppointment itau = orderReAppointmentService.lambdaQuery()
+                .eq(OrderReAppointment::getId,ojtutl.getId())
+                .last("limit 1").one();
+
+        if (orderBase !=null  && orderBase.getUploadFlag() && itau.getExamineStatus().equals("OK")){
             ReAppointment request = new ReAppointment();
             request.setOrderNo(ojtutl.getOrderNo());
             request.setId(ojtutl.getId());

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

@@ -293,7 +293,12 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
                 .last("limit 1")
                 .one();
 
-        if (orderBase !=null  && orderBase.getUploadFlag()){
+        // 待审批改约时不同步处理
+        OrderReAppointment itau = orderReAppointmentService.lambdaQuery()
+                .eq(OrderReAppointment::getId,ojtutl.getId())
+                .last("limit 1").one();
+
+        if (orderBase !=null  && orderBase.getUploadFlag() && itau.getExamineStatus().equals("OK")){
             // 修改内部序列outid
             upOutId(orderBase);
             // 无pgid时先不同步待工单主表同步后再同步