Merge remote-tracking branch 'origin/master'

wu

2024-12-23 b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java

@@ -1,7 +1,10 @@
package com.mes.glassinfo.service;

import com.mes.glassinfo.entity.GlassInfo;
import com.github.yulichang.base.MPJBaseService;
import com.mes.engineering.entity.Engineering;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.entity.dto.HollowGlassInfoDTO;

import java.util.List;
import java.util.Map;

@@ -18,22 +21,24 @@
       * 查询小片表
       * @return List<GlassInfo>
       */
      List<GlassInfo> selectGlassInfo(String engineeringId);
      List<GlassInfo> selectGlassInfo(Engineering engineeringId);
      /**
       * 保存小片表
       */
      void saveGlassInfo(List<GlassInfo> glassinfo);

//      int getGlassInfoCountByFlowCardId(String flowCardId,int layer);
      int getGlassInfoCountByFlowCardId(String flowCardId, int layer);

      /**
       * @return
       * 查询所有工程状态不为300不同流程卡号
       * @return 查询所有工程状态不为300不同流程卡号
       */
//      List<Map<String, Object>> getFlowCardId();
      List<Map<String, Object>> getFlowCardId();


    List<HollowGlassInfoDTO> listBySize(String engineerId);

    void deleteTask(String engineerId);

    List<GlassInfo> selectEdgGlassInfo(String engineering);
}