板材库去掉价格

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderBody/OrderBodyMapper.java

@@ -77,4 +77,25 @@ public interface OrderBodyMapper extends BaseMapperX<OrderBodyDO> {
                 .eq(OrderBodyDO::getDeleted, deleted)
                 .eq(OrderBodyDO::getOrganId, organId)));
     }
+
+//    按照房间名称查询
+    default List<OrderBodyDO> selectByRoomName(Long orderId, String roomName,
+                                               Long organId, Integer deleted){
+        return selectList(new LambdaUpdateWrapper<OrderBodyDO>()
+                .eq(OrderBodyDO::getOrderId, orderId)
+                .eq(OrderBodyDO::getRoomName, roomName)
+                .eq(OrderBodyDO::getDeleted, deleted)
+                .eq(OrderBodyDO::getOrganId, organId));
+    }
+
+//    按照房间id和柜体名称查询
+    default List<OrderBodyDO> selectByRoomIdAndBodyName(Long orderId, Long roomId,
+                                                        String bodyName, Long organId, Integer deleted){
+        return selectList(new LambdaUpdateWrapper<OrderBodyDO>()
+                .eq(OrderBodyDO::getOrderId, orderId)
+               .eq(OrderBodyDO::getRoomId, roomId)
+                .eq(OrderBodyDO::getName, bodyName)
+                .eq(OrderBodyDO::getDeleted, deleted)
+                .eq(OrderBodyDO::getOrganId, organId));
+        }
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderGroup/OrderGroupMapper.java

@@ -43,9 +43,33 @@ public interface OrderGroupMapper extends BaseMapperX<OrderGroupDO> {
                 .eq(OrderGroupDO::getBodyId, id)
                 .eq(OrderGroupDO::getOrganId, organId));
     }
+
     default int deletedById(Long id, Long organId) {
         return delete(new LambdaUpdateWrapper<OrderGroupDO>()
                 .eq(OrderGroupDO::getBodyId, id)
                 .eq(OrderGroupDO::getOrganId, organId));
     }
+
+    //    通过柜体id和加工组类型名称查询加工组
+    default List<OrderGroupDO> selectByRoomIdAndGroupTypeName(Long orderId, Long bodyId,
+                                                          String groupTypeName, Long organId, Integer deleted) {
+        return selectList(new LambdaUpdateWrapper<OrderGroupDO>()
+                .eq(OrderGroupDO::getOrderId, orderId)
+                .eq(OrderGroupDO::getBodyId, bodyId)
+                .eq(OrderGroupDO::getGroupTypeName, groupTypeName)
+                .eq(OrderGroupDO::getOrganId, organId)
+                .eq(OrderGroupDO::getDeleted, deleted));
+    }
+
+    //    通过柜体id和加工组类型id加工组名称名称查询加工组
+    default List<OrderGroupDO> selectByRoomIdAndGroupTypeIdAndGroupName(Long orderId, Long bodyId,
+                                                                        Long groupTypeId, String groupName, Long organId, Integer deleted) {
+        return selectList(new LambdaUpdateWrapper<OrderGroupDO>()
+                .eq(OrderGroupDO::getOrderId, orderId)
+                .eq(OrderGroupDO::getBodyId, bodyId)
+                .eq(OrderGroupDO::getGroupTypeId, groupTypeId)
+                .eq(OrderGroupDO::getName, groupName)
+                .eq(OrderGroupDO::getOrganId, organId)
+                .eq(OrderGroupDO::getDeleted, deleted));
+    }
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java

@@ -300,7 +300,6 @@ public class OrderServiceImpl implements OrderService {
     public Integer orderCount() {
 //        角色判断
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
-        System.out.println("loginUser " + loginUser);
 //        数据查询
         if (loginUser.getIsSupAdmin()){
             return orderMapper.selectOrderCount();
@@ -758,7 +757,7 @@ public class OrderServiceImpl implements OrderService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void importExcelData(OrderDO orderDO, List<?> list, Integer index) {
-        if (index == 0){
+        if (index == null || index == 0){
             orderDO.setId((Long) snowFlakeGenerator.nextId(null));
             orderMapper.insert(orderDO);
         }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelTypeRealize.java

@@ -163,9 +163,9 @@ public class ExcelTypeRealize {
                                 excelVO -> excelVO.getSynthesisTypeName() != null ? excelVO.getSynthesisTypeName() : " ",
                                 Collectors.toList()
                         ));
-                Long groupTypeId = (Long) snowFlakeGenerator.nextId(null);
 
                 synthesisCollect.forEach((synthesisTypeName, listSynthesis) -> {
+                    Long groupTypeId = (Long) snowFlakeGenerator.nextId(null);
                     // 加工组名称为条件进行分组
                     Map<String, List<OrderPlateImportExcelVO>> combinationNameCollect = listSynthesis.stream()
                             .collect(Collectors.groupingBy(
@@ -177,7 +177,7 @@ public class ExcelTypeRealize {
                         final Double[] plateCountByCombination = {0.0};
                         Long groupId = (Long) snowFlakeGenerator.nextId(null);
                         OrderGroupDO  orderGroupDO = OrderGroupDO.builder().id(groupId).orderId(orderId).organId(organId).bodyId(bodyId)
-                                    .groupTypeId(groupTypeId).groupTypeName(synthesisTypeName).name(combinationName != " " ? combinationName : synthesisTypeName).width(0.0).height(0.0)
+                                    .groupTypeId(groupTypeId).groupTypeName(synthesisTypeName).name(!Objects.equals(combinationName, " ") ? combinationName : synthesisTypeName).width(0.0).height(0.0)
                                     .depth(0.0).multiNum(0).plateNum(0).unregularNum(0).filename("无").remark("无").build();
 
                         listCombinationName.forEach(combination -> {