blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
廖井涛
2024-07-08 9732b34128a37e509db4eb99da5bf158dc3a049c 
 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java


@@ -16,6 +16,7 @@


import com.example.erp.exception.ServiceException;


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


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;


@@ -34,15 +35,17 @@


    private final OrderGlassDetailMapper orderGlassDetailMapper;


    private final SysErrorService sysErrorService;


    private final OrderOtherMoneyMapper orderOtherMoneyMapper;


    private final ProductMapper productMapper;




    private final OrderProcessDetailMapper orderProcessDetailMapper;


    public OrderService(OrderMapper orderMapper, OrderDetailMapper orderDetailMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, SysErrorService sysErrorService, OrderOtherMoneyMapper orderOtherMoneyMapper) {


    public OrderService(OrderMapper orderMapper, OrderDetailMapper orderDetailMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, SysErrorService sysErrorService, OrderOtherMoneyMapper orderOtherMoneyMapper, ProductMapper productMapper) {


        this.orderMapper = orderMapper;


        this.orderDetailMapper = orderDetailMapper;


        this.orderGlassDetailMapper = orderGlassDetailMapper;


        this.orderProcessDetailMapper = orderProcessDetailMapper;


        this.sysErrorService = sysErrorService;


        this.orderOtherMoneyMapper = orderOtherMoneyMapper;


        this.productMapper = productMapper;


    }




    public boolean saveOrder(Map<String,Object> orderMap) throws Exception {


@@ -51,7 +54,10 @@


        Order order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("title")), Order.class);


        List<OrderDetail> OrderDetails = JSONArray.parseArray(JSONObject.toJSONString(orderJson.get("detail")), OrderDetail.class);


        List<OrderOtherMoney> orderOtherMoneyList = JSONArray.parseArray(JSONObject.toJSONString(orderJson.get("otherMoney")), OrderOtherMoney.class);


        orderOtherMoneyList = orderOtherMoneyList.stream().filter(o -> o.getColumn().indexOf("M")==0).collect(Collectors.toList());


        if(orderOtherMoneyList != null ){


            orderOtherMoneyList = orderOtherMoneyList.stream().filter(o -> o.getColumn().indexOf("M")==0).collect(Collectors.toList());


        }




        boolean saveState = true;


        //设置回滚点


        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();


@@ -187,7 +193,9 @@


            OrderDetails.get(i).setOrderNumber(i+1);


            OrderDetails.get(i).setOrderId(orderId);


            OrderDetails.get(i).setPerimeter(Double.valueOf(String.format("%.3f",(OrderDetails.get(i).getWidth()+OrderDetails.get(i).getHeight())*2/1000*OrderDetails.get(i).getQuantity())));


            OrderDetails.get(i).setWeight(1.0);


            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){


                //获取弯钢弧度


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


@@ -552,4 +560,8 @@






    }




    public boolean updateOrderPrintNumber(String orderId) {


        return orderMapper.updateOrderPrintNumber(orderId);


    }


}