Merge remote-tracking branch 'origin/master' into develop-QA

develop-QA
Tom Li 4 months ago
commit 69d2a50f53
  1. 32
      blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
  2. 161
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PartController.java
  3. 161
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PartRelationController.java
  4. 161
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SintTempCurveController.java
  5. 3
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/dto/WorkOrderDto.java
  6. 294
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/PartEntity.java
  7. 74
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/PartRelationEntity.java
  8. 94
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/SintTempCurveEntity.java
  9. 357
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/PartExcel.java
  10. 93
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/PartRelationExcel.java
  11. 117
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/SintTempCurveExcel.java
  12. 67
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartMapper.java
  13. 86
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartMapper.xml
  14. 64
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartRelationMapper.java
  15. 31
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartRelationMapper.xml
  16. 64
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SintTempCurveMapper.java
  17. 35
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SintTempCurveMapper.xml
  18. 33
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml
  19. 2
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml
  20. 62
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPartRelationService.java
  21. 64
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPartService.java
  22. 62
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ISintTempCurveService.java
  23. 63
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PartRelationServiceImpl.java
  24. 68
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PartServiceImpl.java
  25. 63
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/SintTempCurveServiceImpl.java
  26. 74
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
  27. 7
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/YieldOrderServiceImpl.java
  28. 46
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/PartRelationVO.java
  29. 46
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/PartVO.java
  30. 46
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/SintTempCurveVO.java
  31. 6
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/YieldOrderVO.java
  32. 60
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/PartRelationWrapper.java
  33. 60
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/PartWrapper.java
  34. 60
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/SintTempCurveWrapper.java

