提交

廖井涛

2024-05-22 5a80a537776167a2ad897016285e712bf052072b

提交

 north-glass-erp/northglass-erp/src/views/mm/stockReport/WarehouseReport.vue

@@ -31,6 +31,8 @@
  ],//表格表头字段
  data:[],//表格数据
  url :'/FinishedGoodsInventory/getSelectFinishedOperateLogReport',
  exportUrl :'/FinishedGoodsInventory/exportFinishedOperateLogReport',
  exportName:'成品报表',
  footList:['quantity']
})


 north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryProductReport.vue

@@ -35,6 +35,8 @@
  ],//表格表头字段
  data:[],//表格数据
  url :'/Delivery/getSelectDeliveryDetailProductReport',
  exportUrl :'/Delivery/exportDeliveryDetailProductReport',
  exportName:'发货明细产品分类报表',
  footList:['quantity','area','money']
})


 north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryReport.vue

@@ -33,6 +33,8 @@
  ],//表格表头字段
  data:[],//表格数据
  url :'/Delivery/getSelectDeliveryDetailReport',
  exportUrl :'/Delivery/exportDeliveryDetailReport',
  exportName:'发货明细报表',
  footList:['quantity','area','money']
})


 north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java

@@ -7,9 +7,11 @@
import com.example.erp.common.Result;
import com.example.erp.entity.mm.FinishedOperateLog;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.mm.FinishedGoodsInventoryService;
import com.example.erp.tools.DownExcel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +19,9 @@
import com.example.erp.entity.mm.FinishedGoodsInventory;


import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.time.LocalDate;
import java.util.List;
import java.util.Map;

@@ -162,4 +167,11 @@
    public Result getSelectFinishedOperateLogReport(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
        return Result.seccess(finishedGoodsInventoryService.getSelectFinishedOperateLogReport(pageNum,pageSize,selectDate,finishedOperateLog));
    }

    @ApiOperation("成品报表导出")
    @PostMapping("/exportFinishedOperateLogReport")
    public void exportFinishedOperateLogReport(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
        //参数：相应的数据，实体类信息，相应的方法（数据获取），生成的excel名字
        DownExcel.download(response, FinishedOperateLog.class, finishedGoodsInventoryService.exportFinishedOperateLogReport(dates),"orderReport");
    }
}

 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java

@@ -11,6 +11,7 @@
import org.apache.ibatis.annotations.Param;
import org.springframework.data.repository.CrudRepository;

import java.time.LocalDate;
import java.util.List;
import java.util.Map;

@@ -113,6 +114,8 @@
    Boolean updateInventoryInventoryInt(@Param("orderId") String orderId,
                                               @Param("orderNumber") Integer orderNumber,
                                               @Param("quantity") Integer quantity);


}



 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java

@@ -8,6 +8,7 @@
import org.apache.ibatis.annotations.Param;
import org.springframework.data.repository.CrudRepository;

import java.time.LocalDate;
import java.util.List;
import java.util.Map;

@@ -66,11 +67,13 @@
                                                           @Param("pageSize") Integer pageSize,String startDate, String endDate,String type,
                                                           @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);

    List<OrderDetail> getSelectFinishedOperateLogReport(@Param("offset") Integer offset,
    List<FinishedOperateLog> getSelectFinishedOperateLogReport(@Param("offset") Integer offset,
                                             @Param("pageSize") Integer pageSize,String startDate, String endDate,
                                             @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);

    Map<String,Integer> getSelectFinishedOperateLogReportPageTotal(@Param("offset") Integer offset,
                                                           @Param("pageSize") Integer pageSize,String startDate, String endDate,
                                                           @Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);

    List<FinishedOperateLog> exportFinishedOperateLogReport(List<LocalDate> dates);
}

 north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java

@@ -670,6 +670,11 @@

    }

    public List<FinishedOperateLog> exportFinishedOperateLogReport(List<LocalDate> dates) {
        System.out.println(finishedOperateLogMapper.exportFinishedOperateLogReport(dates));
        return finishedOperateLogMapper.exportFinishedOperateLogReport(dates);
    }





 north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml

@@ -837,4 +837,7 @@
        ;
    </select>




</mapper>

 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml

@@ -648,5 +648,34 @@
               )
    </insert>

    <select id="exportFinishedOperateLogReport" resultMap="selectFinishedGoodsInventory">
        select fol.id,
               fol.operation_order_number,
               fol.order_id,
               fol.operate_type,
               fol.process_id,
               fol.operation_number,
               fol.quantity,
               fol.operator,
               od.product_id,
               od.product_name,
               od.width,
               od.height,
               fol.stater_operation_order_number,
               fol.end_operation_order_number,
               fol.operate_time,
               fol.`status`,
               fol.is_state,
               fol.reviewed,
               fol.reviewed_time,
               fol.type,
               fol.remarks
        from (select *
              from mm.finished_operate_log aa where  aa.status!='已作废') fol
                 left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
        where  date(fol.operate_time)>=#{dates[0]} and date(fol.operate_time) &lt;= #{dates[1]}

    </select>


</mapper>