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


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


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;


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


@@ -21,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")


@@ -213,9 +209,16 @@






    //修改订单数据，并且重新生成多个副表数据


    public void updateOrder(Order order,List<OrderDetail> OrderDetails,List<OrderOtherMoney> orderOtherMoneyList) {




    public void updateOrder(Order order,List<OrderDetail> OrderDetails,List<OrderOtherMoney> orderOtherMoneyList) throws Exception {


        Order oldOrder = orderMapper.selectOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderId,order.getOrderId()));


        if(oldOrder.getProcessReview()==2){


            throw  new ServiceException(Constants.Code_600,"该订单已经审核，无法修改");


        }


        if(!Objects.equals(oldOrder.getVersion(), order.getVersion())){


            throw  new ServiceException(Constants.Code_600,"该订单已经修改，请刷新页面");


        }


        order.setCreateTime(null);


        order.setVersion(order.getVersion()+1);


        LambdaUpdateWrapper<Order> updateWrapper = new LambdaUpdateWrapper<>();


        updateWrapper.eq(Order::getOrderId, order.getOrderId());


        orderMapper.update(order,updateWrapper);


@@ -346,7 +349,7 @@


            }


        }


        JSONObject orderJson = new JSONObject(config);


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


        OrderSearchDTO order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("filter")), OrderSearchDTO.class);


        Map<String,String> sortDate = (Map<String, String>) config.get("sort");


        String field = sortDate.get("field").replaceAll("(?<!^)([A-Z])", "_$1").toLowerCase();


        String orderBy = sortDate.get("order");


@@ -383,6 +386,12 @@


    }


    //订单审核


    public boolean reviewOrderById(String id, Integer status, String userId, String userName) {


        Log log = new Log();


        log.setOperator(userName);


        log.setOperatorId(userId);


        log.setContent(status.toString());


        log.setFunction("reviewOrderById:"+id);


        logService.saveLog(log);


        Order order = orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",id));


        if(order.getProcessReview()!=2){


            throw  new ServiceException(Constants.Code_600,"该订单还未审核");


@@ -395,6 +404,9 @@


    }


    //工艺审核界面审核更新数据


    public boolean reviewProcessById(String id, Integer status,List<OrderGlassDetail> orderGlassDetails) {


        Log log = new Log();


        log.setContent(orderGlassDetails.toString());


        log.setFunction("reviewProcessById:"+id);


        if(!orderGlassDetails.isEmpty() && status==2){


            orderGlassDetails.forEach(orderGlassDetail ->{


                double area = Math.round((orderGlassDetail.getChildWidth()*orderGlassDetail.getChildHeight()/1000000) * 100) * 0.01d;


@@ -409,7 +421,7 @@


//            //赋值订单工艺表


//            orderProcessDetailMapper.insertOrderProcessDetail(orderProcessDetailList);


        }




        logService.saveLog(log);


        return orderMapper.reviewProcessById(id,status);


    }


    //工艺审核界面数据查询


@@ -528,7 +540,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();


@@ -540,9 +552,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);