diff --git a/blade-service/blade-desk/blade-desk.iml b/blade-service/blade-desk/blade-desk.iml index 40fbc39b6..09683da3a 100644 --- a/blade-service/blade-desk/blade-desk.iml +++ b/blade-service/blade-desk/blade-desk.iml @@ -17,6 +17,7 @@ + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/constant/TaskingConstant.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/constant/TaskingConstant.java index adfa52cc2..8fb757136 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/constant/TaskingConstant.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/constant/TaskingConstant.java @@ -51,4 +51,21 @@ public interface TaskingConstant { * 是否是烧结零件 */ String IS_SINTERING = "1"; + + /** + * 正常 + */ + String STATUS_NEW = "1"; + /** + * 到期 + */ + String STATUS_UNTREATED = "2"; + /** + * PDM变更 + */ + String STATUS_PDM_CHANGE = "3"; + /** + * 作废 + */ + String STATUS_MORAL = "5"; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartController.java index beb354e02..adf061969 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartController.java @@ -32,6 +32,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import lombok.AllArgsConstructor; import jakarta.validation.Valid; +import org.apache.commons.lang3.StringUtils; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; @@ -39,7 +40,6 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.desk.dashboard.pojo.vo.*; -import org.springblade.desk.dashboard.service.impl.DsPartServiceImpl; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -51,7 +51,6 @@ import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; -import java.util.HashMap; import java.util.Map; import java.util.List; import jakarta.servlet.http.HttpServletResponse; @@ -120,7 +119,7 @@ public class DsPartController extends BladeController { @ApiOperationSupport(order = 5) @Operation(summary = "修改", description = "传入dsPart") public R update(@Valid @RequestBody DsPartEntity dsPart) { - return R.status(dsPartService.updateById(dsPart)); + return R.status(dsPartService.updateDsPart(dsPart, null)); } /** @@ -221,13 +220,22 @@ public class DsPartController extends BladeController { */ @GetMapping("/tree") @ApiOperationSupport(order = 1) - @Operation(summary = "烧结BOM查询", description = "传入dsPart") + @Operation(summary = "烧结BOM查询", description = "传入partCode") public R> getSimpleTree(@RequestParam String partCode) { + + if (StringUtils.isBlank(partCode)) { + return R.fail("部件号不能为空"); + } + try { - List result = dsPartService.getSimpleTree(partCode); - return R.data(result); + + List trees = dsPartService.getPartTreeList(partCode); + + return R.data(trees); + } catch (Exception e) { - return R.fail("查询失败"); + + return R.fail("查询失败: " + e.getMessage()); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartRelationController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartRelationController.java new file mode 100644 index 000000000..a26e65832 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartRelationController.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.desk.dashboard.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.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.desk.dashboard.pojo.entity.DsPartRelationEntity; +import org.springblade.desk.dashboard.pojo.vo.DsPartRelationVO; +import org.springblade.desk.dashboard.excel.DsPartRelationExcel; +import org.springblade.desk.dashboard.wrapper.DsPartRelationWrapper; +import org.springblade.desk.dashboard.service.IDsPartRelationService; +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-11-24 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/dsPartRelation") +@Tag(name = "部件-子件关联表", description = "部件-子件关联表接口") +public class DsPartRelationController extends BladeController { + + private final IDsPartRelationService dsPartRelationService; + + /** + * 部件-子件关联表 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入dsPartRelation") + public R detail(DsPartRelationEntity dsPartRelation) { + DsPartRelationEntity detail = dsPartRelationService.getOne(Condition.getQueryWrapper(dsPartRelation)); + return R.data(DsPartRelationWrapper.build().entityVO(detail)); + } + /** + * 部件-子件关联表 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入dsPartRelation") + public R> list(@Parameter(hidden = true) @RequestParam Map dsPartRelation, Query query) { + IPage pages = dsPartRelationService.page(Condition.getPage(query), Condition.getQueryWrapper(dsPartRelation, DsPartRelationEntity.class)); + return R.data(DsPartRelationWrapper.build().pageVO(pages)); + } + + /** + * 部件-子件关联表 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入dsPartRelation") + public R> page(DsPartRelationVO dsPartRelation, Query query) { + IPage pages = dsPartRelationService.selectDsPartRelationPage(Condition.getPage(query), dsPartRelation); + return R.data(pages); + } + + /** + * 部件-子件关联表 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入dsPartRelation") + public R save(@Valid @RequestBody DsPartRelationEntity dsPartRelation) { + return R.status(dsPartRelationService.save(dsPartRelation)); + } + + /** + * 部件-子件关联表 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入dsPartRelation") + public R update(@Valid @RequestBody DsPartRelationEntity dsPartRelation) { + return R.status(dsPartRelationService.updateById(dsPartRelation)); + } + + /** + * 部件-子件关联表 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入dsPartRelation") + public R submit(@Valid @RequestBody DsPartRelationEntity dsPartRelation) { + return R.status(dsPartRelationService.saveOrUpdate(dsPartRelation)); + } + + /** + * 部件-子件关联表 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(dsPartRelationService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-dsPartRelation") + @ApiOperationSupport(order = 9) + @Operation(summary = "导出数据", description = "传入dsPartRelation") + public void exportDsPartRelation(@Parameter(hidden = true) @RequestParam Map dsPartRelation, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(dsPartRelation, DsPartRelationEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(DsPartRelation::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(DsPartRelationEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = dsPartRelationService.exportDsPartRelation(queryWrapper); + ExcelUtil.export(response, "部件-子件关联表数据" + DateUtil.time(), "部件-子件关联表数据表", list, DsPartRelationExcel.class); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsProcessController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsProcessController.java index 9b0bf63c7..3ee6fa907 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsProcessController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsProcessController.java @@ -38,6 +38,7 @@ 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.desk.dashboard.pojo.vo.DsProcessSynthesisVO; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -158,4 +159,15 @@ public class DsProcessController extends BladeController { ExcelUtil.export(response, "零件工艺工序信息表数据" + DateUtil.time(), "零件工艺工序信息表数据表", list, DsProcessExcel.class); } + + /** + * 根据工序ID查询 工装磨具 项目 尺寸量具 + */ + @GetMapping("/processDetail") + @ApiOperationSupport(order = 1) + @Operation(summary = "根据工序ID查询", description = "传入processId") + public R processDetail(Long processId) { + + return R.data(dsProcessService.processDetail(processId)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskingController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskingController.java index d4db0cabc..fa6e9bc10 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskingController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskingController.java @@ -38,13 +38,13 @@ 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.desk.dashboard.excel.DsCraftExcel; import org.springblade.desk.dashboard.pojo.dto.DsTaskingDTO; -import org.springblade.desk.dashboard.pojo.vo.DsPartSynthesisVO; +import org.springblade.desk.dashboard.pojo.entity.*; +import org.springblade.desk.dashboard.pojo.vo.*; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.dashboard.pojo.entity.DsTaskingEntity; -import org.springblade.desk.dashboard.pojo.vo.DsTaskingVO; import org.springblade.desk.dashboard.excel.DsTaskingExcel; import org.springblade.desk.dashboard.wrapper.DsTaskingWrapper; import org.springblade.desk.dashboard.service.IDsTaskingService; @@ -237,10 +237,84 @@ public class DsTaskingController extends BladeController { @GetMapping("/processAuthorized") @ApiOperationSupport(order = 1) @Operation(summary = "工艺编制", description = "传入dsCraft") - public R processAuthorized(Long taskId) { - DsPartSynthesisVO detail = dsTaskingService.processAuthorized(taskId); + public R processAuthorized(Long taskId, String rank) { + DsPartAuthorizedVO detail = dsTaskingService.processAuthorized(taskId,rank); return R.data(detail); } + /** + * 编制 - 工艺编制 - 完成 + */ + @PostMapping("/authorizedAccomplish") + @ApiOperationSupport(order = 1) + @Operation(summary = "工艺编制-完成") + public R authorizedAccomplish( + @RequestBody BsCompilationCompletedVO compilationCompleted + + ) { + DsPartEntity dsPart = compilationCompleted.getDsPart(); + List zPartList = compilationCompleted.getZPartList(); + DsCraftEntity craft = compilationCompleted.getCraft(); + List processList = compilationCompleted.getProcessList(); + List deleteIds = compilationCompleted.getDeleteIds(); + return R.status(dsTaskingService.authorizedAccomplish(dsPart,zPartList,craft,processList,deleteIds)); + } + + + /** + * 编制 - 工艺编制 - 项目 保存 + */ + @PostMapping("/saveProcessProjectSave") + @ApiOperationSupport(order = 1) + @Operation(summary = "项目 - 保存") + public R saveProcessProjectSave( + @RequestBody DsProcessSaveVO compilationCompleted + + ) { + DsProcessEntity processEntity = compilationCompleted.getProcessEntity(); + List processProjectEntityList = compilationCompleted.getProcessProjectEntityList(); + List deleteIds = compilationCompleted.getDeleteIds(); + return R.status(dsTaskingService.saveProcessProjectSave(processEntity,processProjectEntityList,deleteIds)); + } + + + /** + * 编制 - 工艺编制 - 尺寸量具 保存 + */ + @PostMapping("/saveProcessMeasuringTool") + @ApiOperationSupport(order = 1) + @Operation(summary = "项目 - 保存") + public R saveProcessMeasuringTool( + @RequestBody DsProcessSaveVO compilationCompleted + + ) { + DsProcessEntity processEntity = compilationCompleted.getProcessEntity(); + List processMeasuringToolEntities = compilationCompleted.getProcessMeasuringToolEntities(); + List deleteIds = compilationCompleted.getDeleteIds(); + return R.status(dsTaskingService.saveProcessMeasuringTool(processEntity,processMeasuringToolEntities,deleteIds)); + } + + + /** + * 编制 - 工艺编制 - 工装 保存 + */ + @PostMapping("/saveProcessMoldTool") + @ApiOperationSupport(order = 1) + @Operation(summary = "工装 - 保存") + public R saveProcessMoldTool( + @RequestBody DsProcessSaveVO compilationCompleted + + ) { + DsProcessEntity processEntity = compilationCompleted.getProcessEntity(); + List processMoldToolEntities = compilationCompleted.getProcessMoldToolEntities(); + List deleteIds = compilationCompleted.getDeleteIds(); + return R.status(dsTaskingService.saveProcessMoldTool(processEntity,processMoldToolEntities,deleteIds)); + } + + + + + + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/excel/DsPartRelationExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/excel/DsPartRelationExcel.java new file mode 100644 index 000000000..eb1aad3a8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/excel/DsPartRelationExcel.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.desk.dashboard.excel; + + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +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-11-24 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class DsPartRelationExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ColumnWidth(20) + @ExcelProperty("主键ID") + private BigDecimal id; + /** + * 部件ID + */ + @ColumnWidth(20) + @ExcelProperty("部件ID") + private BigDecimal partId; + /** + * 部件号 + */ + @ColumnWidth(20) + @ExcelProperty("部件号") + private String partCode; + /** + * 子件ID + */ + @ColumnWidth(20) + @ExcelProperty("子件ID") + private BigDecimal childPartId; + /** + * 子件号 + */ + @ColumnWidth(20) + @ExcelProperty("子件号") + private String childPartCode; + /** + * 删除标记:0-未删除,1-已删除 + */ + @ColumnWidth(20) + @ExcelProperty("删除标记:0-未删除,1-已删除") + private Long isDeleted; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/CraftMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/CraftMapper.xml index 76e482496..2b6e4d30c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/CraftMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/CraftMapper.xml @@ -44,5 +44,14 @@ + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsCraftMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsCraftMapper.java index 0caebf794..6a5bef1ba 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsCraftMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsCraftMapper.java @@ -64,4 +64,8 @@ public interface DsCraftMapper extends BaseMapper { List selectDsCraftByIds(@Param("craftIds")List craftIds); List selectDsCraftByPartId(@Param("partId")Long partId); + + List selectCraftByPartId(@Param("partId")Long partId); + + List selectCraft(@Param("partId")Long partId, @Param("version")String version,@Param("rank")String rank); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsHourQuotaMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsHourQuotaMapper.java index 2b5bf7fdb..d751a8b2c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsHourQuotaMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsHourQuotaMapper.java @@ -60,4 +60,14 @@ public interface DsHourQuotaMapper extends BaseMapper { */ List exportDsHourQuota(@Param("ew") Wrapper queryWrapper); + /** + * 根据工序和工艺能力以及零件号查询工时定额对象 + * @param processNo + * @param craftCode + * @param partCode + * @return + */ + DsHourQuotaEntity getHourQuotaByPpsIdCaIdPartCode(@Param("processNo")String processNo, + @Param("craftCode")String craftCode, + @Param("partCode")String partCode); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsPartMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsPartMapper.java index 0dd569b99..8902213b8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsPartMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsPartMapper.java @@ -34,6 +34,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import java.time.LocalDate; +import java.util.ArrayList; import java.util.List; /** @@ -128,4 +129,16 @@ public interface DsPartMapper extends BaseMapper { List selectAllParts(); List selectDsPartZpartCode(@Param("zPartCode") String zPartCode); + + List selectPartByCodeLike(@Param("partCode")String partCode); + + List selectPartsByIds(@Param("ids") ArrayList longs); + + List selectChildrenByParentIds(@Param("parentIds")ArrayList longs); + + List selectChildrenByParentId(@Param("parentId")Long id); + + List selectPartRelations(@Param("partCode")String partCode); + + DsPartEntity selectDsPartByPartIdAndPartCode(@Param("id")Long id, @Param("partCode")String partCode); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsPartRelationMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsPartRelationMapper.java new file mode 100644 index 000000000..d2b426384 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsPartRelationMapper.java @@ -0,0 +1,67 @@ +/** + * 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.desk.dashboard.mapper; + +import org.springblade.desk.dashboard.pojo.entity.DsPartRelationEntity; +import org.springblade.desk.dashboard.pojo.vo.DsPartBomVO; +import org.springblade.desk.dashboard.pojo.vo.DsPartRelationVO; +import org.springblade.desk.dashboard.excel.DsPartRelationExcel; +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 java.util.List; + +/** + * 部件-子件关联表 Mapper 接口 + * + * @author BladeX + * @since 2025-11-24 + */ +public interface DsPartRelationMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param dsPartRelation 查询参数 + * @return List + */ + List selectDsPartRelationPage(IPage page, DsPartRelationVO dsPartRelation); + + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportDsPartRelation(@Param("ew") Wrapper queryWrapper); + + List selectDsPartRelationByPartId(@Param("partId")Long partId); + + List selectDsPartRelationByPartCodeAndChildPartCode(@Param("bPartCode")String bPartCode, @Param("zPartCode")String zPartCode); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMeasuringToolMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMeasuringToolMapper.java index bc642914a..403da7d1d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMeasuringToolMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMeasuringToolMapper.java @@ -66,4 +66,6 @@ public interface DsProcessMeasuringToolMapper extends BaseMapper selectDsProcessMeasuringToolByProcessIds(@Param("processIds")List processIds); + + List selectDsProcessMeasuringToolByProcessId(@Param("processId")Long processId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMoldToolMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMoldToolMapper.java index 09747bc7c..e09351766 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMoldToolMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMoldToolMapper.java @@ -66,4 +66,6 @@ public interface DsProcessMoldToolMapper extends BaseMapper selectDsProcessMoldToolByProcessIds(@Param("processIds")List processIds); + + List selectDsProcessMoldToolByProcessId(@Param("processId")Long processId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessProjectMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessProjectMapper.java index edcdf50f0..72e91ab6b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessProjectMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessProjectMapper.java @@ -73,4 +73,6 @@ public interface DsProcessProjectMapper extends BaseMapper selectDsProcessProjectByProcessCode(@Param("projectCode")Long projectCode); + + List selectDsProcessProjectByProcessId(@Param("processId")Long processId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/HourQuotaMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/HourQuotaMapper.xml index 9e775c60c..2c1535fec 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/HourQuotaMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/HourQuotaMapper.xml @@ -32,5 +32,12 @@ + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml index d59495321..f576d25c1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml @@ -51,6 +51,15 @@ + + + + + + + + + @@ -93,7 +102,7 @@ #{id} - + ORDER BY CREATE_TIME DESC @@ -182,5 +191,91 @@ AND p.IS_DELETED=0; + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartRelationMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartRelationMapper.xml new file mode 100644 index 000000000..b979f296a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartRelationMapper.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMeasuringToolMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMeasuringToolMapper.xml index f15fd5e03..abfba9d7c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMeasuringToolMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMeasuringToolMapper.xml @@ -42,5 +42,9 @@ + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMoldToolMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMoldToolMapper.xml index 045990f4d..2b3ec1c58 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMoldToolMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMoldToolMapper.xml @@ -39,5 +39,10 @@ #{id} + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessProjectMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessProjectMapper.xml index a14c51937..e97877729 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessProjectMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessProjectMapper.xml @@ -43,6 +43,10 @@ resultType="org.springblade.desk.dashboard.pojo.entity.DsProcessProjectEntity"> select * from DS_PROCESS_PROJECT where is_deleted = 0 and PROJECT_CODE = #{projectCode} + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsPartRelationDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsPartRelationDTO.java new file mode 100644 index 000000000..2a327c2cd --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsPartRelationDTO.java @@ -0,0 +1,45 @@ +/** + * 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.desk.dashboard.pojo.dto; + +import org.springblade.desk.dashboard.pojo.entity.DsPartRelationEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * 部件-子件关联表 数据传输对象实体类 + * + * @author BladeX + * @since 2025-11-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class DsPartRelationDTO extends DsPartRelationEntity { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartEntity.java index cec5cb4c1..5fc715e84 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartEntity.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartEntity.java @@ -247,4 +247,61 @@ public class DsPartEntity extends BaseEntity { */ @Schema(description = "零件类型") private String sinTerType; + + /** + * 镀种2 + */ + @Schema(description = "镀种2") + private String plateTwo; + + /** + * '镀层代码2 + */ + @Schema(description = "'镀层代码2") + private String plateCodeTwo; + + /** + * 面积2 + */ + @Schema(description = "面积2") + private BigDecimal areaTwo; + + + /** + * '产品应用领域 + */ + @Schema(description = "产品应用领域") + private String productApplicationArea; + + + /** + * 热处理检验 + */ + @Schema(description = "热处理检验") + private String hotDispose; + + /** + * 荧光检 + */ + @Schema(description = "荧光检") + private String fluorescenceCheck; + + /** + * 喷码 + */ + @Schema(description = "喷码") + private String inkjetPrinting; + + /** + * 有效期 + */ + @Schema(description = "有效期") + private String periodOfValidity; + + /** + * 状态;1、正常,2、到期,5、作废 + */ + @Schema(description = "零件状态") + private String pfStatus = "1"; + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartRelationEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartRelationEntity.java new file mode 100644 index 000000000..dda7c39a5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartRelationEntity.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.desk.dashboard.pojo.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-11-24 + */ +@Data +@TableName("DS_PART_RELATION") +@Schema(description = "DsPartRelation对象") +@EqualsAndHashCode(callSuper = true) +public class DsPartRelationEntity extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 部件ID + */ + @Schema(description = "部件ID") + private Long partId; + /** + * 部件号 + */ + @Schema(description = "部件号") + private String partCode; + /** + * 子件ID + */ + @Schema(description = "子件ID") + private Long childPartId; + /** + * 子件号 + */ + @Schema(description = "子件号") + private String childPartCode; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessEntity.java index e6abcaab4..e08bfe7c1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessEntity.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessEntity.java @@ -100,4 +100,10 @@ public class DsProcessEntity extends BaseEntity { @Schema(description = "备注") private String remarks; + /** + * 准备工时(分钟) + */ + @Schema(description = "准备工时(分钟)") + private Long setoutHours; + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsCompilationCompletedVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsCompilationCompletedVO.java new file mode 100644 index 000000000..86cbad0d1 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsCompilationCompletedVO.java @@ -0,0 +1,38 @@ +package org.springblade.desk.dashboard.pojo.vo; + +import lombok.Data; +import org.springblade.desk.dashboard.pojo.entity.DsCraftEntity; +import org.springblade.desk.dashboard.pojo.entity.DsPartEntity; +import org.springblade.desk.dashboard.pojo.entity.DsProcessEntity; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +/** + * @author: liweidong + * @create: 2025-11-26 + */ +@Data +public class BsCompilationCompletedVO { + + /** + * 零件信息 + */ + private DsPartEntity dsPart; + /** + * 子件集合 + */ + private List zPartList; + /** + * 工艺信息 + */ + private DsCraftEntity craft; + /** + * 工序集合 + */ + private List processList; + /** + * 工序删除ID集合 + */ + private List deleteIds; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/CraftTreeVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/CraftTreeVO.java new file mode 100644 index 000000000..1d89d74ec --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/CraftTreeVO.java @@ -0,0 +1,18 @@ +package org.springblade.desk.dashboard.pojo.vo; + +import lombok.Data; + +import java.util.List; + +/** + * @author: liweidong + * @create: 2025-11-25 + */ +@Data +public class CraftTreeVO { + /** 工艺信息 */ + private Object craftInfo; + + /** 工序列表(工艺直接包含工序) */ + private List processList; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartAuthorizedVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartAuthorizedVO.java new file mode 100644 index 000000000..89e3ec6ee --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartAuthorizedVO.java @@ -0,0 +1,18 @@ +package org.springblade.desk.dashboard.pojo.vo; + +import lombok.Data; + +import java.util.List; + +/** + * @author: liweidong + * @create: 2025-11-24 + */ +@Data +public class DsPartAuthorizedVO { + /** 零件信息 */ + private Object partInfo; + + /** 工艺列表(零件直接包含工艺) */ + private List craftList; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartBomVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartBomVO.java index 8123253c6..eecf86683 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartBomVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartBomVO.java @@ -41,15 +41,24 @@ import java.util.List; */ @Data public class DsPartBomVO { - @Serial - private static final long serialVersionUID = 1L; - /** * 部件号 */ @Schema(description = "部件号") private String bPartCode; + /** + * 部件名称 + */ + @Schema(description = "部件名称") + private String bPartName; + + /** + * 部件PDM图纸链接 + */ + @Schema(description = "部件PDM图纸链接") + private String bDocLink; + /** * 子件号 */ @@ -57,8 +66,14 @@ public class DsPartBomVO { private String zPartCode; /** - * PDM图纸链接 + * 子件名称 + */ + @Schema(description = "子件名称") + private String zPartName; + + /** + * 子件PDM图纸链接 */ - @Schema(description = "PDM图纸链接") - private String docLink; + @Schema(description = "子件PDM图纸链接") + private String zDocLink; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartRelationVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartRelationVO.java new file mode 100644 index 000000000..420d8a99e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartRelationVO.java @@ -0,0 +1,45 @@ +/** + * 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.desk.dashboard.pojo.vo; + +import org.springblade.desk.dashboard.pojo.entity.DsPartRelationEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * 部件-子件关联表 视图实体类 + * + * @author BladeX + * @since 2025-11-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class DsPartRelationVO extends DsPartRelationEntity { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartTreeVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartTreeVO.java index 43b479629..5349b3d34 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartTreeVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartTreeVO.java @@ -24,12 +24,7 @@ * Author: Chill Zhuang (bladejava@qq.com) */ package org.springblade.desk.dashboard.pojo.vo; - -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import org.springblade.desk.dashboard.pojo.entity.DsPartEntity; - -import java.io.Serial; import java.util.ArrayList; import java.util.List; @@ -41,21 +36,10 @@ import java.util.List; */ @Data public class DsPartTreeVO { - private Long id; - private Long parentId; private String partCode; private String partName; private String docLink; private List children; - private Boolean isMatched; - /** - * 标记是否存在循环 - */ - private Boolean hasCycle = false; - /** - * 当前节点深度 - */ - private Integer depth = 0; /** * 构造方法 @@ -65,4 +49,10 @@ public class DsPartTreeVO { } + public DsPartTreeVO(String partCode, String partName, String docLink) { + this(); + this.partCode = partCode; + this.partName = partName; + this.docLink = docLink; + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessSaveVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessSaveVO.java new file mode 100644 index 000000000..484a9871e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessSaveVO.java @@ -0,0 +1,43 @@ +package org.springblade.desk.dashboard.pojo.vo; + +import lombok.Data; +import org.springblade.desk.dashboard.pojo.entity.DsProcessEntity; +import org.springblade.desk.dashboard.pojo.entity.DsProcessMeasuringToolEntity; +import org.springblade.desk.dashboard.pojo.entity.DsProcessMoldToolEntity; +import org.springblade.desk.dashboard.pojo.entity.DsProcessProjectEntity; + +import java.util.List; + +/** + * @author: liweidong + * @create: 2025-11-26 + */ +@Data +public class DsProcessSaveVO { + + /** + * 工序 + */ + private DsProcessEntity processEntity; + + /** + * 项目 + */ + private List processProjectEntityList; + + /** + * 尺寸量具 + */ + private List processMeasuringToolEntities; + + + /** + * 工装模具 + */ + private List processMoldToolEntities; + + /** + * 项目删除ID集合 + */ + private List deleteIds; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/ProcessTreeVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/ProcessTreeVO.java new file mode 100644 index 000000000..35b8ecc65 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/ProcessTreeVO.java @@ -0,0 +1,24 @@ +package org.springblade.desk.dashboard.pojo.vo; + +import lombok.Data; + +import java.util.List; + +/** + * @author: liweidong + * @create: 2025-11-25 + */ +@Data +public class ProcessTreeVO { + /** 工序信息 */ + private Object processInfo; + + /** 工装模具列表 */ + private List moldToolList; + + /** 尺寸量具列表 */ + private List measuringToolList; + + /** 工序项目列表 */ + private List projectList; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsCraftService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsCraftService.java index 520db585c..736d1bf9d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsCraftService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsCraftService.java @@ -84,4 +84,27 @@ public interface IDsCraftService extends BaseService { * @return */ List getVersion(Long partId); + + /** + * 根据零件号查询工艺信息 + * @param partId + * @return + */ + List selectDsCraftByPartId(Long partId); + + /** + * 根据零件号 版本号 工艺级别查询工艺信息 + * @param partId + * @param version + * @param rank + * @return + */ + List selectDsCraftByPartId(Long partId, String version, String rank); + + /** + * 保存修改工艺 + * @param craft + * @return + */ + boolean addOrEdit(DsCraftEntity craft); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsHourQuotaService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsHourQuotaService.java index 9aa6e0093..2fb7c5572 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsHourQuotaService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsHourQuotaService.java @@ -58,4 +58,12 @@ public interface IDsHourQuotaService extends BaseService { */ List exportDsHourQuota(Wrapper queryWrapper); + /** + * 根据工序和工艺能力以及零件号查询工时定额对象 + * @param processNo + * @param craftCode + * @param partCode + * @return + */ + DsHourQuotaEntity getHourQuotaByPpsIdCaIdPartCode(String processNo, String craftCode, String partCode); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartRelationService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartRelationService.java new file mode 100644 index 000000000..22c6b8798 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartRelationService.java @@ -0,0 +1,76 @@ +/** + * 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.desk.dashboard.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.springblade.desk.dashboard.pojo.entity.DsPartRelationEntity; +import org.springblade.desk.dashboard.pojo.vo.DsPartBomVO; +import org.springblade.desk.dashboard.pojo.vo.DsPartRelationVO; +import org.springblade.desk.dashboard.excel.DsPartRelationExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * 部件-子件关联表 服务类 + * + * @author BladeX + * @since 2025-11-24 + */ +public interface IDsPartRelationService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param dsPartRelation 查询参数 + * @return IPage + */ + IPage selectDsPartRelationPage(IPage page, DsPartRelationVO dsPartRelation); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportDsPartRelation(Wrapper queryWrapper); + + /** + * 根据部件id查询子件 + * @param partId + * @return + */ + List selectDsPartRelationByPartId(Long partId); + + /** + * 根据部件号 和 子件号查询 + * @param bPartCode + * @param zPartCode + * @return + */ + List selectDsPartRelationByPartCodeAndChildPartCode(String bPartCode, String zPartCode); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java index 64087770e..f8c150f2f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java @@ -31,7 +31,6 @@ import org.springblade.desk.dashboard.pojo.vo.*; import org.springblade.desk.dashboard.excel.DsPartExcel; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; -import org.springblade.desk.dashboard.service.impl.DsPartServiceImpl; import java.util.List; @@ -149,10 +148,28 @@ public interface IDsPartService extends BaseService { */ List sinteringPart(String bPartCode, String zPartCode); + + + /** + * 根据部件号模糊查询树形结构 + * @param partCode + * @return 返回多个匹配的树 + */ + List getPartTreeList(String partCode); + /** + * 修改零件信息 + * @param dsPart + * @param zPartList + * @return + */ + boolean updateDsPart(DsPartEntity dsPart, List zPartList); + + /** * 烧结树形结构 * @param partCode * @return */ - List getSimpleTree(String partCode); +// List getSimpleTree(String partCode); + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessMeasuringToolService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessMeasuringToolService.java index c4d224544..2f59fc9a4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessMeasuringToolService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessMeasuringToolService.java @@ -26,6 +26,7 @@ package org.springblade.desk.dashboard.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.springblade.desk.dashboard.pojo.entity.DsProcessEntity; import org.springblade.desk.dashboard.pojo.entity.DsProcessMeasuringToolEntity; import org.springblade.desk.dashboard.pojo.vo.DsProcessMeasuringToolVO; import org.springblade.desk.dashboard.excel.DsProcessMeasuringToolExcel; @@ -64,4 +65,19 @@ public interface IDsProcessMeasuringToolService extends BaseService selectDsProcessMeasuringToolByProcessIds(List processIds); + + /** + * 根据工序ID 查询量具 + * @param processId + * @return + */ + List selectDsProcessMeasuringToolByProcessId(Long processId); + + /** + * 新增修改 + * @param processEntity + * @param processMeasuringToolEntities + * @return + */ + boolean saveProcessMeasuringTool(DsProcessEntity processEntity, List processMeasuringToolEntities); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessMoldToolService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessMoldToolService.java index 3cec7c1f9..161ec55ec 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessMoldToolService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessMoldToolService.java @@ -26,6 +26,7 @@ package org.springblade.desk.dashboard.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.springblade.desk.dashboard.pojo.entity.DsProcessEntity; import org.springblade.desk.dashboard.pojo.entity.DsProcessMoldToolEntity; import org.springblade.desk.dashboard.pojo.vo.DsProcessMoldToolVO; import org.springblade.desk.dashboard.excel.DsProcessMoldToolExcel; @@ -64,4 +65,19 @@ public interface IDsProcessMoldToolService extends BaseService selectDsProcessMoldToolByProcessIds(List processIds); + + /** + * 根据工序ID 查询工装模具 + * @param processId + * @return + */ + List selectDsProcessMoldToolByProcessId(Long processId); + + /** + * 新增 修改 + * @param processEntity + * @param processMoldToolEntities + * @return + */ + boolean saveProcessMoldTool(DsProcessEntity processEntity, List processMoldToolEntities); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessProjectService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessProjectService.java index 770a8ed38..b9aa92e3b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessProjectService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessProjectService.java @@ -26,6 +26,7 @@ package org.springblade.desk.dashboard.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.springblade.desk.dashboard.pojo.entity.DsProcessEntity; import org.springblade.desk.dashboard.pojo.entity.DsProcessProjectEntity; import org.springblade.desk.dashboard.pojo.vo.DsProcessProjectVO; import org.springblade.desk.dashboard.excel.DsProcessProjectExcel; @@ -71,4 +72,19 @@ public interface IDsProcessProjectService extends BaseService selectDsProcessProjectByProcessCode(Long projectCode); + + /** + * 工具工序ID查询项目 + * @param processId + * @return + */ + List selectDsProcessProjectByProcessId(Long processId); + + /** + * 保存项目信息 + * @param processEntity + * @param processProjectEntityList + * @return + */ + boolean saveProcessProjectSave(DsProcessEntity processEntity, List processProjectEntityList); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java index 55502c8de..3e15941f7 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java @@ -26,7 +26,9 @@ package org.springblade.desk.dashboard.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.springblade.desk.dashboard.pojo.entity.DsCraftEntity; import org.springblade.desk.dashboard.pojo.entity.DsProcessEntity; +import org.springblade.desk.dashboard.pojo.vo.DsProcessSynthesisVO; import org.springblade.desk.dashboard.pojo.vo.DsProcessVO; import org.springblade.desk.dashboard.excel.DsProcessExcel; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -71,4 +73,20 @@ public interface IDsProcessService extends BaseService { * @return */ List selectDsProcessByIds(List processIds); + + /** + * 根据工序ID查询 工装磨具 项目 尺寸量具 + * @param processId + * @return + */ + DsProcessSynthesisVO processDetail(Long processId); + + /** + * 新增修改工序信息 + * @param craft + * @param processList + * @param deleteIds + * @return + */ + boolean addOrEdit(DsCraftEntity craft, List processList, List deleteIds); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsTaskingService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsTaskingService.java index ea53fab51..4ce35fb09 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsTaskingService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsTaskingService.java @@ -27,7 +27,8 @@ package org.springblade.desk.dashboard.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.springblade.desk.dashboard.pojo.dto.DsTaskingDTO; -import org.springblade.desk.dashboard.pojo.entity.DsTaskingEntity; +import org.springblade.desk.dashboard.pojo.entity.*; +import org.springblade.desk.dashboard.pojo.vo.DsPartAuthorizedVO; import org.springblade.desk.dashboard.pojo.vo.DsPartSynthesisVO; import org.springblade.desk.dashboard.pojo.vo.DsTaskingVO; import org.springblade.desk.dashboard.excel.DsTaskingExcel; @@ -144,5 +145,44 @@ public interface IDsTaskingService extends BaseService { * @param taskId * @return */ - DsPartSynthesisVO processAuthorized(Long taskId); + DsPartAuthorizedVO processAuthorized(Long taskId, String rank); + + + /** + * 工艺编制 完成 + * @param dsPart 零件 + * @param zPartList 子件集合 + * @param craft 工艺 + * @param processList 工序 + * @param deleteIds 删除ID + * @return + */ + boolean authorizedAccomplish(DsPartEntity dsPart, List zPartList, DsCraftEntity craft, List processList, List deleteIds); + + /** + * 任务处理 编制 项目保存 + * @param processEntity + * @param processProjectEntityList + * @param deleteIds + * @return + */ + boolean saveProcessProjectSave(DsProcessEntity processEntity, List processProjectEntityList, List deleteIds); + + /** + * 任务处理 编制 尺寸量具保存 + * @param processEntity + * @param processMeasuringToolEntities + * @param deleteIds + * @return + */ + boolean saveProcessMeasuringTool(DsProcessEntity processEntity, List processMeasuringToolEntities, List deleteIds); + + /** + * 任务处理 编制 工装磨具保存 + * @param processEntity + * @param processMoldToolEntities + * @param deleteIds + * @return + */ + boolean saveProcessMoldTool(DsProcessEntity processEntity, List processMoldToolEntities, List deleteIds); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java index 9fe06f6c3..1304001cf 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java @@ -27,6 +27,7 @@ package org.springblade.desk.dashboard.service.impl; import org.apache.commons.lang3.ObjectUtils; import org.springblade.core.log.exception.ServiceException; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.dashboard.constant.TaskingConstant; import org.springblade.desk.dashboard.pojo.entity.*; @@ -74,6 +75,7 @@ public class DsCraftServiceImpl extends BaseServiceImpl selectDsCraftByPartId(Long partId) { + return craftMapper.selectCraftByPartId(partId); + } + + @Override + public List selectDsCraftByPartId(Long partId, String version, String rank) { + return craftMapper.selectCraft(partId,version,rank); + } + + @Override + public boolean addOrEdit(DsCraftEntity craft) { + + if(null != craft.getId()){ + updateById(craft); + }else { + save(craft); + } + + DsPartEntity partEntity = partService.getById(craft.getPartId()); + partEntity.setUpdateUser(AuthUtil.getUser().getUserId()); + try { + partService.updateById(partEntity); + } catch (Exception e) { + e.printStackTrace(); + } + return true; + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsHourQuotaServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsHourQuotaServiceImpl.java index 6ae1b9f05..3d8011791 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsHourQuotaServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsHourQuotaServiceImpl.java @@ -30,6 +30,7 @@ import org.springblade.desk.dashboard.pojo.vo.DsHourQuotaVO; import org.springblade.desk.dashboard.excel.DsHourQuotaExcel; import org.springblade.desk.dashboard.mapper.DsHourQuotaMapper; import org.springblade.desk.dashboard.service.IDsHourQuotaService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -45,6 +46,10 @@ import java.util.List; @Service public class DsHourQuotaServiceImpl extends BaseServiceImpl implements IDsHourQuotaService { + + @Autowired + DsHourQuotaMapper dsHourQuotaMapper; + @Override public IPage selectDsHourQuotaPage(IPage page, DsHourQuotaVO dsHourQuota) { return page.setRecords(baseMapper.selectDsHourQuotaPage(page, dsHourQuota)); @@ -60,4 +65,9 @@ public class DsHourQuotaServiceImpl 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.desk.dashboard.service.impl; + +import org.checkerframework.checker.units.qual.A; +import org.springblade.desk.dashboard.pojo.entity.DsPartRelationEntity; +import org.springblade.desk.dashboard.pojo.vo.DsPartBomVO; +import org.springblade.desk.dashboard.pojo.vo.DsPartRelationVO; +import org.springblade.desk.dashboard.excel.DsPartRelationExcel; +import org.springblade.desk.dashboard.mapper.DsPartRelationMapper; +import org.springblade.desk.dashboard.service.IDsPartRelationService; +import org.springframework.beans.factory.annotation.Autowired; +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.time.ZoneId; +import java.util.List; + +/** + * 部件-子件关联表 服务实现类 + * + * @author BladeX + * @since 2025-11-24 + */ +@Service +public class DsPartRelationServiceImpl extends BaseServiceImpl implements IDsPartRelationService { + + @Autowired + DsPartRelationMapper partRelationMapper; + + @Override + public IPage selectDsPartRelationPage(IPage page, DsPartRelationVO dsPartRelation) { + return page.setRecords(baseMapper.selectDsPartRelationPage(page, dsPartRelation)); + } + + + @Override + public List exportDsPartRelation(Wrapper queryWrapper) { + List dsPartRelationList = baseMapper.exportDsPartRelation(queryWrapper); + //dsPartRelationList.forEach(dsPartRelation -> { + // dsPartRelation.setTypeName(DictCache.getValue(DictEnum.YES_NO, DsPartRelation.getType())); + //}); + return dsPartRelationList; + } + + @Override + public List selectDsPartRelationByPartId(Long partId) { + return partRelationMapper.selectDsPartRelationByPartId(partId); + } + + @Override + public List selectDsPartRelationByPartCodeAndChildPartCode(String bPartCode, String zPartCode) { + return partRelationMapper.selectDsPartRelationByPartCodeAndChildPartCode(bPartCode, zPartCode); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java index aed369bc1..3013269de 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java @@ -26,6 +26,7 @@ package org.springblade.desk.dashboard.service.impl; import org.springblade.core.log.exception.ServiceException; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.dashboard.constant.TaskingConstant; import org.springblade.desk.dashboard.pojo.entity.*; @@ -33,6 +34,7 @@ import org.springblade.desk.dashboard.pojo.vo.*; import org.springblade.desk.dashboard.excel.DsPartExcel; import org.springblade.desk.dashboard.mapper.DsPartMapper; import org.springblade.desk.dashboard.service.*; +import org.springblade.system.feign.IUserClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -45,10 +47,10 @@ import org.springframework.util.StringUtils; import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.LocalDate; +import java.time.LocalDateTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.*; -import java.util.function.Function; import java.util.stream.Collectors; /** @@ -77,12 +79,19 @@ public class DsPartServiceImpl extends BaseServiceImpl selectDsPartPage(IPage page, DsPartVO dsPart) { @@ -113,8 +122,14 @@ public class DsPartServiceImpl extends BaseServiceImpl dsPartEntityList = dsPartMapper.selectDsPartByParentID(dsPartVO.getId()); - dsPartVO.setChildren(dsPartEntityList); + //查询子件信息 + List partRelationEntityList = partRelationService.selectDsPartRelationByPartId(dsPartVO.getId()); + //获取所有子件ID + List idList = partRelationEntityList.stream().map(DsPartRelationEntity::getChildPartId).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(idList)){ + List dsPartEntityList = dsPartMapper.selectDsPartByIds(idList); + dsPartVO.setChildren(dsPartEntityList); + } } } } @@ -285,70 +300,144 @@ public class DsPartServiceImpl extends BaseServiceImpl sinteringPart(String bPartCode, String zPartCode) { if(!StringUtils.isEmpty(bPartCode) && !StringUtils.isEmpty(zPartCode)){ - return dsPartMapper.selectDsPartByIdAndParentId(bPartCode,zPartCode); + return partRelationService.selectDsPartRelationByPartCodeAndChildPartCode(bPartCode,zPartCode); } + if(!StringUtils.isEmpty(zPartCode)){ - return dsPartMapper.selectDsPartZpartCode(zPartCode); + return partRelationService.selectDsPartRelationByPartCodeAndChildPartCode(null,zPartCode); } return new ArrayList<>(); } @Override - public List getSimpleTree(String partCode) { - // 1. SQL中模糊查询父节点 - List matchedParents = dsPartMapper.selectMatchedParents(partCode); - - // 2. 获取所有数据用于构建树 - List allParts = dsPartMapper.selectAllParts(); - Map partMap = allParts.stream() - .collect(Collectors.toMap(DsPartTreeVO::getId, Function.identity())); - - // 3. 为每个匹配的父节点构建完整的子树 - List result = new ArrayList<>(); - Set processedIds = new HashSet<>(); // 防止重复处理 - - for (DsPartTreeVO parent : matchedParents) { - if (!processedIds.contains(parent.getId())) { - DsPartTreeVO tree = buildTree(parent, partMap, processedIds, 0); - result.add(tree); - } + public List getPartTreeList(String partCode) { + + // 1. 联表查询所有相关关系 + List relations = dsPartMapper.selectPartRelations(partCode); + if (relations.isEmpty()) { + return new ArrayList<>(); } - return result; + // 2. 构建树形结构 + return buildTreeFromRelations(relations); } - private DsPartTreeVO buildTree(DsPartTreeVO node, Map partMap, - Set processedIds, int depth) { - // 标记已处理,防止重复 - processedIds.add(node.getId()); + @Override + public boolean updateDsPart(DsPartEntity dsPart, List zPartList) { - DsPartTreeVO treeNode = copyNode(node); - treeNode.setDepth(depth); - treeNode.setIsMatched(depth == 0); // 只有根节点标记为匹配 + DsPartEntity partEntity = dsPartMapper.selectDsPartByPartIdAndPartCode(dsPart.getId(),dsPart.getPartCode()); + if(null == partEntity){ + throw new ServiceException("零件ID与零件号有误"); + } + Long userId = AuthUtil.getUser().getUserId(); + if(null != dsPart.getExpirationPeriod()){ + //到期时间 + Date futureDate = addDaysToCurrentDate(dsPart.getExpirationPeriod().intValue()); + dsPart.setNextDue(futureDate); + } + dsPart.setLastUpdateTime(new Date()); + dsPart.setLastUpdateUser(userId); + dsPart.setPfStatus(TaskingConstant.STATUS_NEW); + updateById(dsPart); + //todo 调用erp过程发送零件信息(烧结零件不同步erp) + if (!TaskingConstant.IS_SINTERING.equals(dsPart.getIsSintering())) { + if((org.apache.commons.lang3.StringUtils.isNotBlank(dsPart.getCraftWay()) && dsPart.getCraftWay().contains("4"))) { + //dsPartDao.sendingPartGiveErp(dsPart); + } + } + if(!CollectionUtils.isEmpty(zPartList)){ + updateBatchById(zPartList); + } + return true; + } + public Date addDaysToCurrentDate(int days) { + LocalDateTime localDateTime = LocalDateTime.now().plusDays(days); + return Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant()); + } + + /** + * 从关系列表构建树形结构 + */ + private List buildTreeFromRelations(List relations) { + // 创建部件编码到树节点的映射 + Map partMap = new HashMap<>(); + + // 创建父子关系映射 + Map> parentChildMap = new HashMap<>(); + + // 第一遍遍历:收集所有部件和父子关系 + for (DsPartBomVO relation : relations) { + String parentCode = relation.getBPartCode(); + String childCode = relation.getZPartCode(); + + // 创建或获取父节点 + if (!partMap.containsKey(parentCode)) { + DsPartTreeVO parentNode = new DsPartTreeVO( + parentCode, + relation.getBPartName(), + relation.getBDocLink() + ); + partMap.put(parentCode, parentNode); + } - // 查找所有直接子节点 - for (DsPartTreeVO part : partMap.values()) { - if (node.getId().equals(part.getParentId()) && !processedIds.contains(part.getId())) { - DsPartTreeVO child = buildTree(part, partMap, processedIds, depth + 1); - treeNode.getChildren().add(child); + // 创建或获取子节点 + if (!partMap.containsKey(childCode)) { + DsPartTreeVO childNode = new DsPartTreeVO( + childCode, + relation.getZPartName(), + relation.getZDocLink() + ); + partMap.put(childCode, childNode); } + + // 建立父子关系 + parentChildMap.computeIfAbsent(parentCode, k -> new ArrayList<>()) + .add(childCode); } - return treeNode; - } + // 第二遍遍历:识别根节点(没有父节点的部件) + List roots = new ArrayList<>(); + Set allChildren = new HashSet<>(); + + // 收集所有子节点 + for (List children : parentChildMap.values()) { + allChildren.addAll(children); + } + + // 根节点:在partMap中存在,但不在allChildren中 + for (String partCode : partMap.keySet()) { + if (!allChildren.contains(partCode)) { + roots.add(partMap.get(partCode)); + } + } + + // 第三遍遍历:构建树形结构 + for (DsPartTreeVO root : roots) { + buildTreeRecursively(root, partMap, parentChildMap); + } - private DsPartTreeVO copyNode(DsPartTreeVO original) { - DsPartTreeVO copy = new DsPartTreeVO(); - copy.setId(original.getId()); - copy.setParentId(original.getParentId()); - copy.setPartCode(original.getPartCode()); - copy.setPartName(original.getPartName()); - copy.setDocLink(original.getDocLink()); - copy.setChildren(new ArrayList<>()); - return copy; + return roots; } + /** + * 递归构建树形结构 + */ + private void buildTreeRecursively(DsPartTreeVO parentNode, + Map partMap, + Map> parentChildMap) { + List childCodes = parentChildMap.get(parentNode.getPartCode()); + if (childCodes != null) { + for (String childCode : childCodes) { + DsPartTreeVO childNode = partMap.get(childCode); + if (childNode != null) { + parentNode.getChildren().add(childNode); + // 递归构建子树 + buildTreeRecursively(childNode, partMap, parentChildMap); + } + } + } + } public int compareDateOnly(Date date1, Date date2) { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessMeasuringToolServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessMeasuringToolServiceImpl.java index 47b514f01..144b84c8a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessMeasuringToolServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessMeasuringToolServiceImpl.java @@ -25,6 +25,7 @@ */ package org.springblade.desk.dashboard.service.impl; +import org.springblade.desk.dashboard.pojo.entity.DsProcessEntity; import org.springblade.desk.dashboard.pojo.entity.DsProcessMeasuringToolEntity; import org.springblade.desk.dashboard.pojo.vo.DsProcessMeasuringToolVO; import org.springblade.desk.dashboard.excel.DsProcessMeasuringToolExcel; @@ -35,6 +36,8 @@ 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 org.springframework.util.CollectionUtils; + import java.util.List; /** @@ -69,4 +72,25 @@ public class DsProcessMeasuringToolServiceImpl extends BaseServiceImpl selectDsProcessMeasuringToolByProcessId(Long processId) { + return dsProcessMeasuringToolMapper.selectDsProcessMeasuringToolByProcessId(processId); + } + + @Override + public boolean saveProcessMeasuringTool(DsProcessEntity processEntity, List processMeasuringToolEntities) { + if(!CollectionUtils.isEmpty(processMeasuringToolEntities)){ + for (DsProcessMeasuringToolEntity processMeasuringToolEntity : processMeasuringToolEntities) { + if (null != processMeasuringToolEntity.getId()){ + updateById(processMeasuringToolEntity); + }else { + processMeasuringToolEntity.setProcessId(processEntity.getId()); + save(processMeasuringToolEntity); + } + } + + } + return true; + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessMoldToolServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessMoldToolServiceImpl.java index 5253e2774..7ad144161 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessMoldToolServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessMoldToolServiceImpl.java @@ -25,6 +25,7 @@ */ package org.springblade.desk.dashboard.service.impl; +import org.springblade.desk.dashboard.pojo.entity.DsProcessEntity; import org.springblade.desk.dashboard.pojo.entity.DsProcessMoldToolEntity; import org.springblade.desk.dashboard.pojo.vo.DsProcessMoldToolVO; import org.springblade.desk.dashboard.excel.DsProcessMoldToolExcel; @@ -35,6 +36,8 @@ 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 org.springframework.util.CollectionUtils; + import java.util.List; /** @@ -69,4 +72,24 @@ public class DsProcessMoldToolServiceImpl extends BaseServiceImpl selectDsProcessMoldToolByProcessId(Long processId) { + return processMoldToolMapper.selectDsProcessMoldToolByProcessId(processId); + } + + @Override + public boolean saveProcessMoldTool(DsProcessEntity processEntity, List processMoldToolEntities) { + if(!CollectionUtils.isEmpty(processMoldToolEntities)){ + for (DsProcessMoldToolEntity processMoldToolEntity : processMoldToolEntities) { + if(null != processMoldToolEntity.getId()){ + updateById(processMoldToolEntity); + }else { + processMoldToolEntity.setProcessId(processEntity.getId()); + save(processMoldToolEntity); + } + } + } + return true; + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessProjectServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessProjectServiceImpl.java index 59ef09e69..976194661 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessProjectServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessProjectServiceImpl.java @@ -25,6 +25,7 @@ */ package org.springblade.desk.dashboard.service.impl; +import org.springblade.desk.dashboard.pojo.entity.DsProcessEntity; import org.springblade.desk.dashboard.pojo.entity.DsProcessProjectEntity; import org.springblade.desk.dashboard.pojo.vo.DsProcessProjectVO; import org.springblade.desk.dashboard.excel.DsProcessProjectExcel; @@ -35,6 +36,8 @@ 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 org.springframework.util.CollectionUtils; + import java.util.List; /** @@ -74,4 +77,24 @@ public class DsProcessProjectServiceImpl extends BaseServiceImpl selectDsProcessProjectByProcessId(Long processId) { + return processProjectMapper.selectDsProcessProjectByProcessId(processId); + } + + @Override + public boolean saveProcessProjectSave(DsProcessEntity processEntity, List processProjectEntityList) { + if(!CollectionUtils.isEmpty(processProjectEntityList)){ + for (DsProcessProjectEntity dsProcessProjectEntity : processProjectEntityList) { + if(null != dsProcessProjectEntity.getId()){ + updateById(dsProcessProjectEntity); + }else { + dsProcessProjectEntity.setProcessId(processEntity.getId()); + save(dsProcessProjectEntity); + } + } + } + return true; + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java index de094fddd..13bf1efe7 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java @@ -25,16 +25,21 @@ */ package org.springblade.desk.dashboard.service.impl; -import org.springblade.desk.dashboard.pojo.entity.DsProcessEntity; +import com.baomidou.mybatisplus.core.injector.methods.DeleteByIds; +import org.springblade.desk.dashboard.pojo.entity.*; +import org.springblade.desk.dashboard.pojo.vo.DsProcessSynthesisVO; import org.springblade.desk.dashboard.pojo.vo.DsProcessVO; import org.springblade.desk.dashboard.excel.DsProcessExcel; import org.springblade.desk.dashboard.mapper.DsProcessMapper; -import org.springblade.desk.dashboard.service.IDsProcessService; +import org.springblade.desk.dashboard.service.*; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; 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 org.springframework.util.CollectionUtils; + import java.util.List; /** @@ -49,6 +54,26 @@ public class DsProcessServiceImpl extends BaseServiceImpl selectDsProcessPage(IPage page, DsProcessVO dsProcess) { return page.setRecords(baseMapper.selectDsProcessPage(page, dsProcess)); @@ -74,4 +99,50 @@ public class DsProcessServiceImpl extends BaseServiceImpl processProjectEntityList = processProjectService.selectDsProcessProjectByProcessId(processId); + + List processMoldToolEntityList = processMoldToolService.selectDsProcessMoldToolByProcessId(processId); + + List processMeasuringToolEntityList = processMeasuringToolService.selectDsProcessMeasuringToolByProcessId(processId); + + DsProcessSynthesisVO dsProcessSynthesisVO = new DsProcessSynthesisVO(); + dsProcessSynthesisVO.setProcessProjectEntityList(processProjectEntityList); + dsProcessSynthesisVO.setProcessMoldToolEntityList(processMoldToolEntityList); + dsProcessSynthesisVO.setProcessMeasuringToolEntityList(processMeasuringToolEntityList); + return dsProcessSynthesisVO; + } + + @Override + public boolean addOrEdit(DsCraftEntity craft, List processList, List deleteIds) { + if(!CollectionUtils.isEmpty(processList)){ + for (DsProcessEntity process : processList) { + if (null != process.getId() ) { + DsCraftEntity craftEntity = craftService.getById(process.getCraftId()); + DsPartEntity partEntity = partService.getById(craftEntity.getPartId()); + + DsHourQuotaEntity dsHourQuota = hourQuotaService.getHourQuotaByPpsIdCaIdPartCode(process.getProcessNo(), process.getCraftCode(),partEntity.getPartCode() ); + if (dsHourQuota != null) { + process.setProHours(dsHourQuota.getProHours()); + } + updateById(process); + } else { + DsPartEntity partEntity = partService.getById(craft.getPartId()); + DsHourQuotaEntity dsHourQuota = hourQuotaService.getHourQuotaByPpsIdCaIdPartCode(process.getProcessNo(), process.getCraftCode(),partEntity.getPartCode()); + if (dsHourQuota != null) { + process.setProHours(dsHourQuota.getProHours()); + } + process.setCraftId(craft.getId()); + save(process); + } + } + } + if(!CollectionUtils.isEmpty(deleteIds)){ + deleteLogic(deleteIds); + } + return true; + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java index 45520c3cc..54070e03a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java @@ -25,23 +25,18 @@ */ package org.springblade.desk.dashboard.service.impl; -import org.apache.commons.lang3.ObjectUtils; +import com.alibaba.fastjson2.JSONObject; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.desk.dashboard.constant.*; import org.springblade.desk.dashboard.pojo.dto.DsTaskingDTO; -import org.springblade.desk.dashboard.pojo.entity.DsCraftEntity; -import org.springblade.desk.dashboard.pojo.entity.DsPartEntity; -import org.springblade.desk.dashboard.pojo.entity.DsTaskingEntity; -import org.springblade.desk.dashboard.pojo.vo.DsPartSynthesisVO; -import org.springblade.desk.dashboard.pojo.vo.DsTaskingVO; +import org.springblade.desk.dashboard.pojo.entity.*; +import org.springblade.desk.dashboard.pojo.vo.*; import org.springblade.desk.dashboard.excel.DsTaskingExcel; import org.springblade.desk.dashboard.mapper.DsTaskingMapper; -import org.springblade.desk.dashboard.service.IBsPlatingService; -import org.springblade.desk.dashboard.service.IDsPartService; -import org.springblade.desk.dashboard.service.IDsTaskingService; +import org.springblade.desk.dashboard.service.*; import org.springblade.system.feign.IUserClient; import org.springblade.system.pojo.entity.UserInfo; import org.springframework.beans.factory.annotation.Autowired; @@ -80,6 +75,21 @@ public class DsTaskingServiceImpl extends BaseServiceImpl selectAssignList(IPage page, DsTaskingVO dsTasking) { List dsTaskingVOS = baseMapper.selectDsTaskingPage(page, dsTasking); @@ -316,16 +326,146 @@ public class DsTaskingServiceImpl extends BaseServiceImpl()); + + // 查询零件工艺信息 + List dsCraftVOList = craftService.selectDsCraftByPartId(partEntity.getId(), dsTaskingEntity.getVersion(), rank); + + if (!CollectionUtils.isEmpty(dsCraftVOList)) { + for (DsCraftVO craftVO : dsCraftVOList) { + // 创建工艺节点 + CraftTreeVO craftTree = new CraftTreeVO(); + craftTree.setCraftInfo(JSONObject.from(craftVO)); + craftTree.setProcessList(new ArrayList<>()); + + // 查询工序信息 + List processEntities = processService.selectDsProcessByCraftId(craftVO.getId()); + + if (!CollectionUtils.isEmpty(processEntities)) { + List processIds = processEntities.stream() + .map(DsProcessEntity::getId) + .collect(Collectors.toList()); + + // 批量查询关联数据 + List processProjectEntityList = processProjectService.selectDsProcessProjectByProcessIds(processIds); + List processMeasuringToolEntityList = processMeasuringToolService.selectDsProcessMeasuringToolByProcessIds(processIds); + List processMoldToolEntityList = processMoldToolService.selectDsProcessMoldToolByProcessIds(processIds); + + // 构建工序树 + List processTree = buildProcessTree(processEntities, processProjectEntityList, + processMeasuringToolEntityList, processMoldToolEntityList); + craftTree.setProcessList(processTree); + } + + result.getCraftList().add(craftTree); + } + } + + return result; + } + + @Override + public boolean authorizedAccomplish(DsPartEntity dsPart, List zPartList, DsCraftEntity craft, List processList, List deleteIds) { + + //零件 + partService.updateDsPart(dsPart,zPartList); + //工艺 + craftService.addOrEdit(craft); + //工序 + processService.addOrEdit(craft,processList,deleteIds); + + return true; + } + + @Override + public boolean saveProcessProjectSave(DsProcessEntity processEntity, List processProjectEntityList, List deleteIds) { + processProjectService.saveProcessProjectSave(processEntity,processProjectEntityList); + processProjectService.deleteLogic(deleteIds); + return true; + } + + @Override + public boolean saveProcessMeasuringTool(DsProcessEntity processEntity, List processMeasuringToolEntities, List deleteIds) { + processMeasuringToolService.saveProcessMeasuringTool(processEntity,processMeasuringToolEntities); + processMeasuringToolService.deleteLogic(deleteIds); + return true; + } + + @Override + public boolean saveProcessMoldTool(DsProcessEntity processEntity, List processMoldToolEntities, List deleteIds) { + processMoldToolService.saveProcessMoldTool(processEntity,processMoldToolEntities); + processMoldToolService.deleteLogic(deleteIds); + return true; + } + + + /** + * 构建工序树 + */ + private List buildProcessTree(List processEntities, + List projectEntities, + List measuringToolEntities, + List moldToolEntities) { + + // 按工序ID分组 + Map> projectMap = projectEntities.stream() + .collect(Collectors.groupingBy(DsProcessProjectEntity::getProcessId)); + + Map> measuringToolMap = measuringToolEntities.stream() + .collect(Collectors.groupingBy(DsProcessMeasuringToolEntity::getProcessId)); + + Map> moldToolMap = moldToolEntities.stream() + .collect(Collectors.groupingBy(DsProcessMoldToolEntity::getProcessId)); + + List processTree = new ArrayList<>(); + + + for (DsProcessEntity process : processEntities) { + ProcessTreeVO processNode = new ProcessTreeVO(); + + // 设置工序基本信息 + processNode.setProcessInfo(JSONObject.from(process)); + + Long processId = process.getId(); + + // 设置工装模具列表 + List molds = moldToolMap.get(processId); + processNode.setMoldToolList(molds != null ? + molds.stream().map(JSONObject::from).collect(Collectors.toList()) : + new ArrayList<>()); + + // 设置尺寸量具列表 + List tools = measuringToolMap.get(processId); + processNode.setMeasuringToolList(tools != null ? + tools.stream().map(JSONObject::from).collect(Collectors.toList()) : + new ArrayList<>()); + + // 设置工序项目列表 + List projects = projectMap.get(processId); + processNode.setProjectList(projects != null ? + projects.stream().map(JSONObject::from).collect(Collectors.toList()) : + new ArrayList<>()); + + processTree.add(processNode); + } + + return processTree; } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/wrapper/DsPartRelationWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/wrapper/DsPartRelationWrapper.java new file mode 100644 index 000000000..4b86b4052 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/wrapper/DsPartRelationWrapper.java @@ -0,0 +1,59 @@ +/** + * 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.desk.dashboard.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.dashboard.pojo.entity.DsPartRelationEntity; +import org.springblade.desk.dashboard.pojo.vo.DsPartRelationVO; +import java.util.Objects; + +/** + * 部件-子件关联表 包装类,返回视图层所需的字段 + * + * @author BladeX + * @since 2025-11-24 + */ +public class DsPartRelationWrapper extends BaseEntityWrapper { + + public static DsPartRelationWrapper build() { + return new DsPartRelationWrapper(); + } + + @Override + public DsPartRelationVO entityVO(DsPartRelationEntity dsPartRelation) { + DsPartRelationVO dsPartRelationVO = Objects.requireNonNull(BeanUtil.copyProperties(dsPartRelation, DsPartRelationVO.class)); + + //User createUser = UserCache.getUser(dsPartRelation.getCreateUser()); + //User updateUser = UserCache.getUser(dsPartRelation.getUpdateUser()); + //dsPartRelationVO.setCreateUserName(createUser.getName()); + //dsPartRelationVO.setUpdateUserName(updateUser.getName()); + + return dsPartRelationVO; + } + + +} diff --git a/blade-service/blade-desk/target/blade-desk.jar.original b/blade-service/blade-desk/target/blade-desk.jar.original deleted file mode 100644 index 4e1938433..000000000 Binary files a/blade-service/blade-desk/target/blade-desk.jar.original and /dev/null differ diff --git a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/CraftMapper.xml b/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/CraftMapper.xml deleted file mode 100644 index 76e482496..000000000 --- a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/CraftMapper.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/HourQuotaMapper.xml b/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/HourQuotaMapper.xml deleted file mode 100644 index 9e775c60c..000000000 --- a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/HourQuotaMapper.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/PartMapper.xml b/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/PartMapper.xml deleted file mode 100644 index d59495321..000000000 --- a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/PartMapper.xml +++ /dev/null @@ -1,186 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UPDATE DS_PART - SET NEXT_DUE = TO_DATE(#{nextDue}, 'YYYY-MM-DD') - WHERE ID IN - - #{id} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProcessMeasuringToolMapper.xml b/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProcessMeasuringToolMapper.xml deleted file mode 100644 index f15fd5e03..000000000 --- a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProcessMeasuringToolMapper.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProcessMoldToolMapper.xml b/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProcessMoldToolMapper.xml deleted file mode 100644 index 045990f4d..000000000 --- a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProcessMoldToolMapper.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProcessProjectMapper.xml b/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProcessProjectMapper.xml deleted file mode 100644 index a14c51937..000000000 --- a/blade-service/blade-desk/target/classes/org/springblade/desk/dashboard/mapper/ProcessProjectMapper.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-desk/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/blade-service/blade-desk/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 75a8be770..000000000 --- a/blade-service/blade-desk/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,289 +0,0 @@ -org\springblade\desk\dashboard\wrapper\BsPlatingWrapper.class -org\springblade\desk\dashboard\pojo\vo\DsProcessMoldToolVO.class -org\springblade\desk\dashboard\controller\DsBatchPreserveTaskController.class -org\springblade\desk\dashboard\pojo\dto\DsProcessMoldToolDTO.class -org\springblade\desk\dashboard\pojo\dto\BsProcessGroupDTO.class -org\springblade\desk\dashboard\pojo\dto\DsProcessProjectDTO.class -org\springblade\desk\dashboard\pojo\vo\BsProcessTeamVO.class -org\springblade\desk\dashboard\pojo\entity\DsHourQuotaDetailEntity.class -org\springblade\desk\dashboard\wrapper\DsTaskBillWrapper.class -org\springblade\desk\dashboard\pojo\dto\BsPlatingTypeDTO.class -org\springblade\desk\notice\controller\LeaveController.class -org\springblade\desk\dashboard\wrapper\DsTaskingWrapper.class -org\springblade\desk\dashboard\pojo\entity\BsCraftAbilityEntity.class -org\springblade\desk\dashboard\pojo\dto\DsBatchPreserveTaskDTO.class -org\springblade\desk\dashboard\pojo\dto\DsTaskingDTO.class -org\springblade\desk\dashboard\pojo\entity\BsProcessGroupEntity.class -org\springblade\desk\dashboard\mapper\BsProcessSetMapper.class -org\springblade\desk\dashboard\mapper\DsBatchPreserveTaskMapper.class -org\springblade\desk\dashboard\pojo\entity\DsProcessProjectEntity.class -org\springblade\desk\notice\service\impl\LeaveServiceImpl.class -org\springblade\desk\dashboard\mapper\DsTaskingMapper.class -org\springblade\desk\dashboard\excel\DsProModelExcel.class -org\springblade\desk\dashboard\pojo\entity\DsPartEntity.class -org\springblade\desk\dashboard\service\impl\BsPlatingTypeSmallServiceImpl.class -org\springblade\desk\dashboard\mapper\DsBatchWorkCenterSetMapper.class -org\springblade\desk\dashboard\wrapper\BsWorkCenterWrapper.class -org\springblade\desk\dashboard\wrapper\BsCraftAbilityWrapper.class -org\springblade\desk\dashboard\mapper\BsProcessGroupMapper.class -org\springblade\desk\dashboard\mapper\DsPartMapper.class -org\springblade\desk\dashboard\pojo\dto\BsPlatingTypeAssignDTO.class -org\springblade\desk\dashboard\excel\DsBomExcel.class -org\springblade\desk\dashboard\controller\DsProcessMeasuringToolController.class -org\springblade\desk\dashboard\excel\BsPlatingTypeExcel.class -org\springblade\desk\dashboard\pojo\vo\BsTeamSetEntityVO.class -org\springblade\desk\dashboard\controller\DsTaskingController.class -org\springblade\desk\dashboard\service\IBsCraftAbilityService.class -org\springblade\desk\dashboard\wrapper\DsProDetailWrapper.class -org\springblade\desk\dashboard\pojo\dto\BsTeamSetDTO.class -org\springblade\desk\dashboard\service\IBsProcessSetService.class -org\springblade\inspection\listener\AfterListener.class -org\springblade\desk\dashboard\pojo\vo\DsBatchPreserveTaskVO.class -org\springblade\desk\dashboard\service\impl\DsProcessMeasuringToolServiceImpl.class -org\springblade\desk\dashboard\mapper\DsProcessProjectMapper.class -org\springblade\desk\dashboard\mapper\BsCraftAbilityMapper.class -org\springblade\desk\dashboard\service\impl\BsPlatingServiceImpl.class -org\springblade\desk\dashboard\service\IDsProcessService.class -org\springblade\desk\dashboard\pojo\vo\DsPartSynthesisVO.class -org\springblade\desk\notice\controller\NoticeController.class -org\springblade\desk\dashboard\service\impl\DsTaskBillServiceImpl.class -org\springblade\desk\dashboard\excel\BsTeamSetExcel.class -org\springblade\desk\dashboard\excel\BsPlatingTypeAssignExcel.class -org\springblade\desk\dashboard\service\impl\DsTaskingServiceImpl.class -org\springblade\desk\dashboard\pojo\entity\DsBatchPreserveTaskEntity.class -org\springblade\desk\dashboard\pojo\vo\BsPlatingTypeListVO.class -org\springblade\desk\dashboard\wrapper\DsBatchWorkCenterSetWrapper.class -org\springblade\desk\dashboard\controller\DsProcessProjectController.class -org\springblade\desk\notice\feign\NoticeClient.class -org\springblade\desk\dashboard\excel\DsSpecialProExcel.class -org\springblade\desk\dashboard\service\impl\DsProDetailServiceImpl.class -org\springblade\desk\dashboard\mapper\BsPlatingTypeMapper.class -org\springblade\desk\dashboard\pojo\entity\DsSpecialProEntity.class -org\springblade\desk\dashboard\pojo\dto\DsBatchWorkCenterSetDTO.class -org\springblade\inspection\listener\FirstListener.class -org\springblade\desk\dashboard\wrapper\DsHourQuotaDetailWrapper.class -org\springblade\desk\dashboard\pojo\vo\DsTaskBillVO.class -org\springblade\desk\dashboard\wrapper\BsPlatingTypeAssignWrapper.class -org\springblade\desk\dashboard\controller\DsBatchPreservePlanController.class -org\springblade\desk\dashboard\pojo\entity\BsPlatingTypeAssignEntity.class -org\springblade\desk\dashboard\controller\DsBomController.class -org\springblade\desk\dashboard\service\IBsPlatingTypeService.class -org\springblade\desk\dashboard\excel\BsPlatingExcel.class -org\springblade\desk\dashboard\pojo\vo\DsPartCodeAndPartNameVO.class -org\springblade\desk\dashboard\service\impl\DsProcessMoldToolServiceImpl.class -org\springblade\desk\notice\service\INoticeService.class -org\springblade\desk\dashboard\excel\BsPlatingTypeSmallExcel.class -org\springblade\desk\dashboard\excel\DsBatchWorkCenterSetExcel.class -org\springblade\desk\dashboard\pojo\vo\BsProcessSetVO.class -org\springblade\desk\dashboard\excel\BsProcessGroupExcel.class -org\springblade\desk\dashboard\pojo\dto\DsTaskBillDTO.class -org\springblade\desk\dashboard\wrapper\DsProcessWrapper.class -org\springblade\desk\dashboard\pojo\dto\BsProcessTeamDTO.class -org\springblade\desk\dashboard\wrapper\BsTeamSetWrapper.class -org\springblade\inspection\listener\HandleListener.class -org\springblade\desk\dashboard\mapper\BsProcessTeamMapper.class -org\springblade\desk\dashboard\mapper\DsProcessMoldToolMapper.class -org\springblade\desk\dashboard\wrapper\DsSpecialProWrapper.class -org\springblade\desk\dashboard\pojo\vo\DsProcessSynthesisVO.class -org\springblade\desk\dashboard\service\IDsBomService.class -org\springblade\desk\dashboard\controller\BsPlatingTypeSmallController.class -org\springblade\desk\dashboard\mapper\BsPlatingTypeAssignMapper.class -org\springblade\desk\dashboard\service\IDsCraftService.class -org\springblade\desk\dashboard\pojo\dto\DsSpecialProDTO.class -org\springblade\desk\dashboard\wrapper\DsProcessProjectWrapper.class -org\springblade\desk\dashboard\service\IDsProModelService.class -org\springblade\desk\dashboard\pojo\dto\DsHourQuotaDTO.class -org\springblade\desk\dashboard\pojo\dto\BsPlatingDTO.class -org\springblade\desk\dashboard\pojo\vo\BsWorkCenterVO.class -org\springblade\desk\dashboard\service\impl\BsProcessSetServiceImpl.class -org\springblade\desk\notice\mapper\NoticeMapper.class -org\springblade\desk\dashboard\excel\BsWorkCenterExcel.class -org\springblade\desk\dashboard\pojo\vo\DsSimilarPartsVO.class -org\springblade\desk\dashboard\mapper\DsHourQuotaMapper.class -org\springblade\desk\dashboard\mapper\DsSpecialProMapper.class -org\springblade\desk\dashboard\controller\DsProcessController.class -org\springblade\desk\dashboard\pojo\vo\DsBatchPreservePlanVO.class -org\springblade\desk\dashboard\mapper\DsMainSaltAddQuantityMapper.class -org\springblade\desk\dashboard\controller\DsTaskBillController.class -org\springblade\desk\dashboard\service\IDsBatchWorkCenterSetService.class -org\springblade\desk\dashboard\wrapper\BsPlatingTypeWrapper.class -org\springblade\desk\dashboard\excel\DsProcessExcel.class -org\springblade\desk\dashboard\wrapper\DsProcessMeasuringToolWrapper.class -org\springblade\desk\dashboard\pojo\dto\BsProcessSetDTO.class -org\springblade\desk\dashboard\pojo\dto\DsCraftDTO.class -org\springblade\desk\dashboard\service\IDsPartService.class -org\springblade\desk\dashboard\pojo\entity\BsPlatingTypeEntity.class -org\springblade\desk\dashboard\controller\BsProcessSetController.class -org\springblade\desk\dashboard\pojo\vo\DsMainSaltAddQuantityVO.class -org\springblade\desk\dashboard\pojo\dto\DsProModelDTO.class -org\springblade\desk\notice\service\ILeaveService.class -org\springblade\desk\dashboard\excel\BsProcessSetExcel.class -org\springblade\desk\dashboard\service\IDsBatchPreservePlanService.class -org\springblade\desk\notice\entity\ProcessLeave.class -org\springblade\desk\dashboard\pojo\dto\BsWorkCenterDTO.class -org\springblade\desk\dashboard\controller\DsHourQuotaDetailController.class -org\springblade\desk\dashboard\service\IBsPlatingService.class -org\springblade\desk\dashboard\service\impl\DsMainSaltAddQuantityServiceImpl.class -org\springblade\desk\dashboard\constant\TaskingConstant.class -org\springblade\desk\dashboard\pojo\vo\DsBomVO.class -org\springblade\desk\dashboard\wrapper\DsProModelWrapper.class -org\springblade\desk\dashboard\pojo\entity\DsBatchPreservePlanEntity.class -org\springblade\desk\dashboard\pojo\vo\DsPartBomVO.class -org\springblade\desk\dashboard\service\IDsHourQuotaService.class -org\springblade\desk\dashboard\service\IDsProDetailService.class -org\springblade\desk\dashboard\service\impl\DsCraftServiceImpl.class -org\springblade\desk\dashboard\excel\DsTaskBillExcel.class -org\springblade\desk\dashboard\controller\BsPlatingTypeController.class -org\springblade\desk\dashboard\pojo\dto\DsBatchPreservePlanDTO.class -org\springblade\desk\dashboard\service\IBsTeamSetService.class -org\springblade\desk\dashboard\controller\DsProModelController.class -org\springblade\desk\dashboard\mapper\BsPlatingTypeSmallMapper.class -org\springblade\desk\dashboard\controller\DsBatchWorkCenterSetController.class -org\springblade\desk\dashboard\mapper\DsProDetailMapper.class -org\springblade\desk\dashboard\pojo\vo\DsPartVO.class -org\springblade\desk\dashboard\pojo\vo\DsProModelVO.class -org\springblade\desk\dashboard\service\IDsProcessMeasuringToolService.class -org\springblade\desk\dashboard\pojo\vo\DsModelAndDetailVO.class -org\springblade\desk\dashboard\wrapper\BsProcessTeamWrapper.class -org\springblade\desk\dashboard\mapper\DsBatchPreservePlanMapper.class -org\springblade\desk\dashboard\mapper\DsProModelMapper.class -org\springblade\desk\dashboard\controller\DsSpecialProController.class -org\springblade\desk\dashboard\service\impl\DsProModelServiceImpl.class -org\springblade\desk\dashboard\pojo\vo\DsSpecialProVO.class -org\springblade\desk\dashboard\service\IDsMainSaltAddQuantityService.class -org\springblade\desk\dashboard\service\IDsProcessProjectService.class -org\springblade\desk\dashboard\service\impl\BsTeamSetServiceImpl.class -org\springblade\desk\dashboard\service\IBsWorkCenterService.class -org\springblade\desk\dashboard\controller\DsHourQuotaController.class -org\springblade\desk\dashboard\pojo\vo\BsTeamProcessVO.class -org\springblade\desk\dashboard\service\IBsProcessTeamService.class -org\springblade\desk\dashboard\wrapper\DsBatchPreservePlanWrapper.class -org\springblade\desk\dashboard\excel\DsBatchPreserveTaskExcel.class -org\springblade\desk\dashboard\service\impl\BsProcessTeamServiceImpl.class -org\springblade\desk\dashboard\wrapper\DsBatchPreserveTaskWrapper.class -org\springblade\desk\dashboard\pojo\vo\DsHourQuotaVO.class -org\springblade\desk\dashboard\service\impl\DsSpecialProServiceImpl.class -org\springblade\desk\dashboard\mapper\BsWorkCenterMapper.class -org\springblade\desk\dashboard\mapper\DsBomMapper.class -org\springblade\desk\dashboard\pojo\dto\BsPlatingTypeSmallDTO.class -org\springblade\desk\dashboard\controller\DsProDetailController.class -org\springblade\desk\dashboard\controller\DsMainSaltAddQuantityController.class -org\springblade\desk\notice\mapper\LeaveMapper.class -org\springblade\desk\dashboard\pojo\entity\DsTaskingEntity.class -org\springblade\desk\dashboard\excel\BsProcessTeamExcel.class -org\springblade\desk\dashboard\service\impl\BsPlatingTypeAssignServiceImpl.class -org\springblade\desk\dashboard\mapper\DsSimilarPartsMapper.class -org\springblade\desk\dashboard\service\impl\DsProcessServiceImpl.class -org\springblade\desk\dashboard\controller\BsPlatingTypeAssignController.class -org\springblade\desk\dashboard\pojo\dto\DsProcessDTO.class -org\springblade\desk\dashboard\pojo\dto\DsProDetailDTO.class -org\springblade\desk\dashboard\pojo\entity\DsMainSaltAddQuantityEntity.class -org\springblade\desk\dashboard\service\impl\DsHourQuotaServiceImpl.class -org\springblade\desk\dashboard\service\impl\BsPlatingTypeServiceImpl.class -org\springblade\desk\dashboard\controller\BsProcessTeamController.class -org\springblade\desk\dashboard\pojo\vo\DsProcessProjectVO.class -org\springblade\desk\dashboard\pojo\dto\DsBomDTO.class -org\springblade\desk\dashboard\service\impl\BsCraftAbilityServiceImpl.class -org\springblade\desk\dashboard\excel\DsPartExcel.class -org\springblade\desk\dashboard\controller\BsCraftAbilityController.class -org\springblade\desk\dashboard\pojo\vo\DsCraftExpireVO.class -org\springblade\desk\dashboard\service\impl\DsHourQuotaDetailServiceImpl.class -org\springblade\desk\dashboard\excel\DsProcessMoldToolExcel.class -org\springblade\desk\dashboard\service\IBsPlatingTypeAssignService.class -org\springblade\desk\dashboard\service\IDsTaskBillService.class -org\springblade\desk\DeskApplication.class -org\springblade\desk\dashboard\pojo\vo\BsPlatingTypeAssignVO.class -org\springblade\desk\dashboard\pojo\vo\DsPartTreeVO.class -org\springblade\desk\dashboard\service\IDsBatchPreserveTaskService.class -org\springblade\desk\dashboard\pojo\entity\BsWorkCenterEntity.class -org\springblade\desk\dashboard\excel\DsHourQuotaDetailExcel.class -org\springblade\desk\dashboard\pojo\entity\DsSimilarPartsEntity.class -org\springblade\desk\dashboard\pojo\dto\DsProcessMeasuringToolDTO.class -org\springblade\desk\dashboard\service\IDsHourQuotaDetailService.class -org\springblade\desk\dashboard\controller\BsWorkCenterController.class -org\springblade\desk\dashboard\wrapper\DsMainSaltAddQuantityWrapper.class -org\springblade\desk\dashboard\excel\DsTaskingExcel.class -org\springblade\desk\dashboard\pojo\entity\BsProcessTeamEntity.class -org\springblade\desk\dashboard\pojo\entity\BsTeamSetEntity.class -org\springblade\desk\dashboard\pojo\entity\DsTaskBillEntity.class -org\springblade\desk\dashboard\pojo\vo\DsProModelDetailListVO.class -org\springblade\desk\dashboard\pojo\entity\DsCraftEntity.class -org\springblade\desk\dashboard\controller\BsTeamSetController.class -org\springblade\desk\dashboard\service\impl\DsBomServiceImpl.class -org\springblade\desk\dashboard\controller\BsProcessGroupController.class -org\springblade\desk\dashboard\pojo\entity\DsProcessMeasuringToolEntity.class -org\springblade\desk\dashboard\pojo\vo\BsCraftAbilityVO.class -org\springblade\desk\dashboard\wrapper\BsProcessSetWrapper.class -org\springblade\desk\dashboard\pojo\dto\DsMainSaltAddQuantityDTO.class -org\springblade\desk\dashboard\excel\BsCraftAbilityExcel.class -org\springblade\desk\dashboard\pojo\entity\DsProModelEntity.class -org\springblade\desk\notice\wrapper\NoticeWrapper.class -org\springblade\desk\dashboard\controller\DsPartController.class -org\springblade\desk\dashboard\pojo\entity\BsPlatingEntity.class -org\springblade\desk\dashboard\controller\DsProcessMoldToolController.class -org\springblade\desk\dashboard\wrapper\DsPartWrapper.class -org\springblade\desk\dashboard\controller\DsCraftController.class -org\springblade\desk\dashboard\pojo\dto\BsCraftAbilityDTO.class -org\springblade\desk\dashboard\pojo\vo\DsProcessVO.class -org\springblade\desk\dashboard\excel\DsHourQuotaExcel.class -org\springblade\desk\dashboard\pojo\dto\DsSimilarPartsDTO.class -org\springblade\desk\dashboard\pojo\entity\DsProDetailEntity.class -org\springblade\desk\dashboard\service\impl\BsWorkCenterServiceImpl.class -org\springblade\desk\dashboard\wrapper\DsProcessMoldToolWrapper.class -org\springblade\desk\dashboard\pojo\entity\DsProcessEntity.class -org\springblade\desk\dashboard\wrapper\BsProcessGroupWrapper.class -org\springblade\desk\dashboard\pojo\entity\DsProcessMoldToolEntity.class -org\springblade\desk\dashboard\pojo\vo\BsProcessGroupVO.class -org\springblade\desk\dashboard\wrapper\DsSimilarPartsWrapper.class -org\springblade\desk\dashboard\controller\BsPlatingController.class -org\springblade\desk\dashboard\service\impl\DsPartServiceImpl.class -org\springblade\desk\dashboard\pojo\vo\DsProDetailVO.class -org\springblade\desk\dashboard\service\IDsSimilarPartsService.class -org\springblade\desk\dashboard\pojo\vo\DsProcessMeasuringToolVO.class -org\springblade\desk\dashboard\pojo\vo\BsPlatingVO.class -org\springblade\desk\dashboard\service\IBsPlatingTypeSmallService.class -org\springblade\desk\dashboard\service\IDsProcessMoldToolService.class -org\springblade\desk\dashboard\mapper\BsPlatingMapper.class -org\springblade\desk\dashboard\mapper\DsTaskBillMapper.class -org\springblade\desk\notice\service\impl\NoticeServiceImpl.class -org\springblade\desk\dashboard\pojo\dto\DsHourQuotaDetailDTO.class -org\springblade\desk\dashboard\pojo\vo\DsCraftVO.class -org\springblade\desk\dashboard\excel\DsMainSaltAddQuantityExcel.class -org\springblade\desk\dashboard\excel\DsSimilarPartsExcel.class -org\springblade\desk\dashboard\mapper\DsProcessMapper.class -org\springblade\desk\dashboard\pojo\entity\DsBomEntity.class -org\springblade\desk\dashboard\excel\DsCraftExcel.class -org\springblade\desk\dashboard\controller\DsSimilarPartsController.class -org\springblade\desk\dashboard\mapper\DsCraftMapper.class -org\springblade\desk\dashboard\wrapper\DsBomWrapper.class -org\springblade\desk\dashboard\service\IBsProcessGroupService.class -org\springblade\inspection\listener\StartListener.class -org\springblade\desk\dashboard\pojo\entity\BsProcessSetEntity.class -org\springblade\desk\dashboard\service\impl\DsSimilarPartsServiceImpl.class -org\springblade\desk\dashboard\service\impl\DsBatchPreservePlanServiceImpl.class -org\springblade\desk\dashboard\pojo\dto\DsPartDTO.class -org\springblade\desk\dashboard\pojo\entity\BsPlatingTypeSmallEntity.class -org\springblade\desk\dashboard\service\IDsSpecialProService.class -org\springblade\desk\dashboard\service\impl\DsProcessProjectServiceImpl.class -org\springblade\desk\dashboard\mapper\DsHourQuotaDetailMapper.class -org\springblade\desk\dashboard\pojo\vo\DsBatchWorkCenterSetVO.class -org\springblade\desk\dashboard\mapper\DsProcessMeasuringToolMapper.class -org\springblade\desk\dashboard\excel\DsProDetailExcel.class -org\springblade\desk\dashboard\wrapper\DsCraftWrapper.class -org\springblade\desk\dashboard\pojo\entity\DsBatchWorkCenterSetEntity.class -org\springblade\desk\dashboard\wrapper\BsPlatingTypeSmallWrapper.class -org\springblade\desk\dashboard\service\impl\BsProcessGroupServiceImpl.class -org\springblade\desk\dashboard\service\IDsTaskingService.class -org\springblade\desk\dashboard\mapper\BsTeamSetMapper.class -org\springblade\desk\dashboard\pojo\vo\DsTaskingVO.class -org\springblade\desk\dashboard\service\impl\DsBatchWorkCenterSetServiceImpl.class -org\springblade\desk\dashboard\pojo\vo\BsPlatingTypeSmallVO.class -org\springblade\desk\dashboard\pojo\vo\BsPlatingTypeVO.class -org\springblade\desk\dashboard\excel\DsProcessMeasuringToolExcel.class -org\springblade\desk\dashboard\pojo\vo\DsHourQuotaDetailVO.class -org\springblade\desk\dashboard\pojo\vo\BsTeamSetVO.class -org\springblade\desk\dashboard\excel\DsProcessProjectExcel.class -org\springblade\desk\dashboard\wrapper\DsHourQuotaWrapper.class -org\springblade\desk\dashboard\excel\DsBatchPreservePlanExcel.class -org\springblade\desk\dashboard\service\impl\DsBatchPreserveTaskServiceImpl.class -org\springblade\desk\dashboard\pojo\entity\DsHourQuotaEntity.class diff --git a/blade-service/blade-desk/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/blade-service/blade-desk/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index bc1845967..000000000 --- a/blade-service/blade-desk/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,289 +0,0 @@ -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\DsHourQuotaServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\DsBatchWorkCenterSetServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsPartSynthesisVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\BsPlatingWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\DsProcessServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\DsHourQuotaController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsBatchPreserveTaskVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\notice\service\INoticeService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\DsBatchPreserveTaskExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\DsCraftMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\BsWorkCenterEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IDsSpecialProService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\DsCraftExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\BsProcessTeamDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IDsPartService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\BsPlatingMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\DsBatchPreserveTaskWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\DsTaskBillMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\BsProcessSetDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\BsWorkCenterServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\DsMainSaltAddQuantityWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\DsMainSaltAddQuantityDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IDsBatchPreserveTaskService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\BsCraftAbilityServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsTaskBillVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\BsTeamSetServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\DsProcessMoldToolServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\BsPlatingTypeAssignExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\notice\service\ILeaveService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\DsSpecialProWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\BsProcessGroupVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\BsWorkCenterExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\DsSimilarPartsEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\DsCraftController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\BsProcessGroupWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\DsProDetailEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\DsProModelServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\BsPlatingTypeDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\DsBomServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\DsBatchWorkCenterSetExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\DsMainSaltAddQuantityServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\DsMainSaltAddQuantityMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\DsProcessProjectEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\BsProcessTeamExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IDsHourQuotaDetailService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IDsProcessMeasuringToolService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\BsPlatingTypeSmallWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\DsCraftServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\DsBatchPreserveTaskEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\constant\TaskingConstant.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsMainSaltAddQuantityVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\BsProcessTeamServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\DsBomWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\DsProcessMoldToolDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\BsTeamSetController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsProModelVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IDsSimilarPartsService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\DsSimilarPartsDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\BsProcessGroupServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\notice\mapper\NoticeMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsProcessProjectVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\DsSimilarPartsMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\BsPlatingTypeSmallController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsPartTreeVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IDsBatchWorkCenterSetService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\notice\service\impl\LeaveServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\BsProcessSetWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\BsProcessTeamVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\BsProcessSetServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\DsProcessMoldToolController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\DsProcessMeasuringToolExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\DsHourQuotaDetailWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\DsProModelEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\BsWorkCenterWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\DsTaskBillServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\DsTaskingWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\notice\controller\LeaveController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\DsSimilarPartsExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsBomVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsProcessMoldToolVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\DsBatchPreserveTaskController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\DsBatchWorkCenterSetMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\BsPlatingEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\DsProcessEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IBsTeamSetService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\DsHourQuotaDetailDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\DsBatchPreservePlanWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\DsProModelMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\DsProModelDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsTaskingVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\BsPlatingTypeSmallVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsBatchPreservePlanVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\inspection\listener\AfterListener.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\DsHourQuotaExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\DsBatchPreservePlanDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\DsSpecialProExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\DsProcessMoldToolExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\notice\entity\ProcessLeave.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\BsTeamSetMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\notice\controller\NoticeController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\DsSimilarPartsWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\inspection\listener\FirstListener.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IDsHourQuotaService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\DsBatchPreserveTaskMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IDsBomService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsSpecialProVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\DsProcessProjectWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\DsProcessMeasuringToolDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsProModelDetailListVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\DsProcessExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\DsHourQuotaDetailMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\BsPlatingTypeSmallEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\BsProcessTeamMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\BsCraftAbilityEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\DsProDetailServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\BsTeamSetExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\DsBomController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\BsProcessGroupController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\BsProcessTeamController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\BsPlatingTypeServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IDsProModelService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\BsCraftAbilityMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsHourQuotaDetailVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\BsTeamSetVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsProcessVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IDsCraftService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\DsTaskBillEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\DsProcessMeasuringToolWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\BsPlatingTypeSmallServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\DsProcessMoldToolMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\DsBatchWorkCenterSetDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\BsPlatingExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\DsMainSaltAddQuantityExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\BsProcessGroupMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\BsTeamSetEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\BsPlatingTypeAssignController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsCraftVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\BsProcessGroupDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\DsHourQuotaDetailServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\DsSimilarPartsServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IDsProcessService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\BsPlatingTypeSmallDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\DeskApplication.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\DsProcessProjectExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\BsPlatingTypeAssignMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\DsBatchPreservePlanEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\BsPlatingTypeSmallExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsCraftExpireVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\DsBatchPreservePlanController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\DsProcessMeasuringToolServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\BsPlatingTypeMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\BsPlatingServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\notice\feign\NoticeClient.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\notice\wrapper\NoticeWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IDsMainSaltAddQuantityService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\DsProcessWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\BsPlatingTypeExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\DsBatchPreserveTaskServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\DsSpecialProController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\DsProcessMoldToolEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\DsProModelExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\DsBatchWorkCenterSetEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\DsProcessMeasuringToolMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\BsCraftAbilityController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\DsBatchWorkCenterSetController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\BsPlatingTypeEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\BsPlatingTypeAssignEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\DsTaskingExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\DsTaskingMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\DsSpecialProMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsPartCodeAndPartNameVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\DsProModelWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IDsProDetailService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IBsPlatingTypeSmallService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\DsTaskBillController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\DsProcessProjectMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\DsBatchPreservePlanExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IDsTaskBillService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\BsTeamProcessVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\BsProcessSetMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsProcessSynthesisVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\DsProcessMeasuringToolController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IBsProcessGroupService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\BsPlatingTypeAssignWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\DsCraftDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\BsPlatingTypeAssignServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IBsProcessTeamService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\DsProcessProjectServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\DsCraftWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\DsProcessMoldToolWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\DsTaskBillExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\DsHourQuotaDetailController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\DsPartExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IDsProcessMoldToolService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\DsProDetailWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\BsPlatingTypeWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\inspection\listener\StartListener.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\DsTaskingController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\DsBomExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\DsSpecialProEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsModelAndDetailVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\DsProDetailDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\BsPlatingVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\BsTeamSetWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\inspection\listener\HandleListener.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\DsProModelController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\BsCraftAbilityExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\DsMainSaltAddQuantityController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\DsHourQuotaDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\BsWorkCenterVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\DsPartEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\DsTaskBillDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\notice\service\impl\NoticeServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsPartBomVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\DsSpecialProDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\DsPartWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\DsTaskingServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\BsPlatingTypeController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\BsProcessGroupExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IDsBatchPreservePlanService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\DsBomMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\notice\mapper\LeaveMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IDsTaskingService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\DsProDetailExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\BsProcessSetEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsProcessMeasuringToolVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\BsCraftAbilityVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\BsProcessSetExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\BsPlatingTypeAssignDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\BsWorkCenterController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\DsHourQuotaDetailEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\DsProDetailController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\DsPartDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\BsPlatingTypeListVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IBsPlatingTypeAssignService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IBsWorkCenterService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsProDetailVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\DsCraftEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\DsPartController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\DsBatchWorkCenterSetWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsPartVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\DsPartServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\BsWorkCenterDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IBsCraftAbilityService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\DsHourQuotaMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\BsProcessSetVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\DsSimilarPartsController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\DsProcessDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\DsProcessProjectController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\BsPlatingTypeVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\BsProcessTeamEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\DsSpecialProServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\BsTeamSetEntityVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\DsHourQuotaEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\BsPlatingTypeSmallMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\DsProDetailMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\BsCraftAbilityDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\DsProcessController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\DsBomEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\BsWorkCenterMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\DsMainSaltAddQuantityEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\BsTeamSetDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\DsBomDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IDsProcessProjectService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\impl\DsBatchPreservePlanServiceImpl.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\DsProcessProjectDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\DsBatchPreserveTaskDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\BsProcessTeamWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\BsCraftAbilityWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\BsPlatingDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\DsProcessMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\dto\DsTaskingDTO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsBatchWorkCenterSetVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\DsBatchPreservePlanMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\BsProcessGroupEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsHourQuotaVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\DsSimilarPartsVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IBsPlatingService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IBsProcessSetService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\DsTaskingEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\mapper\DsPartMapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\DsHourQuotaWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\wrapper\DsTaskBillWrapper.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\BsPlatingController.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\entity\DsProcessMeasuringToolEntity.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\pojo\vo\BsPlatingTypeAssignVO.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\excel\DsHourQuotaDetailExcel.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\service\IBsPlatingTypeService.java -D:\ideaworkspeate\jonhon-mes-svr\blade-service\blade-desk\src\main\java\org\springblade\desk\dashboard\controller\BsProcessSetController.java