排产相关-sjx

develop-QA
sunjianxi 6 months ago
parent 1e7d2f4b51
commit 608cc20c46
  1. 5
      blade-ops/blade-job/src/main/java/org/springblade/job/JobApplication.java
  2. 173
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/CraftAbilityController.java
  3. 7
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipAbilityController.java
  4. 170
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipmentController.java
  5. 7
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/MainProducerController.java
  6. 7
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PersonAbilityController.java
  7. 170
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/ProcessSetController.java
  8. 171
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkCenterController.java
  9. 1
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/dto/WorkOrderDto.java
  10. 74
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/CraftAbilityEntity.java
  11. 2
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/DifferentFurnaceTankEntity.java
  12. 6
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipAbilityEntity.java
  13. 119
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipmentEntity.java
  14. 6
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/MainProducerEntity.java
  15. 129
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/ProcessSetEntity.java
  16. 2
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/TeamSetEntity.java
  17. 3
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/TeamTimeEntity.java
  18. 154
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/WorkCenterEntity.java
  19. 93
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/CraftAbilityExcel.java
  20. 147
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/EquipmentExcel.java
  21. 159
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/ProcessSetExcel.java
  22. 2
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/TeamSetExcel.java
  23. 5
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/TeamTimeExcel.java
  24. 189
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/WorkCenterExcel.java
  25. 64
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/CraftAbilityMapper.java
  26. 31
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/CraftAbilityMapper.xml
  27. 14
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/DifferentFurnaceTankMapper.xml
  28. 2
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.java
  29. 17
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.xml
  30. 64
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipmentMapper.java
  31. 40
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipmentMapper.xml
  32. 8
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/InspectionItemMapper.xml
  33. 13
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/MainProducerMapper.xml
  34. 18
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.xml
  35. 64
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessSetMapper.java
  36. 42
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessSetMapper.xml
  37. 8
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/QualityGradeMapper.xml
  38. 12
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamSetMapper.java
  39. 6
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamSetMapper.xml
  40. 12
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamTimeMapper.java
  41. 6
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamTimeMapper.xml
  42. 64
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkCenterMapper.java
  43. 47
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkCenterMapper.xml
  44. 5
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml
  45. 62
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ICraftAbilityService.java
  46. 62
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IEquipmentService.java
  47. 62
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IProcessSetService.java
  48. 12
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ITeamSetService.java
  49. 12
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ITeamTimeService.java
  50. 62
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkCenterService.java
  51. 63
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/CraftAbilityServiceImpl.java
  52. 2
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipAbilityServiceImpl.java
  53. 63
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipmentServiceImpl.java
  54. 63
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/ProcessSetServiceImpl.java
  55. 20
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/TeamSetServiceImpl.java
  56. 20
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/TeamTimeServiceImpl.java
  57. 63
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkCenterServiceImpl.java
  58. 1
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
  59. 46
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/CraftAbilityVO.java
  60. 46
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/EquipmentVO.java
  61. 46
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/ProcessSetVO.java
  62. 4
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/TeamSetVO.java
  63. 4
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/TeamTimeVO.java
  64. 46
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/WorkCenterVO.java
  65. 60
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/CraftAbilityWrapper.java
  66. 60
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/EquipmentWrapper.java
  67. 60
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/ProcessSetWrapper.java
  68. 14
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/TeamSetWrapper.java
  69. 14
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/TeamTimeWrapper.java
  70. 60
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkCenterWrapper.java

@ -39,6 +39,11 @@ public class JobApplication {
public static void main(String[] args) {
BladeApplication.run(AppConstant.APPLICATION_JOB_NAME, JobApplication.class, args);
System.out.println("===================");
System.out.println("===================");
System.out.println("=======启动成功!====");
System.out.println("===================");
System.out.println("===================");
}
}

@ -0,0 +1,173 @@
/**
* 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.CraftAbilityEntity;
import org.springblade.scheduling.scheduling.entity.WorkCenterEntity;
import org.springblade.scheduling.scheduling.excel.CraftAbilityExcel;
import org.springblade.scheduling.scheduling.service.ICraftAbilityService;
import org.springblade.scheduling.scheduling.vo.CraftAbilityVO;
import org.springblade.scheduling.scheduling.wrapper.CraftAbilityWrapper;
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-22
*/
@RestController
@AllArgsConstructor
@RequestMapping("/craftAbility")
@Tag(name = "工艺能力", description = "工艺能力接口")
public class CraftAbilityController extends BladeController {
private final ICraftAbilityService craftAbilityService;
/**
* 工艺能力 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入CraftAbility")
public R<CraftAbilityVO> detail(CraftAbilityEntity craftAbility) {
CraftAbilityEntity detail = craftAbilityService.getOne(Condition.getQueryWrapper(craftAbility));
return R.data(CraftAbilityWrapper.build().entityVO(detail));
}
/**
* 工艺能力 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@Operation(summary = "分页", description = "传入CraftAbility")
public R<IPage<CraftAbilityVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> craftAbility, Query query) {
IPage<CraftAbilityEntity> pages = craftAbilityService.page(Condition.getPage(query), Condition.getQueryWrapper(craftAbility, CraftAbilityEntity.class));
return R.data(CraftAbilityWrapper.build().pageVO(pages));
}
/**
* 工艺能力 自定义分页
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@Operation(summary = "分页", description = "传入CraftAbility")
public R<IPage<CraftAbilityVO>> page(CraftAbilityVO craftAbility, Query query) {
IPage<CraftAbilityVO> pages = craftAbilityService.selectCraftAbilityPage(Condition.getPage(query), craftAbility);
return R.data(pages);
}
/**
* 工艺能力 新增
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入CraftAbility")
public R save(@Valid @RequestBody CraftAbilityEntity craftAbility) {
return R.status(craftAbilityService.save(craftAbility));
}
/**
* 工艺能力 修改
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入CraftAbility")
public R update(@Valid @RequestBody CraftAbilityEntity craftAbility) {
return R.status(craftAbilityService.updateById(craftAbility));
}
/**
* 工艺能力 新增或修改
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入CraftAbility")
public R submit(@Valid @RequestBody CraftAbilityEntity craftAbility) {
return R.status(craftAbilityService.saveOrUpdate(craftAbility));
}
/**
* 工艺能力 删除
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(craftAbilityService.deleteLogic(Func.toLongList(ids)));
}
/**
* 导出数据
*/
@IsAdmin
@GetMapping("/export-CraftAbility")
@ApiOperationSupport(order = 9)
@Operation(summary = "导出数据", description = "传入CraftAbility")
public void exportCraftAbility(@Parameter(hidden = true) @RequestParam Map<String, Object> craftAbility, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<CraftAbilityEntity> queryWrapper = Condition.getQueryWrapper(craftAbility, CraftAbilityEntity.class);
//if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(CraftAbility::getTenantId, bladeUser.getTenantId());
//}
//queryWrapper.lambda().eq(CraftAbilityEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<CraftAbilityExcel> list = craftAbilityService.export(queryWrapper);
ExcelUtil.export(response, "工艺能力数据" + DateUtil.time(), "工艺能力数据表", list, CraftAbilityExcel.class);
}
/**
* 工艺能力表查询列表
*/
@GetMapping("/findList")
@ApiOperationSupport(order = 2)
@Operation(summary = "列表", description = "传入CraftAbility")
public R<List<CraftAbilityEntity>> findList() {
List<CraftAbilityEntity> list = craftAbilityService.list();
return R.data(list);
}
}

