diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/JobApplication.java b/blade-ops/blade-job/src/main/java/org/springblade/job/JobApplication.java index 0ce1972f0..148c675a7 100644 --- a/blade-ops/blade-job/src/main/java/org/springblade/job/JobApplication.java +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/JobApplication.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("==================="); } } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/CraftAbilityController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/CraftAbilityController.java new file mode 100644 index 000000000..929dbca45 --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/CraftAbilityController.java @@ -0,0 +1,173 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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 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> list(@Parameter(hidden = true) @RequestParam Map craftAbility, Query query) { + IPage 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> page(CraftAbilityVO craftAbility, Query query) { + IPage 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 craftAbility, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper 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 list = craftAbilityService.export(queryWrapper); + ExcelUtil.export(response, "工艺能力数据" + DateUtil.time(), "工艺能力数据表", list, CraftAbilityExcel.class); + } + + /** + * 工艺能力表查询列表 + */ + @GetMapping("/findList") + @ApiOperationSupport(order = 2) + @Operation(summary = "列表", description = "传入CraftAbility") + public R> findList() { + List list = craftAbilityService.list(); + return R.data(list); + } + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipAbilityController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipAbilityController.java index a2a62eb3a..7ba3a69c1 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipAbilityController.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipAbilityController.java @@ -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 list = equipAbilityService.list(Wrappers.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)); } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipmentController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipmentController.java new file mode 100644 index 000000000..3d21442e2 --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipmentController.java @@ -0,0 +1,170 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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 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> list(@Parameter(hidden = true) @RequestParam Map equipment, Query query) { + IPage 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> page(EquipmentVO equipment, Query query) { + IPage 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 equipment, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper 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 list = equipmentService.export(queryWrapper); + ExcelUtil.export(response, "设备信息表数据" + DateUtil.time(), "设备信息表数据表", list, EquipmentExcel.class); + } + + @GetMapping("/findList") + @ApiOperationSupport(order = 2) + @Operation(summary = "列表", description = "传入Equipment") + public R> findList() { + List list = equipmentService.list(); + return R.data(list); + } + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/MainProducerController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/MainProducerController.java index 15d5b3323..79c9412d9 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/MainProducerController.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/MainProducerController.java @@ -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 list = mainProducerService.list(Wrappers.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)); } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PersonAbilityController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PersonAbilityController.java index 3b4932100..4929865a3 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PersonAbilityController.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PersonAbilityController.java @@ -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 list = personAbilityService.list(Wrappers.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)); } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/ProcessSetController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/ProcessSetController.java new file mode 100644 index 000000000..773f9389e --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/ProcessSetController.java @@ -0,0 +1,170 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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 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> list(@Parameter(hidden = true) @RequestParam Map processSet, Query query) { + IPage 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> page(ProcessSetVO processSet, Query query) { + IPage 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 processSet, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper 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 list = processSetService.export(queryWrapper); + ExcelUtil.export(response, "工序设置表数据" + DateUtil.time(), "工序设置表数据表", list, ProcessSetExcel.class); + } + + @GetMapping("/findList") + @ApiOperationSupport(order = 2) + @Operation(summary = "列表", description = "传入Equipment") + public R> findList() { + List list = processSetService.list(); + return R.data(list); + } + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkCenterController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkCenterController.java new file mode 100644 index 000000000..d71e854f9 --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkCenterController.java @@ -0,0 +1,171 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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 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> list(@Parameter(hidden = true) @RequestParam Map workCenter, Query query) { + IPage 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> page(WorkCenterVO workCenter, Query query) { + IPage 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 workCenter, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper 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 list = workCenterService.export(queryWrapper); + ExcelUtil.export(response, "工作中心表数据" + DateUtil.time(), "工作中心表数据表", list, WorkCenterExcel.class); + } + + /** + * 工作中心表 分页 + */ + @GetMapping("/findList") + @ApiOperationSupport(order = 2) + @Operation(summary = "列表", description = "传入WorkCenter") + public R> findList() { + List list = workCenterService.list(); + return R.data(list); + } + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/dto/WorkOrderDto.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/dto/WorkOrderDto.java index 49502ffa8..f2b297893 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/dto/WorkOrderDto.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/dto/WorkOrderDto.java @@ -39,5 +39,6 @@ public class WorkOrderDto { private Integer totalCount; private Integer schedulingCount; private String schedulingRate; + private String productIdent; } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/CraftAbilityEntity.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/CraftAbilityEntity.java new file mode 100644 index 000000000..c9d7532d8 --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/CraftAbilityEntity.java @@ -0,0 +1,74 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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; + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/DifferentFurnaceTankEntity.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/DifferentFurnaceTankEntity.java index 6e9f6fef8..350ec5129 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/DifferentFurnaceTankEntity.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/DifferentFurnaceTankEntity.java @@ -108,7 +108,7 @@ public class DifferentFurnaceTankEntity extends BaseEntity { /** * 镀化 */ - @Schema(description = "镀化") + @Schema(description = "钝化") private String passivation; /** * 硬度 diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipAbilityEntity.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipAbilityEntity.java index 36e21fe5d..593baaa0f 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipAbilityEntity.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipAbilityEntity.java @@ -128,4 +128,10 @@ public class EquipAbilityEntity extends BaseEntity { @Schema(description = "设备顺序") private Integer equipOrder; + /** + * 备注 + */ + @Schema(description = "备注") + private String remarks; + } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipmentEntity.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipmentEntity.java new file mode 100644 index 000000000..88e786e74 --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipmentEntity.java @@ -0,0 +1,119 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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; + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/MainProducerEntity.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/MainProducerEntity.java index 6f7cbc117..686764130 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/MainProducerEntity.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/MainProducerEntity.java @@ -66,4 +66,10 @@ public class MainProducerEntity extends BaseEntity { @Schema(description = "主生产者(人/设备)") private String mainProducer; + /** + * 备注 + */ + @Schema(description = "备注") + private String remarks; + } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/ProcessSetEntity.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/ProcessSetEntity.java new file mode 100644 index 000000000..c0e720419 --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/ProcessSetEntity.java @@ -0,0 +1,129 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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; + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/BsTeamSetEntity.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/TeamSetEntity.java similarity index 98% rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/BsTeamSetEntity.java rename to blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/TeamSetEntity.java index 84eaab86c..444497c8c 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/BsTeamSetEntity.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/TeamSetEntity.java @@ -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; diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/BsTeamTimeEntity.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/TeamTimeEntity.java similarity index 96% rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/BsTeamTimeEntity.java rename to blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/TeamTimeEntity.java index 3ffb8d0a4..ff2e9f49b 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/BsTeamTimeEntity.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/TeamTimeEntity.java @@ -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; diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/WorkCenterEntity.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/WorkCenterEntity.java new file mode 100644 index 000000000..a4f54f77d --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/WorkCenterEntity.java @@ -0,0 +1,154 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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; + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/CraftAbilityExcel.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/CraftAbilityExcel.java new file mode 100644 index 000000000..d579f3baf --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/CraftAbilityExcel.java @@ -0,0 +1,93 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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; + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/EquipmentExcel.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/EquipmentExcel.java new file mode 100644 index 000000000..7f4efb27a --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/EquipmentExcel.java @@ -0,0 +1,147 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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; + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/ProcessSetExcel.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/ProcessSetExcel.java new file mode 100644 index 000000000..43618a6eb --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/ProcessSetExcel.java @@ -0,0 +1,159 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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; + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/BsTeamSetExcel.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/TeamSetExcel.java similarity index 98% rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/BsTeamSetExcel.java rename to blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/TeamSetExcel.java index 821785292..20e041b95 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/BsTeamSetExcel.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/TeamSetExcel.java @@ -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; diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/BsTeamTimeExcel.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/TeamTimeExcel.java similarity index 91% rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/BsTeamTimeExcel.java rename to blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/TeamTimeExcel.java index 4cca5598f..002135bab 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/BsTeamTimeExcel.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/TeamTimeExcel.java @@ -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; diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/WorkCenterExcel.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/WorkCenterExcel.java new file mode 100644 index 000000000..4ae3ed101 --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/WorkCenterExcel.java @@ -0,0 +1,189 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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; + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/CraftAbilityMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/CraftAbilityMapper.java new file mode 100644 index 000000000..7797ace83 --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/CraftAbilityMapper.java @@ -0,0 +1,64 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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 { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param CraftAbility 查询参数 + * @return List + */ + List selectCraftAbilityPage(IPage page, CraftAbilityVO craftAbility); + + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List export(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/CraftAbilityMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/CraftAbilityMapper.xml new file mode 100644 index 000000000..76362c90a --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/CraftAbilityMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/DifferentFurnaceTankMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/DifferentFurnaceTankMapper.xml index 9af6dfe3c..7fe168472 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/DifferentFurnaceTankMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/DifferentFurnaceTankMapper.xml @@ -31,7 +31,19 @@ diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.java index fa0397823..039ff5d1f 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.java @@ -49,7 +49,7 @@ public interface EquipAbilityMapper extends BaseMapper { * @param entity 查询参数 * @return List */ - List selectMesEquipAbilityPage(IPage page, EquipAbilityVO entity); + List selectEquipAbilityPage(IPage page, EquipAbilityVO entity); /** diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.xml index fd264e5ec..38779bb6e 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.xml @@ -10,9 +10,9 @@ - + - + @@ -27,8 +27,17 @@ - + select * from MES_EQUIP_ABILITY + + is_deleted = 0 + + and work_center_id = #{param2.workCenterId} + + + and equip_code = #{param2.equipCode} + + diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipmentMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipmentMapper.java new file mode 100644 index 000000000..46f2f71ac --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipmentMapper.java @@ -0,0 +1,64 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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 { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param Equipment 查询参数 + * @return List + */ + List selectEquipmentPage(IPage page, EquipmentVO equipment); + + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List export(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipmentMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipmentMapper.xml new file mode 100644 index 000000000..6cf118c49 --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipmentMapper.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/InspectionItemMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/InspectionItemMapper.xml index 138219e42..dd4570f26 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/InspectionItemMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/InspectionItemMapper.xml @@ -22,7 +22,13 @@ diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/MainProducerMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/MainProducerMapper.xml index 1d77cb169..783173a93 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/MainProducerMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/MainProducerMapper.xml @@ -5,7 +5,7 @@ - + @@ -19,7 +19,16 @@ diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.xml index ba823536f..1acab3519 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.xml @@ -6,9 +6,9 @@ - + - + @@ -23,7 +23,19 @@ diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessSetMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessSetMapper.java new file mode 100644 index 000000000..be34dfb64 --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessSetMapper.java @@ -0,0 +1,64 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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 { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param ProcessSet 查询参数 + * @return List + */ + List selectProcessSetPage(IPage page, ProcessSetVO processSet); + + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List export(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessSetMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessSetMapper.xml new file mode 100644 index 000000000..88c87ef33 --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessSetMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/QualityGradeMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/QualityGradeMapper.xml index 4b9e632ba..8622bd573 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/QualityGradeMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/QualityGradeMapper.xml @@ -18,7 +18,13 @@ diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/BsTeamSetMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamSetMapper.java similarity index 78% rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/BsTeamSetMapper.java rename to blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamSetMapper.java index 524ccb01d..947826278 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/BsTeamSetMapper.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamSetMapper.java @@ -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 { +public interface TeamSetMapper extends BaseMapper { /** * 自定义分页 @@ -50,7 +50,7 @@ public interface BsTeamSetMapper extends BaseMapper { * @param bsTeamSet 查询参数 * @return List */ - List selectBsTeamSetPage(IPage page, BsTeamSetVO bsTeamSet); + List selectBsTeamSetPage(IPage page, TeamSetVO bsTeamSet); /** @@ -59,6 +59,6 @@ public interface BsTeamSetMapper extends BaseMapper { * @param queryWrapper 查询条件 * @return List */ - List export(@Param("ew") Wrapper queryWrapper); + List export(@Param("ew") Wrapper queryWrapper); } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/BsTeamSetMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamSetMapper.xml similarity index 95% rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/BsTeamSetMapper.xml rename to blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamSetMapper.xml index d02b0100f..665308140 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/BsTeamSetMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamSetMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -34,7 +34,7 @@ - SELECT * FROM BS_TEAM_SET ${ew.customSqlSegment} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/BsTeamTimeMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamTimeMapper.java similarity index 78% rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/BsTeamTimeMapper.java rename to blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamTimeMapper.java index cab588013..ffcd2488a 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/BsTeamTimeMapper.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamTimeMapper.java @@ -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 { +public interface TeamTimeMapper extends BaseMapper { /** * 自定义分页 @@ -50,7 +50,7 @@ public interface BsTeamTimeMapper extends BaseMapper { * @param bsTeamTime 查询参数 * @return List */ - List selectBsTeamTimePage(IPage page, BsTeamTimeVO bsTeamTime); + List selectBsTeamTimePage(IPage page, TeamTimeVO bsTeamTime); /** @@ -59,6 +59,6 @@ public interface BsTeamTimeMapper extends BaseMapper { * @param queryWrapper 查询条件 * @return List */ - List export(@Param("ew") Wrapper queryWrapper); + List export(@Param("ew") Wrapper queryWrapper); } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/BsTeamTimeMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamTimeMapper.xml similarity index 92% rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/BsTeamTimeMapper.xml rename to blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamTimeMapper.xml index 1a7ec71a7..d81700b18 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/BsTeamTimeMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/TeamTimeMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -24,7 +24,7 @@ - SELECT * FROM BS_TEAM_TIME ${ew.customSqlSegment} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkCenterMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkCenterMapper.java new file mode 100644 index 000000000..974a4e6cb --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkCenterMapper.java @@ -0,0 +1,64 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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 { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param WorkCenter 查询参数 + * @return List + */ + List selectWorkCenterPage(IPage page, WorkCenterVO workCenter); + + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List export(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkCenterMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkCenterMapper.xml new file mode 100644 index 000000000..2a4c0a89a --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkCenterMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml index 44d2b962b..1f59ae2e9 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml @@ -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 a.is_deleted = 0 @@ -126,6 +128,9 @@ and b.equip_name = #{equipName} + + and d.name = #{processName} + order by a.WO_CODE,b.start_time diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ICraftAbilityService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ICraftAbilityService.java new file mode 100644 index 000000000..e925b172f --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ICraftAbilityService.java @@ -0,0 +1,62 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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 { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param CraftAbility 查询参数 + * @return IPage + */ + IPage selectCraftAbilityPage(IPage page, CraftAbilityVO craftAbility); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List export(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IEquipmentService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IEquipmentService.java new file mode 100644 index 000000000..8e8532e38 --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IEquipmentService.java @@ -0,0 +1,62 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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 { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param Equipment 查询参数 + * @return IPage + */ + IPage selectEquipmentPage(IPage page, EquipmentVO equipment); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List export(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IProcessSetService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IProcessSetService.java new file mode 100644 index 000000000..343758fa7 --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IProcessSetService.java @@ -0,0 +1,62 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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 { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param ProcessSet 查询参数 + * @return IPage + */ + IPage selectProcessSetPage(IPage page, ProcessSetVO ProcessSet); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List export(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IBsTeamSetService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ITeamSetService.java similarity index 78% rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IBsTeamSetService.java rename to blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ITeamSetService.java index b834a6e83..52bcbab4b 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IBsTeamSetService.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ITeamSetService.java @@ -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 { +public interface ITeamSetService extends BaseService { /** * 自定义分页 * @@ -48,7 +48,7 @@ public interface IBsTeamSetService extends BaseService { * @param bsTeamSet 查询参数 * @return IPage */ - IPage selectBsTeamSetPage(IPage page, BsTeamSetVO bsTeamSet); + IPage selectBsTeamSetPage(IPage page, TeamSetVO bsTeamSet); /** @@ -57,7 +57,7 @@ public interface IBsTeamSetService extends BaseService { * @param queryWrapper 查询条件 * @return List */ - List export(Wrapper queryWrapper); + List export(Wrapper queryWrapper); } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IBsTeamTimeService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ITeamTimeService.java similarity index 77% rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IBsTeamTimeService.java rename to blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ITeamTimeService.java index 0d842b7db..ae5763ab2 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IBsTeamTimeService.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ITeamTimeService.java @@ -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 { +public interface ITeamTimeService extends BaseService { /** * 自定义分页 * @@ -48,7 +48,7 @@ public interface IBsTeamTimeService extends BaseService { * @param bsTeamTime 查询参数 * @return IPage */ - IPage selectBsTeamTimePage(IPage page, BsTeamTimeVO bsTeamTime); + IPage selectBsTeamTimePage(IPage page, TeamTimeVO bsTeamTime); /** @@ -57,7 +57,7 @@ public interface IBsTeamTimeService extends BaseService { * @param queryWrapper 查询条件 * @return List */ - List export(Wrapper queryWrapper); + List export(Wrapper queryWrapper); } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkCenterService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkCenterService.java new file mode 100644 index 000000000..d2335e622 --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkCenterService.java @@ -0,0 +1,62 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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 { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param WorkCenter 查询参数 + * @return IPage + */ + IPage selectWorkCenterPage(IPage page, WorkCenterVO WorkCenter); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List export(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/CraftAbilityServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/CraftAbilityServiceImpl.java new file mode 100644 index 000000000..2a6bb0250 --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/CraftAbilityServiceImpl.java @@ -0,0 +1,63 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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 implements ICraftAbilityService { + + @Override + public IPage selectCraftAbilityPage(IPage page, CraftAbilityVO craftAbility) { + return page.setRecords(baseMapper.selectCraftAbilityPage(page, craftAbility)); + } + + + @Override + public List export(Wrapper queryWrapper) { + List CraftAbilityList = baseMapper.export(queryWrapper); + //CraftAbilityList.forEach(CraftAbility -> { + // CraftAbility.setTypeName(DictCache.getValue(DictEnum.YES_NO, CraftAbility.getType())); + //}); + return CraftAbilityList; + } + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipAbilityServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipAbilityServiceImpl.java index f183b9e76..0c6899337 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipAbilityServiceImpl.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipAbilityServiceImpl.java @@ -48,7 +48,7 @@ public class EquipAbilityServiceImpl extends BaseServiceImpl selectEquipAbilityPage(IPage page, EquipAbilityVO entity) { - return page.setRecords(baseMapper.selectMesEquipAbilityPage(page, entity)); + return page.setRecords(baseMapper.selectEquipAbilityPage(page, entity)); } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipmentServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipmentServiceImpl.java new file mode 100644 index 000000000..8b2c0fdb7 --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipmentServiceImpl.java @@ -0,0 +1,63 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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 implements IEquipmentService { + + @Override + public IPage selectEquipmentPage(IPage page, EquipmentVO equipment) { + return page.setRecords(baseMapper.selectEquipmentPage(page, equipment)); + } + + + @Override + public List export(Wrapper queryWrapper) { + List EquipmentList = baseMapper.export(queryWrapper); + //EquipmentList.forEach(Equipment -> { + // Equipment.setTypeName(DictCache.getValue(DictEnum.YES_NO, Equipment.getType())); + //}); + return EquipmentList; + } + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/ProcessSetServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/ProcessSetServiceImpl.java new file mode 100644 index 000000000..ec88cf9f3 --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/ProcessSetServiceImpl.java @@ -0,0 +1,63 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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 implements IProcessSetService { + + @Override + public IPage selectProcessSetPage(IPage page, ProcessSetVO processSet) { + return page.setRecords(baseMapper.selectProcessSetPage(page, processSet)); + } + + + @Override + public List export(Wrapper queryWrapper) { + List ProcessSetList = baseMapper.export(queryWrapper); + //ProcessSetList.forEach(ProcessSet -> { + // ProcessSet.setTypeName(DictCache.getValue(DictEnum.YES_NO, ProcessSet.getType())); + //}); + return ProcessSetList; + } + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/BsTeamSetServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/TeamSetServiceImpl.java similarity index 69% rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/BsTeamSetServiceImpl.java rename to blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/TeamSetServiceImpl.java index a545eff09..9c666b488 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/BsTeamSetServiceImpl.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/TeamSetServiceImpl.java @@ -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 implements IBsTeamSetService { +public class TeamSetServiceImpl extends BaseServiceImpl implements ITeamSetService { @Autowired - BsTeamSetMapper bsTeamSetMapper; + TeamSetMapper teamSetMapper; @Override - public IPage selectBsTeamSetPage(IPage page, BsTeamSetVO bsTeamSet) { + public IPage selectBsTeamSetPage(IPage page, TeamSetVO bsTeamSet) { return page.setRecords(baseMapper.selectBsTeamSetPage(page, bsTeamSet)); } @Override - public List export(Wrapper queryWrapper) { - List bsTeamSetList = baseMapper.export(queryWrapper); + public List export(Wrapper queryWrapper) { + List bsTeamSetList = baseMapper.export(queryWrapper); //bsTeamSetList.forEach(bsTeamSet -> { // bsTeamSet.setTypeName(DictCache.getValue(DictEnum.YES_NO, BsTeamSet.getType())); //}); diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/BsTeamTimeServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/TeamTimeServiceImpl.java similarity index 69% rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/BsTeamTimeServiceImpl.java rename to blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/TeamTimeServiceImpl.java index bcd94bf46..a72c29c95 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/BsTeamTimeServiceImpl.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/TeamTimeServiceImpl.java @@ -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 implements IBsTeamTimeService { +public class TeamTimeServiceImpl extends BaseServiceImpl implements ITeamTimeService { @Autowired - BsTeamTimeMapper bsTeamTimeMapper; + TeamTimeMapper teamTimeMapper; @Override - public IPage selectBsTeamTimePage(IPage page, BsTeamTimeVO bsTeamTime) { + public IPage selectBsTeamTimePage(IPage page, TeamTimeVO bsTeamTime) { return page.setRecords(baseMapper.selectBsTeamTimePage(page, bsTeamTime)); } @Override - public List export(Wrapper queryWrapper) { - List bsTeamTimeList = baseMapper.export(queryWrapper); + public List export(Wrapper queryWrapper) { + List bsTeamTimeList = baseMapper.export(queryWrapper); //bsTeamTimeList.forEach(bsTeamTime -> { // bsTeamTime.setTypeName(DictCache.getValue(DictEnum.YES_NO, BsTeamTime.getType())); //}); diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkCenterServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkCenterServiceImpl.java new file mode 100644 index 000000000..41ffb13a0 --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkCenterServiceImpl.java @@ -0,0 +1,63 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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 implements IWorkCenterService { + + @Override + public IPage selectWorkCenterPage(IPage page, WorkCenterVO workCenter) { + return page.setRecords(baseMapper.selectWorkCenterPage(page, workCenter)); + } + + + @Override + public List export(Wrapper queryWrapper) { + List WorkCenterList = baseMapper.export(queryWrapper); + //WorkCenterList.forEach(WorkCenter -> { + // WorkCenter.setTypeName(DictCache.getValue(DictEnum.YES_NO, WorkCenter.getType())); + //}); + return WorkCenterList; + } + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java index bab513993..e432b0ab5 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java @@ -201,6 +201,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl + * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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; + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/EquipmentVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/EquipmentVO.java new file mode 100644 index 000000000..4d039c09a --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/EquipmentVO.java @@ -0,0 +1,46 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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; + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/ProcessSetVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/ProcessSetVO.java new file mode 100644 index 000000000..678ebc46b --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/ProcessSetVO.java @@ -0,0 +1,46 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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; + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/BsTeamSetVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/TeamSetVO.java similarity index 91% rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/BsTeamSetVO.java rename to blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/TeamSetVO.java index 26870908a..b750ec48b 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/BsTeamSetVO.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/TeamSetVO.java @@ -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; diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/BsTeamTimeVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/TeamTimeVO.java similarity index 91% rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/BsTeamTimeVO.java rename to blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/TeamTimeVO.java index fb1e6e85e..abd2a71bd 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/BsTeamTimeVO.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/TeamTimeVO.java @@ -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; diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/WorkCenterVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/WorkCenterVO.java new file mode 100644 index 000000000..84a0c5474 --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/WorkCenterVO.java @@ -0,0 +1,46 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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; + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/CraftAbilityWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/CraftAbilityWrapper.java new file mode 100644 index 000000000..63f8a89ac --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/CraftAbilityWrapper.java @@ -0,0 +1,60 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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 { + + 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; + } + + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/EquipmentWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/EquipmentWrapper.java new file mode 100644 index 000000000..fdc3c8ac1 --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/EquipmentWrapper.java @@ -0,0 +1,60 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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 { + + 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; + } + + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/ProcessSetWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/ProcessSetWrapper.java new file mode 100644 index 000000000..0eb855c1b --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/ProcessSetWrapper.java @@ -0,0 +1,60 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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 { + + 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; + } + + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/BsTeamSetWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/TeamSetWrapper.java similarity index 77% rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/BsTeamSetWrapper.java rename to blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/TeamSetWrapper.java index 9de9da9af..c896a12ce 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/BsTeamSetWrapper.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/TeamSetWrapper.java @@ -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 { +public class TeamSetWrapper extends BaseEntityWrapper { - 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()); diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/BsTeamTimeWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/TeamTimeWrapper.java similarity index 76% rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/BsTeamTimeWrapper.java rename to blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/TeamTimeWrapper.java index 2b5161943..e5e3f4248 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/BsTeamTimeWrapper.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/TeamTimeWrapper.java @@ -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 { +public class TeamTimeWrapper extends BaseEntityWrapper { - 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()); diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkCenterWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkCenterWrapper.java new file mode 100644 index 000000000..abe7a1599 --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkCenterWrapper.java @@ -0,0 +1,60 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * 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 { + + 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; + } + + +}