From 1df70a1e4f92cda7dc66eade5bc63d3d1607f9ab Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Wed, 7 Jan 2026 17:36:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E7=9B=B8=E5=85=B3-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/LauncherConstant.java | 8 +- .../DifferentFurnaceTankController.java | 160 ---------------- .../controller/EquipAbilityController.java | 12 +- .../controller/SameTroughController.java | 161 +++++++++++++++++ .../scheduling/entity/EquipAbilityEntity.java | 2 +- ...eTankEntity.java => SameTroughEntity.java} | 53 +++--- .../scheduling/excel/SameTroughExcel.java | 171 ++++++++++++++++++ ...eTankMapper.java => SameTroughMapper.java} | 22 +-- ...aceTankMapper.xml => SameTroughMapper.xml} | 32 ++-- .../scheduling/mapper/YieldOrderMapper.xml | 2 +- .../service/IEquipResourceService.java | 1 + ...nkService.java => ISameTroughService.java} | 22 +-- .../impl/EquipResourceServiceImpl.java | 48 ++++- ...ceImpl.java => SameTroughServiceImpl.java} | 30 ++- .../service/impl/WorkOrderServiceImpl.java | 28 ++- ...ntFurnaceTankVO.java => SameTroughVO.java} | 9 +- ...ankWrapper.java => SameTroughWrapper.java} | 28 +-- 17 files changed, 509 insertions(+), 280 deletions(-) delete mode 100644 blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/DifferentFurnaceTankController.java create mode 100644 blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SameTroughController.java rename blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/{DifferentFurnaceTankEntity.java => SameTroughEntity.java} (79%) create mode 100644 blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/SameTroughExcel.java rename blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/{DifferentFurnaceTankMapper.java => SameTroughMapper.java} (65%) rename blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/{DifferentFurnaceTankMapper.xml => SameTroughMapper.xml} (60%) rename blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/{IDifferentFurnaceTankService.java => ISameTroughService.java} (64%) rename blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/{DifferentFurnaceTankServiceImpl.java => SameTroughServiceImpl.java} (51%) rename blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/{DifferentFurnaceTankVO.java => SameTroughVO.java} (84%) rename blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/{DifferentFurnaceTankWrapper.java => SameTroughWrapper.java} (54%) diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index 25e59f6e..0ff16892 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -13,10 +13,10 @@ public interface LauncherConstant { * nacos 命名空间 */ // String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e"; - // 生产环境 - String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; - // 测试环境 - // String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8"; + // 生产环境 +// String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; + // 测试环境 + String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8"; /** * nacos 用户名 diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/DifferentFurnaceTankController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/DifferentFurnaceTankController.java deleted file mode 100644 index 730e2cf5..00000000 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/DifferentFurnaceTankController.java +++ /dev/null @@ -1,160 +0,0 @@ -/** - * 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.DifferentFurnaceTankEntity; -import org.springblade.scheduling.scheduling.excel.DifferentFurnaceTankExcel; -import org.springblade.scheduling.scheduling.service.IDifferentFurnaceTankService; -import org.springblade.scheduling.scheduling.vo.DifferentFurnaceTankVO; -import org.springblade.scheduling.scheduling.wrapper.DifferentFurnaceTankWrapper; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Map; - -/** - * 非同炉同槽因素表 控制器 - * - * @author BladeX - * @since 2025-12-18 - */ -@RestController -@AllArgsConstructor -@RequestMapping("/differentFurnaceTank") -@Tag(name = "非同炉同槽因素表", description = "非同炉同槽因素表接口") -public class DifferentFurnaceTankController extends BladeController { - - private final IDifferentFurnaceTankService differentFurnaceTankService; - - /** - * 非同炉同槽因素表 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 1) - @Operation(summary = "详情", description = "传入DifferentFurnaceTank") - public R detail(DifferentFurnaceTankEntity DifferentFurnaceTank) { - DifferentFurnaceTankEntity detail = differentFurnaceTankService.getOne(Condition.getQueryWrapper(DifferentFurnaceTank)); - return R.data(DifferentFurnaceTankWrapper.build().entityVO(detail)); - } - /** - * 非同炉同槽因素表 分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 2) - @Operation(summary = "分页", description = "传入DifferentFurnaceTank") - public R> list(@Parameter(hidden = true) @RequestParam Map DifferentFurnaceTank, Query query) { - IPage pages = differentFurnaceTankService.page(Condition.getPage(query), Condition.getQueryWrapper(DifferentFurnaceTank, DifferentFurnaceTankEntity.class)); - return R.data(DifferentFurnaceTankWrapper.build().pageVO(pages)); - } - - /** - * 非同炉同槽因素表 自定义分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 3) - @Operation(summary = "分页", description = "传入DifferentFurnaceTank") - public R> page(DifferentFurnaceTankVO DifferentFurnaceTank, Query query) { - IPage pages = differentFurnaceTankService.selectDifferentFurnaceTankPage(Condition.getPage(query), DifferentFurnaceTank); - return R.data(pages); - } - - /** - * 非同炉同槽因素表 新增 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 4) - @Operation(summary = "新增", description = "传入DifferentFurnaceTank") - public R save(@Valid @RequestBody DifferentFurnaceTankEntity DifferentFurnaceTank) { - return R.status(differentFurnaceTankService.save(DifferentFurnaceTank)); - } - - /** - * 非同炉同槽因素表 修改 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 5) - @Operation(summary = "修改", description = "传入DifferentFurnaceTank") - public R update(@Valid @RequestBody DifferentFurnaceTankEntity DifferentFurnaceTank) { - return R.status(differentFurnaceTankService.updateById(DifferentFurnaceTank)); - } - - /** - * 非同炉同槽因素表 新增或修改 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 6) - @Operation(summary = "新增或修改", description = "传入DifferentFurnaceTank") - public R submit(@Valid @RequestBody DifferentFurnaceTankEntity DifferentFurnaceTank) { - return R.status(differentFurnaceTankService.saveOrUpdate(DifferentFurnaceTank)); - } - - /** - * 非同炉同槽因素表 删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 7) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(differentFurnaceTankService.deleteLogic(Func.toLongList(ids))); - } - - - /** - * 导出数据 - */ - @IsAdmin - @GetMapping("/export") - @ApiOperationSupport(order = 9) - @Operation(summary = "导出数据", description = "传入DifferentFurnaceTank") - public void export(@Parameter(hidden = true) @RequestParam Map DifferentFurnaceTank, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(DifferentFurnaceTank, DifferentFurnaceTankEntity.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(DifferentFurnaceTank::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(DifferentFurnaceTankEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = differentFurnaceTankService.export(queryWrapper); - ExcelUtil.export(response, "非同炉同槽因素表数据" + DateUtil.time(), "非同炉同槽因素表数据表", list, DifferentFurnaceTankExcel.class); - } - -} 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 7ba3a69c..bab19bde 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 @@ -49,6 +49,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.scheduling.scheduling.entity.EquipAbilityEntity; import org.springblade.scheduling.scheduling.excel.EquipAbilityExcel; import org.springblade.scheduling.scheduling.service.IEquipAbilityService; +import org.springblade.scheduling.scheduling.service.IEquipResourceService; import org.springblade.scheduling.scheduling.vo.EquipAbilityVO; import org.springblade.scheduling.scheduling.wrapper.EquipAbilityWrapper; import org.springframework.web.bind.annotation.*; @@ -69,6 +70,7 @@ import java.util.Map; public class EquipAbilityController extends BladeController { private final IEquipAbilityService equipAbilityService; + private final IEquipResourceService equipResourceService; /** * 设备能力表 详情 @@ -113,7 +115,10 @@ public class EquipAbilityController extends BladeController { if(CollectionUtils.isNotEmpty(list)){ return R.status(false,"该设备能力已存在！"); } - return R.status(equipAbilityService.save(entity)); + equipAbilityService.save(entity); + //初始化设备资源 + equipResourceService.initSingleEquipResource(entity.getWorkCenterId(),entity.getCraftId(),entity.getEquipCode()); + return R.status(true); } /** @@ -123,7 +128,10 @@ public class EquipAbilityController extends BladeController { @ApiOperationSupport(order = 5) @Operation(summary = "修改", description = "传入mesEquipAbility") public R update(@Valid @RequestBody EquipAbilityEntity entity) { - return R.status(equipAbilityService.updateById(entity)); + equipAbilityService.updateById(entity); + //初始化设备资源 + equipResourceService.initSingleEquipResource(entity.getWorkCenterId(),entity.getCraftId(),entity.getEquipCode()); + return R.status(true); } /** diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SameTroughController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SameTroughController.java new file mode 100644 index 00000000..8f0cddbb --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SameTroughController.java @@ -0,0 +1,161 @@ +/** + * 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.SameTroughEntity; +import org.springblade.scheduling.scheduling.excel.SameTroughExcel; +import org.springblade.scheduling.scheduling.service.ISameTroughService; +import org.springblade.scheduling.scheduling.vo.SameTroughVO; +import org.springblade.scheduling.scheduling.wrapper.SameTroughWrapper; +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 2026-01-07 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/sameTrough") +@Tag(name = "非同槽因素表", description = "非同槽因素表接口") +public class SameTroughController extends BladeController { + + private final ISameTroughService sameTroughService; + + /** + * 非同槽因素表 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入SameTrough") + public R detail(SameTroughEntity sameTrough) { + SameTroughEntity detail = sameTroughService.getOne(Condition.getQueryWrapper(sameTrough)); + return R.data(SameTroughWrapper.build().entityVO(detail)); + } + /** + * 非同槽因素表 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入SameTrough") + public R> list(@Parameter(hidden = true) @RequestParam Map sameTrough, Query query) { + IPage pages = sameTroughService.page(Condition.getPage(query), Condition.getQueryWrapper(sameTrough, SameTroughEntity.class)); + return R.data(SameTroughWrapper.build().pageVO(pages)); + } + + /** + * 非同槽因素表 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入SameTrough") + public R> page(SameTroughVO sameTrough, Query query) { + IPage pages = sameTroughService.selectSameTroughPage(Condition.getPage(query), sameTrough); + return R.data(pages); + } + + /** + * 非同槽因素表 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入SameTrough") + public R save(@Valid @RequestBody SameTroughEntity sameTrough) { + return R.status(sameTroughService.save(sameTrough)); + } + + /** + * 非同槽因素表 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入SameTrough") + public R update(@Valid @RequestBody SameTroughEntity sameTrough) { + return R.status(sameTroughService.updateById(sameTrough)); + } + + /** + * 非同槽因素表 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入SameTrough") + public R submit(@Valid @RequestBody SameTroughEntity sameTrough) { + return R.status(sameTroughService.saveOrUpdate(sameTrough)); + } + + /** + * 非同槽因素表 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(sameTroughService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export") + @ApiOperationSupport(order = 9) + @Operation(summary = "导出数据", description = "传入SameTrough") + public void export(@Parameter(hidden = true) @RequestParam Map sameTrough, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(sameTrough, SameTroughEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(SameTrough::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(SameTroughEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = sameTroughService.export(queryWrapper); + ExcelUtil.export(response, "非同槽因素表数据" + DateUtil.time(), "非同槽因素表数据表", list, SameTroughExcel.class); + } + +} 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 593baaa0..8eaec722 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 @@ -84,7 +84,7 @@ public class EquipAbilityEntity extends BaseEntity { * 工艺能力Id */ @Schema(description = "工艺能力Id") - private String craftId; + private Long craftId; /** * 工艺能力名称 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/SameTroughEntity.java similarity index 79% rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/DifferentFurnaceTankEntity.java rename to blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/SameTroughEntity.java index 350ec512..1272fe24 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/SameTroughEntity.java @@ -25,27 +25,26 @@ */ 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 io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; -import org.springblade.core.tenant.mp.TenantEntity; + import java.io.Serial; +import java.math.BigDecimal; /** - * 非同炉同槽因素表 实体类 + * 非同槽因素表 实体类 * * @author BladeX - * @since 2025-12-18 + * @since 2026-01-07 */ @Data -@TableName("MES_DIFFERENT_FURNACE_TANK") -@Schema(description = "MesDifferentFurnaceTank对象") +@TableName("MES_SAME_TROUGH") +@Schema(description = "MesSameTrough对象") @EqualsAndHashCode(callSuper = true) -public class DifferentFurnaceTankEntity extends BaseEntity { +public class SameTroughEntity extends BaseEntity { @Serial private static final long serialVersionUID = 1L; @@ -71,14 +70,14 @@ public class DifferentFurnaceTankEntity extends BaseEntity { @Schema(description = "工序名称") private String processName; /** - * 工艺能力id + * 工艺id */ - @Schema(description = "工艺能力id") + @Schema(description = "工艺id") private BigDecimal craftId; /** - * 工艺能力 + * 工艺名称 */ - @Schema(description = "工艺能力") + @Schema(description = "工艺名称") private String craftName; /** * 键位 @@ -89,11 +88,11 @@ public class DifferentFurnaceTankEntity extends BaseEntity { * 生产厂家 */ @Schema(description = "生产厂家") - private String factory; + private String producter; /** - * 检验编号 + * 检验编码 */ - @Schema(description = "检验编号") + @Schema(description = "检验编码") private String inspectionCode; /** * 材料 @@ -106,7 +105,7 @@ public class DifferentFurnaceTankEntity extends BaseEntity { @Schema(description = "厚度") private String thickness; /** - * 镀化 + * 钝化 */ @Schema(description = "钝化") private String passivation; @@ -119,11 +118,21 @@ public class DifferentFurnaceTankEntity extends BaseEntity { * 生产标识 */ @Schema(description = "生产标识") - private String productionIdent; + private String productIdent; + /** + * 结构 + */ + @Schema(description = "结构") + private String structure; + /** + * 磁性 + */ + @Schema(description = "磁性") + private String magnetism; /** - * 结构/单件面积 + * 批次号 */ - @Schema(description = "结构/单件面积") - private String singleArea; + @Schema(description = "批次号") + private String batchNo; } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/SameTroughExcel.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/SameTroughExcel.java new file mode 100644 index 00000000..e0d9096c --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/SameTroughExcel.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.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 2026-01-07 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class SameTroughExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ColumnWidth(20) + @ExcelProperty("ID") + private BigDecimal id; + /** + * 作业中心id + */ + @ColumnWidth(20) + @ExcelProperty("作业中心id") + private BigDecimal workCenterId; + /** + * 作业中心名称 + */ + @ColumnWidth(20) + @ExcelProperty("作业中心名称") + private String workCenterName; + /** + * 工序id + */ + @ColumnWidth(20) + @ExcelProperty("工序id") + private BigDecimal processId; + /** + * 工序名称 + */ + @ColumnWidth(20) + @ExcelProperty("工序名称") + private String processName; + /** + * 工艺id + */ + @ColumnWidth(20) + @ExcelProperty("工艺id") + private BigDecimal craftId; + /** + * 工艺名称 + */ + @ColumnWidth(20) + @ExcelProperty("工艺名称") + private String craftName; + /** + * 键位 + */ + @ColumnWidth(20) + @ExcelProperty("键位") + private String keyBinding; + /** + * 生产厂家 + */ + @ColumnWidth(20) + @ExcelProperty("生产厂家") + private String producter; + /** + * 检验编码 + */ + @ColumnWidth(20) + @ExcelProperty("检验编码") + private String inspectionCode; + /** + * 材料 + */ + @ColumnWidth(20) + @ExcelProperty("材料") + private String material; + /** + * 厚度 + */ + @ColumnWidth(20) + @ExcelProperty("厚度") + private String thickness; + /** + * 钝化 + */ + @ColumnWidth(20) + @ExcelProperty("钝化") + private String passivation; + /** + * 硬度 + */ + @ColumnWidth(20) + @ExcelProperty("硬度") + private String hardness; + /** + * 生产标识 + */ + @ColumnWidth(20) + @ExcelProperty("生产标识") + private String productIdent; + /** + * 结构 + */ + @ColumnWidth(20) + @ExcelProperty("结构") + private String structure; + /** + * 磁性 + */ + @ColumnWidth(20) + @ExcelProperty("磁性") + private String magnetism; + /** + * 批次号 + */ + @ColumnWidth(20) + @ExcelProperty("批次号") + private String batchNo; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Long isDeleted; + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/DifferentFurnaceTankMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.java similarity index 65% rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/DifferentFurnaceTankMapper.java rename to blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.java index ee38a6a2..32adaa91 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/DifferentFurnaceTankMapper.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.java @@ -29,36 +29,36 @@ 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.DifferentFurnaceTankEntity; -import org.springblade.scheduling.scheduling.excel.DifferentFurnaceTankExcel; -import org.springblade.scheduling.scheduling.vo.DifferentFurnaceTankVO; +import org.springblade.scheduling.scheduling.entity.SameTroughEntity; +import org.springblade.scheduling.scheduling.excel.SameTroughExcel; +import org.springblade.scheduling.scheduling.vo.SameTroughVO; import java.util.List; /** - * 非同炉同槽因素表 Mapper 接口 + * 非同槽因素表 Mapper 接口 * * @author BladeX - * @since 2025-12-18 + * @since 2026-01-07 */ -public interface DifferentFurnaceTankMapper extends BaseMapper { +public interface SameTroughMapper extends BaseMapper { /** * 自定义分页 * * @param page 分页参数 - * @param DifferentFurnaceTank 查询参数 - * @return List + * @param SameTrough 查询参数 + * @return List */ - List selectDifferentFurnaceTankPage(IPage page, DifferentFurnaceTankVO DifferentFurnaceTank); + List selectSameTroughPage(IPage page, SameTroughVO SameTrough); /** * 获取导出数据 * * @param queryWrapper 查询条件 - * @return List + * @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/DifferentFurnaceTankMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.xml similarity index 60% rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/DifferentFurnaceTankMapper.xml rename to blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.xml index 7fe16847..0662df00 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/SameTroughMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -12,14 +12,16 @@ - + - - + + + + @@ -30,25 +32,13 @@ - + select * from MES_SAME_TROUGH where is_deleted = 0 - + SELECT * FROM MES_SAME_TROUGH ${ew.customSqlSegment} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml index 7d335b51..10108696 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml @@ -61,7 +61,7 @@