@ -27,6 +27,8 @@ package org.springblade.scheduling.scheduling.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@ -36,6 +38,7 @@ import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -106,6 +109,10 @@ public class EquipAbilityController extends BladeController {
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入mesEquipAbility")
public R save(@Valid @RequestBody EquipAbilityEntity entity) {
List<EquipAbilityEntity> list = equipAbilityService.list(Wrappers.<EquipAbilityEntity>lambdaQuery().eq(EquipAbilityEntity::getWorkCenterId,entity.getWorkCenterId()).eq(EquipAbilityEntity::getEquipCode,entity.getEquipCode()).eq(EquipAbilityEntity::getEquipType,entity.getEquipType()).eq(EquipAbilityEntity::getCraftId,entity.getCraftId()).eq(BaseEntity::getIsDeleted,0));
if(CollectionUtils.isNotEmpty(list)){
return R.status(false,"该设备能力已存在!");
}
return R.status(equipAbilityService.save(entity));
}

@ -0,0 +1,170 @@
/**
* 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.CraftAbilityEntity;
import org.springblade.scheduling.scheduling.entity.EquipmentEntity;
import org.springblade.scheduling.scheduling.excel.EquipmentExcel;
import org.springblade.scheduling.scheduling.service.IEquipmentService;
import org.springblade.scheduling.scheduling.vo.EquipmentVO;
import org.springblade.scheduling.scheduling.wrapper.EquipmentWrapper;
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-22
*/
@RestController
@AllArgsConstructor
@RequestMapping("/equipment")
@Tag(name = "设备信息表", description = "设备信息表接口")
public class EquipmentController extends BladeController {
private final IEquipmentService equipmentService;
/**
* 设备信息表 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入Equipment")
public R<EquipmentVO> detail(EquipmentEntity equipment) {
EquipmentEntity detail = equipmentService.getOne(Condition.getQueryWrapper(equipment));
return R.data(EquipmentWrapper.build().entityVO(detail));
}
/**
* 设备信息表 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@Operation(summary = "分页", description = "传入Equipment")
public R<IPage<EquipmentVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> equipment, Query query) {
IPage<EquipmentEntity> pages = equipmentService.page(Condition.getPage(query), Condition.getQueryWrapper(equipment, EquipmentEntity.class));
return R.data(EquipmentWrapper.build().pageVO(pages));
}
/**
* 设备信息表 自定义分页
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@Operation(summary = "分页", description = "传入Equipment")
public R<IPage<EquipmentVO>> page(EquipmentVO equipment, Query query) {
IPage<EquipmentVO> pages = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment);
return R.data(pages);
}
/**
* 设备信息表 新增
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入Equipment")
public R save(@Valid @RequestBody EquipmentEntity equipment) {
return R.status(equipmentService.save(equipment));
}
/**
* 设备信息表 修改
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入Equipment")
public R update(@Valid @RequestBody EquipmentEntity equipment) {
return R.status(equipmentService.updateById(equipment));
}
/**
* 设备信息表 新增或修改
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入Equipment")
public R submit(@Valid @RequestBody EquipmentEntity equipment) {
return R.status(equipmentService.saveOrUpdate(equipment));
}
/**
* 设备信息表 删除
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(equipmentService.deleteLogic(Func.toLongList(ids)));
}
/**
* 导出数据
*/
@IsAdmin
@GetMapping("/export-Equipment")
@ApiOperationSupport(order = 9)
@Operation(summary = "导出数据", description = "传入Equipment")
public void exportEquipment(@Parameter(hidden = true) @RequestParam Map<String, Object> equipment, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<EquipmentEntity> queryWrapper = Condition.getQueryWrapper(equipment, EquipmentEntity.class);
//if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(Equipment::getTenantId, bladeUser.getTenantId());
//}
//queryWrapper.lambda().eq(EquipmentEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<EquipmentExcel> list = equipmentService.export(queryWrapper);
ExcelUtil.export(response, "设备信息表数据" + DateUtil.time(), "设备信息表数据表", list, EquipmentExcel.class);
}
@GetMapping("/findList")
@ApiOperationSupport(order = 2)
@Operation(summary = "列表", description = "传入Equipment")
public R<List<EquipmentEntity>> findList() {
List<EquipmentEntity> list = equipmentService.list();
return R.data(list);
}
}

@ -27,6 +27,8 @@ package org.springblade.scheduling.scheduling.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@ -36,6 +38,7 @@ import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -106,6 +109,10 @@ public class MainProducerController extends BladeController {
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入mainProducer")
public R save(@Valid @RequestBody MainProducerEntity entity) {
List<MainProducerEntity> list = mainProducerService.list(Wrappers.<MainProducerEntity>lambdaQuery().eq(MainProducerEntity::getProcessId,entity.getProcessId()).eq(MainProducerEntity::getMainProducer,entity.getMainProducer()).eq(BaseEntity::getIsDeleted,0));
if(CollectionUtils.isNotEmpty(list)){
return R.status(false,"该主生产者已存在!");
}
return R.status(mainProducerService.save(entity));
}

@ -27,6 +27,8 @@ package org.springblade.scheduling.scheduling.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@ -36,6 +38,7 @@ import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -106,6 +109,10 @@ public class PersonAbilityController extends BladeController {
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入personAbility")
public R save(@Valid @RequestBody PersonAbilityEntity entity) {
List<PersonAbilityEntity> list = personAbilityService.list(Wrappers.<PersonAbilityEntity>lambdaQuery().eq(PersonAbilityEntity::getWorkCenterId,entity.getWorkCenterId()).eq(PersonAbilityEntity::getProcessId,entity.getProcessId()).eq(PersonAbilityEntity::getCraftId,entity.getCraftId()).eq(BaseEntity::getIsDeleted,0));
if(CollectionUtils.isNotEmpty(list)){
return R.status(false,"该人员能力已存在!");
}
return R.status(personAbilityService.save(entity));
}

@ -0,0 +1,170 @@
/**
* 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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.scheduling.scheduling.entity.ProcessSetEntity;
import org.springblade.scheduling.scheduling.excel.ProcessSetExcel;
import org.springblade.scheduling.scheduling.service.IProcessSetService;
import org.springblade.scheduling.scheduling.vo.ProcessSetVO;
import org.springblade.scheduling.scheduling.wrapper.ProcessSetWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
* 工序设置表 控制器
*
* @author BladeX
* @since 2025-12-22
*/
@RestController
@AllArgsConstructor
@RequestMapping("/processSet")
@Tag(name = "工序设置表", description = "工序设置表接口")
public class ProcessSetController extends BladeController {
private final IProcessSetService processSetService;
/**
* 工序设置表 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入ProcessSet")
public R<ProcessSetVO> detail(ProcessSetEntity processSet) {
ProcessSetEntity detail = processSetService.getOne(Condition.getQueryWrapper(processSet));
return R.data(ProcessSetWrapper.build().entityVO(detail));
}
/**
* 工序设置表 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@Operation(summary = "分页", description = "传入ProcessSet")
public R<IPage<ProcessSetVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> processSet, Query query) {
IPage<ProcessSetEntity> pages = processSetService.page(Condition.getPage(query), Condition.getQueryWrapper(processSet, ProcessSetEntity.class));
return R.data(ProcessSetWrapper.build().pageVO(pages));
}
/**
* 工序设置表 自定义分页
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@Operation(summary = "分页", description = "传入ProcessSet")
public R<IPage<ProcessSetVO>> page(ProcessSetVO processSet, Query query) {
IPage<ProcessSetVO> pages = processSetService.selectProcessSetPage(Condition.getPage(query), processSet);
return R.data(pages);
}
/**
* 工序设置表 新增
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入ProcessSet")
public R save(@Valid @RequestBody ProcessSetEntity processSet) {
return R.status(processSetService.save(processSet));
}
/**
* 工序设置表 修改
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入ProcessSet")
public R update(@Valid @RequestBody ProcessSetEntity processSet) {
return R.status(processSetService.updateById(processSet));
}
/**
* 工序设置表 新增或修改
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入ProcessSet")
public R submit(@Valid @RequestBody ProcessSetEntity processSet) {
return R.status(processSetService.saveOrUpdate(processSet));
}
/**
* 工序设置表 删除
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(processSetService.deleteLogic(Func.toLongList(ids)));
}
/**
* 导出数据
*/
@IsAdmin
@GetMapping("/export-ProcessSet")
@ApiOperationSupport(order = 9)
@Operation(summary = "导出数据", description = "传入ProcessSet")
public void exportProcessSet(@Parameter(hidden = true) @RequestParam Map<String, Object> processSet, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<ProcessSetEntity> queryWrapper = Condition.getQueryWrapper(processSet, ProcessSetEntity.class);
//if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(ProcessSet::getTenantId, bladeUser.getTenantId());
//}
//queryWrapper.lambda().eq(ProcessSetEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<ProcessSetExcel> list = processSetService.export(queryWrapper);
ExcelUtil.export(response, "工序设置表数据" + DateUtil.time(), "工序设置表数据表", list, ProcessSetExcel.class);
}
@GetMapping("/findList")
@ApiOperationSupport(order = 2)
@Operation(summary = "列表", description = "传入Equipment")
public R<List<ProcessSetEntity>> findList() {
List<ProcessSetEntity> list = processSetService.list();
return R.data(list);
}
}

@ -0,0 +1,171 @@
/**
* 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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.scheduling.scheduling.entity.WorkCenterEntity;
import org.springblade.scheduling.scheduling.excel.WorkCenterExcel;
import org.springblade.scheduling.scheduling.service.IWorkCenterService;
import org.springblade.scheduling.scheduling.vo.WorkCenterVO;
import org.springblade.scheduling.scheduling.wrapper.WorkCenterWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
* 工作中心表 控制器
*
* @author BladeX
* @since 2025-12-22
*/
@RestController
@AllArgsConstructor
@RequestMapping("/workCenter")
@Tag(name = "工作中心表", description = "工作中心表接口")
public class WorkCenterController extends BladeController {
private final IWorkCenterService workCenterService;
/**
* 工作中心表 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入WorkCenter")
public R<WorkCenterVO> detail(WorkCenterEntity workCenter) {
WorkCenterEntity detail = workCenterService.getOne(Condition.getQueryWrapper(workCenter));
return R.data(WorkCenterWrapper.build().entityVO(detail));
}
/**
* 工作中心表 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@Operation(summary = "分页", description = "传入WorkCenter")
public R<IPage<WorkCenterVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> workCenter, Query query) {
IPage<WorkCenterEntity> pages = workCenterService.page(Condition.getPage(query), Condition.getQueryWrapper(workCenter, WorkCenterEntity.class));
return R.data(WorkCenterWrapper.build().pageVO(pages));
}
/**
* 工作中心表 自定义分页
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@Operation(summary = "分页", description = "传入WorkCenter")
public R<IPage<WorkCenterVO>> page(WorkCenterVO workCenter, Query query) {
IPage<WorkCenterVO> pages = workCenterService.selectWorkCenterPage(Condition.getPage(query), workCenter);
return R.data(pages);
}
/**
* 工作中心表 新增
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入WorkCenter")
public R save(@Valid @RequestBody WorkCenterEntity workCenter) {
return R.status(workCenterService.save(workCenter));
}
/**
* 工作中心表 修改
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入WorkCenter")
public R update(@Valid @RequestBody WorkCenterEntity workCenter) {
return R.status(workCenterService.updateById(workCenter));
}
/**
* 工作中心表 新增或修改
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入WorkCenter")
public R submit(@Valid @RequestBody WorkCenterEntity workCenter) {
return R.status(workCenterService.saveOrUpdate(workCenter));
}
/**
* 工作中心表 删除
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(workCenterService.deleteLogic(Func.toLongList(ids)));
}
/**
* 导出数据
*/
@IsAdmin
@GetMapping("/export-WorkCenter")
@ApiOperationSupport(order = 9)
@Operation(summary = "导出数据", description = "传入WorkCenter")
public void exportWorkCenter(@Parameter(hidden = true) @RequestParam Map<String, Object> workCenter, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<WorkCenterEntity> queryWrapper = Condition.getQueryWrapper(workCenter, WorkCenterEntity.class);
//if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(WorkCenter::getTenantId, bladeUser.getTenantId());
//}
//queryWrapper.lambda().eq(WorkCenterEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<WorkCenterExcel> list = workCenterService.export(queryWrapper);
ExcelUtil.export(response, "工作中心表数据" + DateUtil.time(), "工作中心表数据表", list, WorkCenterExcel.class);
}
/**
* 工作中心表 分页
*/
@GetMapping("/findList")
@ApiOperationSupport(order = 2)
@Operation(summary = "列表", description = "传入WorkCenter")
public R<List<WorkCenterEntity>> findList() {
List<WorkCenterEntity> list = workCenterService.list();
return R.data(list);
}
}

@ -39,5 +39,6 @@ public class WorkOrderDto {
private Integer totalCount;
private Integer schedulingCount;
private String schedulingRate;
private String productIdent;
}

@ -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-22
*/
@Data
@TableName("BS_CRAFT_ABILITY")
@Schema(description = "BsCraftAbility对象")
@EqualsAndHashCode(callSuper = true)
public class CraftAbilityEntity extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 作业中心
*/
@Schema(description = "作业中心")
private String caCode;
/**
* 设备编码
*/
@Schema(description = "设备编码")
private String caName;
/**
* 设备分类
*/
@Schema(description = "设备分类")
private Long wtId;
/**
* 设备名称
*/
@Schema(description = "设备名称")
private Long bpsId;
}

@ -108,7 +108,7 @@ public class DifferentFurnaceTankEntity extends BaseEntity {
/**
* 镀化
*/
@Schema(description = "化")
@Schema(description = "化")
private String passivation;
/**
* 硬度

@ -128,4 +128,10 @@ public class EquipAbilityEntity extends BaseEntity {
@Schema(description = "设备顺序")
private Integer equipOrder;
/**
* 备注
*/
@Schema(description = "备注")
private String remarks;
}

@ -0,0 +1,119 @@
/**
* 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-22
*/
@Data
@TableName("MES_EQUIPMENT")
@Schema(description = "MesEquipment对象")
@EqualsAndHashCode(callSuper = true)
public class EquipmentEntity extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 设备编码
*/
@Schema(description = "设备编码")
private String deviceCode;
/**
* 设备名称
*/
@Schema(description = "设备名称")
private String deviceName;
/**
* 类别名称
*/
@Schema(description = "类别名称")
private String typeName;
/**
* 规格型号
*/
@Schema(description = "规格型号")
private String macSpec;
/**
* 服役状态;1正常服役2暂停服役
*/
@Schema(description = "服役状态;1、正常服役,2、暂停服役")
private BigDecimal used;
/**
* RFID
*/
@Schema(description = "RFID")
private String rfId;
/**
* 虚拟设备;1., 0.
*/
@Schema(description = "虚拟设备;1.是, 0.否")
private String virtualMac;
/**
* 是否对接;1., 0.
*/
@Schema(description = "是否对接;1.是, 0.否")
private String docking;
/**
* 类别说明
*/
@Schema(description = "类别说明")
private String memo;
/**
* 绑定数量
*/
@Schema(description = "绑定数量")
private BigDecimal bindQty;
/**
* 设备分类
*/
@Schema(description = "设备分类")
private String category;
/**
* 设备ip
*/
@Schema(description = "设备ip")
private String deviceIp;
/**
* 设备分类
*/
@Schema(description = "设备分类")
private String categorys;
}

@ -66,4 +66,10 @@ public class MainProducerEntity extends BaseEntity {
@Schema(description = "主生产者(人/设备)")
private String mainProducer;
/**
* 备注
*/
@Schema(description = "备注")
private String remarks;
}

@ -0,0 +1,129 @@
/**
* 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-22
*/
@Data
@TableName("BS_PROCESS_SET")
@Schema(description = "BsProcessSet对象")
@EqualsAndHashCode(callSuper = true)
public class ProcessSetEntity extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* Ni+
*/
@Schema(description = "Ni+")
private String niValue;
/**
* 转速/振频
*/
@Schema(description = "转速/振频")
private String vSpeed;
/**
* 整流机控制模式
*/
@Schema(description = "整流机控制模式")
private String cyropactorControl;
/**
* 班组
*/
@Schema(description = "班组")
private String team;
/**
*
*/
@Schema(description = "")
private BigDecimal newColumn;
/**
* 编码
*/
@Schema(description = "编码")
private String code;
/**
* 名称
*/
@Schema(description = "名称")
private String name;
/**
* 标准周期
*/
@Schema(description = "标准周期")
private BigDecimal cycle;
/**
* 是否主工序
*/
@Schema(description = "是否主工序")
private String isMain;
/**
* 是否特殊
*/
@Schema(description = "是否特殊")
private String isSpecial;
/**
* 是否分派
*/
@Schema(description = "是否分派")
private String isDispatch;
/**
* 备注
*/
@Schema(description = "备注")
private String remarks;
/**
* 电流(A)
*/
@Schema(description = "电流(A)")
private String eleStream;
/**
* 电导率
*/
@Schema(description = "电导率")
private String eleRate;
/**
* PH
*/
@Schema(description = "PH")
private String phValue;
}

