add

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

@@ -289,7 +289,10 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         if (orderBase !=null  && orderBase.getUploadFlag()){
             // 修改内部序列outid
             upOutId(orderBase);
-
+            // 无pgid时先不同步待工单主表同步后再同步
+            if (StringUtils.isEmpty(orderBase.getPgid())){
+                return;
+            }
             ReAppointment request = new ReAppointment();
             request.setOrderNo(ojtutl.getOrderNo());
             request.setId(ojtutl.getId());
@@ -324,6 +327,9 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
                     n.setId(ite.getId());
                     n.setOutId(outId);
                     n.setUpdateTime(new Date());
+                    if (StringUtils.isNotEmpty(orderBase.getPgid())){
+                        n.setPgid(orderBase.getPgid());
+                    }
                     upList.add(n);
                 }
             }
@@ -1954,21 +1960,16 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         // 这里仅67满足
         if (greekeyGetMode != null && greekeyGetMode.equalsIgnoreCase("Ins")) {
             Long pgid = null;
-            if (uploadTaskType == 67 || uploadTaskType == 230) {
+            if (uploadTaskType == 67) {
                 // 提取工单数据 取pgid
                 OrderBase orderBase = orderBaseService.lambdaQuery()
                         .eq(OrderBase::getId, row.getOrderNo()).one();
                 if (StringUtils.isNotEmpty(orderBase.getPgid())){
-                    pgid = Long.valueOf(orderBase.getPgid());
-                }
-                if (uploadTaskType == 67){
                     OrderPar request = new OrderPar();
                     request.setPgid(orderBase.getPgid());
                     request.setOrderNo(row.getOrderNo());
                     repairLogMapper.upRepairLogPgid(request);
-                }
-                if (uploadTaskType == 230){
-                    log.info("查看工单的pggid:{}",JSONObject.toJSONString(orderBase));
+                    pgid = Long.valueOf(orderBase.getPgid());
                 }
             }
             if (pgid == null || pgid.toString().equals("0")) {