@ -1,28 +1,3 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.common.constant;
import org.springblade.core.launch.constant.AppConstant;
@ -37,8 +12,11 @@ public interface LauncherConstant {
/**
* nacos 命名空间
*/
String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8";
// String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401";
// String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e";
// 生产环境
String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401";
// 测试环境
// String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8";
/**
* nacos 用户名

@ -0,0 +1,161 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.controller;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import jakarta.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.scheduling.scheduling.entity.PartEntity;
import org.springblade.scheduling.scheduling.excel.PartExcel;
import org.springblade.scheduling.scheduling.service.IPartService;
import org.springblade.scheduling.scheduling.vo.PartVO;
import org.springblade.scheduling.scheduling.wrapper.PartWrapper;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.util.Map;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
/**
* 零件信息表 控制器
*
* @author BladeX
* @since 2025-12-26
*/
@RestController
@AllArgsConstructor
@RequestMapping("/part")
@Tag(name = "零件信息表", description = "零件信息表接口")
public class PartController extends BladeController {
private final IPartService partService;
/**
* 零件信息表 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入Part")
public R<PartVO> detail(PartEntity part) {
PartEntity detail = partService.getOne(Condition.getQueryWrapper(part));
return R.data(PartWrapper.build().entityVO(detail));
}
/**
* 零件信息表 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@Operation(summary = "分页", description = "传入Part")
public R<IPage<PartVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> part, Query query) {
IPage<PartEntity> pages = partService.page(Condition.getPage(query), Condition.getQueryWrapper(part, PartEntity.class));
return R.data(PartWrapper.build().pageVO(pages));
}
/**
* 零件信息表 自定义分页
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@Operation(summary = "分页", description = "传入Part")
public R<IPage<PartVO>> page(PartVO part, Query query) {
IPage<PartVO> pages = partService.selectPartPage(Condition.getPage(query), part);
return R.data(pages);
}
/**
* 零件信息表 新增
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入Part")
public R save(@Valid @RequestBody PartEntity part) {
return R.status(partService.save(part));
}
/**
* 零件信息表 修改
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入Part")
public R update(@Valid @RequestBody PartEntity part) {
return R.status(partService.updateById(part));
}
/**
* 零件信息表 新增或修改
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入Part")
public R submit(@Valid @RequestBody PartEntity part) {
return R.status(partService.saveOrUpdate(part));
}
/**
* 零件信息表 删除
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(partService.deleteLogic(Func.toLongList(ids)));
}
/**
* 导出数据
*/
@IsAdmin
@GetMapping("/export-Part")
@ApiOperationSupport(order = 9)
@Operation(summary = "导出数据", description = "传入Part")
public void exportPart(@Parameter(hidden = true) @RequestParam Map<String, Object> part, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<PartEntity> queryWrapper = Condition.getQueryWrapper(part, PartEntity.class);
//if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(Part::getTenantId, bladeUser.getTenantId());
//}
//queryWrapper.lambda().eq(PartEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<PartExcel> list = partService.export(queryWrapper);
ExcelUtil.export(response, "零件信息表数据" + DateUtil.time(), "零件信息表数据表", list, PartExcel.class);
}
}

@ -0,0 +1,161 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.controller;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import jakarta.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.scheduling.scheduling.entity.PartRelationEntity;
import org.springblade.scheduling.scheduling.excel.PartRelationExcel;
import org.springblade.scheduling.scheduling.service.IPartRelationService;
import org.springblade.scheduling.scheduling.vo.PartRelationVO;
import org.springblade.scheduling.scheduling.wrapper.PartRelationWrapper;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.util.Map;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
/**
* 部件-子件关联表 控制器
*
* @author BladeX
* @since 2025-12-26
*/
@RestController
@AllArgsConstructor
@RequestMapping("/partRelation")
@Tag(name = "部件-子件关联表", description = "部件-子件关联表接口")
public class PartRelationController extends BladeController {
private final IPartRelationService partRelationService;
/**
* 部件-子件关联表 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入PartRelation")
public R<PartRelationVO> detail(PartRelationEntity partRelation) {
PartRelationEntity detail = partRelationService.getOne(Condition.getQueryWrapper(partRelation));
return R.data(PartRelationWrapper.build().entityVO(detail));
}
/**
* 部件-子件关联表 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@Operation(summary = "分页", description = "传入PartRelation")
public R<IPage<PartRelationVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> partRelation, Query query) {
IPage<PartRelationEntity> pages = partRelationService.page(Condition.getPage(query), Condition.getQueryWrapper(partRelation, PartRelationEntity.class));
return R.data(PartRelationWrapper.build().pageVO(pages));
}
/**
* 部件-子件关联表 自定义分页
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@Operation(summary = "分页", description = "传入PartRelation")
public R<IPage<PartRelationVO>> page(PartRelationVO partRelation, Query query) {
IPage<PartRelationVO> pages = partRelationService.selectPartRelationPage(Condition.getPage(query), partRelation);
return R.data(pages);
}
/**
* 部件-子件关联表 新增
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入PartRelation")
public R save(@Valid @RequestBody PartRelationEntity partRelation) {
return R.status(partRelationService.save(partRelation));
}
/**
* 部件-子件关联表 修改
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入PartRelation")
public R update(@Valid @RequestBody PartRelationEntity partRelation) {
return R.status(partRelationService.updateById(partRelation));
}
/**
* 部件-子件关联表 新增或修改
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入PartRelation")
public R submit(@Valid @RequestBody PartRelationEntity partRelation) {
return R.status(partRelationService.saveOrUpdate(partRelation));
}
/**
* 部件-子件关联表 删除
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(partRelationService.deleteLogic(Func.toLongList(ids)));
}
/**
* 导出数据
*/
@IsAdmin
@GetMapping("/export-PartRelation")
@ApiOperationSupport(order = 9)
@Operation(summary = "导出数据", description = "传入PartRelation")
public void exportPartRelation(@Parameter(hidden = true) @RequestParam Map<String, Object> partRelation, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<PartRelationEntity> queryWrapper = Condition.getQueryWrapper(partRelation, PartRelationEntity.class);
//if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(PartRelation::getTenantId, bladeUser.getTenantId());
//}
//queryWrapper.lambda().eq(PartRelationEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<PartRelationExcel> list = partRelationService.export(queryWrapper);
ExcelUtil.export(response, "部件-子件关联表数据" + DateUtil.time(), "部件-子件关联表数据表", list, PartRelationExcel.class);
}
}

@ -0,0 +1,161 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.controller;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import jakarta.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.scheduling.scheduling.entity.SintTempCurveEntity;
import org.springblade.scheduling.scheduling.excel.SintTempCurveExcel;
import org.springblade.scheduling.scheduling.service.ISintTempCurveService;
import org.springblade.scheduling.scheduling.vo.SintTempCurveVO;
import org.springblade.scheduling.scheduling.wrapper.SintTempCurveWrapper;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import java.util.Map;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
/**
* 烧结温度曲线表 控制器
*
* @author BladeX
* @since 2025-12-26
*/
@RestController
@AllArgsConstructor
@RequestMapping("/sintTempCurve")
@Tag(name = "烧结温度曲线表", description = "烧结温度曲线表接口")
public class SintTempCurveController extends BladeController {
private final ISintTempCurveService sintTempCurveService;
/**
* 烧结温度曲线表 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入SintTempCurve")
public R<SintTempCurveVO> detail(SintTempCurveEntity sintTempCurve) {
SintTempCurveEntity detail = sintTempCurveService.getOne(Condition.getQueryWrapper(sintTempCurve));
return R.data(SintTempCurveWrapper.build().entityVO(detail));
}
/**
* 烧结温度曲线表 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@Operation(summary = "分页", description = "传入SintTempCurve")
public R<IPage<SintTempCurveVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> sintTempCurve, Query query) {
IPage<SintTempCurveEntity> pages = sintTempCurveService.page(Condition.getPage(query), Condition.getQueryWrapper(sintTempCurve, SintTempCurveEntity.class));
return R.data(SintTempCurveWrapper.build().pageVO(pages));
}
/**
* 烧结温度曲线表 自定义分页
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@Operation(summary = "分页", description = "传入SintTempCurve")
public R<IPage<SintTempCurveVO>> page(SintTempCurveVO sintTempCurve, Query query) {
IPage<SintTempCurveVO> pages = sintTempCurveService.selectSintTempCurvePage(Condition.getPage(query), sintTempCurve);
return R.data(pages);
}
/**
* 烧结温度曲线表 新增
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入SintTempCurve")
public R save(@Valid @RequestBody SintTempCurveEntity sintTempCurve) {
return R.status(sintTempCurveService.save(sintTempCurve));
}
/**
* 烧结温度曲线表 修改
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入SintTempCurve")
public R update(@Valid @RequestBody SintTempCurveEntity sintTempCurve) {
return R.status(sintTempCurveService.updateById(sintTempCurve));
}
/**
* 烧结温度曲线表 新增或修改
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入SintTempCurve")
public R submit(@Valid @RequestBody SintTempCurveEntity sintTempCurve) {
return R.status(sintTempCurveService.saveOrUpdate(sintTempCurve));
}
/**
* 烧结温度曲线表 删除
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(sintTempCurveService.deleteLogic(Func.toLongList(ids)));
}
/**
* 导出数据
*/
@IsAdmin
@GetMapping("/export-SintTempCurve")
@ApiOperationSupport(order = 9)
@Operation(summary = "导出数据", description = "传入SintTempCurve")
public void exportSintTempCurve(@Parameter(hidden = true) @RequestParam Map<String, Object> sintTempCurve, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<SintTempCurveEntity> queryWrapper = Condition.getQueryWrapper(sintTempCurve, SintTempCurveEntity.class);
//if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(SintTempCurve::getTenantId, bladeUser.getTenantId());
//}
//queryWrapper.lambda().eq(SintTempCurveEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<SintTempCurveExcel> list = sintTempCurveService.export(queryWrapper);
ExcelUtil.export(response, "烧结温度曲线表数据" + DateUtil.time(), "烧结温度曲线表数据表", list, SintTempCurveExcel.class);
}
}

@ -3,6 +3,7 @@ package org.springblade.scheduling.scheduling.dto;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
* TODO功能描述
@ -43,4 +44,6 @@ public class WorkOrderDto {
private String receiveTime;
private String priorityAps;
private List<String> planStatusList;
}

@ -0,0 +1,294 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.entity;
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import java.math.BigDecimal;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.tenant.mp.TenantEntity;
import java.io.Serial;
/**
* 零件信息表 实体类
*
* @author BladeX
* @since 2025-12-26
*/
@Data
@TableName("DS_PART")
@Schema(description = "DsPart对象")
@EqualsAndHashCode(callSuper = true)
public class PartEntity extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 审定人
*/
@Schema(description = "审定人")
private String approveUser;
/**
* 涂色标个数
*/
@Schema(description = "涂色标个数")
private String tsbNum;
/**
* 涂色带个数
*/
@Schema(description = "涂色带个数")
private String tsdNum;
/**
* 涂箭头个数
*/
@Schema(description = "涂箭头个数")
private String tjtNum;
/**
* 上次修改时间
*/
@Schema(description = "上次修改时间")
private Date lastUpdateTime;
/**
* 上次修改人
*/
@Schema(description = "上次修改人")
private BigDecimal lastUpdateUser;
/**
* 备注
*/
@Schema(description = "备注")
private String remarks;
/**
* 零件类型
*/
@Schema(description = "零件类型")
private String sinTerType;
/**
* 镀种2
*/
@Schema(description = "镀种2")
private String plateTwo;
/**
* 镀层代码2
*/
@Schema(description = "镀层代码2")
private String plateCodeTwo;
/**
* 面积2
*/
@Schema(description = "面积2")
private BigDecimal areaTwo;
/**
* 产品应用领域
*/
@Schema(description = "产品应用领域")
private String productApplicationArea;
/**
* 热处理检验
*/
@Schema(description = "热处理检验")
private String hotDispose;
/**
* 荧光检
*/
@Schema(description = "荧光检")
private String fluorescenceCheck;
/**
* 喷码
*/
@Schema(description = "喷码")
private String inkjetPrinting;
/**
* 有效期
*/
@Schema(description = "有效期")
private String periodOfValidity;
/**
* 零件状态
*/
@Schema(description = "零件状态")
private String pfStatus;
/**
* 父级零件id
*/
@Schema(description = "父级零件id")
private String parentId;
/**
* 零件号
*/
@Schema(description = "零件号")
private String partCode;
/**
* 零件名称
*/
@Schema(description = "零件名称")
private String partName;
/**
* 硬度
*/
@Schema(description = "硬度")
private String hardness;
/**
* 材料
*/
@Schema(description = "材料")
private String material;
/**
* 面积
*/
@Schema(description = "面积")
private BigDecimal area;
/**
* 镀种
*/
@Schema(description = "镀种")
private String plate;
/**
* 工艺路线
*/
@Schema(description = "工艺路线")
private String craftWay;
/**
* 到期周期
*/
@Schema(description = "到期周期(天)")
private Long expirationPeriod;
/**
* 提前提醒
*/
@Schema(description = "提前提醒")
private Long advanceRemind;
/**
* 下次到期日
*/
@Schema(description = "下次到期日")
private Date nextDue;
/**
* 工艺员
*/
@Schema(description = "工艺员")
private String technician;
/**
* 关键信息
*/
@Schema(description = "关键信息")
private String keyInfo;
/**
* 标记要求
*/
@Schema(description = "标记要求")
private String signMemo;
/**
* 是否烧结产品
*/
@Schema(description = "是否烧结产品")
private String isSintering;
/**
* 产品型号
*/
@Schema(description = "产品型号")
private String productType;
/**
* 异常工艺标识
*/
@Schema(description = "异常工艺标识")
private String isAbnormal;
/**
* 配置码
*/
@Schema(description = "配置码")
private String configCode;
/**
* 镀金标识
*/
@Schema(description = "镀金标识")
private String goldMark;
/**
* PDM图纸链接
*/
@Schema(description = "PDM图纸链接")
private String docLink;
/**
* 镀层代号
*/
@Schema(description = "镀层代号")
private String plateCode;
/**
* 镀层厚度
*/
@Schema(description = "镀层厚度")
private String plateThickness;
/**
* 镀层物料
*/
@Schema(description = "镀层物料")
private String plateGoodsCode;
/**
* 涂色标验证
*/
@Schema(description = "涂色标验证")
private String markingsTest;
/**
* 产品系列
*/
@Schema(description = "产品系列")
private String productSeries;
/**
* 是否玻璃饼
*/
@Schema(description = "是否玻璃饼")
private String isClassCake;
/**
* 成型厚度
*/
@Schema(description = "成型厚度")
private BigDecimal formingThickness;
/**
* 子件是否印字
*/
@Schema(description = "子件是否印字")
private String isChildPrint;
/**
* 粉重
*/
@Schema(description = "粉重")
private BigDecimal powderWeight;
/**
* 是否印字;123
*/
@Schema(description = "是否印字;1、否,2、单,3、双")
private String isPrint;
/**
* 审核人
*/
@Schema(description = "审核人")
private String reviewUser;
}

