更换数据库为云剑数据库

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/BomProcedureVersionServiceImpl.java

@@ -602,7 +602,7 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
                     BomProcedureProgram item = new BomProcedureProgram();
                     BeanUtil.copyProperties(map, item);
                     item.setProcedureId(bean.getId());
-                    item.setProcedureTrayGroupId(Long.parseLong(trayGroupMap.get(map.getGroupSort().toString())));
+//                    item.setProcedureTrayGroupId(Long.parseLong(trayGroupMap.get(map.getGroupSort().toString())));
                     item.setId(null);
                     return item;
                 }).collect(Collectors.toList());
@@ -786,7 +786,7 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
 //        //看似冗余，不能删除，防止前端数据没传
 //        if(StringUtils.isEmpty(bean.getTrayConf())){
 //            bean = baseMapper.selectById(bean.getId());
-//        }
+//        }0
         //需要
         if("3".equals(bean.getTrayConf())){
             return getBomProcedureTrayList(bean);
@@ -888,8 +888,8 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
     public List<BomProcedureTray>getBomProcedureTrayList(BomProcedureVersion bean){
         //托盘夹具
         List<BomProcedureTray> procedureTrayList = baseMapper.getProcedureTray(bean);
-        //托盘对应位置数据
-        List<BomProcedureTrayPosition> trayPositionList = bomProcedureTrayPositionService.getTrayPositionList();
+//        //托盘对应位置数据
+//        List<BomProcedureTrayPosition> trayPositionList = bomProcedureTrayPositionService.getTrayPositionList();
 
         if(procedureTrayList !=null && procedureTrayList.size() >0){
             //数据转换
@@ -900,21 +900,21 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
                 if(brandMap != null){
                     trayBean.setBrand(new RemoteData<>(brandKey,brandMap.getOrDefault(brandKey, StrPool.EMPTY)));
                 }
-                //设置位置id数据
-                List<Long> positionList1 = new ArrayList<>();
-                List<String> positionList2 = new ArrayList<>();
-                if(trayPositionList != null && trayPositionList.size() > 0){
-                    String trayPositions = "";
-                    for(BomProcedureTrayPosition trayPositionBean:trayPositionList){
-                        if(trayBean.getId().longValue() == trayPositionBean.getProcedureTrayId().longValue()){
-                            positionList1.add(trayPositionBean.getTrayPositionId());
-                            trayPositions = trayPositionBean.getTrayPositionId()+","+trayPositionBean.getPositionSort();
-                            positionList2.add(trayPositions);
-                        }
-                    }
-                }
-                trayBean.setPositionList(positionList1);
-                trayBean.setPositionLists(positionList2);
+//                //设置位置id数据
+//                List<Long> positionList1 = new ArrayList<>();
+//                List<String> positionList2 = new ArrayList<>();
+//                if(trayPositionList != null && trayPositionList.size() > 0){
+//                    String trayPositions = "";
+//                    for(BomProcedureTrayPosition trayPositionBean:trayPositionList){
+//                        if(trayBean.getId().longValue() == trayPositionBean.getProcedureTrayId().longValue()){
+//                            positionList1.add(trayPositionBean.getTrayPositionId());
+//                            trayPositions = trayPositionBean.getTrayPositionId()+","+trayPositionBean.getPositionSort();
+//                            positionList2.add(trayPositions);
+//                        }
+//                    }
+//                }
+//                trayBean.setPositionList(positionList1);
+//                trayBean.setPositionLists(positionList2);
             }
         }
         return procedureTrayList;

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/BomProcedureVersionMapper.xml

@@ -45,10 +45,10 @@
     <select id="getProcedureTray" parameterType="com.github.zuihou.business.productionReadyCenter.entity.BomProcedureVersion" resultType="com.github.zuihou.business.productionReadyCenter.entity.BomProcedureTray">
         select ts.*,ps.positions,tg.group_sort,tg.group_prority
         from (
-            (select a.id,a.tray_id,a.biz_type,a.specification_id,t.name,t.no,t.specification,t.brand,a.armor_pic,a.remark,a.group_id,a.sort,a.procedure_id from imcs_b_bom_procedure_tray a
-            left join imcs_t_tray t on a.tray_id = t.id
-            where biz_type = '1')
-            union
+--             (select a.id,a.tray_id,a.biz_type,a.specification_id,t.name,t.no,t.specification,t.brand,a.armor_pic,a.remark,a.group_id,a.sort,a.procedure_id from imcs_b_bom_procedure_tray a
+--             left join imcs_t_tray t on a.tray_id = t.id
+--             where biz_type = '1')
+--             union
             (select b.id,b.tray_id,b.biz_type,b.specification_id,c.name,c.no,c.specification,c.brand,b.armor_pic,b.remark,b.group_id,b.sort,b.procedure_id from imcs_b_bom_procedure_tray b
                 left join (
                     select ms.id,ms.specification,m.name,m.brand,m.id as meterialId,m.no from imcs_m_tool_meterial_specs ms