Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 13:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
gaoqr
2024-09-02 18:47:17 +08:00
parent 80dc750a26 d46dd943e7
commit 8c4adb473a
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/orderParts/OrderPartsController.java
+1 -1
View File
@@ -96,7 +96,7 @@ public class OrderPartsController {
@GetMapping("getPartsByOrderId") @GetMapping("getPartsByOrderId")
@Operation(summary = "批量查询有生产单号id、房间id，柜体id的板材") @Operation(summary = "批量查询有生产单号id、房间id，柜体id的板材")
@PreAuthorize("@ss.hasPermission('executor:plate:getPlatesByOrderId')") @PreAuthorize("@ss.hasPermission('executor:plate:getPlatesByOrderId')")
public CommonResult<PageResult<OrderPartsRespVO>> getPPartsByOrderId(@Valid PlateTermsPageReqVO pageVO) { public CommonResult<PageResult<PartGoodsRespVO>> getPPartsByOrderId(@Valid PlateTermsPageReqVO pageVO) {
return success(orderPartsService.getPartsPageByTerms(pageVO)); return success(orderPartsService.getPartsPageByTerms(pageVO));
} }
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderParts/OrderPartsMapper.java
+1 -1
View File
@@ -47,7 +47,7 @@ public interface OrderPartsMapper extends BaseMapperX<OrderPartsDO> {
} }
IPage<OrderPartsRespVO> selectProductList(@Param("page") IPage<OrderPartsRespVO> page , @Param("orderId")Long orderId, @Param("roomId")Long roomId , @Param("bodyId")Long bodyId,@Param("organId")Long organId); IPage<PartGoodsRespVO> selectProductList(@Param("page") IPage<PartGoodsRespVO> page , @Param("orderId")Long orderId, @Param("roomId")Long roomId , @Param("bodyId")Long bodyId,@Param("organId")Long organId);
List<PartGoodsRespVO> selectPartDetail(@Param("orderId") Long orderId, @Param("organId") Long organId, @Param("deleted") Integer deleted);// 配件明细 List<PartGoodsRespVO> selectPartDetail(@Param("orderId") Long orderId, @Param("organId") Long organId, @Param("deleted") Integer deleted);// 配件明细
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderParts/OrderPartsService.java
+1 -1
View File
@@ -67,7 +67,7 @@ public interface OrderPartsService {
* @param pageReqVO: * @param pageReqVO:
* @return PageResult<PlateDO> * @return PageResult<PlateDO>
*/ */
PageResult<OrderPartsRespVO> getPartsPageByTerms(PlateTermsPageReqVO pageReqVO); PageResult<PartGoodsRespVO> getPartsPageByTerms(PlateTermsPageReqVO pageReqVO);
/** /**
* 分组查询 * 分组查询
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderParts/OrderPartsServiceImpl.java
+4 -4
View File
@@ -108,10 +108,10 @@ public class OrderPartsServiceImpl implements OrderPartsService {
} }
@Override @Override
public PageResult<OrderPartsRespVO> getPartsPageByTerms(PlateTermsPageReqVO pageReqVO) { public PageResult<PartGoodsRespVO> getPartsPageByTerms(PlateTermsPageReqVO pageReqVO) {
PageDTO<OrderPartsRespVO> page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); PageDTO<PartGoodsRespVO> page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
IPage<OrderPartsRespVO> pageRes = orderPartsMapper.selectProductList(page, pageReqVO.getOrderId(), pageReqVO.getRoomId(), pageReqVO.getBodyId(),getUserOrganId()); IPage<PartGoodsRespVO> pageRes = orderPartsMapper.selectProductList(page, pageReqVO.getOrderId(), pageReqVO.getRoomId(), pageReqVO.getBodyId(),getUserOrganId());
return new PageResult<OrderPartsRespVO>(pageRes.getRecords(), pageRes.getTotal()); return new PageResult<PartGoodsRespVO>(pageRes.getRecords(), pageRes.getTotal());
} }
@Override @Override
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml
+3 -2
View File
@@ -3,11 +3,12 @@
<mapper namespace="com.cf.imes.module.executor.dal.mysql.orderParts.OrderPartsMapper"> <mapper namespace="com.cf.imes.module.executor.dal.mysql.orderParts.OrderPartsMapper">
<select id="selectProductList" <select id="selectProductList"
resultType="com.cf.imes.module.executor.controller.admin.orderParts.vo.OrderPartsRespVO"> resultType="com.cf.imes.module.executor.controller.admin.orderParts.vo.PartGoodsRespVO">
SELECT distinct a.id, a.goods_id, a.name, a.material, a.type, a.model, a.spec, a.brand, a.factory, SELECT distinct a.id, a.goods_id, a.name, a.material, a.type, a.model, a.spec, a.brand, a.factory,
a.unit, a.price, a.is_composite, a.remark, b.num a.unit, a.price, a.is_composite, a.remark, b.num, c.id as bodyId, c.room_id, c.name as bodyName, c.room_name
FROM order_parts a FROM order_parts a
LEFT JOIN order_item b ON a.id = b.parts_id and a.organ_id = b.organ_id LEFT JOIN order_item b ON a.id = b.parts_id and a.organ_id = b.organ_id
LEFT JOIN order_body c on b.body_id = c.id and b.organ_id = c.organ_id and c.order_id = b.order_id
WHERE b.organ_id =#{organId} and b.order_id = #{orderId} WHERE b.organ_id =#{organId} and b.order_id = #{orderId}
AND (#{roomId} IS NULL OR b.room_id = #{roomId}) AND (#{roomId} IS NULL OR b.room_id = #{roomId})
AND (#{bodyId} IS NULL OR b.body_id = #{bodyId}) AND (#{bodyId} IS NULL OR b.body_id = #{bodyId})