@ -0,0 +1,74 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.entity;
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import com.baomidou.mybatisplus.annotation.TableName;
import java.math.BigDecimal;
import java.util.Date;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.tenant.mp.TenantEntity;
import java.io.Serial;
/**
* 部件-子件关联表 实体类
*
* @author BladeX
* @since 2025-12-26
*/
@Data
@TableName("DS_PART_RELATION")
@Schema(description = "DsPartRelation对象")
@EqualsAndHashCode(callSuper = true)
public class PartRelationEntity extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 部件ID
*/
@Schema(description = "部件ID")
private BigDecimal partId;
/**
* 部件号
*/
@Schema(description = "部件号")
private String partCode;
/**
* 子件ID
*/
@Schema(description = "子件ID")
private BigDecimal childPartId;
/**
* 子件号
*/
@Schema(description = "子件号")
private String childPartCode;
}

@ -0,0 +1,94 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.entity;
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import com.baomidou.mybatisplus.annotation.TableName;
import java.math.BigDecimal;
import java.util.Date;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.tenant.mp.TenantEntity;
import java.io.Serial;
/**
* 烧结温度曲线表 实体类
*
* @author BladeX
* @since 2025-12-26
*/
@Data
@TableName("MES_SINT_TEMP_CURVE")
@Schema(description = "MesSintTempCurve对象")
@EqualsAndHashCode(callSuper = true)
public class SintTempCurveEntity extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 工序id
*/
@Schema(description = "工序id")
private Long processId;
/**
* 工序名称
*/
@Schema(description = "工序名称")
private String processName;
/**
* 设备编码
*/
@Schema(description = "设备编码")
private String equipCode;
/**
* 设备类型
*/
@Schema(description = "设备类型")
private String equipType;
/**
* 设备名称
*/
@Schema(description = "设备名称")
private String equipName;
/**
* 玻璃粉牌号
*/
@Schema(description = "玻璃粉牌号")
private String glassCode;
/**
* 设定温度
*/
@Schema(description = "设定温度")
private String temperature;
/**
* 备注
*/
@Schema(description = "备注")
private String remarks;
}

@ -0,0 +1,357 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.excel;
import lombok.Data;
import java.util.Date;
import java.math.BigDecimal;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import java.io.Serializable;
import java.io.Serial;
/**
* 零件信息表 Excel实体类
*
* @author BladeX
* @since 2025-12-26
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class PartExcel implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 审定人
*/
@ColumnWidth(20)
@ExcelProperty("审定人")
private String approveUser;
/**
* 涂色标个数
*/
@ColumnWidth(20)
@ExcelProperty("涂色标个数")
private String tsbNum;
/**
* 涂色带个数
*/
@ColumnWidth(20)
@ExcelProperty("涂色带个数")
private String tsdNum;
/**
* 涂箭头个数
*/
@ColumnWidth(20)
@ExcelProperty("涂箭头个数")
private String tjtNum;
/**
* 上次修改时间
*/
@ColumnWidth(20)
@ExcelProperty("上次修改时间")
private Date lastUpdateTime;
/**
* 上次修改人
*/
@ColumnWidth(20)
@ExcelProperty("上次修改人")
private BigDecimal lastUpdateUser;
/**
* 备注
*/
@ColumnWidth(20)
@ExcelProperty("备注")
private String remarks;
/**
* 是否删除
*/
@ColumnWidth(20)
@ExcelProperty("是否删除")
private Long isDeleted;
/**
* 零件类型
*/
@ColumnWidth(20)
@ExcelProperty("零件类型")
private String sinTerType;
/**
* 镀种2
*/
@ColumnWidth(20)
@ExcelProperty("镀种2")
private String plateTwo;
/**
* 镀层代码2
*/
@ColumnWidth(20)
@ExcelProperty("镀层代码2")
private String plateCodeTwo;
/**
* 面积2
*/
@ColumnWidth(20)
@ExcelProperty("面积2")
private BigDecimal areaTwo;
/**
* 产品应用领域
*/
@ColumnWidth(20)
@ExcelProperty("产品应用领域")
private String productApplicationArea;
/**
* 热处理检验
*/
@ColumnWidth(20)
@ExcelProperty("热处理检验")
private String hotDispose;
/**
* 荧光检
*/
@ColumnWidth(20)
@ExcelProperty("荧光检")
private String fluorescenceCheck;
/**
* 喷码
*/
@ColumnWidth(20)
@ExcelProperty("喷码")
private String inkjetPrinting;
/**
* 有效期
*/
@ColumnWidth(20)
@ExcelProperty("有效期")
private String periodOfValidity;
/**
* 零件状态
*/
@ColumnWidth(20)
@ExcelProperty("零件状态")
private String pfStatus;
/**
* id
*/
@ColumnWidth(20)
@ExcelProperty("id")
private BigDecimal id;
/**
* 父级零件id
*/
@ColumnWidth(20)
@ExcelProperty("父级零件id")
private String parentId;
/**
* 零件号
*/
@ColumnWidth(20)
@ExcelProperty("零件号")
private String partCode;
/**
* 零件名称
*/
@ColumnWidth(20)
@ExcelProperty("零件名称")
private String partName;
/**
* 硬度
*/
@ColumnWidth(20)
@ExcelProperty("硬度")
private String hardness;
/**
* 材料
*/
@ColumnWidth(20)
@ExcelProperty("材料")
private String material;
/**
* 面积
*/
@ColumnWidth(20)
@ExcelProperty("面积")
private BigDecimal area;
/**
* 镀种
*/
@ColumnWidth(20)
@ExcelProperty("镀种")
private String plate;
/**
* 工艺路线
*/
@ColumnWidth(20)
@ExcelProperty("工艺路线")
private String craftWay;
/**
* 到期周期
*/
@ColumnWidth(20)
@ExcelProperty("到期周期(天)")
private Long expirationPeriod;
/**
* 提前提醒
*/
@ColumnWidth(20)
@ExcelProperty("提前提醒")
private Long advanceRemind;
/**
* 下次到期日
*/
@ColumnWidth(20)
@ExcelProperty("下次到期日")
private Date nextDue;
/**
* 工艺员
*/
@ColumnWidth(20)
@ExcelProperty("工艺员")
private String technician;
/**
* 关键信息
*/
@ColumnWidth(20)
@ExcelProperty("关键信息")
private String keyInfo;
/**
* 标记要求
*/
@ColumnWidth(20)
@ExcelProperty("标记要求")
private String signMemo;
/**
* 是否烧结产品
*/
@ColumnWidth(20)
@ExcelProperty("是否烧结产品")
private String isSintering;
/**
* 产品型号
*/
@ColumnWidth(20)
@ExcelProperty("产品型号")
private String productType;
/**
* 异常工艺标识
*/
@ColumnWidth(20)
@ExcelProperty("异常工艺标识")
private String isAbnormal;
/**
* 配置码
*/
@ColumnWidth(20)
@ExcelProperty("配置码")
private String configCode;
/**
* 镀金标识
*/
@ColumnWidth(20)
@ExcelProperty("镀金标识")
private String goldMark;
/**
* PDM图纸链接
*/
@ColumnWidth(20)
@ExcelProperty("PDM图纸链接")
private String docLink;
/**
* 镀层代号
*/
@ColumnWidth(20)
@ExcelProperty("镀层代号")
private String plateCode;
/**
* 镀层厚度
*/
@ColumnWidth(20)
@ExcelProperty("镀层厚度")
private String plateThickness;
/**
* 镀层物料
*/
@ColumnWidth(20)
@ExcelProperty("镀层物料")
private String plateGoodsCode;
/**
* 涂色标验证
*/
@ColumnWidth(20)
@ExcelProperty("涂色标验证")
private String markingsTest;
/**
* 产品系列
*/
@ColumnWidth(20)
@ExcelProperty("产品系列")
private String productSeries;
/**
* 是否玻璃饼
*/
@ColumnWidth(20)
@ExcelProperty("是否玻璃饼")
private String isClassCake;
/**
* 成型厚度
*/
@ColumnWidth(20)
@ExcelProperty("成型厚度")
private BigDecimal formingThickness;
/**
* 子件是否印字
*/
@ColumnWidth(20)
@ExcelProperty("子件是否印字")
private String isChildPrint;
/**
* 粉重
*/
@ColumnWidth(20)
@ExcelProperty("粉重")
private BigDecimal powderWeight;
/**
* 是否印字;123
*/
@ColumnWidth(20)
@ExcelProperty("是否印字;1、否,2、单,3、双")
private String isPrint;
/**
* 审核人
*/
@ColumnWidth(20)
@ExcelProperty("审核人")
private String reviewUser;
}

