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

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java

@@ -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) {
+    public CommonResult<List<PlateResList>> getPlateList(@Valid @RequestParam("planIds") List<Long> planIds) {
-        return success(planService.getPlateList(planId));
+        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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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;
 

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/ProductionProcessController.java

@@ -40,7 +40,7 @@ public class ProductionProcessController {
 
     @GetMapping("/page")
     @Operation(summary = "查看生产工序分页")
-    @PreAuthorize("@ss.hasPermission('manage:process:query')")
+    @PreAuthorize("@ss.hasPermission('product:process:query')")
     public CommonResult<PageResult<ProcessRespVO>> getUserPage(@Valid ProcessPageReqVO pageReqVO) {
 
         return success(productionProcessService.getProcessPage(pageReqVO));
@@ -53,7 +53,7 @@ public class ProductionProcessController {
 
     @PutMapping("/update")
     @Operation(summary = "修改生产工序明细和步骤表的状态")
-    @PreAuthorize("@ss.hasPermission('manage:process:update')")
+    @PreAuthorize("@ss.hasPermission('product:process:work')")
     public  CommonResult<Boolean> updateProcessStatus(@Valid @RequestBody OrderProcessStepItemVO reqVo){
         productionProcessService.updateProcessStatus(reqVo);
         return success(true);
@@ -64,7 +64,7 @@ public class ProductionProcessController {
 
     @GetMapping("/selectPlate")
     @Operation(summary = "查看当前生产单的工序对应的板件信息")
-    @PreAuthorize("@ss.hasPermission('manage:process:view')")
+    @PreAuthorize("@ss.hasPermission('product:process:view')")
     public CommonResult<OrderPlateReqVO>  selectPlate(@Valid ProcessPlateReqVO reqVO){
         return success(productionProcessService.selectPlate(reqVO));
     }

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.java

@@ -44,16 +44,16 @@ public interface ProductionStatusMapper extends BaseMapperX<OrderDO> {
     PrintOrderRespVO selectPrintOrder(@Param("orderNo") Long orderNo,@Param("organId")Long organId);
 
 
-    default List<OrderDO> selectPackPage(PackPageReqVO pageReqVO,Long organId) {
+//    default List<OrderDO> selectOrderIds(PackPageReqVO pageReqVO,Long organId) {
-        return selectList(new LambdaQueryWrapperX<OrderDO>()
+//        return selectList(new LambdaQueryWrapperX<OrderDO>()
-                .eq(OrderDO::getOrganId,organId)
+//                .eq(OrderDO::getOrganId,organId)
-                .likeIfPresent(OrderDO::getId, String.valueOf(pageReqVO.getOrderId()))
+//                .eqIfPresent(OrderDO::getId, pageReqVO.getOrderId())
-                .eqIfPresent(OrderDO::getCustomOrderNo, pageReqVO.getCustomOrderNo())
+//                .eqIfPresent(OrderDO::getCustomOrderNo, pageReqVO.getCustomOrderNo())
-                .likeIfPresent(OrderDO::getCustomer, pageReqVO.getCustomer())
+//                .likeIfPresent(OrderDO::getCustomer, pageReqVO.getCustomer())
-                .likeIfPresent(OrderDO::getAddress, pageReqVO.getAddress())
+//                .likeIfPresent(OrderDO::getAddress, pageReqVO.getAddress())
-                .eqIfPresent(OrderDO::getStatus, pageReqVO.getStatus())
+//                .eqIfPresent(OrderDO::getStatus, pageReqVO.getStatus())
-                .orderByDesc(OrderDO::getCreateTime));
+//                .orderByDesc(OrderDO::getCreateTime));
-    }
+//    }
 
     IPage<PackRespVO> selectOrderPlate( @Param("page") IPage page, @Param("orderIds") List<Long> orderIds, @Param("organId")  Long organId);
 
@@ -64,4 +64,6 @@ public interface ProductionStatusMapper extends BaseMapperX<OrderDO> {
 
 
 
+    List<OrderDO> selectOrderIds(@Param("pageReqVO") PackPageReqVO pageReqVO,@Param("organId") Long organId);
+
 }

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java

@@ -74,7 +74,7 @@ public class PackServiceImpl implements PackService {
         PageDTO<PackRespVO> page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
 
         // 根据生产状态查询生产单号
-        List<Long> orderIds = productionStatusMapper.selectPackPage(pageReqVO,getUserOrganId()).stream().map(OrderDO::getId).collect(Collectors.toList());
+        List<Long> orderIds = productionStatusMapper.selectOrderIds(pageReqVO,getUserOrganId()).stream().map(m->m.getId()).collect(Collectors.toList());
 
         if(orderIds.isEmpty()){
             return null;

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml

@@ -57,7 +57,7 @@
     </resultMap>
 
     <select id="selectOrderPlate"
-            parameterType="java.util.List"
+            parameterType="java.lang.Long"
             resultMap="PackMap">
 
 
@@ -82,8 +82,11 @@
             o.organ_id = #{organId} and oi.plate_id != 0 and
             o.id in
                 <foreach item="id" collection="orderIds" open="(" separator="," close=")">
-                    #{id}
+                    <if test="id !=null">
+                        #{id}
+                    </if>
                 </foreach>
+
         group by orderNo,customOrderNo,dealer,createTime,deliveryDate,customer,phoneNumber,address,salesman,splitter,status
 
 
@@ -134,4 +137,40 @@
     </select>
 
 
+    <select id="selectOrderIds" resultType="com.cf.imes.module.manage.dal.dataobject.process.OrderDO" parameterType="map">
+
+
+        select * from orders
+        <where>
+
+            organ_id =#{organId}
+            and deleted = false
+
+            <if test="pageReqVO.orderId !=null">
+                and id like concat('%', #{pageReqVO.orderId},'%')
+            </if>
+
+            <if test="pageReqVO.status !=null">
+                and status = #{pageReqVO.status}
+            </if>
+
+            <if test="pageReqVO.customOrderNo !=null">
+                and custom_order_no like concat('%',#{pageReqVO.customOrderNo},'%')
+            </if>
+
+            <if test="pageReqVO.customer !=null">
+                and customer like concat('%', #{pageReqVO.customer},'%')
+            </if>
+
+            <if test="pageReqVO.address !=null">
+                and address like concat('%', #{pageReqVO.address},'%')
+            </if>
+
+        </where>
+
+
+
+    </select>
+
+
 </mapper>

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/ProcessController.java

@@ -119,7 +119,7 @@ public class ProcessController {
     @GetMapping("/select")
     @Operation(summary = "查看当前登录用户的组织的工序信息")
     @Parameter(name = "userId", description = "当前登录的用户ID", required = true, example = "1")
-    @PreAuthorize("@ss.hasPermission('manage:process:query')")
+    @PreAuthorize("@ss.hasPermission('system:process:query')")
     public CommonResult<List<ProcessDO>> getUserPage(@Valid @RequestParam("userId") Long userId) {
 
         return success(processService.getUserProcess(userId));