diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateGoodDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateGoodDO.java index 5fd6ef9c4..97a9df0fc 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateGoodDO.java +++ b/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; /** * 品牌 */ diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java index e9265801c..35b10ccbb 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java +++ b/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> roomCabinetProcessGroupMatch(Long orderId, List orderBodyList, List orderGroupDOList, List orderItemDOList) { + Map> map = new HashMap<>(); + List changeBodyList = new ArrayList<>(); + List changeGroupList = new ArrayList<>(); + List changeItemList = new ArrayList<>(); + + Map> bodyMap = orderBodyList.stream().collect(Collectors.groupingBy(OrderBodyDO::getRoomName)); + bodyMap.forEach((roomName, bodyList) -> { + List partBodyList = orderBodyMapper.selectByRoomName(orderId, roomName, SecurityFrameworkUtils.getLoginUser().getOrganId(), OrderDeletedEnum.NOT_DELETED.getStatus()); + }); + + return map; + } } \ No newline at end of file