Merge remote-tracking branch 'origin/main'

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateGoodDO.java

@@ -59,7 +59,7 @@ public class PlateGoodDO extends BaseDO {
     /**
      * 价格
      */
-    private Double price;
+//    private Double price;
     /**
      * 品牌
      */

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

@@ -177,7 +177,7 @@ public class OrderServiceImpl implements OrderService {
         //校验手机号是否合法
         validatePhoneNumber(updateReqVO.getPhoneNumber());
 
-        //验证自定义单号是否存在，业务员、拆单员是否存在
+        //验证自定义单号是否存在
         validateCustomOrderNoExists(updateReqVO.getCustomOrderNo(), updateReqVO.getId());
         // 更新
         OrderDO updateObj = BeanUtils.toBean(updateReqVO, OrderDO.class);
@@ -914,4 +914,20 @@ public class OrderServiceImpl implements OrderService {
         }
         return sb.toString();
     }
+
+
+//    房间、柜体、加工组匹配
+    public Map<String, List<?>> roomCabinetProcessGroupMatch(Long orderId, List<OrderBodyDO> orderBodyList,  List<OrderGroupDO> orderGroupDOList, List<OrderItemDO> orderItemDOList) {
+        Map<String, List<?>> map = new HashMap<>();
+        List<OrderBodyDO> changeBodyList = new ArrayList<>();
+        List<OrderGroupDO> changeGroupList = new ArrayList<>();
+        List<OrderItemDO> changeItemList = new ArrayList<>();
+
+        Map<String, List<OrderBodyDO>> bodyMap = orderBodyList.stream().collect(Collectors.groupingBy(OrderBodyDO::getRoomName));
+        bodyMap.forEach((roomName, bodyList) -> {
+            List<OrderBodyDO> partBodyList = orderBodyMapper.selectByRoomName(orderId, roomName, SecurityFrameworkUtils.getLoginUser().getOrganId(), OrderDeletedEnum.NOT_DELETED.getStatus());
+        });
+
+        return map;
+    }
 }