add

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

@@ -772,7 +772,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         for (OrderRepairDetailReason i: ordrs){
             // 生成维修项目现象数据
             ItfTblWxjsWxxmJyktUpload wxxm = generateItfTblWxjsWxxmJyktUpload(orderBase, i.getId());
-            // 生成维修项目现象2表数据
+            // 生成维修项目现象
             generateItfTblwxjswxxmjykt(j_syn_task_no, wxxm);
         }
         return false;
@@ -790,7 +790,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
     }
 
     public void generateItfTblwxjswxxmjykt(String j_syn_task_no, ItfTblWxjsWxxmJyktUpload wxxm) {
-        // 查看维修结算2表数据有无插入成功
+        // 维修结算表
         ItfTblwxjsjykt jskt = itfTblwxjsjyktService.lambdaQuery()
                 .eq(ItfTblwxjsjykt::getSynTaskNo, j_syn_task_no).one();
         if (jskt !=null){
@@ -1073,9 +1073,9 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
     }
 
     public Boolean dataInit(OutJiasmToGreeUploadTaskList sourceData, String newDykh, OrderBase orderBase) throws IOException {
-        // 同步工单的pgid,pguuid
+        // 同步工单的 OrderBase.pgid.pguuid
         upOrderBasePgid(orderBase, newDykh);
-        // 同步维修工单产品信息 pgid
+        // 同步维修工单产品信息 OrderProduct.pgid
         upOrderProduct(sourceData, newDykh);
         // 同步维修工单操作日志pgid
         uporderRepairOperatingLogpgid(sourceData, newDykh);
@@ -1086,16 +1086,16 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         // 修改序采集单内的序
         upOrderRepairDetail(orderBase.getId());
 
-        // 修改 wxjsmxguid
+        // 修改 OrderRepairDetail.wxjsmxguid
         updateOrderRepairDetailWxjsmxguid(orderBase);
 
-        // 采集明细表全表更新pgid = brand_pgid
+        // 采集明细表全表更新order_repair_detail.pgid = brand_pgid
         upBrandPgid(orderBase);
 
-        // 故障现象原因序
+        // 故障现象原因序 OrderRepairDetailReason.outid
         upOrderRepairDetailReasonOutId(orderBase.getId());
 
-        // 故障现象Xxyyguid主键 wxjsguid 自生成
+        // 故障现象Xxyyguid主键 wxjsguid ,wxxmguid自生成
         upOrderRepairDetailReasonSetOther(orderBase.getId());
 
         // 修改 维修现象主键、维修明细主键
@@ -1245,6 +1245,10 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
                 ite.setWxjsguid(publicService.getUUID());
                 f = Boolean.TRUE;
             }
+            if (StringUtils.isEmpty(ite.getWxxmguid())){
+                ite.setWxxmguid(publicService.getUUID());
+                f = Boolean.TRUE;
+            }
 
             if (f){
                 upList.add(ite);