blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
2025-07-17 0fc6a5ac6b228b432a48a267a4bfd0cb38116bae 
 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java


@@ -11,7 +11,6 @@


import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;


import com.example.erp.common.Constants;


import com.example.erp.dto.sd.OrderDTO;


import com.example.erp.dto.sd.OrderDetailProductDTO;


import com.example.erp.dto.sd.OrderSearchDTO;


import com.example.erp.entity.sd.*;


import com.example.erp.entity.userInfo.Log;


@@ -22,20 +21,16 @@


import com.example.erp.mapper.sd.*;


import com.example.erp.service.userInfo.LogService;


import com.example.erp.service.userInfo.SysErrorService;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.transaction.interceptor.TransactionAspectSupport;




import java.math.BigDecimal;


import java.math.RoundingMode;


import java.sql.SQLOutput;


import java.text.SimpleDateFormat;


import java.time.LocalDate;


import java.util.*;


import java.util.stream.Collectors;




import static org.apache.coyote.http11.Constants.a;




@Service


@DS("sd")


@@ -261,7 +256,7 @@


            Product product = productMapper.selectById(OrderDetails.get(i).getProductId());




            OrderDetails.get(i).setWeight(Double.valueOf(String.format("%.2f",product.getThickness()*OrderDetails.get(i).getWidth()*OrderDetails.get(i).getHeight()/1000000*2.5)));


            if(OrderDetails.get(i).getBendRadius()!=null && OrderDetails.get(i).getBendRadius()!=0){


            /*if(OrderDetails.get(i).getBendRadius()!=null && OrderDetails.get(i).getBendRadius()!=0){


                //获取弯钢弧度


                Double bendRadius = OrderDetails.get(i).getBendRadius();


                //获取宽


@@ -270,7 +265,7 @@


                String archRiseS =  String.format("%.1f",bendRadius-(bendRadius*Math.cos(width/2/bendRadius)));


                Double archRise = Double.parseDouble(archRiseS);


                OrderDetails.get(i).setArchRise(archRise);


            }


            }*/




            Map<String,Object> otherColumns = JSON.parseObject(OrderDetails.get(i).getOtherColumns(), new TypeReference<Map<String, Object>>(){});


            int finalI = i;


@@ -303,6 +298,45 @@


        orderDetailMapper.insertBatch(OrderDetails);


        //往小片表传入产品数据


        orderGlassDetailMapper.insertOrderGlassDetail(orderId);




        //修改成品拱高


        List<OrderDetail> orderDetails = orderDetailMapper


                .selectList(new LambdaQueryWrapper<OrderDetail>()


                        .eq(OrderDetail::getOrderId, orderId)


                        .isNotNull(OrderDetail::getBendRadius)


                );




        orderDetails.forEach(orderDetail -> {


            //获取最小弧度


            OrderGlassDetail orderGlassDetail = orderGlassDetailMapper


                    .selectOne(new LambdaQueryWrapper<OrderGlassDetail>()


                            .eq(OrderGlassDetail::getOrderId, orderId)


                            .eq(OrderGlassDetail::getOrderNumber, orderDetail.getOrderNumber())


                            .orderByDesc(OrderGlassDetail::getArc)


                            .last("limit 1")


                    );


            //获取当前序号产品Math.cos(


            Product product = productMapper.selectById(orderDetail.getProductId());


            //内半径


            Double radius = orderDetail.getBendRadius() - product.getTotalThickness();




            //内片内弧长


            Double innerArc = orderGlassDetail.getArc()


                    -orderGlassDetail.getArc()*product.getTotalThickness()/orderDetail.getBendRadius();




            //拱高


            String archRiseS =  String.format("%.1f",radius-radius*Math.cos(innerArc/2/radius));


            Double archRise = Double.parseDouble(archRiseS);


            orderDetail.setArchRise(archRise);




            orderDetailMapper.update(null,new LambdaUpdateWrapper<OrderDetail>()


                    .set(OrderDetail::getArchRise,archRise)


                    .eq(OrderDetail::getId, orderDetail.getId())


            );




        });






        if(orderOtherMoneyList!=null){


            orderOtherMoneyList.forEach(orderOtherMoney ->{


                orderOtherMoney.setId(null);


@@ -545,7 +579,7 @@


    }






    public Map<String,Object> getOrderReport(Integer pageNum, Integer pageSize, List<String> selectDate, OrderDetail orderDetail) {


    public Map<String,Object> getOrderReport(Integer pageNum, Integer pageSize, List<String> selectDate, OrderDetail orderDetail, Integer model, Integer scope) {


        Integer offset = (pageNum-1)*pageSize;


        String endDate = LocalDate.now().toString();


        String startDate = LocalDate.now().minusDays(15).toString();


@@ -557,9 +591,8 @@


                endDate = selectDate.get(1);


            }


        }




        Map<String,Object> map = new HashMap<>();


        map.put("data",orderDetailMapper.getOrderReport(offset, pageSize, startDate, endDate, orderDetail));


        map.put("data",orderDetailMapper.getOrderReport(offset, pageSize, startDate, endDate, orderDetail,model,scope));


        map.put("total",orderDetailMapper.getOrderReportTotal(offset, pageSize, startDate, endDate, orderDetail,"order"));


        List<String> list = new ArrayList<>();


        list.add(startDate);