Merge remote-tracking branch 'origin/master'

廖井涛

2025-08-25 fec9f42e00f2df68a2a20cbf132b17bdeed8e63a

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

@@ -22,7 +22,6 @@
    List<Map<String, Object>> analogComputationOptimization(String projectNo);


    // todo 模拟计算这块儿的rackNo为硬编码，后续需要改
    List<Map<String, Object>> computeAndOptimization(String projectNo);

    List<Map<String, Object>> getOptimizeDetail(String projectNo);
@@ -185,4 +184,33 @@
    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);
}