@ -0,0 +1,93 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.excel;
import lombok.Data;
import java.math.BigDecimal;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import java.io.Serializable;
import java.io.Serial;
/**
* 部件-子件关联表 Excel实体类
*
* @author BladeX
* @since 2025-12-26
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class PartRelationExcel implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ColumnWidth(20)
@ExcelProperty("主键ID")
private BigDecimal id;
/**
* 部件ID
*/
@ColumnWidth(20)
@ExcelProperty("部件ID")
private BigDecimal partId;
/**
* 部件号
*/
@ColumnWidth(20)
@ExcelProperty("部件号")
private String partCode;
/**
* 子件ID
*/
@ColumnWidth(20)
@ExcelProperty("子件ID")
private BigDecimal childPartId;
/**
* 子件号
*/
@ColumnWidth(20)
@ExcelProperty("子件号")
private String childPartCode;
/**
* 删除标记0-未删除1-已删除
*/
@ColumnWidth(20)
@ExcelProperty("删除标记:0-未删除,1-已删除")
private Long isDeleted;
}

@ -0,0 +1,117 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.excel;
import lombok.Data;
import java.math.BigDecimal;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import java.io.Serializable;
import java.io.Serial;
/**
* 烧结温度曲线表 Excel实体类
*
* @author BladeX
* @since 2025-12-26
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class SintTempCurveExcel implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* ID
*/
@ColumnWidth(20)
@ExcelProperty("ID")
private BigDecimal id;
/**
* 工序id
*/
@ColumnWidth(20)
@ExcelProperty("工序id")
private BigDecimal processId;
/**
* 工序名称
*/
@ColumnWidth(20)
@ExcelProperty("工序名称")
private String processName;
/**
* 设备编码
*/
@ColumnWidth(20)
@ExcelProperty("设备编码")
private String equipCode;
/**
* 设备类型
*/
@ColumnWidth(20)
@ExcelProperty("设备类型")
private String equipType;
/**
* 设备名称
*/
@ColumnWidth(20)
@ExcelProperty("设备名称")
private String equipName;
/**
* 玻璃粉牌号
*/
@ColumnWidth(20)
@ExcelProperty("玻璃粉牌号")
private String glassCode;
/**
* 设定温度
*/
@ColumnWidth(20)
@ExcelProperty("设定温度")
private String temperature;
/**
* 备注
*/
@ColumnWidth(20)
@ExcelProperty("备注")
private String remarks;
/**
* 是否已删除
*/
@ColumnWidth(20)
@ExcelProperty("是否已删除")
private Long isDeleted;
}

@ -0,0 +1,67 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.scheduling.scheduling.entity.PartEntity;
import org.springblade.scheduling.scheduling.excel.PartExcel;
import org.springblade.scheduling.scheduling.vo.PartVO;
import java.util.List;
/**
* 零件信息表 Mapper 接口
*
* @author BladeX
* @since 2025-12-26
*/
public interface PartMapper extends BaseMapper<PartEntity> {
/**
* 自定义分页
*
* @param page 分页参数
* @param Part 查询参数
* @return List<PartVO>
*/
List<PartVO> selectPartPage(IPage page, PartVO Part);
/**
* 获取导出数据
*
* @param queryWrapper 查询条件
* @return List<PartExcel>
*/
List<PartExcel> export(@Param("ew") Wrapper<PartEntity> queryWrapper);
List<PartEntity> selectChildPart(PartEntity part);
}

@ -0,0 +1,86 @@
<?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="org.springblade.scheduling.scheduling.mapper.PartMapper">
<!-- 通用查询映射结果 -->
<resultMap id="partResultMap" type="org.springblade.scheduling.scheduling.entity.PartEntity">
<result column="APPROVE_USER" property="approveUser"/>
<result column="TSB_NUM" property="tsbNum"/>
<result column="TSD_NUM" property="tsdNum"/>
<result column="TJT_NUM" property="tjtNum"/>
<result column="LAST_UPDATE_TIME" property="lastUpdateTime"/>
<result column="LAST_UPDATE_USER" property="lastUpdateUser"/>
<result column="CREATE_TIME" property="createTime"/>
<result column="CREATE_USER" property="createUser"/>
<result column="CREATE_DEPT" property="createDept"/>
<result column="UPDATE_TIME" property="updateTime"/>
<result column="UPDATE_USER" property="updateUser"/>
<result column="REMARKS" property="remarks"/>
<result column="STATUS" property="status"/>
<result column="IS_DELETED" property="isDeleted"/>
<result column="SIN_TER_TYPE" property="sinTerType"/>
<result column="PLATE_TWO" property="plateTwo"/>
<result column="PLATE_CODE_TWO" property="plateCodeTwo"/>
<result column="AREA_TWO" property="areaTwo"/>
<result column="PRODUCT_APPLICATION_AREA" property="productApplicationArea"/>
<result column="HOT_DISPOSE" property="hotDispose"/>
<result column="FLUORESCENCE_CHECK" property="fluorescenceCheck"/>
<result column="INKJET_PRINTING" property="inkjetPrinting"/>
<result column="PERIOD_OF_VALIDITY" property="periodOfValidity"/>
<result column="PF_STATUS" property="pfStatus"/>
<result column="ID" property="id"/>
<result column="PARENT_ID" property="parentId"/>
<result column="PART_CODE" property="partCode"/>
<result column="PART_NAME" property="partName"/>
<result column="HARDNESS" property="hardness"/>
<result column="MATERIAL" property="material"/>
<result column="AREA" property="area"/>
<result column="PLATE" property="plate"/>
<result column="CRAFT_WAY" property="craftWay"/>
<result column="EXPIRATION_PERIOD" property="expirationPeriod"/>
<result column="ADVANCE_REMIND" property="advanceRemind"/>
<result column="NEXT_DUE" property="nextDue"/>
<result column="TECHNICIAN" property="technician"/>
<result column="KEY_INFO" property="keyInfo"/>
<result column="SIGN_MEMO" property="signMemo"/>
<result column="IS_SINTERING" property="isSintering"/>
<result column="PRODUCT_TYPE" property="productType"/>
<result column="IS_ABNORMAL" property="isAbnormal"/>
<result column="CONFIG_CODE" property="configCode"/>
<result column="GOLD_MARK" property="goldMark"/>
<result column="DOC_LINK" property="docLink"/>
<result column="PLATE_CODE" property="plateCode"/>
<result column="PLATE_THICKNESS" property="plateThickness"/>
<result column="PLATE_GOODS_CODE" property="plateGoodsCode"/>
<result column="MARKINGS_TEST" property="markingsTest"/>
<result column="PRODUCT_SERIES" property="productSeries"/>
<result column="IS_CLASS_CAKE" property="isClassCake"/>
<result column="FORMING_THICKNESS" property="formingThickness"/>
<result column="IS_CHILD_PRINT" property="isChildPrint"/>
<result column="POWDER_WEIGHT" property="powderWeight"/>
<result column="IS_PRINT" property="isPrint"/>
<result column="REVIEW_USER" property="reviewUser"/>
</resultMap>
<select id="selectPartPage" resultMap="partResultMap">
select * from DS_PART where is_deleted = 0
</select>
<select id="export" resultType="org.springblade.scheduling.scheduling.excel.PartExcel">
SELECT * FROM DS_PART ${ew.customSqlSegment}
</select>
<select id="selectChildPart" resultMap="partResultMap">
SELECT
c.*
FROM
DS_PART a
LEFT JOIN DS_PART_RELATION b ON a.id = b.PART_ID
LEFT JOIN DS_PART c ON b.CHILD_PART_ID = c.id
WHERE
a.PART_CODE = #{partCode}
</select>
</mapper>

