add

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

@@ -1902,7 +1902,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                 .list();
         // 找出最大的序 默认值为0
         int outId=0;
-        if (CollectionUtils.isNotEmpty(detaillist) && CollectionUtils.isNotEmpty(oids)){
+        if (CollectionUtils.isNotEmpty(detaillist)){
             for (OrderInstallDetailCode item:detaillist){
                 if (outId<item.getOutId()){
                     outId = item.getOutId();
@@ -1910,8 +1910,10 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             }
             for (OrderInstallDetailCode ite:oids){
                 outId++;
-                ite.setOutId(outId);
-                upList.add(ite);
+                OrderInstallDetailCode n = new OrderInstallDetailCode();
+                MyBeanUtils.copyProperties(ite,n);
+                n.setOutId(outId);
+                upList.add(n);
             }
             // 修改序
             if (upList.size()>0){
@@ -1947,11 +1949,13 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             }
             for (OrderInstallDetail ite:oids){
                 outId++;
-                ite.setOutId(outId);
+                OrderInstallDetail n = new OrderInstallDetail();
+                MyBeanUtils.copyProperties(ite,n);
+                n.setOutId(outId);
                 // 修改首次提交时间
-                ite.setFirstTime(new Date());
-                ite.setPgwcmxid(IdWorker.getIdStr());
-                upList.add(ite);
+                n.setFirstTime(new Date());
+                n.setPgwcmxid(IdWorker.getIdStr());
+                upList.add(n);
             }
             // 修改序
             if (upList.size()>0){

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

@@ -458,8 +458,18 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
 
     public void upOrderProductOutId(OutJiasmToGreeUploadTaskList sourceData) {
         List<OrderProduct> upList = new ArrayList<>();
+        // 查看是否有需要修改的数据
+        List<OrderProduct> ops = orderProductService.lambdaQuery()
+                .eq(OrderProduct::getOrderBaseId, sourceData.getOrderNo())
+                .eq(OrderProduct::getOutId, 0)
+                .list();
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(ops)){
+            return;
+        }
+
         List<OrderProduct> oplist = orderProductService.lambdaQuery()
                 .eq(OrderProduct::getOrderBaseId, sourceData.getOrderNo())
+                .ne(OrderProduct::getOutId, 0)
                 .orderByAsc(OrderProduct::getCreateTime).list();
         // 找出最大的序 默认值为0
         int outId=0;
@@ -469,15 +479,13 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
                     outId = item.getOutId();
                 }
             }
-            for (OrderProduct ite:oplist){
-                if (ite.getOutId() == 0){
-                    outId++;
-                    OrderProduct n = new OrderProduct();
-                    n.setId(ite.getId());
-                    n.setOutId(outId);
-                    n.setUpdateTime(new Date());
-                    upList.add(n);
-                }
+            for (OrderProduct ite:ops){
+                outId++;
+                OrderProduct n = new OrderProduct();
+                MyBeanUtils.copyProperties(ite,n);
+                n.setOutId(outId);
+                n.setUpdateTime(new Date());
+                upList.add(n);
             }
             // 修改序
             if (upList.size()>0){