工序组相关问题修改

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/RemainPlateController.java

@@ -107,6 +107,14 @@ public class RemainPlateController {
         return success(BeanUtils.toBean(pageResult, RemainPlateRespVO.class));
     }
 
+    @GetMapping("/pageAdd")
+    @Operation(summary = "获得生产单余料板可添加分页")
+    @PreAuthorize("@ss.hasPermission('placeorder:remain')")
+    public CommonResult<PageResult<RemainPlateRespVO>> getRemainPlatePageToAdd(@Valid RemainPlatePageReqVO pageReqVO) {
+        PageResult<RemainPlateDO> pageResult = remainPlateService.getRemainPlatePageToAdd(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, RemainPlateRespVO.class));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出生产单余料板表Excel")
     @PreAuthorize("@ss.hasPermission('placeorder:remain')")

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/remainplaten/RemainPlateMapper.java

@@ -8,6 +8,7 @@ import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX;
 import com.cf.imes.module.manage.controller.admin.plate.vo.remain.RemainPlatePageReqVO;
 import com.cf.imes.module.manage.dal.dataobject.remainplaten.RemainPlateDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Set;
@@ -47,6 +48,27 @@ public interface RemainPlateMapper extends BaseMapperX<RemainPlateDO> {
                 .orderByDesc(RemainPlateDO::getId));
     }
 
+    default PageResult<RemainPlateDO> selectPageToAdd(RemainPlatePageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<RemainPlateDO>()
+                .neIfPresent(RemainPlateDO::getInitPlanId, reqVO.getInitPlanId())
+                .eqIfPresent(RemainPlateDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(RemainPlateDO::getGoodsId, reqVO.getGoodsId())
+                .likeIfPresent(RemainPlateDO::getName, reqVO.getName())
+                .likeIfPresent(RemainPlateDO::getMaterial, reqVO.getMaterial())
+                .likeIfPresent(RemainPlateDO::getColor, reqVO.getColor())
+                .eqIfPresent(RemainPlateDO::getThickness, reqVO.getThickness())
+                .eqIfPresent(RemainPlateDO::getBrand, reqVO.getBrand())
+                .likeIfPresent(RemainPlateDO::getStore, reqVO.getStore())
+                .eqIfPresent(RemainPlateDO::getCount, reqVO.getCount())
+                .eqIfPresent(RemainPlateDO::getTexture, reqVO.getTexture())
+                .likeIfPresent(RemainPlateDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(RemainPlateDO::getOrganId, reqVO.getOrganId())
+                .eqIfPresent(RemainPlateDO::getOutLineJson, reqVO.getOutLineJson())
+                .betweenIfPresent(RemainPlateDO::getWidth, reqVO.getWidth())
+                .betweenIfPresent(RemainPlateDO::getLength, reqVO.getLength())
+                .betweenIfPresent(RemainPlateDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(RemainPlateDO::getId));
+    }
     // 批量修改状态
     default void updateRemainPlateStatus(Set<Long> ids, Integer status, Integer useType,Long organId,Long planId) {
         update(new UpdateWrapper<RemainPlateDO>()
@@ -75,12 +97,13 @@ public interface RemainPlateMapper extends BaseMapperX<RemainPlateDO> {
     }
 
     // 通过排单id批量余料板
-    default void deleteRemainPlate(Long initPlanId, Long organId) {
-        update(new UpdateWrapper<RemainPlateDO>()
-                .set("deleted", 1)
-                .eq("init_plan_id", initPlanId)
-                .eq("organ_id", organId));
-    }
+//    default void deleteRemainPlate(Long initPlanId, Long organId) {
+//        update(new UpdateWrapper<RemainPlateDO>()
+//                .set("deleted", 1)
+//                .eq("init_plan_id", initPlanId)
+//                .eq("organ_id", organId));
+//    }
+    void deleteRemainPlate(@Param("initPlanId") Long initPlanId, @Param("organId") Long organId);
 
     // 根据使用排单id批量还原状态
     default void updateRemainPlateStatusByPlanId(Integer status, Integer useType,Long organId,Long planId) {

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/remainplaten/RemainPlateService.java

@@ -79,4 +79,11 @@ public interface RemainPlateService {
      */
     PageResult<RemainPlateDO> getRemainPlatePage(RemainPlatePageReqVO pageReqVO);
 
+    /**
+     * 查询可添加余料板
+     *
+     * @param pageReqVO 分页查询
+     * @return 生产单余料板表
+     */
+    PageResult<RemainPlateDO> getRemainPlatePageToAdd(RemainPlatePageReqVO pageReqVO);
 }

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/remainplaten/RemainPlateServiceImpl.java

@@ -173,4 +173,9 @@ public class RemainPlateServiceImpl implements RemainPlateService {
         return remainPlateMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public PageResult<RemainPlateDO> getRemainPlatePageToAdd(RemainPlatePageReqVO pageReqVO) {
+        return remainPlateMapper.selectPageToAdd(pageReqVO.setStatus(RemainPlateStatusEnum.UNUSED.getStatus()));
+    }
+
 }

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/mapper/remainPlaten/RemainPlateMapper.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cf.imes.module.manage.dal.mysql.remainplaten.RemainPlateMapper">
+
+    <delete id="deleteRemainPlate">
+        delete from order_remain_plate where init_plan_id = #{initPlanId} and organ_id = #{organId}
+    </delete>
+</mapper>