1.修复单据编辑更新库存信息的bug

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

@@ -190,6 +190,7 @@ public class IoOrderServiceImpl implements IoOrderService {
                 } else if (basicBussinessTypeEntity.isAdvanceType()) {
                     //是否寄售，删除寄售库存
                     List<InvPreProductDetailEntity> invProductDetailEntities = invPreProductDetailService.selectByOrderIdFk(billNo);
+                    if (CollUtil.isNotEmpty(invProductDetailEntities)) {
                         for (InvPreProductDetailEntity invProductDetailEntity : invProductDetailEntities) {
                             //更新库存
                             InvPreProductEntity invProductEntity = invPreProductService.selectByUnique(invProductDetailEntity.getRelId(), invProductDetailEntity.getBatchNo(), invProductDetailEntity.getSupId(), invProductDetailEntity.getDeptCode(), invProductDetailEntity.getInvCode());
@@ -201,16 +202,20 @@ public class IoOrderServiceImpl implements IoOrderService {
                                     int count = invProductEntity.getOutCount() - invProductDetailEntity.getReCount();
                                     invProductEntity.setOutCount(count);
                                 }
-                        }
+
+                                //计算实际数量
+                                invProductEntity.setReCount(invProductEntity.getInCount() - invProductEntity.getOutCount());
                                 invPreProductService.update(invProductEntity);
                             }
+
+                        }
                         //删除库存详情
                         invPreProductDetailService.deleteByOrderId(billNo);
-
+                    }
-
                 } else {
                     //删除普通库存
                     List<InvProductDetailEntity> invProductDetailEntities = invProductDetailService.selectByOrderIdFk(billNo);
+                    if (CollUtil.isNotEmpty(invProductDetailEntities)) {
                         for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) {
                             //更新库存
                             InvProductEntity invProductEntity = invProductService.selectByUnique(invProductDetailEntity.getRelId(), invProductDetailEntity.getBatchNo(), invProductDetailEntity.getSupId(), invProductDetailEntity.getDeptCode(), invProductDetailEntity.getInvCode());
@@ -222,14 +227,18 @@ public class IoOrderServiceImpl implements IoOrderService {
                                     int count = invProductEntity.getOutCount() - invProductDetailEntity.getReCount();
                                     invProductEntity.setOutCount(count);
                                 }
-                        }
+
+                                //计算实际数量
+                                invProductEntity.setReCount(invProductEntity.getInCount() - invProductEntity.getOutCount());
                                 invProductService.update(invProductEntity);
                             }
+                        }
                         //删除库存详情
                         invProductDetailService.deleteByOrderId(billNo);
                     }
                 }
             }
+        }
 
         return 0;
     }
@@ -680,11 +689,12 @@ public class IoOrderServiceImpl implements IoOrderService {
         }
 
         ArrayList<IoOrderEntity> orders = new ArrayList<>();
-        if (CollUtil.isNotEmpty(orders)) {
+        if (CollUtil.isNotEmpty(billNos)) {
             List<IoOrderEntity> list = orderDao.selectList(new QueryWrapper<IoOrderEntity>().in("billNo", billNos).orderByDesc("id"));
             orders.addAll(list);
         }
-        orders.add(order);
+        //将查询入口单据放在第一位的顺序
+        orders.add(0, order);
         return orders;
     }