@ -44,7 +44,7 @@ import java.math.BigDecimal;
@TableName("BS_TEAM_SET")
@Schema(description = "班组")
@EqualsAndHashCode(callSuper = true)
public class BsTeamSetEntity extends BaseEntity {
public class TeamSetEntity extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;

@ -32,7 +32,6 @@ import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import java.io.Serial;
import java.math.BigDecimal;
/**
* 班组设置表 实体类
@ -44,7 +43,7 @@ import java.math.BigDecimal;
@TableName("BS_TEAM_TIME")
@Schema(description = "班组排班")
@EqualsAndHashCode(callSuper = true)
public class BsTeamTimeEntity extends BaseEntity {
public class TeamTimeEntity extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;

@ -0,0 +1,154 @@
/**
* 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-22
*/
@Data
@TableName("BS_WORK_CENTER")
@Schema(description = "BsWorkCenter对象")
@EqualsAndHashCode(callSuper = true)
public class WorkCenterEntity extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 编码
*/
@Schema(description = "编码")
private String wcCode;
/**
* 名称
*/
@Schema(description = "名称")
private String wcName;
/**
* 工序
*/
@Schema(description = "工序")
private String processes;
/**
* 工艺能力
*/
@Schema(description = "工艺能力")
private String craftAbility;
/**
* 业务标识
*/
@Schema(description = "业务标识")
private String sign;
/**
* 主管工艺员外键-人员
*/
@Schema(description = "主管工艺员(外键-人员)")
private BigDecimal leaderUser;
/**
* 班组
*/
@Schema(description = "班组")
private String team;
/**
* 面积
*/
@Schema(description = "面积")
private BigDecimal area;
/**
* 数量
*/
@Schema(description = "数量")
private Long quantity;
/**
* 批次
*/
@Schema(description = "批次")
private Long batchNo;
/**
* 饱和度
*/
@Schema(description = "饱和度")
private BigDecimal saturation;
/**
* 是否检验0不需检验1需检验
*/
@Schema(description = "是否检验(0:不需检验;1:需检验)")
private Short checkout;
/**
* 是否镀后0不需要1需要
*/
@Schema(description = "是否镀后(0:不需要;1:需要)")
private Short whetherPlate;
/**
* 是否大批量0不是1
*/
@Schema(description = "是否大批量(0:不是;1:是)")
private Short bigBatch;
/**
* 开始点位
*/
@Schema(description = "开始点位")
private String startPoint;
/**
* 结束点位
*/
@Schema(description = "结束点位")
private String endPoint;
/**
* 轮转周期
*/
@Schema(description = "轮转周期")
private Long roundCycle;
/**
* 描述
*/
@Schema(description = "描述")
private String describe;
/**
* 交付中心外键
*/
@Schema(description = "交付中心(外键)")
private BigDecimal jcId;
/**
*
*/
@Schema(description = "")
private String remarks;
}

@ -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-22
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class CraftAbilityExcel implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 产品ID
*/
@ColumnWidth(20)
@ExcelProperty("产品ID")
private BigDecimal id;
/**
* 作业中心
*/
@ColumnWidth(20)
@ExcelProperty("作业中心")
private String caCode;
/**
* 设备编码
*/
@ColumnWidth(20)
@ExcelProperty("设备编码")
private String caName;
/**
* 设备分类
*/
@ColumnWidth(20)
@ExcelProperty("设备分类")
private Long wtId;
/**
* 设备名称
*/
@ColumnWidth(20)
@ExcelProperty("设备名称")
private Long bpsId;
/**
* 是否已删除
*/
@ColumnWidth(20)
@ExcelProperty("是否已删除")
private Long isDeleted;
}

@ -0,0 +1,147 @@
/**
* 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-22
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class EquipmentExcel implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* ID
*/
@ColumnWidth(20)
@ExcelProperty("ID")
private BigDecimal id;
/**
* 设备编码
*/
@ColumnWidth(20)
@ExcelProperty("设备编码")
private String deviceCode;
/**
* 设备名称
*/
@ColumnWidth(20)
@ExcelProperty("设备名称")
private String deviceName;
/**
* 类别名称
*/
@ColumnWidth(20)
@ExcelProperty("类别名称")
private String typeName;
/**
* 规格型号
*/
@ColumnWidth(20)
@ExcelProperty("规格型号")
private String macSpec;
/**
* 服役状态;1正常服役2暂停服役
*/
@ColumnWidth(20)
@ExcelProperty("服役状态;1、正常服役,2、暂停服役")
private BigDecimal used;
/**
* RFID
*/
@ColumnWidth(20)
@ExcelProperty("RFID")
private String rfId;
/**
* 虚拟设备;1., 0.
*/
@ColumnWidth(20)
@ExcelProperty("虚拟设备;1.是, 0.否")
private String virtualMac;
/**
* 是否对接;1., 0.
*/
@ColumnWidth(20)
@ExcelProperty("是否对接;1.是, 0.否")
private String docking;
/**
* 类别说明
*/
@ColumnWidth(20)
@ExcelProperty("类别说明")
private String memo;
/**
* 绑定数量
*/
@ColumnWidth(20)
@ExcelProperty("绑定数量")
private BigDecimal bindQty;
/**
* 设备分类
*/
@ColumnWidth(20)
@ExcelProperty("设备分类")
private String category;
/**
* 设备ip
*/
@ColumnWidth(20)
@ExcelProperty("设备ip")
private String deviceIp;
/**
* 设备分类
*/
@ColumnWidth(20)
@ExcelProperty("设备分类")
private String categorys;
/**
* 是否已删除
*/
@ColumnWidth(20)
@ExcelProperty("是否已删除")
private Long isDeleted;
}

