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

guoyujie

2025-09-05 b0c60452329a61c32db74a1c7d7753d383d6310a

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

@@ -17,7 +17,12 @@

    List<Map<String, Object>> firstOptimization(String projectNo);

    List<Map<String, Object>> directOptimization(String projectNo);

    List<Map<String, Object>> analogComputationOptimization(String projectNo);


    List<Map<String, Object>> computeAndOptimization(String projectNo);

    List<Map<String, Object>> getOptimizeDetail(String projectNo);

@@ -152,6 +157,8 @@

    List<Map<String, Object>> getGrindingTrimming(String username);

    List<Map<String, Object>> getGrindingOptimize(String username);

    List<Map<String, Object>> getEdgeTrimming(String username);

    Boolean updateOptimizeConfig(String json,Integer type,String username);
@@ -176,4 +183,36 @@
    //工程信息流程卡
    List<Map<String, Object>> getProcessCardMpThirdParty(String projectNo);

    List<Map<String, Object>> getProjectByProjectNoSv(String projectNo);

    void updateFlowCardRack(String processId, String technologyNumber, int rackValue);

    Map<String,Object> selectOptimizeProject(String projectNo);

    List<Map<String,Object>> selectOptimizeLayout(String projectNo);

    List<Map<String,Object>> selectOptimizeDetail(String projectNo);

    List<Map<String,Object>> selectFlowCardInfoList(String projectNo);


    Map<String, Object> getGlassInfo(String projectId);

    void addOptimizeOffcut(Map<String, Object> map, String projectId, String glassType, String glassThickness);

    List<Map<String, Object>> getOptimizeLayoutsInfo(String processId);

    List<Map<String, Object>> getOptimizeDetailsInfo(String processId);

    List<Map<String, Object>> getOptimizeOffsetsInfo(String processId);

    int deleteOptimizeOffcut(String projectNumber);

    void updateNormalDetails(Map<String, Object> detail, String processId);

    void deleteOffcutDetails(String processId);

    void addUpdateOffcut(Map<String, Object> detail, String processId, String glassType, String glassThickness);

    void updateProjectOptimize(String projectId, Integer states, Map<String, Object> optimalResults);
}