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

ZengTao

2024-07-16 55b94886f07ddd77d0b9ebbbf2d6ff8e92f682a4

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

@@ -24,13 +24,13 @@
       */
      void saveGlassInfo(List<GlassInfo> glassinfo);

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

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