@ -0,0 +1,159 @@
/**
* 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-22
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class ProcessSetExcel implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* Ni+
*/
@ColumnWidth(20)
@ExcelProperty("Ni+")
private String niValue;
/**
* 转速/振频
*/
@ColumnWidth(20)
@ExcelProperty("转速/振频")
private String vSpeed;
/**
* 整流机控制模式
*/
@ColumnWidth(20)
@ExcelProperty("整流机控制模式")
private String cyropactorControl;
/**
* 班组
*/
@ColumnWidth(20)
@ExcelProperty("班组")
private String team;
/**
*
*/
@ColumnWidth(20)
@ExcelProperty("")
private BigDecimal newColumn;
/**
* 主键
*/
@ColumnWidth(20)
@ExcelProperty("主键")
private BigDecimal id;
/**
* 编码
*/
@ColumnWidth(20)
@ExcelProperty("编码")
private String code;
/**
* 名称
*/
@ColumnWidth(20)
@ExcelProperty("名称")
private String name;
/**
* 标准周期
*/
@ColumnWidth(20)
@ExcelProperty("标准周期")
private BigDecimal cycle;
/**
* 是否主工序
*/
@ColumnWidth(20)
@ExcelProperty("是否主工序")
private String isMain;
/**
* 是否特殊
*/
@ColumnWidth(20)
@ExcelProperty("是否特殊")
private String isSpecial;
/**
* 是否分派
*/
@ColumnWidth(20)
@ExcelProperty("是否分派")
private String isDispatch;
/**
* 备注
*/
@ColumnWidth(20)
@ExcelProperty("备注")
private String remarks;
/**
* 是否删除
*/
@ColumnWidth(20)
@ExcelProperty("是否删除")
private Long isDeleted;
/**
* 电流(A)
*/
@ColumnWidth(20)
@ExcelProperty("电流(A)")
private String eleStream;
/**
* 电导率
*/
@ColumnWidth(20)
@ExcelProperty("电导率")
private String eleRate;
/**
* PH
*/
@ColumnWidth(20)
@ExcelProperty("PH")
private String phValue;
}