@ -0,0 +1,64 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.scheduling.scheduling.entity.PartRelationEntity;
import org.springblade.scheduling.scheduling.excel.PartRelationExcel;
import org.springblade.scheduling.scheduling.vo.PartRelationVO;
import java.util.List;
/**
* 部件-子件关联表 Mapper 接口
*
* @author BladeX
* @since 2025-12-26
*/
public interface PartRelationMapper extends BaseMapper<PartRelationEntity> {
/**
* 自定义分页
*
* @param page 分页参数
* @param PartRelation 查询参数
* @return List<PartRelationVO>
*/
List<PartRelationVO> selectPartRelationPage(IPage page, PartRelationVO PartRelation);
/**
* 获取导出数据
*
* @param queryWrapper 查询条件
* @return List<PartRelationExcel>
*/
List<PartRelationExcel> export(@Param("ew") Wrapper<PartRelationEntity> queryWrapper);
}

@ -0,0 +1,31 @@
<?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="org.springblade.scheduling.scheduling.mapper.PartRelationMapper">
<!-- 通用查询映射结果 -->
<resultMap id="partRelationResultMap" type="org.springblade.scheduling.scheduling.entity.PartRelationEntity">
<result column="ID" property="id"/>
<result column="PART_ID" property="partId"/>
<result column="PART_CODE" property="partCode"/>
<result column="CHILD_PART_ID" property="childPartId"/>
<result column="CHILD_PART_CODE" property="childPartCode"/>
<result column="CREATE_TIME" property="createTime"/>
<result column="CREATE_USER" property="createUser"/>
<result column="CREATE_DEPT" property="createDept"/>
<result column="UPDATE_TIME" property="updateTime"/>
<result column="UPDATE_USER" property="updateUser"/>
<result column="STATUS" property="status"/>
<result column="IS_DELETED" property="isDeleted"/>
</resultMap>
<select id="selectPartRelationPage" resultMap="partRelationResultMap">
select * from DS_PART_RELATION where is_deleted = 0
</select>
<select id="export" resultType="org.springblade.scheduling.scheduling.excel.PartRelationExcel">
SELECT * FROM DS_PART_RELATION ${ew.customSqlSegment}
</select>
</mapper>

@ -0,0 +1,64 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.scheduling.scheduling.entity.SintTempCurveEntity;
import org.springblade.scheduling.scheduling.excel.SintTempCurveExcel;
import org.springblade.scheduling.scheduling.vo.SintTempCurveVO;
import java.util.List;
/**
* 烧结温度曲线表 Mapper 接口
*
* @author BladeX
* @since 2025-12-26
*/
public interface SintTempCurveMapper extends BaseMapper<SintTempCurveEntity> {
/**
* 自定义分页
*
* @param page 分页参数
* @param SintTempCurve 查询参数
* @return List<SintTempCurveVO>
*/
List<SintTempCurveVO> selectSintTempCurvePage(IPage page, SintTempCurveVO SintTempCurve);
/**
* 获取导出数据
*
* @param queryWrapper 查询条件
* @return List<SintTempCurveExcel>
*/
List<SintTempCurveExcel> export(@Param("ew") Wrapper<SintTempCurveEntity> queryWrapper);
}

@ -0,0 +1,35 @@
<?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="org.springblade.scheduling.scheduling.mapper.SintTempCurveMapper">
<!-- 通用查询映射结果 -->
<resultMap id="sintTempCurveResultMap" type="org.springblade.scheduling.scheduling.entity.SintTempCurveEntity">
<result column="ID" property="id"/>
<result column="PROCESS_ID" property="processId"/>
<result column="PROCESS_NAME" property="processName"/>
<result column="EQUIP_CODE" property="equipCode"/>
<result column="EQUIP_TYPE" property="equipType"/>
<result column="EQUIP_NAME" property="equipName"/>
<result column="GLASS_CODE" property="glassCode"/>
<result column="TEMPERATURE" property="temperature"/>
<result column="REMARKS" property="remarks"/>
<result column="CREATE_USER" property="createUser"/>
<result column="CREATE_DEPT" property="createDept"/>
<result column="CREATE_TIME" property="createTime"/>
<result column="UPDATE_USER" property="updateUser"/>
<result column="UPDATE_TIME" property="updateTime"/>
<result column="STATUS" property="status"/>
<result column="IS_DELETED" property="isDeleted"/>
</resultMap>
<select id="selectSintTempCurvePage" resultMap="sintTempCurveResultMap">
select * from MES_SINT_TEMP_CURVE where is_deleted = 0
</select>
<select id="export" resultType="org.springblade.scheduling.scheduling.excel.SintTempCurveExcel">
SELECT * FROM MES_SINT_TEMP_CURVE ${ew.customSqlSegment}
</select>
</mapper>

