基础数据修改

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;
+    }
+
     /**
      * 上传文件并保存至附件表
      *

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;
 	/**
 	 * 排序
 	 */

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;
 	/**
 	 * 排序
 	 */

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<MesRbFilePreserveSlotEntity> submitList;
+    private Long rfpId;
+    List<Long> deleteIds;
+}

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<String> types;
 	@TableField(exist = false)
-	private List<String> types;
+	private String types;
+
 
 }

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<CraftAbilityEntity> 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<CraftAbilityEntity> 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));
 	}
 

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;
 	/**
 	 * 排序
 	 */

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;
 	/**
 	 * 排序
 	 */

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<MaterialQuota> {
 	 * @param dsProcessId
 	 * @return
 	 */
-	MaterialQuota queryMaterialQuota(@Param("thickness")Long thickness,@Param("dsProcessId") Long dsProcessId);
+	MaterialQuota queryMaterialQuota(@Param("thickness") BigDecimal thickness, @Param("dsProcessId") Long dsProcessId);
 }

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<MaterialQuota> {
 	 * @param dsProcessId
 	 * @return
 	 */
-	MaterialQuota queryMaterialQuota(Long thickness, Long dsProcessId);
+	MaterialQuota queryMaterialQuota(BigDecimal thickness, Long dsProcessId);
 }

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<MaterialQuotaMappe
 	 * @return
 	 */
 	@Override
-	public	MaterialQuota queryMaterialQuota(Long thickness, Long dsProcessId){
+	public	MaterialQuota queryMaterialQuota(BigDecimal thickness, Long dsProcessId){
 		return baseMapper.queryMaterialQuota(thickness,dsProcessId);
 	}
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java

@@ -226,7 +226,7 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl<PlateGoodsRecor
                     }
 					CoatingThickness CoatingThickness=coatingThicknessService.queryCoatingThickness(matCode,productIdent,start_f21e8);
 					//镀层厚度
-					Long thickness=CoatingThickness.getThickness();
+					BigDecimal thickness=CoatingThickness.getThickness();
 					//未找到镀层厚度
 					if(Func.isEmpty(thickness)){
 						//将订单状态标记为数据异常，记录异常原因，并退出
@@ -258,7 +258,8 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl<PlateGoodsRecor
 									return false;
 								}
 								//定额
-								Long quota=materialQuota.getQuota();
+								BigDecimal quotanew=materialQuota.getQuota();
+								double quota = quotanew.doubleValue();
 								//未找到定额
 								if(Func.isEmpty(quota)){
 									this.updateYieldOrder(yieldOrder);

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java

@@ -52,6 +52,7 @@ import org.springblade.desk.produce.service.IWorkPlanService;
 import org.springblade.desk.quality.constant.InspectionTaskConst;
 import org.springblade.desk.quality.constant.QAModuleConst;
 import org.springblade.desk.quality.excel.InspectionTaskExcel;
+import org.springblade.desk.quality.pojo.dto.SlotDTO;
 import org.springblade.desk.quality.pojo.entity.InspectionTask;
 import org.springblade.desk.quality.pojo.entity.ReviewSheet;
 import org.springblade.desk.quality.pojo.entity.WorkPlanItem;
@@ -344,14 +345,20 @@ public class InspectionTaskController extends BladeController {
 
     @Operation(summary = "新增或修改热表电子档案维护-槽子明细及对应的明细")
     @PostMapping(value = "/saveOrEdit")
-    public R saveOrEdit(@RequestBody JSONObject data, HttpServletRequest request) throws Exception {
+    public R saveOrEdit(@RequestBody SlotDTO dto) throws Exception {
+
+//        List<MesRbFilePreserveSlotEntity> submitList = JSONArray.parseArray(data.get("submitList").toString(), MesRbFilePreserveSlotEntity.class);
+        List<MesRbFilePreserveSlotEntity> submitList = dto.getSubmitList();
+
+//        List<Long> deleteIds = JSONArray.parseArray(data.get("deleteIds").toString(), Long.class);
+        List<Long> deleteIds = dto.getDeleteIds();
 
-        List<MesRbFilePreserveSlotEntity> submitList = JSONArray.parseArray(data.get("submitList").toString(), MesRbFilePreserveSlotEntity.class);
-        List<Long> 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);
     }
 

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java

@@ -599,7 +599,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
         if (null != workPlan.getOcId() && workPlan.getOcId() >0 && workPlan.getReceiveMan() != null ) {
 
             R<User> 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) {

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<QualityGradeVO> detail(QualityGradeEntity QualityGrade) {
 		QualityGradeEntity detail = qualityGradeService.getOne(Condition.getQueryWrapper(QualityGrade));
 		List<String> 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<String> names = new ArrayList<>();
-		List<String> types = qualityGrade.getTypes();
+//		List<String> types = qualityGrade.getTypes();
+
+		List<String> 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<String> names = new ArrayList<>();
-		List<String> types = qualityGrade.getTypes();
+//		List<String> types = qualityGrade.getTypes();
+		List<String> types = Func.toStrList(qualityGrade.getTypes());
 		for(String type: types){
 			if("1".equals( type)){
 				names.add("军品");

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java

@@ -178,6 +178,11 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 		Map<String, List<User>> noChooseMap = new HashMap<>();
 		Map<String, List<User>> chooseMap = new HashMap<>();
 
+		//工艺人员
+		List<String> 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<DeptMapper, Dept> implements ID
 				List<Long> ids = Func.toLongList(teamId);
 				QueryWrapper<User> queryWrapper = new QueryWrapper<>();
 				queryWrapper.notIn("id",ids);
+				queryWrapper.in("role_id",roleIds);
 //				queryWrapper.eq("dept_id",parentId);
 				teamUnSelects = userService.list(queryWrapper);
 			}else{
 				QueryWrapper<User> 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<DeptMapper, Dept> implements ID
 				List<Long> ids = Func.toLongList(teamId);
 				QueryWrapper<User> 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<DeptMapper, Dept> 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));
 			}
 		}