@ -47,7 +47,7 @@ import java.math.BigDecimal;
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class BsTeamSetExcel implements Serializable {
public class TeamSetExcel implements Serializable {
@Serial
private static final long serialVersionUID = 1L;

@ -29,10 +29,7 @@ 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 com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import java.io.Serial;
@ -47,7 +44,7 @@ import java.io.Serial;
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class BsTeamTimeExcel extends BaseEntity {
public class TeamTimeExcel extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;

@ -0,0 +1,189 @@
/**
* 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-22
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class WorkCenterExcel implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ColumnWidth(20)
@ExcelProperty("主键ID")
private BigDecimal id;
/**
* 编码
*/
@ColumnWidth(20)
@ExcelProperty("编码")
private String wcCode;
/**
* 名称
*/
@ColumnWidth(20)
@ExcelProperty("名称")
private String wcName;
/**
* 工序
*/
@ColumnWidth(20)
@ExcelProperty("工序")
private String processes;
/**
* 工艺能力
*/
@ColumnWidth(20)
@ExcelProperty("工艺能力")
private String craftAbility;
/**
* 业务标识
*/
@ColumnWidth(20)
@ExcelProperty("业务标识")
private String sign;
/**
* 主管工艺员外键-人员
*/
@ColumnWidth(20)
@ExcelProperty("主管工艺员(外键-人员)")
private BigDecimal leaderUser;
/**
* 班组
*/
@ColumnWidth(20)
@ExcelProperty("班组")
private String team;
/**
* 面积
*/
@ColumnWidth(20)
@ExcelProperty("面积")
private BigDecimal area;
/**
* 数量
*/
@ColumnWidth(20)
@ExcelProperty("数量")
private Long quantity;
/**
* 批次
*/
@ColumnWidth(20)
@ExcelProperty("批次")
private Long batchNo;
/**
* 饱和度
*/
@ColumnWidth(20)
@ExcelProperty("饱和度")
private BigDecimal saturation;
/**
* 是否检验0不需检验1需检验
*/
@ColumnWidth(20)
@ExcelProperty("是否检验(0:不需检验;1:需检验)")
private Short checkout;
/**
* 是否镀后0不需要1需要
*/
@ColumnWidth(20)
@ExcelProperty("是否镀后(0:不需要;1:需要)")
private Short whetherPlate;
/**
* 是否大批量0不是1
*/
@ColumnWidth(20)
@ExcelProperty("是否大批量(0:不是;1:是)")
private Short bigBatch;
/**
* 开始点位
*/
@ColumnWidth(20)
@ExcelProperty("开始点位")
private String startPoint;
/**
* 结束点位
*/
@ColumnWidth(20)
@ExcelProperty("结束点位")
private String endPoint;
/**
* 轮转周期
*/
@ColumnWidth(20)
@ExcelProperty("轮转周期")
private Long roundCycle;
/**
* 描述
*/
@ColumnWidth(20)
@ExcelProperty("描述")
private String describe;
/**
* 交付中心外键
*/
@ColumnWidth(20)
@ExcelProperty("交付中心(外键)")
private BigDecimal jcId;
/**
*
*/
@ColumnWidth(20)
@ExcelProperty("")
private String remarks;
/**
*
*/
@ColumnWidth(20)
@ExcelProperty("")
private Long isDeleted;
}

@ -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.CraftAbilityEntity;
import org.springblade.scheduling.scheduling.excel.CraftAbilityExcel;
import org.springblade.scheduling.scheduling.vo.CraftAbilityVO;
import java.util.List;
/**
* 工艺能力 Mapper 接口
*
* @author BladeX
* @since 2025-12-22
*/
public interface CraftAbilityMapper extends BaseMapper<CraftAbilityEntity> {
/**
* 自定义分页
*
* @param page 分页参数
* @param CraftAbility 查询参数
* @return List<CraftAbilityVO>
*/
List<CraftAbilityVO> selectCraftAbilityPage(IPage page, CraftAbilityVO craftAbility);
/**
* 获取导出数据
*
* @param queryWrapper 查询条件
* @return List<CraftAbilityExcel>
*/
List<CraftAbilityExcel> export(@Param("ew") Wrapper<CraftAbilityEntity> 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.CraftAbilityMapper">
<!-- 通用查询映射结果 -->
<resultMap id="craftAbilityResultMap" type="org.springblade.scheduling.scheduling.entity.CraftAbilityEntity">
<result column="ID" property="id"/>
<result column="CA_CODE" property="caCode"/>
<result column="CA_NAME" property="caName"/>
<result column="WT_ID" property="wtId"/>
<result column="BPS_ID" property="bpsId"/>
<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="selectCraftAbilityPage" resultMap="craftAbilityResultMap">
select * from BS_CRAFT_ABILITY where is_deleted = 0
</select>
<select id="export" resultType="org.springblade.scheduling.scheduling.excel.CraftAbilityExcel">
SELECT * FROM BS_CRAFT_ABILITY ${ew.customSqlSegment}
</select>
</mapper>

@ -31,7 +31,19 @@
<select id="selectDifferentFurnaceTankPage" resultMap="differentFurnaceTankResultMap">
select * from MES_DIFFERENT_FURNACE_TANK where is_deleted = 0
select * from MES_DIFFERENT_FURNACE_TANK
<where>
is_deleted = 0
<if test="param2.workCenterId !=null">
and work_center_id = #{param2.workCenterId}
</if>
<if test="param2.processId !=null">
and process_id = #{param2.processId}
</if>
<if test="param2.craftId !=null">
and craft_id = #{param2.craftId}
</if>
</where>
</select>

@ -49,7 +49,7 @@ public interface EquipAbilityMapper extends BaseMapper<EquipAbilityEntity> {
* @param entity 查询参数
* @return List<MesEquipAbilityVO>
*/
List<EquipAbilityVO> selectMesEquipAbilityPage(IPage page, EquipAbilityVO entity);
List<EquipAbilityVO> selectEquipAbilityPage(IPage page, EquipAbilityVO entity);
/**

@ -10,9 +10,9 @@
<result column="EQUIP_CODE" property="equipCode"/>
<result column="EQUIP_TYPE" property="equipType"/>
<result column="EQUIP_NAME" property="equipName"/>
<result column="CRAFT_CODE" property="craftCode"/>
<result column="CRAFT_ID" property="craftId"/>
<result column="CRAFT_NAME" property="craftName"/>
<result column="STANDARD_PROCESSING_ABILITY" property="standardProcessAbility"/>
<result column="STANDARD_PROCESS_ABILITY" property="standardProcessAbility"/>
<result column="STANDARD_TIME" property="standardTime"/>
<result column="PREPARE_TIME" property="prepareTime"/>
<result column="INTERVAL" property="interval"/>
@ -27,8 +27,17 @@
</resultMap>
<select id="selectMesEquipAbilityPage" resultMap="mesEquipAbilityResultMap">
select * from MES_EQUIP_ABILITY where is_deleted = 0
<select id="selectEquipAbilityPage" resultMap="mesEquipAbilityResultMap">
select * from MES_EQUIP_ABILITY
<where>
is_deleted = 0
<if test="param2.workCenterId !=null">
and work_center_id = #{param2.workCenterId}
</if>
<if test="param2.equipCode !=null and param2.equipCode !=''">
and equip_code = #{param2.equipCode}
</if>
</where>
</select>

@ -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.EquipmentEntity;
import org.springblade.scheduling.scheduling.excel.EquipmentExcel;
import org.springblade.scheduling.scheduling.vo.EquipmentVO;
import java.util.List;
/**
* 设备信息表 Mapper 接口
*
* @author BladeX
* @since 2025-12-22
*/
public interface EquipmentMapper extends BaseMapper<EquipmentEntity> {
/**
* 自定义分页
*
* @param page 分页参数
* @param Equipment 查询参数
* @return List<EquipmentVO>
*/
List<EquipmentVO> selectEquipmentPage(IPage page, EquipmentVO equipment);
/**
* 获取导出数据
*
* @param queryWrapper 查询条件
* @return List<EquipmentExcel>
*/
List<EquipmentExcel> export(@Param("ew") Wrapper<EquipmentEntity> queryWrapper);
}

@ -0,0 +1,40 @@
<?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.EquipmentMapper">
<!-- 通用查询映射结果 -->
<resultMap id="equipmentResultMap" type="org.springblade.scheduling.scheduling.entity.EquipmentEntity">
<result column="ID" property="id"/>
<result column="DEVICE_CODE" property="deviceCode"/>
<result column="DEVICE_NAME" property="deviceName"/>
<result column="TYPE_NAME" property="typeName"/>
<result column="MAC_SPEC" property="macSpec"/>
<result column="USED" property="used"/>
<result column="RF_ID" property="rfId"/>
<result column="VIRTUAL_MAC" property="virtualMac"/>
<result column="DOCKING" property="docking"/>
<result column="MEMO" property="memo"/>
<result column="BIND_QTY" property="bindQty"/>
<result column="CATEGORY" property="category"/>
<result column="DEVICE_IP" property="deviceIp"/>
<result column="CATEGORYS" property="categorys"/>
<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="selectEquipmentPage" resultMap="equipmentResultMap">
select * from MES_EQUIPMENT where is_deleted = 0
</select>
<select id="export" resultType="org.springblade.scheduling.scheduling.excel.EquipmentExcel">
SELECT * FROM MES_EQUIPMENT ${ew.customSqlSegment}
</select>
</mapper>

@ -22,7 +22,13 @@
<select id="selectInspectionItemPage" resultMap="inspectionItemResultMap">
select * from MES_INSPECTION_ITEM where is_deleted = 0
select * from MES_INSPECTION_ITEM
<where>
is_deleted = 0
<if test="param2.inspectionItem !=null">
and inspection_item = #{param2.inspectionItem}
</if>
</where>
</select>

@ -5,7 +5,7 @@
<!-- 通用查询映射结果 -->
<resultMap id="mesMainProducerResultMap" type="org.springblade.scheduling.scheduling.entity.MainProducerEntity">
<result column="ID" property="id"/>
<result column="PROCESS_CODE" property="processCode"/>
<result column="PROCESS_ID" property="processId"/>
<result column="PROCESS_NAME" property="processName"/>
<result column="MAIN_PRODUCER" property="mainProducer"/>
<result column="CREATE_TIME" property="createTime"/>
@ -19,7 +19,16 @@
<select id="selectMesMainProducerPage" resultMap="mesMainProducerResultMap">
select * from MES_MAIN_PRODUCER where is_deleted = 0
select * from MES_MAIN_PRODUCER
<where>
is_deleted = 0
<if test="param2.processId !=null">
and process_id = #{param2.processId}
</if>
<if test="param2.mainProducer !=null and param2.mainProducer !=''">
and main_producer = #{param2.mainProducer}
</if>
</where>
</select>

@ -6,9 +6,9 @@
<resultMap id="mesEquipAbilityResultMap" type="org.springblade.scheduling.scheduling.entity.PersonAbilityEntity">
<result column="ID" property="id"/>
<result column="WORK_CENTER_NAME" property="workCenterName"/>
<result column="WORK_CENTER_CODE" property="workCenterCode"/>
<result column="WORK_CENTER_ID" property="workCenterId"/>
<result column="PROCESS_NAME" property="processName"/>
<result column="CRAFT_CODE" property="craftCode"/>
<result column="CRAFT_ID" property="craftId"/>
<result column="CRAFT_NAME" property="craftName"/>
<result column="STANDARD_TIME" property="standardTime"/>
<result column="PREPARE_TIME" property="prepareTime"/>
@ -23,7 +23,19 @@
<select id="selectMesPersonAbilityPage" resultMap="mesEquipAbilityResultMap">
select * from MES_PERSON_ABILITY where is_deleted = 0
select * from MES_PERSON_ABILITY
<where>
is_deleted = 0
<if test="param2.workCenterId !=null">
and work_center_id = #{param2.workCenterId}
</if>
<if test="param2.processId !=null">
and process_id = #{param2.processId}
</if>
<if test="param2.craftId !=null">
and craft_id = #{param2.craftId}
</if>
</where>
</select>

@ -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.ProcessSetEntity;
import org.springblade.scheduling.scheduling.excel.ProcessSetExcel;
import org.springblade.scheduling.scheduling.vo.ProcessSetVO;
import java.util.List;
/**
* 工序设置表 Mapper 接口
*
* @author BladeX
* @since 2025-12-22
*/
public interface ProcessSetMapper extends BaseMapper<ProcessSetEntity> {
/**
* 自定义分页
*
* @param page 分页参数
* @param ProcessSet 查询参数
* @return List<ProcessSetVO>
*/
List<ProcessSetVO> selectProcessSetPage(IPage page, ProcessSetVO processSet);
/**
* 获取导出数据
*
* @param queryWrapper 查询条件
* @return List<ProcessSetExcel>
*/
List<ProcessSetExcel> export(@Param("ew") Wrapper<ProcessSetEntity> queryWrapper);
}

@ -0,0 +1,42 @@
<?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.ProcessSetMapper">
<!-- 通用查询映射结果 -->
<resultMap id="processSetResultMap" type="org.springblade.scheduling.scheduling.entity.ProcessSetEntity">
<result column="NI_VALUE" property="niValue"/>
<result column="V_SPEED" property="vSpeed"/>
<result column="CYROPACTOR_CONTROL" property="cyropactorControl"/>
<result column="TEAM" property="team"/>
<result column="NEW_COLUMN" property="newColumn"/>
<result column="ID" property="id"/>
<result column="CODE" property="code"/>
<result column="NAME" property="name"/>
<result column="CYCLE" property="cycle"/>
<result column="IS_MAIN" property="isMain"/>
<result column="IS_SPECIAL" property="isSpecial"/>
<result column="IS_DISPATCH" property="isDispatch"/>
<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="ELE_STREAM" property="eleStream"/>
<result column="ELE_RATE" property="eleRate"/>
<result column="PH_VALUE" property="phValue"/>
</resultMap>
<select id="selectProcessSetPage" resultMap="processSetResultMap">
select * from BS_PROCESS_SET where is_deleted = 0
</select>
<select id="export" resultType="org.springblade.scheduling.scheduling.excel.ProcessSetExcel">
SELECT * FROM BS_PROCESS_SET ${ew.customSqlSegment}
</select>
</mapper>

@ -18,7 +18,13 @@
<select id="selectQualityGradePage" resultMap="qualityGradeResultMap">
select * from MES_QUALITY_GRADE where is_deleted = 0
select * from MES_QUALITY_GRADE
<where>
is_deleted = 0
<if test="param2.type !=null and param2.type != ''">
and type = #{param2.type}
</if>
</where>
</select>

@ -29,9 +29,9 @@ 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.BsTeamSetEntity;
import org.springblade.scheduling.scheduling.excel.BsTeamSetExcel;
import org.springblade.scheduling.scheduling.vo.BsTeamSetVO;
import org.springblade.scheduling.scheduling.entity.TeamSetEntity;
import org.springblade.scheduling.scheduling.excel.TeamSetExcel;
import org.springblade.scheduling.scheduling.vo.TeamSetVO;
import java.util.List;
@ -41,7 +41,7 @@ import java.util.List;
* @author BladeX
* @since 2025-11-17
*/
public interface BsTeamSetMapper extends BaseMapper<BsTeamSetEntity> {
public interface TeamSetMapper extends BaseMapper<TeamSetEntity> {
/**
* 自定义分页
@ -50,7 +50,7 @@ public interface BsTeamSetMapper extends BaseMapper<BsTeamSetEntity> {
* @param bsTeamSet 查询参数
* @return List<BsTeamSetVO>
*/
List<BsTeamSetVO> selectBsTeamSetPage(IPage page, BsTeamSetVO bsTeamSet);
List<TeamSetVO> selectBsTeamSetPage(IPage page, TeamSetVO bsTeamSet);
/**
@ -59,6 +59,6 @@ public interface BsTeamSetMapper extends BaseMapper<BsTeamSetEntity> {
* @param queryWrapper 查询条件
* @return List<BsTeamSetExcel>
*/
List<BsTeamSetExcel> export(@Param("ew") Wrapper<BsTeamSetEntity> queryWrapper);
List<TeamSetExcel> export(@Param("ew") Wrapper<TeamSetEntity> queryWrapper);
}

@ -1,9 +1,9 @@
<?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.BsTeamSetMapper">
<mapper namespace="org.springblade.scheduling.scheduling.mapper.TeamSetMapper">
<!-- 通用查询映射结果 -->
<resultMap id="bsTeamSetResultMap" type="org.springblade.scheduling.scheduling.entity.BsTeamSetEntity">
<resultMap id="bsTeamSetResultMap" type="org.springblade.scheduling.scheduling.entity.TeamSetEntity">
<result column="ID" property="id"/>
<result column="TS_CODE" property="tsCode"/>
<result column="TS_NAME" property="tsName"/>
@ -34,7 +34,7 @@
</select>
<select id="export" resultType="org.springblade.scheduling.scheduling.excel.BsTeamSetExcel">
<select id="export" resultType="org.springblade.scheduling.scheduling.excel.TeamSetExcel">
SELECT * FROM BS_TEAM_SET ${ew.customSqlSegment}
</select>

@ -29,9 +29,9 @@ 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.BsTeamTimeEntity;
import org.springblade.scheduling.scheduling.excel.BsTeamTimeExcel;
import org.springblade.scheduling.scheduling.vo.BsTeamTimeVO;
import org.springblade.scheduling.scheduling.entity.TeamTimeEntity;
import org.springblade.scheduling.scheduling.excel.TeamTimeExcel;
import org.springblade.scheduling.scheduling.vo.TeamTimeVO;
import java.util.List;
@ -41,7 +41,7 @@ import java.util.List;
* @author BladeX
* @since 2025-11-17
*/
public interface BsTeamTimeMapper extends BaseMapper<BsTeamTimeEntity> {
public interface TeamTimeMapper extends BaseMapper<TeamTimeEntity> {
/**
* 自定义分页
@ -50,7 +50,7 @@ public interface BsTeamTimeMapper extends BaseMapper<BsTeamTimeEntity> {
* @param bsTeamTime 查询参数
* @return List<BsTeamTimeVO>
*/
List<BsTeamTimeVO> selectBsTeamTimePage(IPage page, BsTeamTimeVO bsTeamTime);
List<TeamTimeVO> selectBsTeamTimePage(IPage page, TeamTimeVO bsTeamTime);
/**
@ -59,6 +59,6 @@ public interface BsTeamTimeMapper extends BaseMapper<BsTeamTimeEntity> {
* @param queryWrapper 查询条件
* @return List<BsTeamTimeExcel>
*/
List<BsTeamTimeExcel> export(@Param("ew") Wrapper<BsTeamTimeEntity> queryWrapper);
List<TeamTimeExcel> export(@Param("ew") Wrapper<TeamTimeEntity> queryWrapper);
}

@ -1,9 +1,9 @@
<?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.BsTeamTimeMapper">
<mapper namespace="org.springblade.scheduling.scheduling.mapper.TeamTimeMapper">
<!-- 通用查询映射结果 -->
<resultMap id="bsTeamTimeResultMap" type="org.springblade.scheduling.scheduling.entity.BsTeamTimeEntity">
<resultMap id="bsTeamTimeResultMap" type="org.springblade.scheduling.scheduling.entity.TeamTimeEntity">
<result column="ID" property="id"/>
<result column="TS_ID" property="tsId"/>
<result column="START_TIME" property="startTime"/>
@ -24,7 +24,7 @@
</select>
<select id="export" resultType="org.springblade.scheduling.scheduling.excel.BsTeamTimeExcel">
<select id="export" resultType="org.springblade.scheduling.scheduling.excel.TeamTimeExcel">
SELECT * FROM BS_TEAM_TIME ${ew.customSqlSegment}
</select>

@ -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.WorkCenterEntity;
import org.springblade.scheduling.scheduling.excel.WorkCenterExcel;
import org.springblade.scheduling.scheduling.vo.WorkCenterVO;
import java.util.List;
/**
* 工作中心表 Mapper 接口
*
* @author BladeX
* @since 2025-12-22
*/
public interface WorkCenterMapper extends BaseMapper<WorkCenterEntity> {
/**
* 自定义分页
*
* @param page 分页参数
* @param WorkCenter 查询参数
* @return List<WorkCenterVO>
*/
List<WorkCenterVO> selectWorkCenterPage(IPage page, WorkCenterVO workCenter);
/**
* 获取导出数据
*
* @param queryWrapper 查询条件
* @return List<WorkCenterExcel>
*/
List<WorkCenterExcel> export(@Param("ew") Wrapper<WorkCenterEntity> queryWrapper);
}

@ -0,0 +1,47 @@
<?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.WorkCenterMapper">
<!-- 通用查询映射结果 -->
<resultMap id="workCenterResultMap" type="org.springblade.scheduling.scheduling.entity.WorkCenterEntity">
<result column="ID" property="id"/>
<result column="WC_CODE" property="wcCode"/>
<result column="WC_NAME" property="wcName"/>
<result column="PROCESSES" property="processes"/>
<result column="CRAFT_ABILITY" property="craftAbility"/>
<result column="SIGN" property="sign"/>
<result column="LEADER_USER" property="leaderUser"/>
<result column="TEAM" property="team"/>
<result column="AREA" property="area"/>
<result column="QUANTITY" property="quantity"/>
<result column="BATCH_NO" property="batchNo"/>
<result column="SATURATION" property="saturation"/>
<result column="CHECKOUT" property="checkout"/>
<result column="WHETHER_PLATE" property="whetherPlate"/>
<result column="BIG_BATCH" property="bigBatch"/>
<result column="START_POINT" property="startPoint"/>
<result column="END_POINT" property="endPoint"/>
<result column="ROUND_CYCLE" property="roundCycle"/>
<result column="DESCRIBE" property="describe"/>
<result column="JC_ID" property="jcId"/>
<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"/>
</resultMap>
<select id="selectWorkCenterPage" resultMap="workCenterResultMap">
select * from BS_WORK_CENTER where is_deleted = 0
</select>
<select id="export" resultType="org.springblade.scheduling.scheduling.excel.WorkCenterExcel">
SELECT * FROM BS_WORK_CENTER ${ew.customSqlSegment}
</select>
</mapper>

@ -92,6 +92,7 @@
a.batch_no AS "batchNo",
a.make_qty AS "makeQty",
a.card_no AS "cardNO",
g.product_ident AS "productIdent",
f.name AS "currentProcessName",
d.name AS "processName",
to_char(b.start_time,'HH24:MI') AS "startTime",
@ -112,6 +113,7 @@
LEFT JOIN BS_PROCESS_SET d ON b.pps_id = d.id
LEFT JOIN MES_WORK_PLAN e on a.wp_id = e.id
LEFT JOIN BS_PROCESS_SET f on e.pps_id = f.id
LEFT JOIN MES_YIELD_ORDER g on g.id = a.yo_id
<where>
a.is_deleted = 0
<if test="startTime !=null and startTime != ''">
@ -126,6 +128,9 @@
<if test="equipName !=null and equipName != ''">
and b.equip_name = #{equipName}
</if>
<if test="processName !=null and processName != ''">
and d.name = #{processName}
</if>
</where>
order by a.WO_CODE,b.start_time
</select>

@ -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.CraftAbilityEntity;
import org.springblade.scheduling.scheduling.excel.CraftAbilityExcel;
import org.springblade.scheduling.scheduling.vo.CraftAbilityVO;
import java.util.List;
/**
* 工艺能力 服务类
*
* @author BladeX
* @since 2025-12-22
*/
public interface ICraftAbilityService extends BaseService<CraftAbilityEntity> {
/**
* 自定义分页
*
* @param page 分页参数
* @param CraftAbility 查询参数
* @return IPage<CraftAbilityVO>
*/
IPage<CraftAbilityVO> selectCraftAbilityPage(IPage<CraftAbilityVO> page, CraftAbilityVO craftAbility);
/**
* 导出数据
*
* @param queryWrapper 查询条件
* @return List<CraftAbilityExcel>
*/
List<CraftAbilityExcel> export(Wrapper<CraftAbilityEntity> queryWrapper);
}

@ -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.EquipmentEntity;
import org.springblade.scheduling.scheduling.excel.EquipmentExcel;
import org.springblade.scheduling.scheduling.vo.EquipmentVO;
import java.util.List;
/**
* 设备信息表 服务类
*
* @author BladeX
* @since 2025-12-22
*/
public interface IEquipmentService extends BaseService<EquipmentEntity> {
/**
* 自定义分页
*
* @param page 分页参数
* @param Equipment 查询参数
* @return IPage<EquipmentVO>
*/
IPage<EquipmentVO> selectEquipmentPage(IPage<EquipmentVO> page, EquipmentVO equipment);
/**
* 导出数据
*
* @param queryWrapper 查询条件
* @return List<EquipmentExcel>
*/
List<EquipmentExcel> export(Wrapper<EquipmentEntity> queryWrapper);
}

@ -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.ProcessSetEntity;
import org.springblade.scheduling.scheduling.excel.ProcessSetExcel;
import org.springblade.scheduling.scheduling.vo.ProcessSetVO;
import java.util.List;
/**
* 工序设置表 服务类
*
* @author BladeX
* @since 2025-12-22
*/
public interface IProcessSetService extends BaseService<ProcessSetEntity> {
/**
* 自定义分页
*
* @param page 分页参数
* @param ProcessSet 查询参数
* @return IPage<ProcessSetVO>
*/
IPage<ProcessSetVO> selectProcessSetPage(IPage<ProcessSetVO> page, ProcessSetVO ProcessSet);
/**
* 导出数据
*
* @param queryWrapper 查询条件
* @return List<ProcessSetExcel>
*/
List<ProcessSetExcel> export(Wrapper<ProcessSetEntity> queryWrapper);
}

@ -28,9 +28,9 @@ 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.BsTeamSetEntity;
import org.springblade.scheduling.scheduling.excel.BsTeamSetExcel;
import org.springblade.scheduling.scheduling.vo.BsTeamSetVO;
import org.springblade.scheduling.scheduling.entity.TeamSetEntity;
import org.springblade.scheduling.scheduling.excel.TeamSetExcel;
import org.springblade.scheduling.scheduling.vo.TeamSetVO;
import java.util.List;
@ -40,7 +40,7 @@ import java.util.List;
* @author BladeX
* @since 2025-11-17
*/
public interface IBsTeamSetService extends BaseService<BsTeamSetEntity> {
public interface ITeamSetService extends BaseService<TeamSetEntity> {
/**
* 自定义分页
*
@ -48,7 +48,7 @@ public interface IBsTeamSetService extends BaseService<BsTeamSetEntity> {
* @param bsTeamSet 查询参数
* @return IPage<BsTeamSetVO>
*/
IPage<BsTeamSetVO> selectBsTeamSetPage(IPage<BsTeamSetVO> page, BsTeamSetVO bsTeamSet);
IPage<TeamSetVO> selectBsTeamSetPage(IPage<TeamSetVO> page, TeamSetVO bsTeamSet);
/**
@ -57,7 +57,7 @@ public interface IBsTeamSetService extends BaseService<BsTeamSetEntity> {
* @param queryWrapper 查询条件
* @return List<BsTeamSetExcel>
*/
List<BsTeamSetExcel> export(Wrapper<BsTeamSetEntity> queryWrapper);
List<TeamSetExcel> export(Wrapper<TeamSetEntity> queryWrapper);
}

@ -28,9 +28,9 @@ 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.BsTeamTimeEntity;
import org.springblade.scheduling.scheduling.excel.BsTeamTimeExcel;
import org.springblade.scheduling.scheduling.vo.BsTeamTimeVO;
import org.springblade.scheduling.scheduling.entity.TeamTimeEntity;
import org.springblade.scheduling.scheduling.excel.TeamTimeExcel;
import org.springblade.scheduling.scheduling.vo.TeamTimeVO;
import java.util.List;
@ -40,7 +40,7 @@ import java.util.List;
* @author BladeX
* @since 2025-11-17
*/
public interface IBsTeamTimeService extends BaseService<BsTeamTimeEntity> {
public interface ITeamTimeService extends BaseService<TeamTimeEntity> {
/**
* 自定义分页
*
@ -48,7 +48,7 @@ public interface IBsTeamTimeService extends BaseService<BsTeamTimeEntity> {
* @param bsTeamTime 查询参数
* @return IPage<BsTeamTimeVO>
*/
IPage<BsTeamTimeVO> selectBsTeamTimePage(IPage<BsTeamTimeVO> page, BsTeamTimeVO bsTeamTime);
IPage<TeamTimeVO> selectBsTeamTimePage(IPage<TeamTimeVO> page, TeamTimeVO bsTeamTime);
/**
@ -57,7 +57,7 @@ public interface IBsTeamTimeService extends BaseService<BsTeamTimeEntity> {
* @param queryWrapper 查询条件
* @return List<BsTeamTimeExcel>
*/
List<BsTeamTimeExcel> export(Wrapper<BsTeamTimeEntity> queryWrapper);
List<TeamTimeExcel> export(Wrapper<TeamTimeEntity> queryWrapper);
}

@ -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.WorkCenterEntity;
import org.springblade.scheduling.scheduling.excel.WorkCenterExcel;
import org.springblade.scheduling.scheduling.vo.WorkCenterVO;
import java.util.List;
/**
* 工作中心表 服务类
*
* @author BladeX
* @since 2025-12-22
*/
public interface IWorkCenterService extends BaseService<WorkCenterEntity> {
/**
* 自定义分页
*
* @param page 分页参数
* @param WorkCenter 查询参数
* @return IPage<WorkCenterVO>
*/
IPage<WorkCenterVO> selectWorkCenterPage(IPage<WorkCenterVO> page, WorkCenterVO WorkCenter);
/**
* 导出数据
*
* @param queryWrapper 查询条件
* @return List<WorkCenterExcel>
*/
List<WorkCenterExcel> export(Wrapper<WorkCenterEntity> 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.CraftAbilityEntity;
import org.springblade.scheduling.scheduling.excel.CraftAbilityExcel;
import org.springblade.scheduling.scheduling.mapper.CraftAbilityMapper;
import org.springblade.scheduling.scheduling.service.ICraftAbilityService;
import org.springblade.scheduling.scheduling.vo.CraftAbilityVO;
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-22
*/
@Service
public class CraftAbilityServiceImpl extends BaseServiceImpl<CraftAbilityMapper, CraftAbilityEntity> implements ICraftAbilityService {
@Override
public IPage<CraftAbilityVO> selectCraftAbilityPage(IPage<CraftAbilityVO> page, CraftAbilityVO craftAbility) {
return page.setRecords(baseMapper.selectCraftAbilityPage(page, craftAbility));
}
@Override
public List<CraftAbilityExcel> export(Wrapper<CraftAbilityEntity> queryWrapper) {
List<CraftAbilityExcel> CraftAbilityList = baseMapper.export(queryWrapper);
//CraftAbilityList.forEach(CraftAbility -> {
// CraftAbility.setTypeName(DictCache.getValue(DictEnum.YES_NO, CraftAbility.getType()));
//});
return CraftAbilityList;
}
}

@ -48,7 +48,7 @@ public class EquipAbilityServiceImpl extends BaseServiceImpl<EquipAbilityMapper,
@Override
public IPage<EquipAbilityVO> selectEquipAbilityPage(IPage<EquipAbilityVO> page, EquipAbilityVO entity) {
return page.setRecords(baseMapper.selectMesEquipAbilityPage(page, entity));
return page.setRecords(baseMapper.selectEquipAbilityPage(page, entity));
}

@ -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.EquipmentEntity;
import org.springblade.scheduling.scheduling.excel.EquipmentExcel;
import org.springblade.scheduling.scheduling.mapper.EquipmentMapper;
import org.springblade.scheduling.scheduling.service.IEquipmentService;
import org.springblade.scheduling.scheduling.vo.EquipmentVO;
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-22
*/
@Service
public class EquipmentServiceImpl extends BaseServiceImpl<EquipmentMapper, EquipmentEntity> implements IEquipmentService {
@Override
public IPage<EquipmentVO> selectEquipmentPage(IPage<EquipmentVO> page, EquipmentVO equipment) {
return page.setRecords(baseMapper.selectEquipmentPage(page, equipment));
}
@Override
public List<EquipmentExcel> export(Wrapper<EquipmentEntity> queryWrapper) {
List<EquipmentExcel> EquipmentList = baseMapper.export(queryWrapper);
//EquipmentList.forEach(Equipment -> {
// Equipment.setTypeName(DictCache.getValue(DictEnum.YES_NO, Equipment.getType()));
//});
return EquipmentList;
}
}

@ -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.ProcessSetEntity;
import org.springblade.scheduling.scheduling.excel.ProcessSetExcel;
import org.springblade.scheduling.scheduling.mapper.ProcessSetMapper;
import org.springblade.scheduling.scheduling.service.IProcessSetService;
import org.springblade.scheduling.scheduling.vo.ProcessSetVO;
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-22
*/
@Service
public class ProcessSetServiceImpl extends BaseServiceImpl<ProcessSetMapper, ProcessSetEntity> implements IProcessSetService {
@Override
public IPage<ProcessSetVO> selectProcessSetPage(IPage<ProcessSetVO> page, ProcessSetVO processSet) {
return page.setRecords(baseMapper.selectProcessSetPage(page, processSet));
}
@Override
public List<ProcessSetExcel> export(Wrapper<ProcessSetEntity> queryWrapper) {
List<ProcessSetExcel> ProcessSetList = baseMapper.export(queryWrapper);
//ProcessSetList.forEach(ProcessSet -> {
// ProcessSet.setTypeName(DictCache.getValue(DictEnum.YES_NO, ProcessSet.getType()));
//});
return ProcessSetList;
}
}

@ -28,11 +28,11 @@ package org.springblade.scheduling.scheduling.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.scheduling.scheduling.entity.BsTeamSetEntity;
import org.springblade.scheduling.scheduling.excel.BsTeamSetExcel;
import org.springblade.scheduling.scheduling.mapper.BsTeamSetMapper;
import org.springblade.scheduling.scheduling.service.IBsTeamSetService;
import org.springblade.scheduling.scheduling.vo.BsTeamSetVO;
import org.springblade.scheduling.scheduling.entity.TeamSetEntity;
import org.springblade.scheduling.scheduling.excel.TeamSetExcel;
import org.springblade.scheduling.scheduling.mapper.TeamSetMapper;
import org.springblade.scheduling.scheduling.service.ITeamSetService;
import org.springblade.scheduling.scheduling.vo.TeamSetVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -45,20 +45,20 @@ import java.util.List;
* @since 2025-11-17
*/
@Service
public class BsTeamSetServiceImpl extends BaseServiceImpl<BsTeamSetMapper, BsTeamSetEntity> implements IBsTeamSetService {
public class TeamSetServiceImpl extends BaseServiceImpl<TeamSetMapper, TeamSetEntity> implements ITeamSetService {
@Autowired
BsTeamSetMapper bsTeamSetMapper;
TeamSetMapper teamSetMapper;
@Override
public IPage<BsTeamSetVO> selectBsTeamSetPage(IPage<BsTeamSetVO> page, BsTeamSetVO bsTeamSet) {
public IPage<TeamSetVO> selectBsTeamSetPage(IPage<TeamSetVO> page, TeamSetVO bsTeamSet) {
return page.setRecords(baseMapper.selectBsTeamSetPage(page, bsTeamSet));
}
@Override
public List<BsTeamSetExcel> export(Wrapper<BsTeamSetEntity> queryWrapper) {
List<BsTeamSetExcel> bsTeamSetList = baseMapper.export(queryWrapper);
public List<TeamSetExcel> export(Wrapper<TeamSetEntity> queryWrapper) {
List<TeamSetExcel> bsTeamSetList = baseMapper.export(queryWrapper);
//bsTeamSetList.forEach(bsTeamSet -> {
// bsTeamSet.setTypeName(DictCache.getValue(DictEnum.YES_NO, BsTeamSet.getType()));
//});

@ -28,11 +28,11 @@ package org.springblade.scheduling.scheduling.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.scheduling.scheduling.entity.BsTeamTimeEntity;
import org.springblade.scheduling.scheduling.excel.BsTeamTimeExcel;
import org.springblade.scheduling.scheduling.mapper.BsTeamTimeMapper;
import org.springblade.scheduling.scheduling.service.IBsTeamTimeService;
import org.springblade.scheduling.scheduling.vo.BsTeamTimeVO;
import org.springblade.scheduling.scheduling.entity.TeamTimeEntity;
import org.springblade.scheduling.scheduling.excel.TeamTimeExcel;
import org.springblade.scheduling.scheduling.mapper.TeamTimeMapper;
import org.springblade.scheduling.scheduling.service.ITeamTimeService;
import org.springblade.scheduling.scheduling.vo.TeamTimeVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -45,20 +45,20 @@ import java.util.List;
* @since 2025-11-17
*/
@Service
public class BsTeamTimeServiceImpl extends BaseServiceImpl<BsTeamTimeMapper, BsTeamTimeEntity> implements IBsTeamTimeService {
public class TeamTimeServiceImpl extends BaseServiceImpl<TeamTimeMapper, TeamTimeEntity> implements ITeamTimeService {
@Autowired
BsTeamTimeMapper bsTeamTimeMapper;
TeamTimeMapper teamTimeMapper;
@Override
public IPage<BsTeamTimeVO> selectBsTeamTimePage(IPage<BsTeamTimeVO> page, BsTeamTimeVO bsTeamTime) {
public IPage<TeamTimeVO> selectBsTeamTimePage(IPage<TeamTimeVO> page, TeamTimeVO bsTeamTime) {
return page.setRecords(baseMapper.selectBsTeamTimePage(page, bsTeamTime));
}
@Override
public List<BsTeamTimeExcel> export(Wrapper<BsTeamTimeEntity> queryWrapper) {
List<BsTeamTimeExcel> bsTeamTimeList = baseMapper.export(queryWrapper);
public List<TeamTimeExcel> export(Wrapper<TeamTimeEntity> queryWrapper) {
List<TeamTimeExcel> bsTeamTimeList = baseMapper.export(queryWrapper);
//bsTeamTimeList.forEach(bsTeamTime -> {
// bsTeamTime.setTypeName(DictCache.getValue(DictEnum.YES_NO, BsTeamTime.getType()));
//});

@ -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.WorkCenterEntity;
import org.springblade.scheduling.scheduling.excel.WorkCenterExcel;
import org.springblade.scheduling.scheduling.mapper.WorkCenterMapper;
import org.springblade.scheduling.scheduling.service.IWorkCenterService;
import org.springblade.scheduling.scheduling.vo.WorkCenterVO;
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-22
*/
@Service
public class WorkCenterServiceImpl extends BaseServiceImpl<WorkCenterMapper, WorkCenterEntity> implements IWorkCenterService {
@Override
public IPage<WorkCenterVO> selectWorkCenterPage(IPage<WorkCenterVO> page, WorkCenterVO workCenter) {
return page.setRecords(baseMapper.selectWorkCenterPage(page, workCenter));
}
@Override
public List<WorkCenterExcel> export(Wrapper<WorkCenterEntity> queryWrapper) {
List<WorkCenterExcel> WorkCenterList = baseMapper.export(queryWrapper);
//WorkCenterList.forEach(WorkCenter -> {
// WorkCenter.setTypeName(DictCache.getValue(DictEnum.YES_NO, WorkCenter.getType()));
//});
return WorkCenterList;
}
}

@ -201,6 +201,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
mergedDto.setPartCode(dto.getPartCode());
mergedDto.setCurrentProcessName(dto.getCurrentProcessName());
mergedDto.setMakeQty(dto.getMakeQty());
mergedDto.setEquipName(dto.getEquipName());
if(dto.getPlanStartTime().equals(minStartTime)){
mergedDto.setStartTime(dto.getStartTime());
}

@ -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.CraftAbilityEntity;
import java.io.Serial;
/**
* 工艺能力 视图实体类
*
* @author BladeX
* @since 2025-12-22
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class CraftAbilityVO extends CraftAbilityEntity {
@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.EquipmentEntity;
import java.io.Serial;
/**
* 设备信息表 视图实体类
*
* @author BladeX
* @since 2025-12-22
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class EquipmentVO extends EquipmentEntity {
@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.ProcessSetEntity;
import java.io.Serial;
/**
* 工序设置表 视图实体类
*
* @author BladeX
* @since 2025-12-22
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class ProcessSetVO extends ProcessSetEntity {
@Serial
private static final long serialVersionUID = 1L;
}

@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.vo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.scheduling.scheduling.entity.BsTeamSetEntity;
import org.springblade.scheduling.scheduling.entity.TeamSetEntity;
import java.io.Serial;
@ -39,7 +39,7 @@ import java.io.Serial;
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class BsTeamSetVO extends BsTeamSetEntity {
public class TeamSetVO extends TeamSetEntity {
@Serial
private static final long serialVersionUID = 1L;

@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.vo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.scheduling.scheduling.entity.BsTeamTimeEntity;
import org.springblade.scheduling.scheduling.entity.TeamTimeEntity;
import java.io.Serial;
@ -39,7 +39,7 @@ import java.io.Serial;
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class BsTeamTimeVO extends BsTeamTimeEntity {
public class TeamTimeVO extends TeamTimeEntity {
@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.WorkCenterEntity;
import java.io.Serial;
/**
* 工作中心表 视图实体类
*
* @author BladeX
* @since 2025-12-22
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class WorkCenterVO extends WorkCenterEntity {
@Serial
private static final long serialVersionUID = 1L;
}

@ -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.CraftAbilityEntity;
import org.springblade.scheduling.scheduling.vo.CraftAbilityVO;
import java.util.Objects;
/**
* 工艺能力 包装类,返回视图层所需的字段
*
* @author BladeX
* @since 2025-12-22
*/
public class CraftAbilityWrapper extends BaseEntityWrapper<CraftAbilityEntity, CraftAbilityVO> {
public static CraftAbilityWrapper build() {
return new CraftAbilityWrapper();
}
@Override
public CraftAbilityVO entityVO(CraftAbilityEntity CraftAbility) {
CraftAbilityVO craftAbilityVO = Objects.requireNonNull(BeanUtil.copyProperties(CraftAbility, CraftAbilityVO.class));
//User createUser = UserCache.getUser(CraftAbility.getCreateUser());
//User updateUser = UserCache.getUser(CraftAbility.getUpdateUser());
//CraftAbilityVO.setCreateUserName(createUser.getName());
//CraftAbilityVO.setUpdateUserName(updateUser.getName());
return craftAbilityVO;
}
}

@ -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.EquipmentEntity;
import org.springblade.scheduling.scheduling.vo.EquipmentVO;
import java.util.Objects;
/**
* 设备信息表 包装类,返回视图层所需的字段
*
* @author BladeX
* @since 2025-12-22
*/
public class EquipmentWrapper extends BaseEntityWrapper<EquipmentEntity, EquipmentVO> {
public static EquipmentWrapper build() {
return new EquipmentWrapper();
}
@Override
public EquipmentVO entityVO(EquipmentEntity Equipment) {
EquipmentVO equipmentVO = Objects.requireNonNull(BeanUtil.copyProperties(Equipment, EquipmentVO.class));
//User createUser = UserCache.getUser(Equipment.getCreateUser());
//User updateUser = UserCache.getUser(Equipment.getUpdateUser());
//EquipmentVO.setCreateUserName(createUser.getName());
//EquipmentVO.setUpdateUserName(updateUser.getName());
return equipmentVO;
}
}

@ -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.ProcessSetEntity;
import org.springblade.scheduling.scheduling.vo.ProcessSetVO;
import java.util.Objects;
/**
* 工序设置表 包装类,返回视图层所需的字段
*
* @author BladeX
* @since 2025-12-22
*/
public class ProcessSetWrapper extends BaseEntityWrapper<ProcessSetEntity, ProcessSetVO> {
public static ProcessSetWrapper build() {
return new ProcessSetWrapper();
}
@Override
public ProcessSetVO entityVO(ProcessSetEntity ProcessSet) {
ProcessSetVO processSetVO = Objects.requireNonNull(BeanUtil.copyProperties(ProcessSet, ProcessSetVO.class));
//User createUser = UserCache.getUser(ProcessSet.getCreateUser());
//User updateUser = UserCache.getUser(ProcessSet.getUpdateUser());
//ProcessSetVO.setCreateUserName(createUser.getName());
//ProcessSetVO.setUpdateUserName(updateUser.getName());
return processSetVO;
}
}

@ -27,8 +27,8 @@ 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.BsTeamSetEntity;
import org.springblade.scheduling.scheduling.vo.BsTeamSetVO;
import org.springblade.scheduling.scheduling.entity.TeamSetEntity;
import org.springblade.scheduling.scheduling.vo.TeamSetVO;
import java.util.Objects;
@ -38,15 +38,15 @@ import java.util.Objects;
* @author BladeX
* @since 2025-11-17
*/
public class BsTeamSetWrapper extends BaseEntityWrapper<BsTeamSetEntity, BsTeamSetVO> {
public class TeamSetWrapper extends BaseEntityWrapper<TeamSetEntity, TeamSetVO> {
public static BsTeamSetWrapper build() {
return new BsTeamSetWrapper();
public static TeamSetWrapper build() {
return new TeamSetWrapper();
}
@Override
public BsTeamSetVO entityVO(BsTeamSetEntity bsTeamSet) {
BsTeamSetVO bsTeamSetVO = Objects.requireNonNull(BeanUtil.copyProperties(bsTeamSet, BsTeamSetVO.class));
public TeamSetVO entityVO(TeamSetEntity bsTeamSet) {
TeamSetVO bsTeamSetVO = Objects.requireNonNull(BeanUtil.copyProperties(bsTeamSet, TeamSetVO.class));
//User createUser = UserCache.getUser(bsTeamSet.getCreateUser());
//User updateUser = UserCache.getUser(bsTeamSet.getUpdateUser());

@ -27,8 +27,8 @@ 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.BsTeamTimeEntity;
import org.springblade.scheduling.scheduling.vo.BsTeamTimeVO;
import org.springblade.scheduling.scheduling.entity.TeamTimeEntity;
import org.springblade.scheduling.scheduling.vo.TeamTimeVO;
import java.util.Objects;
@ -38,15 +38,15 @@ import java.util.Objects;
* @author BladeX
* @since 2025-11-17
*/
public class BsTeamTimeWrapper extends BaseEntityWrapper<BsTeamTimeEntity, BsTeamTimeVO> {
public class TeamTimeWrapper extends BaseEntityWrapper<TeamTimeEntity, TeamTimeVO> {
public static BsTeamTimeWrapper build() {
return new BsTeamTimeWrapper();
public static TeamTimeWrapper build() {
return new TeamTimeWrapper();
}
@Override
public BsTeamTimeVO entityVO(BsTeamTimeEntity bsTeamTime) {
BsTeamTimeVO bsTeamTimeVO = Objects.requireNonNull(BeanUtil.copyProperties(bsTeamTime, BsTeamTimeVO.class));
public TeamTimeVO entityVO(TeamTimeEntity bsTeamTime) {
TeamTimeVO bsTeamTimeVO = Objects.requireNonNull(BeanUtil.copyProperties(bsTeamTime, TeamTimeVO.class));
//User createUser = UserCache.getUser(bsTeamTime.getCreateUser());
//User updateUser = UserCache.getUser(bsTeamTime.getUpdateUser());

@ -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.WorkCenterEntity;
import org.springblade.scheduling.scheduling.vo.WorkCenterVO;
import java.util.Objects;
/**
* 工作中心表 包装类,返回视图层所需的字段
*
* @author BladeX
* @since 2025-12-22
*/
public class WorkCenterWrapper extends BaseEntityWrapper<WorkCenterEntity, WorkCenterVO> {
public static WorkCenterWrapper build() {
return new WorkCenterWrapper();
}
@Override
public WorkCenterVO entityVO(WorkCenterEntity WorkCenter) {
WorkCenterVO workCenterVO = Objects.requireNonNull(BeanUtil.copyProperties(WorkCenter, WorkCenterVO.class));
//User createUser = UserCache.getUser(WorkCenter.getCreateUser());
//User updateUser = UserCache.getUser(WorkCenter.getUpdateUser());
//WorkCenterVO.setCreateUserName(createUser.getName());
//WorkCenterVO.setUpdateUserName(updateUser.getName());
return workCenterVO;
}
}
Loading…
Cancel
Save