@ -96,8 +96,8 @@
g.product_ident AS "productIdent",
f.name AS "currentProcessName",
d.name AS "processName",
to_char(b.start_time,'HH24:MI') AS "startTime",
to_char(b.end_time,'HH24:MI') AS "endTime",
to_char(b.start_time,'YYYY-MM-DD HH24:MI') AS "startTime",
to_char(b.end_time,'YYYY-MM-DD HH24:MI') AS "endTime",
to_char(b.start_time,'YYYY-MM-DD HH24:MI:SS') AS "planStartTime",
to_char(b.end_time,'YYYY-MM-DD HH24:MI:SS') AS "planEndTime",
to_char(b.fact_start_time,'YYYY-MM-DD HH24:MI:SS') AS "factStartTime",
@ -118,7 +118,10 @@
<where>
a.is_deleted = 0 and b.is_deleted = 0 and a.status in (1,2,3,5)
<if test="startTime !=null and startTime != ''">
and (to_char(b.start_time,'YYYY-MM-DD') = #{startTime} or to_char(b.end_time,'YYYY-MM-DD') = #{startTime} or (b.start_time <![CDATA[ < ]]> to_date(CONCAT(#{startTime},' 00:00:00'),'YYYY-MM-DD HH24:MI:SS') and b.end_time <![CDATA[ > ]]> to_date(CONCAT(#{startTime},' 23:59:59'),'YYYY-MM-DD HH24:MI:SS')))
and to_char(b.start_time,'YYYY-MM-DD') <![CDATA[ >= ]]> #{startTime}
</if>
<if test="endTime !=null and endTime != ''">
and to_char(b.end_time,'YYYY-MM-DD') <![CDATA[ <= ]]> #{endTime}
</if>
<if test="woCode !=null and woCode != ''">
and a.wo_code = #{woCode}
@ -139,10 +142,13 @@
and a.batch_no = #{batchNo}
</if>
<if test="receiveTime !=null and receiveTime != ''">
and g.receive_time = #{receiveTime}
and to_char(g.receive_time,'YYYY-MM-DD') = #{receiveTime}
</if>
<if test="planStatus !=null and planStatus != ''">
and b.status = #{planStatus}
<if test="planStatusList !=null">
and b.status IN
<foreach collection="planStatusList" item="planStatus" index="index" open="(" close=")" separator=",">
#{planStatus}
</foreach>
</if>
</where>
order by b.start_time,a.WO_CODE
@ -168,7 +174,7 @@
FROM MES_YIELD_ORDER a
LEFT JOIN BS_WORK_CENTER b ON a.WORK_CENTER_ID = b.ID
<where>
a.is_deleted = 0
a.is_deleted = 0 and a.WORK_CENTER_ID is not null
<if test="startTime !=null and startTime != ''">
and a.receive_time <![CDATA[ >= ]]> to_date(#{startTime},'YYYY-MM-DD HH24:MI:SS')
</if>
@ -221,7 +227,10 @@
<where>
a.is_deleted = 0 and h.is_deleted = 0 and a.status in (1,2,3,5)
<if test="startTime !=null and startTime != ''">
and (to_char(h.start_time,'YYYY-MM-DD') = #{startTime} or to_char(h.end_time,'YYYY-MM-DD') = #{startTime} or (h.start_time <![CDATA[ < ]]> to_date(CONCAT(#{startTime},' 00:00:00'),'YYYY-MM-DD HH24:MI:SS') and h.end_time <![CDATA[ > ]]> to_date(CONCAT(#{startTime},' 23:59:59'),'YYYY-MM-DD HH24:MI:SS')))
and to_char(h.start_time,'YYYY-MM-DD') <![CDATA[ >= ]]> #{startTime}
</if>
<if test="endTime !=null and endTime != ''">
and to_char(h.end_time,'YYYY-MM-DD') <![CDATA[ <= ]]> #{endTime}
</if>
<if test="woCode !=null and woCode != ''">
and a.wo_code = #{woCode}
@ -239,11 +248,17 @@
and a.batch_no = #{batchNo}
</if>
<if test="receiveTime !=null and receiveTime != ''">
and b.receive_time = #{receiveTime}
AND to_char(b.receive_time,'YYYY-MM-DD') = #{receiveTime}
</if>
<if test="planStatus !=null and planStatus != ''">
and h.status = #{planStatus}
</if>
<if test="planStatusList !=null">
and h.status IN
<foreach collection="planStatusList" item="planStatus" index="index" open="(" close=")" separator=",">
#{planStatus}
</foreach>
</if>
</where>
GROUP BY
a.WO_CODE,

@ -58,7 +58,7 @@
</resultMap>
<select id="selectYieldOrderPage" resultMap="yieldOrderResultMap">
<select id="selectYieldOrderPage" resultType="org.springblade.scheduling.scheduling.vo.YieldOrderVO">
select * from MES_YIELD_ORDER
<where>
is_deleted = 0

@ -0,0 +1,62 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import org.springblade.scheduling.scheduling.entity.PartRelationEntity;
import org.springblade.scheduling.scheduling.excel.PartRelationExcel;
import org.springblade.scheduling.scheduling.vo.PartRelationVO;
import java.util.List;
/**
* 部件-子件关联表 服务类
*
* @author BladeX
* @since 2025-12-26
*/
public interface IPartRelationService extends BaseService<PartRelationEntity> {
/**
* 自定义分页
*
* @param page 分页参数
* @param PartRelation 查询参数
* @return IPage<PartRelationVO>
*/
IPage<PartRelationVO> selectPartRelationPage(IPage<PartRelationVO> page, PartRelationVO partRelation);
/**
* 导出数据
*
* @param queryWrapper 查询条件
* @return List<PartRelationExcel>
*/
List<PartRelationExcel> export(Wrapper<PartRelationEntity> queryWrapper);
}

@ -0,0 +1,64 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import org.springblade.scheduling.scheduling.entity.PartEntity;
import org.springblade.scheduling.scheduling.excel.PartExcel;
import org.springblade.scheduling.scheduling.vo.PartVO;
import java.util.List;
/**
* 零件信息表 服务类
*
* @author BladeX
* @since 2025-12-26
*/
public interface IPartService extends BaseService<PartEntity> {
/**
* 自定义分页
*
* @param page 分页参数
* @param Part 查询参数
* @return IPage<PartVO>
*/
IPage<PartVO> selectPartPage(IPage<PartVO> page, PartVO part);
/**
* 导出数据
*
* @param queryWrapper 查询条件
* @return List<PartExcel>
*/
List<PartExcel> export(Wrapper<PartEntity> queryWrapper);
List<PartEntity> selectChildPart(PartEntity part);
}

@ -0,0 +1,62 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import org.springblade.scheduling.scheduling.entity.SintTempCurveEntity;
import org.springblade.scheduling.scheduling.excel.SintTempCurveExcel;
import org.springblade.scheduling.scheduling.vo.SintTempCurveVO;
import java.util.List;
/**
* 烧结温度曲线表 服务类
*
* @author BladeX
* @since 2025-12-26
*/
public interface ISintTempCurveService extends BaseService<SintTempCurveEntity> {
/**
* 自定义分页
*
* @param page 分页参数
* @param SintTempCurve 查询参数
* @return IPage<SintTempCurveVO>
*/
IPage<SintTempCurveVO> selectSintTempCurvePage(IPage<SintTempCurveVO> page, SintTempCurveVO sintTempCurve);
/**
* 导出数据
*
* @param queryWrapper 查询条件
* @return List<SintTempCurveExcel>
*/
List<SintTempCurveExcel> export(Wrapper<SintTempCurveEntity> queryWrapper);
}

@ -0,0 +1,63 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.service.impl;
import org.springblade.scheduling.scheduling.entity.PartRelationEntity;
import org.springblade.scheduling.scheduling.excel.PartRelationExcel;
import org.springblade.scheduling.scheduling.mapper.PartRelationMapper;
import org.springblade.scheduling.scheduling.service.IPartRelationService;
import org.springblade.scheduling.scheduling.vo.PartRelationVO;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import java.util.List;
/**
* 部件-子件关联表 服务实现类
*
* @author BladeX
* @since 2025-12-26
*/
@Service
public class PartRelationServiceImpl extends BaseServiceImpl<PartRelationMapper, PartRelationEntity> implements IPartRelationService {
@Override
public IPage<PartRelationVO> selectPartRelationPage(IPage<PartRelationVO> page, PartRelationVO partRelation) {
return page.setRecords(baseMapper.selectPartRelationPage(page, partRelation));
}
@Override
public List<PartRelationExcel> export(Wrapper<PartRelationEntity> queryWrapper) {
List<PartRelationExcel> PartRelationList = baseMapper.export(queryWrapper);
//PartRelationList.forEach(PartRelation -> {
// PartRelation.setTypeName(DictCache.getValue(DictEnum.YES_NO, PartRelation.getType()));
//});
return PartRelationList;
}
}

@ -0,0 +1,68 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.service.impl;
import org.springblade.scheduling.scheduling.entity.PartEntity;
import org.springblade.scheduling.scheduling.excel.PartExcel;
import org.springblade.scheduling.scheduling.mapper.PartMapper;
import org.springblade.scheduling.scheduling.service.IPartService;
import org.springblade.scheduling.scheduling.vo.PartVO;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import java.util.List;
/**
* 零件信息表 服务实现类
*
* @author BladeX
* @since 2025-12-26
*/
@Service
public class PartServiceImpl extends BaseServiceImpl<PartMapper, PartEntity> implements IPartService {
@Override
public IPage<PartVO> selectPartPage(IPage<PartVO> page, PartVO part) {
return page.setRecords(baseMapper.selectPartPage(page, part));
}
@Override
public List<PartExcel> export(Wrapper<PartEntity> queryWrapper) {
List<PartExcel> PartList = baseMapper.export(queryWrapper);
//PartList.forEach(Part -> {
// Part.setTypeName(DictCache.getValue(DictEnum.YES_NO, Part.getType()));
//});
return PartList;
}
@Override
public List<PartEntity> selectChildPart(PartEntity part) {
return baseMapper.selectChildPart(part);
}
}

@ -0,0 +1,63 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.service.impl;
import org.springblade.scheduling.scheduling.entity.SintTempCurveEntity;
import org.springblade.scheduling.scheduling.excel.SintTempCurveExcel;
import org.springblade.scheduling.scheduling.mapper.SintTempCurveMapper;
import org.springblade.scheduling.scheduling.service.ISintTempCurveService;
import org.springblade.scheduling.scheduling.vo.SintTempCurveVO;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import java.util.List;
/**
* 烧结温度曲线表 服务实现类
*
* @author BladeX
* @since 2025-12-26
*/
@Service
public class SintTempCurveServiceImpl extends BaseServiceImpl<SintTempCurveMapper, SintTempCurveEntity> implements ISintTempCurveService {
@Override
public IPage<SintTempCurveVO> selectSintTempCurvePage(IPage<SintTempCurveVO> page, SintTempCurveVO sintTempCurve) {
return page.setRecords(baseMapper.selectSintTempCurvePage(page, sintTempCurve));
}
@Override
public List<SintTempCurveExcel> export(Wrapper<SintTempCurveEntity> queryWrapper) {
List<SintTempCurveExcel> SintTempCurveList = baseMapper.export(queryWrapper);
//SintTempCurveList.forEach(SintTempCurve -> {
// SintTempCurve.setTypeName(DictCache.getValue(DictEnum.YES_NO, SintTempCurve.getType()));
//});
return SintTempCurveList;
}
}

@ -83,6 +83,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
private final IPersonResourceService personResourceService;
private final IOutsourceProcessService outsourceProcessService;
private final IProcessSetService processSetService;
private final IPartService partService;
private final ISintTempCurveService sintTempCurveService;
@Value("${business.oldMes.url}")
private String oldMesUrl;
@ -141,6 +143,10 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
processList.forEach(item -> {
processMap.put(item.getId(), item.getName());
});
//初始化烧结温度曲线
List<SintTempCurveEntity> sintList = sintTempCurveService.list();
Map<Long, List<SintTempCurveEntity>> sintMap = sintList.stream().collect(Collectors.groupingBy(SintTempCurveEntity::getProcessId));
//计算cr值
calculateCr(list);
//根据作业中心将订单分组,并根据优先级、cr值、订单需求数量、计划下达时间4个维度进行组内排序
@ -169,7 +175,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
new LinkedBlockingQueue<>(),
r -> new Thread(r, "scheduling-thread-" + System.currentTimeMillis()));
map.forEach((workcenter, orders) -> {
threadPool.execute(() -> allocateResources(orders, personAbilityMap, mainProducerMap, planMap, processMap));
threadPool.execute(() -> allocateResources(orders, personAbilityMap, mainProducerMap, planMap, processMap,sintMap));
});
}
@ -212,6 +218,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
mergedDto.setMakeQty(dto.getMakeQty());
mergedDto.setEquipName(dto.getEquipName());
mergedDto.setProductIdent(dto.getProductIdent());
mergedDto.setPriorityAps(YieldOrderEnum.getName(Integer.parseInt(dto.getPriorityAps())));
if (dto.getPlanStartTime().equals(minStartTime)) {
mergedDto.setStartTime(dto.getStartTime());
mergedDto.setFactStartTime(dto.getFactStartTime());
@ -222,19 +229,11 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
mergedDto.setPlanStatus(dto.getPlanStatus());
}
}
//处理跨天的工序
if (!maxEndTime.substring(0, 10).equals(minStartTime.substring(0, 10))) {
if (minStartTime.substring(0, 10).equals(workOrder.getStartTime())) {
mergedDto.setEndTime("24:00");
}
if (maxEndTime.substring(0, 10).equals(workOrder.getStartTime())) {
mergedDto.setStartTime("0:00");
}
}
mergedDto.setPlanStartTime(minStartTime);
mergedDto.setPlanEndTime(maxEndTime);
mergedProcessList.add(mergedDto);
}
@ -330,7 +329,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
* @since 2025/12/1 18:08
**/
@Transactional(rollbackFor = Exception.class)
public void allocateResources(List<YieldOrderEntity> list, Map<String, PersonAbilityEntity> personAbilityMap, Map<Long, String> mainProducerMap, Map<String, List<WorkPlanEntity>> planMap, Map<Long, String> processMap) {
public void allocateResources(List<YieldOrderEntity> list, Map<String, PersonAbilityEntity> personAbilityMap, Map<Long, String> mainProducerMap, Map<String, List<WorkPlanEntity>> planMap, Map<Long, String> processMap, Map<Long, List<SintTempCurveEntity>> sintMap) {
List<WorkOrderEntity> workOrderList = new ArrayList<>();
for (YieldOrderEntity order : list) {
try {
@ -397,6 +396,49 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
workPlanList.add(workPlan);
}else{
if ("设备".equals(mainProducerMap.get(craft.getPpsId()))) {
Map<String,List<EquipResourceEntity>> sameFurnaceMap = new HashMap<>();
String glassCodeStr = null;
//烧结
if(sintMap.containsKey(craft.getPpsId())){
if("2".equals(order.getYieldType())){//烧结订单
//获取当前工序的所有温度曲线
List<SintTempCurveEntity> sintList = sintMap.get(craft.getPpsId());
List<List<String>> sintMaterialList = new ArrayList<>();
sintList.stream().map(SintTempCurveEntity::getGlassCode).collect(Collectors.toList()).forEach(item -> sintMaterialList.add(Arrays.asList(item.split(","))));
//根据零件号获取子件信息
PartEntity part = new PartEntity();
part.setPartCode(order.getPartCode());
List<PartEntity> childPartList = partService.selectChildPart(part);
if(CollectionUtils.isNotEmpty(childPartList)){
//获取子件的所有玻璃粉牌号
List<String> materialList = childPartList.stream().filter(item -> StringUtils.isNotEmpty(item.getMaterial())).map(PartEntity::getMaterial).collect(Collectors.toList());
List<String> maxMatchList = null;
int maxCount = 0;
for(List<String> glassCodeList : sintMaterialList){
int currentCount = (int) glassCodeList.stream().filter(materialList::contains).count();
if (currentCount > maxCount) {
maxCount = currentCount;
maxMatchList = glassCodeList;
}
}
if(maxMatchList != null){
glassCodeStr = maxMatchList.stream().collect(Collectors.joining(","));
//if(sameFurnaceMap.containsKey(glassCodeStr))
}
}
//包含说明之前有过这个温度曲线的订单
if(sameFurnaceMap.containsKey(glassCodeStr)){
}
}else if("3".equals(order.getYieldType())){//玻璃饼
}
}
//根据作业中心查询所有设备
List<EquipAbilityEntity> equipAbilityList = equipAbilityService.list(Wrappers.<EquipAbilityEntity>lambdaQuery().in(EquipAbilityEntity::getWorkCenterId, craft.getWorkCenterId()).eq(EquipAbilityEntity::getCraftId, craft.getCaId()));
if (CollectionUtils.isEmpty(equipAbilityList)) {
@ -443,6 +485,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
BigDecimal sumCapacity = order.getYpArea().multiply(BigDecimal.valueOf(order.getYpQty()));
//需要判断设备额定生产能力是否满足订单总产能,如果不满足,则需要把总产能进行拆分
List<BigDecimal> capacityList = capacitySplit(equipResourceMap, sumCapacity);
List<EquipResourceEntity> sameFurnaceList = new ArrayList<>();
for (BigDecimal capacity : capacityList) {
for (Map.Entry<LocalDateTime, List<EquipResourceEntity>> entry1 : equipResourceMap.entrySet()) {
Boolean isOccupied = false;
@ -500,6 +543,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
EquipResourceEntity equipResource1 = new EquipResourceEntity();
equipResource1.setIsUsed("1");
equipResourceService.update(equipResource1, updateWrapper);
sameFurnaceList.add(equipResource);
//当前工序的结束时间作为下一工序的开始时间
prevProcessEnd = workPlan.getEndTime();
dateTime = workPlan.getEndTime();
@ -512,6 +556,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
}
}
}
if(sintMap.containsKey(craft.getPpsId()) && glassCodeStr != null && CollectionUtils.isNotEmpty(sameFurnaceList)){
sameFurnaceMap.put(glassCodeStr,sameFurnaceList);
}
}
if (!isSchecuding) {
break;
@ -621,6 +668,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
craftLock.unlock(); // 释放本地锁
}*/
}else{
prevProcessEnd = prevProcessEnd.plusMinutes(30);
totalTime = BigDecimal.valueOf(30);
}
workPlan.setWoId(order.getId());
@ -1140,4 +1190,6 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
}
}
}

