From a2732e31c1e86235661819ecf8d826b1e82fcee5 Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Tue, 24 Mar 2026 15:18:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resource/endpoint/OssEndpoint.java | 33 ++++++++++++++++++- .../basic/pojo/entity/CoatingThickness.java | 5 +-- .../desk/basic/pojo/entity/MaterialQuota.java | 9 ++--- .../desk/quality/pojo/dto/SlotDTO.java | 13 ++++++++ .../pojo/entity/QualityGradeEntity.java | 5 ++- .../controller/CraftAbilityController.java | 13 ++++++++ .../basic/excel/CoatingThicknessExcel.java | 5 +-- .../desk/basic/excel/MaterialQuotaExcel.java | 8 ++--- .../basic/mapper/MaterialQuotaMapper.java | 3 +- .../basic/service/IMaterialQuotaService.java | 3 +- .../impl/MaterialQuotaServiceImpl.java | 3 +- .../impl/PlateGoodsRecordServiceImpl.java | 5 +-- .../controller/InspectionTaskController.java | 17 +++++++--- .../impl/InspectionTaskServiceImpl.java | 2 +- .../controller/QualityGradeController.java | 11 +++++-- .../system/service/impl/DeptServiceImpl.java | 16 +++++++-- 16 files changed, 121 insertions(+), 30 deletions(-) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/SlotDTO.java diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/OssEndpoint.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/OssEndpoint.java index 339e1f59..5c9f4de4 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/OssEndpoint.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/OssEndpoint.java @@ -25,6 +25,9 @@ */ package org.springblade.resource.endpoint; +import io.minio.MinioClient; +import io.minio.PutObjectArgs; +import io.minio.errors.*; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import lombok.AllArgsConstructor; @@ -45,6 +48,10 @@ import org.springblade.resource.service.IAttachService; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; + /** * 对象存储端点 * @@ -59,7 +66,7 @@ import org.springframework.web.multipart.MultipartFile; public class OssEndpoint { private static final String TENANT_ID = "000000"; - private static final String CODE = "minio"; + private static final String CODE = "myminio"; /** * 对象存储构建类 @@ -194,6 +201,30 @@ public class OssEndpoint { return R.data(bladeFile); } + @PostMapping("/put-file-attachNew") + public String attachNew(@RequestParam MultipartFile file) throws IOException, ServerException, InsufficientDataException, ErrorResponseException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException { + MinioClient minioClient = MinioClient.builder() + .endpoint("http://49.232.74.228:9000") + .credentials("ozUrsZCh4SVxIkfXAyp4", "uuk7LoVscPwPlB6jQUcLHNAdpupNavA1DDiI3n6r") + .build(); + + // 2. 拼接文件完整路径（如upload/test.txt） + String fileName = "upload/" + file.getOriginalFilename(); + + // 3. 上传文件 + minioClient.putObject( + PutObjectArgs.builder() + .bucket("bladex") + .object(fileName) + .stream(file.getInputStream(), file.getSize(), -1) + .contentType(file.getContentType()) + .build() + ); + + // 4. 返回文件访问路径 + return "http://49.232.74.228:9000" + "/" + "bladex" + "/" + fileName; + } + /** * 上传文件并保存至附件表 * diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java index 3c65478a..095543bf 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java @@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import java.io.Serial; +import java.math.BigDecimal; import java.util.List; /** @@ -71,7 +72,7 @@ public class CoatingThickness extends BaseEntity { * 质量等级 */ @Schema(description = "质量等级") - private Integer levelNum; + private String levelNum; /** * 是否以21E8-210开头 */ @@ -81,7 +82,7 @@ public class CoatingThickness extends BaseEntity { * 厚度 */ @Schema(description = "厚度") - private Long thickness; + private BigDecimal thickness; /** * 排序 */ diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java index 5b8fc32b..64fe8041 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java @@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import java.io.Serial; +import java.math.BigDecimal; /** * [物料定额] 实体类 @@ -82,22 +83,22 @@ public class MaterialQuota extends BaseEntity { * 镀层厚度 */ @Schema(description = "镀层厚度") - private Long thickness; + private BigDecimal thickness; /** * 定额 */ @Schema(description = "定额") - private Long quota; + private BigDecimal quota; /** * 小批量定额 */ @Schema(description = "小批量定额") - private Long smallBatQuota; + private BigDecimal smallBatQuota; /** * 大批量定额 */ @Schema(description = "大批量定额") - private Long bigBatQuota; + private BigDecimal bigBatQuota; /** * 排序 */ diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/SlotDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/SlotDTO.java new file mode 100644 index 00000000..f8559c99 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/SlotDTO.java @@ -0,0 +1,13 @@ +package org.springblade.desk.quality.pojo.dto; + +import lombok.Data; +import org.springblade.desk.produce.pojo.entity.MesRbFilePreserveSlotEntity; + +import java.util.List; + +@Data +public class SlotDTO { + private List submitList; + private Long rfpId; + List deleteIds; +} diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/QualityGradeEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/QualityGradeEntity.java index 77318b1b..a1604d75 100644 --- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/QualityGradeEntity.java +++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/QualityGradeEntity.java @@ -65,7 +65,10 @@ public class QualityGradeEntity extends BaseEntity { private String typeNames; +// @TableField(exist = false) +// private List types; @TableField(exist = false) - private List types; + private String types; + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java index 5f628d03..cab54266 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java @@ -172,6 +172,13 @@ public class CraftAbilityController extends BladeController { @ApiLog("工艺能力新增") @Operation(summary = "新增", description = "传入CraftAbility") public R save(@Valid @RequestBody CraftAbilityEntity craftAbility) { + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("CA_CODE", craftAbility.getCaCode()); + if(craftAbilityService.count(queryWrapper) > 0){ + return R.fail("编码已存在"); + } + return R.status(craftAbilityService.save(craftAbility)); } @@ -183,6 +190,12 @@ public class CraftAbilityController extends BladeController { @ApiLog("工艺能力修改") @Operation(summary = "修改", description = "传入CraftAbility") public R update(@Valid @RequestBody CraftAbilityEntity craftAbility) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("CA_CODE", craftAbility.getCaCode()); + queryWrapper.ne("ID", craftAbility.getId()); + if(craftAbilityService.count(queryWrapper) > 0){ + return R.fail("编码已存在"); + } return R.status(craftAbilityService.updateById(craftAbility)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/CoatingThicknessExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/CoatingThicknessExcel.java index 7063508c..23de3af2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/CoatingThicknessExcel.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/CoatingThicknessExcel.java @@ -12,6 +12,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; /** @@ -46,7 +47,7 @@ public class CoatingThicknessExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("质量等级") - private Integer levelNum; + private String levelNum; /** * 是否以21E8-210开头 */ @@ -62,7 +63,7 @@ public class CoatingThicknessExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("厚度") - private Long thickness; + private BigDecimal thickness; /** * 排序 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/MaterialQuotaExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/MaterialQuotaExcel.java index 3f7110e9..78f38585 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/MaterialQuotaExcel.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/MaterialQuotaExcel.java @@ -54,25 +54,25 @@ public class MaterialQuotaExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("镀层厚度") - private Long thickness; + private BigDecimal thickness; /** * 定额 */ @ColumnWidth(20) @ExcelProperty("定额") - private Long quota; + private BigDecimal quota; /** * 小批量定额 */ @ColumnWidth(20) @ExcelProperty("小批量定额") - private Long smallBatQuota; + private BigDecimal smallBatQuota; /** * 大批量定额 */ @ColumnWidth(20) @ExcelProperty("大批量定额") - private Long bigBatQuota; + private BigDecimal bigBatQuota; /** * 排序 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.java index b87f580a..db7f5a27 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.java @@ -11,6 +11,7 @@ import org.springblade.desk.basic.excel.MaterialQuotaExcel; import org.springblade.desk.basic.pojo.entity.MaterialQuota; import org.springblade.desk.basic.pojo.vo.MaterialQuotaVO; +import java.math.BigDecimal; import java.util.List; /** @@ -44,5 +45,5 @@ public interface MaterialQuotaMapper extends BaseMapper { * @param dsProcessId * @return */ - MaterialQuota queryMaterialQuota(@Param("thickness")Long thickness,@Param("dsProcessId") Long dsProcessId); + MaterialQuota queryMaterialQuota(@Param("thickness") BigDecimal thickness, @Param("dsProcessId") Long dsProcessId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IMaterialQuotaService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IMaterialQuotaService.java index 103bc4ab..782113e3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IMaterialQuotaService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IMaterialQuotaService.java @@ -10,6 +10,7 @@ import org.springblade.desk.basic.excel.MaterialQuotaExcel; import org.springblade.desk.basic.pojo.entity.MaterialQuota; import org.springblade.desk.basic.pojo.vo.MaterialQuotaVO; +import java.math.BigDecimal; import java.util.List; /** @@ -48,5 +49,5 @@ public interface IMaterialQuotaService extends BaseService { * @param dsProcessId * @return */ - MaterialQuota queryMaterialQuota(Long thickness, Long dsProcessId); + MaterialQuota queryMaterialQuota(BigDecimal thickness, Long dsProcessId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/MaterialQuotaServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/MaterialQuotaServiceImpl.java index 4d24ecec..5c1ed396 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/MaterialQuotaServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/MaterialQuotaServiceImpl.java @@ -20,6 +20,7 @@ import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.List; /** @@ -66,7 +67,7 @@ public class MaterialQuotaServiceImpl extends BaseServiceImpl submitList = JSONArray.parseArray(data.get("submitList").toString(), MesRbFilePreserveSlotEntity.class); + List submitList = dto.getSubmitList(); + +// List deleteIds = JSONArray.parseArray(data.get("deleteIds").toString(), Long.class); + List deleteIds = dto.getDeleteIds(); - List submitList = JSONArray.parseArray(data.get("submitList").toString(), MesRbFilePreserveSlotEntity.class); - List deleteIds = JSONArray.parseArray(data.get("deleteIds").toString(), Long.class); BladeUser curUserInfo = AuthUtil.getUser(); // PfUserInfo curUserInfo = (PfUserInfo) ControllerUtils.getCurUserInfo(request); - Long rfpId = data.getLong("rfpId"); - service.saveOrEditMes(submitList, deleteIds, curUserInfo, rfpId); +// Long rfpId = data.getLong("rfpId"); + Long rfpId = dto.getRfpId(); + + service.saveOrEditMes(submitList, deleteIds, curUserInfo, rfpId); return R.status(true); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java index bf05251c..ac472b28 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java @@ -599,7 +599,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl0 && workPlan.getReceiveMan() != null ) { R user = userClient.userInfoById(workPlan.getReceiveMan()); - if(null != user.getData() && null != user.getData().getAccount()){ + if(null != user && null != user.getData() && null != user.getData().getAccount()){ // workPlan.setCreateMan(workPlan.getReceiveMan().getUserName()); MakeRec prMakeRec = workPlanMapper.getByWpId(workPlan.getId()); if (prMakeRec != null) { diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/QualityGradeController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/QualityGradeController.java index 310287fc..80cd06ba 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/QualityGradeController.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/QualityGradeController.java @@ -83,7 +83,7 @@ public class QualityGradeController extends BladeController { public R detail(QualityGradeEntity QualityGrade) { QualityGradeEntity detail = qualityGradeService.getOne(Condition.getQueryWrapper(QualityGrade)); List result = Arrays.asList(detail.getType().split(",")); - detail.setTypes(result); +// detail.setTypes(result); return R.data(QualityGradeWrapper.build().entityVO(detail)); } /** @@ -117,7 +117,11 @@ public class QualityGradeController extends BladeController { public R save(@Valid @RequestBody QualityGradeEntity qualityGrade) { List names = new ArrayList<>(); - List types = qualityGrade.getTypes(); +// List types = qualityGrade.getTypes(); + + List types = Func.toStrList(qualityGrade.getTypes()); + + for(String type: types){ if("1".equals( type)){ names.add("军品"); @@ -150,7 +154,8 @@ public class QualityGradeController extends BladeController { public R update(@Valid @RequestBody QualityGradeEntity qualityGrade) { List names = new ArrayList<>(); - List types = qualityGrade.getTypes(); +// List types = qualityGrade.getTypes(); + List types = Func.toStrList(qualityGrade.getTypes()); for(String type: types){ if("1".equals( type)){ names.add("军品"); diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java index 464f3f9f..b6c711ba 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java @@ -178,6 +178,11 @@ public class DeptServiceImpl extends ServiceImpl implements ID Map> noChooseMap = new HashMap<>(); Map> chooseMap = new HashMap<>(); + //工艺人员 + List roleIds = new ArrayList<>(); + roleIds.add("2032373544077012993"); + roleIds.add("2032373858255548418"); + BasicClazz detail = workCenterClient.getClazzById(clazzId).getData(); if(detail != null){ String teamId = detail.getTeamMemberId(); @@ -185,10 +190,12 @@ public class DeptServiceImpl extends ServiceImpl implements ID List ids = Func.toLongList(teamId); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.notIn("id",ids); + queryWrapper.in("role_id",roleIds); // queryWrapper.eq("dept_id",parentId); teamUnSelects = userService.list(queryWrapper); }else{ QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("role_id",roleIds); // queryWrapper.eq("dept_id",parentId); teamUnSelects = userService.list(queryWrapper); } @@ -198,6 +205,7 @@ public class DeptServiceImpl extends ServiceImpl implements ID List ids = Func.toLongList(teamId); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("id",ids); + queryWrapper.in("role_id",roleIds); // queryWrapper.eq("dept_id",parentId); teamSelects = userService.list(queryWrapper); @@ -205,10 +213,14 @@ public class DeptServiceImpl extends ServiceImpl implements ID if(teamUnSelects != null && teamUnSelects.size() > 0){ - noChooseMap = teamUnSelects.stream().collect(Collectors.groupingBy(User::getDeptId)); + noChooseMap = teamUnSelects.stream() + .filter(user -> user.getDeptId() != null) + .collect(Collectors.groupingBy(User::getDeptId)); } if(teamSelects != null && teamSelects.size() > 0){ - chooseMap = teamSelects.stream().collect(Collectors.groupingBy(User::getDeptId)); + chooseMap = teamSelects.stream() + .filter(user -> user.getDeptId() != null) + .collect(Collectors.groupingBy(User::getDeptId)); } }