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

guoyujie

2025-08-08 a158ed9136af588b82d365f98074b29c70cdb601

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

@@ -17,7 +17,14 @@

    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);

    List<Map<String, Object>> simulatedTypesettingUsingOpt(List<String> processId,List<Integer> technologyNumber);

@@ -146,13 +153,15 @@
    Boolean updateProjectMp(String projectId, String projectNmae, String glassThickness, String glassType,
                         Integer sumQuantity, Double sumArea, String userName,Integer processIdCount, String processId, Integer type);

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

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

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

    Boolean updateOptimizeConfig(String json,Integer type);
    List<Map<String, Object>> getEdgeTrimming(String username);

    Boolean updateOptimizeConfig(String json,Integer type,String username);

    List<Map<String, Object>> getFlowCardListSimulated(String optionVal);

@@ -174,4 +183,20 @@
    //工程信息流程卡
    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);
}