@ -25,6 +25,7 @@
*/
package org.springblade.scheduling.scheduling.service.impl;
import org.springblade.desk.order.pojo.enums.YieldOrderEnum;
import org.springblade.scheduling.scheduling.entity.YieldOrderEntity;
import org.springblade.scheduling.scheduling.vo.YieldOrderVO;
import org.springblade.scheduling.scheduling.excel.YieldOrderExcel;
@ -47,7 +48,11 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
@Override
public IPage<YieldOrderVO> selectYieldOrderPage(IPage<YieldOrderVO> page, YieldOrderVO yieldOrder) {
return page.setRecords(baseMapper.selectYieldOrderPage(page, yieldOrder));
List<YieldOrderVO> list = baseMapper.selectYieldOrderPage(page, yieldOrder);
for(YieldOrderVO vo : list){
vo.setPriorityApsStr(YieldOrderEnum.getName(vo.getPriorityAps()));
}
return page.setRecords(list);
}

@ -0,0 +1,46 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.vo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.scheduling.scheduling.entity.PartRelationEntity;
import java.io.Serial;
/**
* 部件-子件关联表 视图实体类
*
* @author BladeX
* @since 2025-12-26
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class PartRelationVO extends PartRelationEntity {
@Serial
private static final long serialVersionUID = 1L;
}

@ -0,0 +1,46 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.vo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.scheduling.scheduling.entity.PartEntity;
import java.io.Serial;
/**
* 零件信息表 视图实体类
*
* @author BladeX
* @since 2025-12-26
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class PartVO extends PartEntity {
@Serial
private static final long serialVersionUID = 1L;
}

@ -0,0 +1,46 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.vo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.scheduling.scheduling.entity.SintTempCurveEntity;
import java.io.Serial;
/**
* 烧结温度曲线表 视图实体类
*
* @author BladeX
* @since 2025-12-26
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class SintTempCurveVO extends SintTempCurveEntity {
@Serial
private static final long serialVersionUID = 1L;
}

@ -25,6 +25,7 @@
*/
package org.springblade.scheduling.scheduling.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.scheduling.scheduling.entity.YieldOrderEntity;
@ -43,4 +44,9 @@ public class YieldOrderVO extends YieldOrderEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 优先级-排产
*/
private String priorityApsStr;
}

