mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-14 13:42:07 +08:00
订单详情柜体cad视图接口地址修正
This commit is contained in:
+4
-5
@@ -14,7 +14,6 @@ import com.cf.imes.module.executor.dal.dataobject.plate.PlateGoodDO;
|
|||||||
import com.cf.imes.module.executor.service.plate.PlateService;
|
import com.cf.imes.module.executor.service.plate.PlateService;
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
import io.swagger.v3.oas.annotations.Parameter;
|
import io.swagger.v3.oas.annotations.Parameter;
|
||||||
import io.swagger.v3.oas.annotations.Parameters;
|
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
import org.springframework.security.access.prepost.PreAuthorize;
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
@@ -137,15 +136,15 @@ public class PlateController {
|
|||||||
return success(plateService.createNewPlate(reqVO));
|
return success(plateService.createNewPlate(reqVO));
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/view/page")
|
@GetMapping("/body/view/page")
|
||||||
@Operation(summary = "获取柜体下的板件视图分页列表数据")
|
@Operation(summary = "获取柜体下的板件视图分页列表数据")
|
||||||
public CommonResult<PageResult<OrderViewPlatePageRespVO>> getBodyViewPlatesPage(@Validated(OrderCadViewPageGroup.class) OrderCadViewPlatePageReqVO orderCadViewPlatePageReqVO) {
|
public CommonResult<PageResult<OrderViewPlatePageRespVO>> getBodyViewPlatesPage(@Validated(OrderCadViewPageGroup.class) OrderCadViewPlatePageReqVO orderCadViewPlatePageReqVO) {
|
||||||
return success(plateService.getViewPlatesPage(orderCadViewPlatePageReqVO));
|
return success(plateService.getBodyViewPlatesPage(orderCadViewPlatePageReqVO));
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/view/cadinfo")
|
@GetMapping("/body/view/cadinfo")
|
||||||
@Operation(summary = "获取板件对应柜体下的所有板件视图列表数据")
|
@Operation(summary = "获取板件对应柜体下的所有板件视图列表数据")
|
||||||
public CommonResult<List<OrderViewPlatePageRespVO>> getBodyViewPlatesCadInfo(@Validated(OrderCadViewInfoGroup.class) OrderCadViewPlatePageReqVO orderCadViewPlatePageReqVO) {
|
public CommonResult<List<OrderViewPlatePageRespVO>> getBodyViewPlatesCadInfo(@Validated(OrderCadViewInfoGroup.class) OrderCadViewPlatePageReqVO orderCadViewPlatePageReqVO) {
|
||||||
return success(plateService.getViewPlatesCadInfo(orderCadViewPlatePageReqVO));
|
return success(plateService.getBodyViewPlatesCadInfo(orderCadViewPlatePageReqVO));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+4
-4
@@ -96,18 +96,18 @@ public interface PlateService {
|
|||||||
List<InsertPlateRespVO> createNewPlate(List<OptimizationSavePlateReqVO> reqVO);
|
List<InsertPlateRespVO> createNewPlate(List<OptimizationSavePlateReqVO> reqVO);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取板件视图分页列表
|
* 获取柜体板件视图分页列表
|
||||||
*
|
*
|
||||||
* @param orderBodyPageRespVO
|
* @param orderBodyPageRespVO
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
PageResult<OrderViewPlatePageRespVO> getViewPlatesPage(OrderCadViewPlatePageReqVO orderBodyPageRespVO);
|
PageResult<OrderViewPlatePageRespVO> getBodyViewPlatesPage(OrderCadViewPlatePageReqVO orderBodyPageRespVO);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据板件id获取所有板件cad视图所需信息
|
* 根据板件id获取柜体下所有板件cad视图所需信息
|
||||||
*
|
*
|
||||||
* @param orderBodyPageRespVO
|
* @param orderBodyPageRespVO
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
List<OrderViewPlatePageRespVO> getViewPlatesCadInfo(OrderCadViewPlatePageReqVO orderBodyPageRespVO);
|
List<OrderViewPlatePageRespVO> getBodyViewPlatesCadInfo(OrderCadViewPlatePageReqVO orderBodyPageRespVO);
|
||||||
}
|
}
|
||||||
+2
-2
@@ -810,7 +810,7 @@ public class PlateServiceImpl implements PlateService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PageResult<OrderViewPlatePageRespVO> getViewPlatesPage(OrderCadViewPlatePageReqVO pageReqVO) {
|
public PageResult<OrderViewPlatePageRespVO> getBodyViewPlatesPage(OrderCadViewPlatePageReqVO pageReqVO) {
|
||||||
PageDTO<OrderViewPlatePageRespVO> page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
|
PageDTO<OrderViewPlatePageRespVO> page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
|
||||||
IPage<OrderBodyViewPlatesPageDO> pageRes = orderItemMapper.selectBodyViewPlatesPage(page, pageReqVO.getOrderId(), pageReqVO.getRoomId(),
|
IPage<OrderBodyViewPlatesPageDO> pageRes = orderItemMapper.selectBodyViewPlatesPage(page, pageReqVO.getOrderId(), pageReqVO.getRoomId(),
|
||||||
pageReqVO.getBodyId(), pageReqVO.getGroupId(), getUserOrganId(), null, false);
|
pageReqVO.getBodyId(), pageReqVO.getGroupId(), getUserOrganId(), null, false);
|
||||||
@@ -818,7 +818,7 @@ public class PlateServiceImpl implements PlateService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<OrderViewPlatePageRespVO> getViewPlatesCadInfo(OrderCadViewPlatePageReqVO reqVO) {
|
public List<OrderViewPlatePageRespVO> getBodyViewPlatesCadInfo(OrderCadViewPlatePageReqVO reqVO) {
|
||||||
Long plateId = reqVO.getPlateNo();
|
Long plateId = reqVO.getPlateNo();
|
||||||
// 匹配板材
|
// 匹配板材
|
||||||
PlateDO plateDO = plateMapper.selectById(plateId);
|
PlateDO plateDO = plateMapper.selectById(plateId);
|
||||||
|
|||||||
Reference in New Issue
Block a user