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

chenlu

2024-12-06 85741906046ab01e6b824e7e306a1f332c25f2f4

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java

@@ -15,6 +15,8 @@
    //工程信息
    List<Map<String, Object>> projectInfoMp(String projectNo);

    //库存信息
    List<Map<String, Object>>  materialStoreMp(String thickness, String model);

    //工单管理查询未转工单数据
    List<OrderGlassDetail> selectWordOrder(Date selectTime1, Date selectTime2, OrderGlassDetail orderGlassDetail);