提交分架代码

guoyuji

2024-02-22 7b8cc84950a3caeb8cae5e99a7aa99c1aafa6ac7

 north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java

@@ -16,6 +16,7 @@
import org.springframework.stereotype.Service;

import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;

@Service
@@ -32,29 +33,59 @@
    @Autowired
    FinishedGoodsInventoryMapper finishedGoodsInventoryMapper;

    public Map<String, Object> getseletShippingOrder(Integer pageNum, Integer pageSize, Delivery delivery) {
    public Map<String, Object> getseletShippingOrder(Integer pageNum, Integer pageSize,List<String> selectDate, Delivery delivery) {
        Integer offset = (pageNum - 1) * pageSize;
        String endDate = LocalDate.now().toString();
        String startDate = LocalDate.now().minusDays(15).toString();
        if(selectDate !=null && selectDate.size()==2){
            if(!selectDate.get(0).isEmpty()){
                startDate = selectDate.get(0);
            }
            if(!selectDate.get(1).isEmpty()){
                endDate = selectDate.get(1);
            }
        }
        Map<String, Object> map = new HashMap<>();
        map.put("data", deliveryMapper.getseletShippingOrder(offset, pageSize, delivery));
        System.out.println(deliveryMapper.getseletShippingOrder(offset, pageSize, delivery));
        map.put("total", deliveryMapper.getseletShippingOrderPageTotal(offset, pageSize, delivery));
        map.put("data", deliveryMapper.getseletShippingOrder(offset, pageSize,startDate,endDate, delivery));
        map.put("total", deliveryMapper.getseletShippingOrderPageTotal(offset, pageSize,startDate,endDate, delivery));
        List<String> list = new ArrayList<>();
        list.add(startDate);
        list.add(endDate);
        map.put("selectDate",list);
        return map;
    }

    public Map<String, Object> getseletShippingOrderDetail(Integer pageNum, Integer pageSize, OrderDetail orderDetail) {
        Integer offset = (pageNum - 1) * pageSize;

        Map<String, Object> map = new HashMap<>();
        System.out.println(orderDetail.getDeliveryDetail().getMoney());
        map.put("data", deliveryDetailMapper.getseletShippingOrderDetail(offset, pageSize, orderDetail));
        map.put("delivery", deliveryMapper.getseletShippingOrderDetaildelivery(offset, pageSize, orderDetail));
        map.put("total", deliveryDetailMapper.getseletShippingOrderDetailPageTotal(offset, pageSize, orderDetail));

        return map;
    }

    public Map<String, Object> getSelectOrderInventory(Integer pageNum, Integer pageSize, Order order) {
    public Map<String, Object> getSelectOrderInventory(Integer pageNum, Integer pageSize,List<String> selectDate, Order order) {
        Integer offset = (pageNum - 1) * pageSize;
        String endDate = LocalDate.now().toString();
        String startDate = LocalDate.now().minusDays(15).toString();
        if(selectDate !=null && selectDate.size()==2){
            if(!selectDate.get(0).isEmpty()){
                startDate = selectDate.get(0);
            }
            if(!selectDate.get(1).isEmpty()){
                endDate = selectDate.get(1);
            }
        }
        Map<String, Object> map = new HashMap<>();
        map.put("data", deliveryMapper.getSelectOrderInventory(offset, pageSize, order));
        map.put("total", deliveryMapper.getSelectOrderInventoryPageTotal(offset, pageSize, order));
        map.put("data", deliveryMapper.getSelectOrderInventory(offset, pageSize,startDate,endDate, order));
        map.put("total", deliveryMapper.getSelectOrderInventoryPageTotal(offset, pageSize,startDate,endDate, order));
        List<String> list = new ArrayList<>();
        list.add(startDate);
        list.add(endDate);
        map.put("selectDate",list);
        return map;
    }

@@ -82,15 +113,15 @@

        if (!orderDetaillist.isEmpty()){
            for (OrderDetail orderDetail : orderDetaillist) {
                quantity+=orderDetail.getFinishedGoodsInventory().getQuantityAvailable();
                area+=orderDetail.getFinishedGoodsInventory().getActualSignalArea()*orderDetail.getFinishedGoodsInventory().getQuantityAvailable();
                money+=orderDetail.getPrice()*orderDetail.getFinishedGoodsInventory().getQuantityAvailable();
                quantity+=orderDetail.getDeliveryDetail().getQuantity();
                area+=orderDetail.getFinishedGoodsInventory().getActualSignalArea()*orderDetail.getDeliveryDetail().getQuantity();
                money+=orderDetail.getPrice()*orderDetail.getDeliveryDetail().getQuantity();
                Integer deliveryDetailmaximum=deliveryDetailMapper.getdeliveryDetailmaximum(oddNumber);
                System.out.println(deliveryDetailmaximum);
                deliveryDetailMapper.insertDeliveryDetail(orderDetail,oddNumber,deliveryDetailmaximum);
                deliveryDetailMapper.updateOrderDetailDeliveryNum(orderDetail);
                //修改库存表出库数量
                finishedGoodsInventoryMapper.updateInventoryquantityOut(orderDetail.getOrderId(),orderDetail.getOrderNumber(),orderDetail.getFinishedGoodsInventory().getQuantityAvailable());
                finishedGoodsInventoryMapper.updateInventoryquantityOut(orderDetail.getOrderId(),orderDetail.getOrderNumber(),orderDetail.getDeliveryDetail().getQuantity());
                isinsert=true;
            }
            System.out.println("面积"+area+"数量"+quantity+"金额"+money);
@@ -104,6 +135,28 @@
    }


    public Boolean updateDeliveryToExamine(Map<String,Object> object) {
        Boolean isinsert=false;
        String deliveryId = "";
        int type =3;
        if (object.get("deliveryId") != null) {
            deliveryId = object.get("deliveryId").toString();
        }

        if (object.get("type") != null) {
            type = Integer.parseInt(object.get("type").toString());
        }

        System.out.println(deliveryId);
        deliveryMapper.updateDeliveryToExamine(deliveryId,type);

        return true;



    }


    public String orderNumberSetting(String type) {
        //根据类型自动生成不同的操作单号
        String alias="";