add

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

@@ -190,7 +190,7 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
                         .eq(OutJiasmToGreeUploadTaskList::getUploadTaskType,uploadTaskType)
 
                         // .eq(OutJiasmToGreeUploadTaskList::getSynReqId,24157) // 测试用
-                        .ne(OutJiasmToGreeUploadTaskList::getOrderNo,"A1690989338035544065") // 测试用
+                        // .eq(OutJiasmToGreeUploadTaskList::getOrderNo,"A1690989338035544065") // 测试用
                         // .eq(OutJiasmToGreeUploadTaskList::getTableName,"order_base") // 测试用
 
                         .lt(OutJiasmToGreeUploadTaskList::getSynTimes,10)

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

@@ -147,8 +147,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                 return Boolean.FALSE;
             }
 
-            // 修改采集明细表与采集条码表ID超范围 - 采集表及采集条码明细表中的outid统一修改
-            // 修改采集明细表与采集条码表 outid 依采集明细表的outid为准
+            // 修改采集明细表与采集条码表ID
             upOutId(ojtutl.getId());
 
             // 采集明细表中的pgguid 改成工单基础表的pgguid
@@ -169,7 +168,6 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             for (OrderInstallDetail detail:details){
                 upCodep(detail);
             }
-            return Boolean.FALSE;
         }
 
         return orderBaseInstallProc(brand, ojtutl, CategoryRefmap, orderBase);
@@ -1686,6 +1684,59 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
     @Override
     public void upOutId(String orderBaseId) {
+
+        upOrderInstallDetailOutId(orderBaseId);
+
+        upOrderInstallDetailCodeOutId(orderBaseId);
+
+    }
+
+    private void upOrderInstallDetailCodeOutId(String orderBaseId) {
+        // 采集条码码 outid统一修改 自生成
+        List<OrderInstallDetailCode> codelist = orderInstallDetailCodeService.lambdaQuery()
+                .eq(OrderInstallDetailCode::getOrderBaseId, orderBaseId)
+                .eq(OrderInstallDetailCode::getOutId,0).list();
+        if (CollectionUtils.isNotEmpty(codelist)){
+            InstalDetailCode codep = new InstalDetailCode();
+            codep.setOrderNo(orderBaseId);
+            codeOrderInstallDetailMapper.updateCodeOutId(codep);
+        }
+
+        List<OrderInstallDetailCode> upList = new ArrayList<>();
+        // 查看是否有需要修改的数据
+        List<OrderInstallDetailCode> oids = orderInstallDetailCodeService.lambdaQuery()
+                .eq(OrderInstallDetailCode::getOrderBaseId, orderBaseId)
+                .eq(OrderInstallDetailCode::getOutId, 0)
+                .list();
+
+        List<OrderInstallDetailCode> detaillist = orderInstallDetailCodeService.lambdaQuery()
+                .eq(OrderInstallDetailCode::getOrderBaseId, orderBaseId)
+                .list();
+        // 找出最大的序 默认值为0
+        int outId=0;
+        if (CollectionUtils.isNotEmpty(detaillist) && CollectionUtils.isNotEmpty(oids)){
+            for (OrderInstallDetailCode item:detaillist){
+                if (outId<item.getOutId()){
+                    outId = item.getOutId();
+                }
+            }
+            for (OrderInstallDetailCode ite:detaillist){
+                if (ite.getOutId() == 0){
+                    outId++;
+                    ite.setOutId(outId);
+                    upList.add(ite);
+                }
+            }
+            // 修改序
+            if (upList.size()>0){
+                orderInstallDetailCodeService.updateBatchById(upList);
+                upList.clear();
+            }
+            detaillist.clear();
+        }
+    }
+
+    private void upOrderInstallDetailOutId(String orderBaseId) {
         List<OrderInstallDetail> upList = new ArrayList<>();
         // 查看是否有需要修改的数据
         List<OrderInstallDetail> oids = orderInstallDetailService.lambdaQuery()
@@ -1721,17 +1772,6 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             }
             detaillist.clear();
         }
-
-        // 采集条码码 outid统一修改 依采集明细表的outid为准
-        // 采集表与采集条码表ID超范围 - 采集表及采集明细表中的outid统一修改
-        List<OrderInstallDetailCode> codelist = orderInstallDetailCodeService.lambdaQuery()
-                .eq(OrderInstallDetailCode::getOrderBaseId, orderBaseId)
-                .eq(OrderInstallDetailCode::getOutId,0).list();
-        if (CollectionUtils.isNotEmpty(codelist)){
-            InstalDetailCode codep = new InstalDetailCode();
-            codep.setOrderNo(orderBaseId);
-            codeOrderInstallDetailMapper.updateCodeOutId(codep);
-        }
     }
 
     private void setJysWdno(OrderBase orderBase, ItfTblAzWgmxJyktUpload mxup) {