blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
廖井涛
2025-02-13 0ef66b3ae347153997c5a1ba7307dd425cf2a7ed 
 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java


@@ -15,6 +15,7 @@


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


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


import com.example.erp.exception.ServiceException;


import com.example.erp.mapper.pp.WorkOrderMapper;


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


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


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


@@ -44,9 +45,10 @@


    private final OrderOtherMoneyMapper orderOtherMoneyMapper;


    private final ProductMapper productMapper;


    private final LogService logService;


    private final WorkOrderMapper workOrderMapper;




    private final OrderProcessDetailMapper orderProcessDetailMapper;


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


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


        this.orderMapper = orderMapper;


        this.orderDetailMapper = orderDetailMapper;


        this.orderGlassDetailMapper = orderGlassDetailMapper;


@@ -55,6 +57,7 @@


        this.orderOtherMoneyMapper = orderOtherMoneyMapper;


        this.productMapper = productMapper;


        this.logService = logService;


        this.workOrderMapper = workOrderMapper;


    }




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


@@ -335,7 +338,6 @@


        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");


        System.out.println(field+"  "+orderBy);




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


        map.put("data",orderMapper.getOrderList(offset, pageSize, startDate, endDate, order,orderType, field, orderBy));


@@ -809,4 +811,10 @@


    public Boolean selectDifferentSize(String orderId) {


        return !orderMapper.selectDifferentSize(orderId).isEmpty();


    }




    public Object processBack(String orderId) {


        workOrderMapper.deleteOrderWorkMp(orderId, null);


        workOrderMapper.updateWorkType(orderId, 0);


        return null;


    }


}