Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

廖井涛

2025-11-20 35968d7e3a392e19c5593bd31422570812885d22

Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

 north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue

@@ -242,6 +242,7 @@
                gridOptions.loading=false
              }else{
                ElMessage.warning(t('basicData.msg.reviewFail'))
                gridOptions.loading=false
              }
            })
          }
@@ -270,6 +271,7 @@
                gridOptions.loading=false
              }else{
                ElMessage.warning(t('basicData.msg.deleteFail'))
                gridOptions.loading=false
              }
            })
          }
@@ -330,6 +332,7 @@
      gridOptions.loading=false
    }else{
      ElMessage.warning(res.msg)
      gridOptions.loading=false
      router.push("/login")
    }
  })

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

@@ -587,7 +587,7 @@
    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();
        String startDate = LocalDate.now().minusDays(30).toString();
        if(selectDate !=null && selectDate.size()==2){
            if(!selectDate.get(0).isEmpty()){
                startDate = selectDate.get(0);
@@ -614,7 +614,7 @@
    public Map<String,Object> getOrderSummaryReport(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();
        String startDate = LocalDate.now().minusDays(30).toString();
        if(selectDate !=null && selectDate.size()==2){
            if(!selectDate.get(0).isEmpty()){
                startDate = selectDate.get(0);
@@ -642,7 +642,7 @@
    public Map<String,Object> getOrderProductSummary(Integer pageNum, Integer pageSize, List<String> selectDate, OrderDetail orderDetail) {
        Integer offset = (pageNum-1)*pageSize;
        String endDate = LocalDate.now().toString();
        String startDate = LocalDate.now().minusDays(15).toString();
        String startDate = LocalDate.now().minusDays(30).toString();
        if(selectDate !=null && selectDate.size()==2){
            if(!selectDate.get(0).isEmpty()){
                startDate = selectDate.get(0);