@ -0,0 +1,60 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.wrapper;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.scheduling.scheduling.entity.PartRelationEntity;
import org.springblade.scheduling.scheduling.vo.PartRelationVO;
import java.util.Objects;
/**
* 部件-子件关联表 包装类,返回视图层所需的字段
*
* @author BladeX
* @since 2025-12-26
*/
public class PartRelationWrapper extends BaseEntityWrapper<PartRelationEntity, PartRelationVO> {
public static PartRelationWrapper build() {
return new PartRelationWrapper();
}
@Override
public PartRelationVO entityVO(PartRelationEntity partRelation) {
PartRelationVO PartRelationVO = Objects.requireNonNull(BeanUtil.copyProperties(partRelation, PartRelationVO.class));
//User createUser = UserCache.getUser(PartRelation.getCreateUser());
//User updateUser = UserCache.getUser(PartRelation.getUpdateUser());
//PartRelationVO.setCreateUserName(createUser.getName());
//PartRelationVO.setUpdateUserName(updateUser.getName());
return PartRelationVO;
}
}

@ -0,0 +1,60 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.wrapper;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.scheduling.scheduling.entity.PartEntity;
import org.springblade.scheduling.scheduling.vo.PartVO;
import java.util.Objects;
/**
* 零件信息表 包装类,返回视图层所需的字段
*
* @author BladeX
* @since 2025-12-26
*/
public class PartWrapper extends BaseEntityWrapper<PartEntity, PartVO> {
public static PartWrapper build() {
return new PartWrapper();
}
@Override
public PartVO entityVO(PartEntity part) {
PartVO PartVO = Objects.requireNonNull(BeanUtil.copyProperties(part, PartVO.class));
//User createUser = UserCache.getUser(Part.getCreateUser());
//User updateUser = UserCache.getUser(Part.getUpdateUser());
//PartVO.setCreateUserName(createUser.getName());
//PartVO.setUpdateUserName(updateUser.getName());
return PartVO;
}
}

@ -0,0 +1,60 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* <p>
* Use of this software is governed by the Commercial License Agreement
* obtained after purchasing a license from BladeX.
* <p>
* 1. This software is for development use only under a valid license
* from BladeX.
* <p>
* 2. Redistribution of this software's source code to any third party
* without a commercial license is strictly prohibited.
* <p>
* 3. Licensees may copyright their own code but cannot use segments
* from this software for such purposes. Copyright of this software
* remains with BladeX.
* <p>
* Using this software signifies agreement to this License, and the software
* must not be used for illegal purposes.
* <p>
* THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
* not liable for any claims arising from secondary or illegal development.
* <p>
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.scheduling.scheduling.wrapper;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.scheduling.scheduling.entity.SintTempCurveEntity;
import org.springblade.scheduling.scheduling.vo.SintTempCurveVO;
import java.util.Objects;
/**
* 烧结温度曲线表 包装类,返回视图层所需的字段
*
* @author BladeX
* @since 2025-12-26
*/
public class SintTempCurveWrapper extends BaseEntityWrapper<SintTempCurveEntity, SintTempCurveVO> {
public static SintTempCurveWrapper build() {
return new SintTempCurveWrapper();
}
@Override
public SintTempCurveVO entityVO(SintTempCurveEntity sintTempCurve) {
SintTempCurveVO SintTempCurveVO = Objects.requireNonNull(BeanUtil.copyProperties(sintTempCurve, SintTempCurveVO.class));
//User createUser = UserCache.getUser(SintTempCurve.getCreateUser());
//User updateUser = UserCache.getUser(SintTempCurve.getUpdateUser());
//SintTempCurveVO.setCreateUserName(createUser.getName());
//SintTempCurveVO.setUpdateUserName(updateUser.getName());
return SintTempCurveVO;
}
}
Loading…
Cancel
Save