Browse Source

2024-01-07

RoutingTool加分页
master
fengyuan_yang 1 year ago
parent
commit
9f6a5a13e5
  1. 12
      src/main/java/com/spring/modules/part/controller/RoutingManagementController.java
  2. 4
      src/main/java/com/spring/modules/part/entity/ToolHeader.java
  3. 2
      src/main/java/com/spring/modules/part/mapper/RoutingManagementMapper.java
  4. 2
      src/main/java/com/spring/modules/part/service/RoutingManagementService.java
  5. 11
      src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java
  6. 18
      src/main/resources/mapper/part/RoutingManagementMapper.xml

12
src/main/java/com/spring/modules/part/controller/RoutingManagementController.java

@ -396,4 +396,16 @@ public class RoutingManagementController {
Integer operationNo = routingManagementService.queryMaxOperationNo(data);
return R.ok().put("operationNo", operationNo);
}
/**
* 查工具列表
* @param data
* @return
*/
@PostMapping(value="/queryToolList")
@ResponseBody
public R queryToolList(@RequestBody ToolHeader data) {
PageUtils page = routingManagementService.queryToolList(data);
return R.ok().put("page", page);
}
}

4
src/main/java/com/spring/modules/part/entity/ToolHeader.java

@ -5,11 +5,13 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.spring.common.utils.Query;
import com.spring.common.utils.QueryPage;
import lombok.Data;
@Data
@TableName("tool_header")
public class ToolHeader {
public class ToolHeader extends QueryPage {
/**
* 工具编号
*/

2
src/main/java/com/spring/modules/part/mapper/RoutingManagementMapper.java

@ -204,4 +204,6 @@ public interface RoutingManagementMapper extends BaseMapper<RoutingHeaderEntity>
List<RoutingToolEntity> selectRoutingToolByPartNo(@Param("site") String site, @Param("partNo") String partNo);
List<WorkGuidelineEntity> selectRoutingGuidelineByPartNo(@Param("site") String site, @Param("partNo") String partNo);
IPage<ToolHeader> queryToolList(Page<ToolHeader> toolHeaderPage, @Param("query") ToolHeader data);
}

2
src/main/java/com/spring/modules/part/service/RoutingManagementService.java

@ -75,4 +75,6 @@ public interface RoutingManagementService {
void syncWorkCenterToPLM(WorkCenterVo workCenterVo);
PageUtils queryPartListRouting(PartInformationEntity data);
PageUtils queryToolList(ToolHeader data);
}

11
src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java

@ -1583,4 +1583,15 @@ public class RoutingManagementServiceImpl extends ServiceImpl<RoutingManagementM
return new PageUtils(list);
}
/**
* 查工具列表
* @param data
* @return
*/
@Override
public PageUtils queryToolList(ToolHeader data) {
IPage<ToolHeader> resultList = this.routingManagementMapper.queryToolList(new Page<ToolHeader>(data.getPage(), data.getLimit()), data);
return new PageUtils(resultList);
}
}

18
src/main/resources/mapper/part/RoutingManagementMapper.xml

@ -1620,4 +1620,22 @@
FROM plm_routing_work_guide
where site = #{site} and part_no = #{partNo}
</select>
<!-- 查工具列表 -->
<select id="queryToolList" parameterType="ToolHeader" resultType="ToolHeader">
SELECT
site,
tool_id,
tool_description
FROM tool_header
<where>
site = #{query.site} and active = 'Y'
<if test = "query.toolId != null and query.toolId != ''">
AND tool_id like #{query.toolId}
</if>
<if test = "query.toolDescription != null and query.toolDescription != ''">
AND tool_description like #{query.toolDescription}
</if>
</where>
</select>
</mapper>
Loading…
Cancel
Save