1

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/SalesOrderController.java

@@ -140,8 +140,11 @@ public class SalesOrderController {
             List<Integer> productIds = orderProductDetails.stream().map(OrderProductDetail::getProductId).distinct().collect(Collectors.toList());
             productIds.add(-1);
             List<Product> productList = productService.list(new LambdaQueryWrapper<Product>().in(Product::getId, productIds));
+            //移除旧的数据进行更新
+            orderProductDetailService.remove(new LambdaQueryWrapper<OrderProductDetail>().eq(OrderProductDetail::getOrderId,order.getId()));
             if(orderProductDetails.size()>0){
                 for (OrderProductDetail orderProductDetail : orderProductDetails) {
+                    orderProductDetail.setId(null);
                     orderProductDetail.setOrderId(order.getId());
                     Optional<Product> first = productList.stream().filter(p -> p.getId().equals(orderProductDetail.getProductId())).findFirst();
                     if(first.isPresent()){
@@ -155,7 +158,7 @@ public class SalesOrderController {
                         }
                     }
                 }
-                orderProductDetailService.saveOrUpdateBatch(orderProductDetails);
+                orderProductDetailService.saveBatch(orderProductDetails);
             }
         }
         return msg;

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/SalesOrderServiceImpl.java

@@ -169,7 +169,8 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
             orderLambdaQueryWrapper.eq(SalesOrder::getReceivedStatus,receivedStatus);
         }
         if(!StringUtils.isEmpty(startTime)&&!StringUtils.isEmpty(endTime)){
-            orderLambdaQueryWrapper.lt(SalesOrder::getOrderStartDate,endTime).gt(SalesOrder::getOrderEndDate,startTime);
+//            orderLambdaQueryWrapper.lt(SalesOrder::getOrderStartDate,endTime).gt(SalesOrder::getOrderEndDate,startTime);
+            orderLambdaQueryWrapper.between(SalesOrder::getPlaceTime,startTime,endTime);
         }
         if(!StringUtils.isEmpty(orderName)){
             orderLambdaQueryWrapper.like(SalesOrder::getOrderName,orderName);