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-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

打包分页模糊，工序权限修改

Browse Source
This commit is contained in:
liuzhaotian
2024-06-25 18:04:21 +08:00
parent a06a1deecf
commit 130d293ce5
11 changed files with 75 additions and 29 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/plan/PlanController.java
+3 -3
View File
@@ -164,10 +164,10 @@ public class PlanController {
@GetMapping("getPlateList")
@Operation(summary = "根据排单ID获取板材列表（未分页）")
@Parameter(name = "planId", description = "排单id", required = true, example = "1024")
@Parameter(name = "planIds", description = "排单id", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('placeorder:orderlist')")
public CommonResult<List<PlateResList>> getPlateList(@Valid @RequestParam("planId") Long planId) {
return success(planService.getPlateList(planId));
public CommonResult<List<PlateResList>> getPlateList(@Valid @RequestParam("planIds") List<Long> planIds) {
return success(planService.getPlateList(planIds));
}
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java
+4 -4
View File
@@ -29,14 +29,14 @@ public interface PlanMapper extends BaseMapperX<PlanDO> {
if(StrUtil.isNotBlank(reqVO.getCustomer())) {
return selectJoinPage(reqVO, PlanDO.class, new MPJLambdaWrapperX<PlanDO>()
.eq(PlanDO::getOrganId,getUserOrganId())
.eqIfPresent(PlanDO::getPlanNo, reqVO.getPlanNo())
.likeIfPresent(PlanDO::getPlanNo, reqVO.getPlanNo())
.eqIfPresent(PlanDO::getSort, reqVO.getSort())
.eqIfPresent(PlanDO::getType, reqVO.getType())
.eqIfPresent(PlanDO::getStatus, reqVO.getStatus())
.eqIfPresent(PlanDO::getIsPay, reqVO.getIsPay())
.eqIfPresent(PlanDO::getMachineId, reqVO.getMachineId())
.betweenIfPresent(PlanDO::getPlanTime, reqVO.getPlanTime())
.eqIfPresent(PlanDO::getOrderNos, reqVO.getOrderNos())
.likeIfPresent(PlanDO::getOrderNos, reqVO.getOrderNos())
.eqIfPresent(PlanDO::getRemark, reqVO.getRemark())
.betweenIfPresent(PlanDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(PlanDO::getOperator, reqVO.getOperator())
@@ -52,14 +52,14 @@ public interface PlanMapper extends BaseMapperX<PlanDO> {
return selectPage(reqVO, new LambdaQueryWrapperX<PlanDO>()
.eq(PlanDO::getOrganId,getUserOrganId())
.eqIfPresent(PlanDO::getPlanNo, reqVO.getPlanNo())
.likeIfPresent(PlanDO::getPlanNo, reqVO.getPlanNo())
.eqIfPresent(PlanDO::getSort, reqVO.getSort())
.eqIfPresent(PlanDO::getType, reqVO.getType())
.eqIfPresent(PlanDO::getStatus, reqVO.getStatus())
.eqIfPresent(PlanDO::getIsPay, reqVO.getIsPay())
.eqIfPresent(PlanDO::getMachineId, reqVO.getMachineId())
.betweenIfPresent(PlanDO::getPlanTime, reqVO.getPlanTime())
.eqIfPresent(PlanDO::getOrderNos, reqVO.getOrderNos())
.likeIfPresent(PlanDO::getOrderNos, reqVO.getOrderNos())
.eqIfPresent(PlanDO::getRemark, reqVO.getRemark())
.betweenIfPresent(PlanDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(PlanDO::getOperator, reqVO.getOperator())
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java
+1 -1
View File
@@ -116,7 +116,7 @@ public interface PlateMapper extends BaseMapperX<PlateDO> {
List<Long> selectPlateIdListByBodyId(@Param("bodyId") Long bodyId, @Param("organId") Long organId);
List<PlateResList> selectPlateListByPlanId(@Param("planId") Long planId, @Param("organId") Long organId);
List<PlateResList> selectPlateListByPlanId(@Param("planIds") List<Long> planIds, @Param("organId") Long organId);
// 根据需要删除的小板id查找具体信息
List<PlateGoodsIdVO> selectPlateGoodsListByList(@Param("plates") List<Long> goodsIdList, @Param("orderId") Long orderId, @Param("organId") Long organId);
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanService.java
+1 -1
View File
@@ -70,5 +70,5 @@ public interface PlanService {
Boolean setSort(List<SortVO> list);
List<PlateResList> getPlateList(Long planId);
List<PlateResList> getPlateList(List<Long> planIds);
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
+2 -2
View File
@@ -510,10 +510,10 @@ public class PlanServiceImpl implements PlanService {
@Override
public List<PlateResList> getPlateList(Long planId) {
public List<PlateResList> getPlateList(List<Long> planIds) {
return plateMapper.selectPlateListByPlanId(planId,getUserOrganId());
return plateMapper.selectPlateListByPlanId(planIds,getUserOrganId());
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
+6 -1
View File
@@ -301,7 +301,12 @@
left join order_plate a on b.plate_id = a.id and b.order_id = a.order_id and b.organ_id = a.organ_id
left join order_goods e on a.goods_id = e.id and a.order_id = e.order_id and a.organ_id = e.organ_id
where p.plan_id = #{planId} and p.organ_id = #{organId}
where p.organ_id = #{organId}
and p.plan_id in
<foreach collection="planIds" item="planIds" open="(" close=")" separator=",">
#{planIds}
</foreach>
order by a.order_id,plateName;