单据流转设置关联UUID，方便后续关联查询（单据编辑)

src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java

@@ -1,6 +1,7 @@
 package com.glxp.api.service.inout;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.UUID;
 import cn.hutool.core.util.StrUtil;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.ConstantStatus;
@@ -64,12 +65,11 @@ public class IoChangeInoutService {
         List<IoCodeEntity> codeEnttities = codeService.findByOrderId(orderEntity.getBillNo());
         if (basicBusTypePreEntity != null) {
             buildInOrder(basicBusTypePreEntity, codeEnttities, orderEntity);
-        }else {
+        } else {
             //结束，不生成库存，
         }
 
 
-
     }
 
 
@@ -141,6 +141,12 @@ public class IoChangeInoutService {
 
     //生成单据
     public void buildInOrder(BasicBusTypePreEntity bussinessChangeTypeEntity, List<IoCodeEntity> useInList, IoOrderEntity orderEntity) {
+
+
+        if (StrUtil.isEmpty(orderEntity.getRelKey())) {
+            orderEntity.setRelKey(UUID.fastUUID().toString(true));
+            orderService.update(orderEntity);
+        }
         if (useInList.size() <= 0) {
             return;
         }

src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java

@@ -1,6 +1,7 @@
 package com.glxp.api.service.inout;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.UUID;
 import cn.hutool.core.util.StrUtil;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.ConstantStatus;
@@ -716,6 +717,11 @@ public class IoCheckInoutService {
                 }
             }
             if (preInOrder.size() > 0) {
+
+                if (StrUtil.isEmpty(orderEntity.getRelKey())) {
+                    orderEntity.setRelKey(UUID.fastUUID().toString(true));
+                }
+
                 String preInBillNo = "";
                 boolean isBreak = false;
                 for (String key : preInOrder.keySet()) {
@@ -723,6 +729,7 @@ public class IoCheckInoutService {
                         preInBillNo = preInBillNo + "," + key;
                         IoOrderEntity preInEntity = orderService.findByBillNo(key);
                         preInEntity.setPreOutBillNo(orderEntity.getBillNo());
+                        preInEntity.setRelKey(orderEntity.getRelKey());
                         orderService.update(preInEntity);
                         BasicBussinessTypeEntity preBusType = basicBussinessTypeService.findByAction(preInEntity.getAction());
                         //预验收不删除单号，方便后续查询

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -703,28 +703,31 @@ public class IoOrderServiceImpl implements IoOrderService {
      * @return
      */
     private List<IoOrderEntity> getAllOrder(IoOrderEntity order) {
-        Set<String> billNos = new HashSet<>();
+//        Set<String> billNos = new HashSet<>();
-        billNos.add(order.getBillNo());
+//        billNos.add(order.getBillNo());
-
+
-        getLinkedBillNo(order.getBillNo(), billNos);
+
-
+        List<IoOrderEntity> orderEntities = orderDao.selectList(new QueryWrapper<IoOrderEntity>().eq("relKey", order.getRelKey()));
-        //去除本单的单据号
+
-        Iterator<String> iterator = billNos.iterator();
+//        getLinkedBillNo(order.getBillNo(), billNos);
-        while (iterator.hasNext()) {
+//
-            if (iterator.next().equals(order.getBillNo())) {
+//        //去除本单的单据号
-                iterator.remove();
+//        Iterator<String> iterator = billNos.iterator();
-                break;
+//        while (iterator.hasNext()) {
-            }
+//            if (iterator.next().equals(order.getBillNo())) {
-        }
+//                iterator.remove();
-
+//                break;
-        ArrayList<IoOrderEntity> orders = new ArrayList<>();
+//            }
-        if (CollUtil.isNotEmpty(billNos)) {
+//        }
-            List<IoOrderEntity> list = orderDao.selectList(new QueryWrapper<IoOrderEntity>().in("billNo", billNos).orderByDesc("id"));
+//
-            orders.addAll(list);
+//        ArrayList<IoOrderEntity> orders = new ArrayList<>();
-        }
+//        if (CollUtil.isNotEmpty(billNos)) {
+//            List<IoOrderEntity> list = orderDao.selectList(new QueryWrapper<IoOrderEntity>().in("billNo", billNos).orderByDesc("id"));
+//            orders.addAll(list);
+//        }
         //将查询入口单据放在第一位的顺序
-        orders.add(0, order);
+//        orders.add(0, order);
-        return orders;
+        return orderEntities;
     }
 
     /**