add

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

@@ -159,15 +159,17 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     public Boolean upInit(@NotNull OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap, OrderBase orderBase) {
         List<OrderInstallDetail> details = new ArrayList<>();
         // 修改采集明细表与采集条码表ID OrderInstallDetail.pgwcmxid自生成
+        // OrderInstallDetail.outid.pgwcmxid
+        // OrderInstallDetailCode.outid
         upOutId(ojtutl.getId());
 
-        // 采集明细表中的pgguid 改成工单基础表的pgguid
+        // 采集明细表中的OrderInstallDetailCode.pgguid 改成工单基础表的pgguid
         upInstallDetailPgguid(orderBase);
 
-        // 修改采集明细的序 pgwcmxid(自生成) 生成格力总部-采集明细序号
+        // 修改采集明细的序 OrderInstallDetail.pgwcmxid(自生成) 生成格力总部-采集明细序号
         upPgwcmxid(ojtutl);
 
-        // 采集条码表中的pgguid 统一改成工单基础表的pgguid,tmguid自生成
+        // 采集条码表中的OrderInstallDetailCode.pgguid 统一改成工单基础表的pgguid,tmguid自生成
         upOrderInstallDetailCodePgguid(ojtutl, orderBase);
 
         // 特殊安装确认书图从采集明细表中移到附件表中
@@ -866,15 +868,23 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
     public void upOrderInstallDetailCodePgguid(@NotNull OutJiasmToGreeUploadTaskList ojtutl, OrderBase orderBase) {
         List<OrderInstallDetailCode> oidcsUp = new ArrayList<>();
+        Boolean f = Boolean.FALSE;
         List<OrderInstallDetailCode> oidcs = orderInstallDetailCodeService.lambdaQuery()
                 .eq(OrderInstallDetailCode::getOrderBaseId, ojtutl.getId())
-                .isNull(OrderInstallDetailCode::getPgguid)
                 .list();
-        if (com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(oidcs)){
+        if (CollectionUtils.isNotEmpty(oidcs)){
             for (OrderInstallDetailCode code:oidcs){
-                if (StringUtils.isEmpty(code.getPgguid()) || StringUtils.isEmpty(code.getTmguid())){
+                if (StringUtils.isEmpty(code.getPgguid())){
+                    f = Boolean.TRUE;
                     code.setPgguid(orderBase.getPgguid());
+
+                }
+                if (StringUtils.isEmpty(code.getTmguid())){
+                    f = Boolean.TRUE;
                     code.setTmguid(publicService.getUUID());
+                }
+
+                if (f){
                     oidcsUp.add(code);
                 }
             }
@@ -890,9 +900,8 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         List<OrderInstallDetail> upList = new ArrayList<>();
         List<OrderInstallDetail> detaillist = orderInstallDetailService.lambdaQuery()
                 .eq(OrderInstallDetail::getOrderBaseId, ojtutl.getId())
-                .isNull(OrderInstallDetail::getPgwcmxid)
                 .list();
-        if (com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(detaillist)){
+        if (CollectionUtils.isNotEmpty(detaillist)){
             for (OrderInstallDetail item:detaillist){
                 if (StringUtils.isEmpty(item.getPgwcmxid())){
                     item.setPgwcmxid(IdWorker.getIdStr());