update qms不合格评审改检测类型、PDA提交检测结果接口优化

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcUnqualifiedReview.java

@@ -46,9 +46,9 @@ public class QcUnqualifiedReview extends TenantEntity {
     private String inspectionNo;
 
     /**
-     * 检测类型
+     * 检测类型ID
      */
-    private String inspectionType;
+    private Long inspectionType;
 
     /**
      * 生产日期
@@ -141,5 +141,9 @@ public class QcUnqualifiedReview extends TenantEntity {
     @TableLogic
     private String delFlag;
 
-
+    /**
+     * 检测类型名称
+     */
+    @TableField(exist = false)
+    private String typeName;
 }

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcUnqualifiedReviewBo.java

@@ -45,9 +45,9 @@ public class QcUnqualifiedReviewBo extends BaseEntity {
     private String inspectionNo;
 
     /**
-     * 检测类型
+     * 检测类型ID
      */
-    private String inspectionType;
+    private Long inspectionType;
 
     /**
      * 生产日期
@@ -134,5 +134,8 @@ public class QcUnqualifiedReviewBo extends BaseEntity {
      */
     private String remark;
 
-
+    /**
+     * 检测类型名称
+     */
+    private String typeName;
 }

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcUnqualifiedReviewVo.java

@@ -57,10 +57,10 @@ public class QcUnqualifiedReviewVo implements Serializable {
     private String inspectionNo;
 
     /**
-     * 检测类型
+     * 检测类型ID
      */
     @ExcelProperty(value = "检测类型")
-    private String inspectionType;
+    private Long inspectionType;
 
     /**
      * 生产日期
@@ -165,5 +165,8 @@ public class QcUnqualifiedReviewVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
-
+    /**
+     * 检测类型名称
+     */
+    private String typeName;
 }

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcPDAServiceImpl.java

@@ -208,9 +208,9 @@ public class QcPDAServiceImpl implements IQcPDAService {
         // 更新主记录
         if (isUnqualified){
             bo.setQualifiedQty(new BigDecimal(0));
-            bo.setUnqualifiedQty(main.getQualifiedQty());
+            bo.setUnqualifiedQty(main.getInspectionQty());
         } else {
-            bo.setQualifiedQty(main.getQualifiedQty());
+            bo.setQualifiedQty(main.getInspectionQty());
             bo.setUnqualifiedQty(new BigDecimal(0));
         }
         bo.setInspector(username);
@@ -223,13 +223,14 @@ public class QcPDAServiceImpl implements IQcPDAService {
             String unqualifiedReviewNo = remoteCodeRuleService.selectCodeRuleCode("4");
             // 构建一个新的不合格评审业务对象
             QcUnqualifiedReviewBo reviewBo = new QcUnqualifiedReviewBo();
+            // 关联原检验单号，质检单号
+            BeanUtils.copyProperties(bo, reviewBo);
             // 设置不合格检测单号
             reviewBo.setUnqualifiedReviewNo(unqualifiedReviewNo);
-            // 关联原检验单号，质检单号
+            String inspectionNo = main.getInspectionNo();
-            reviewBo.setInspectionNo(main.getInspectionNo());
+            reviewBo.setInspectionNo(inspectionNo);
-            BeanUtils.copyProperties(bo, reviewBo);
             // 复制检验类型信息
-//            reviewBo.setInspectionType(main.getInspectionType());
+            reviewBo.setInspectionType(main.getInspectionType());
             // 关联生产工单号
             reviewBo.setWorkOrderNo(main.getProductionOrder());
             // 复制工序名称
@@ -251,39 +252,42 @@ public class QcPDAServiceImpl implements IQcPDAService {
             for (QcInspectionResultBo resultBo : bo.getResults()) {
                 if ("1".equals(resultBo.getDetectResult())) {//检测结果（0合格，1不合格，2未判定）
                     // 创建一条不合格明细记录对象
+                    Long resultId = resultBo.getResultId();
+                    // 根据结果ID查询已有的结果详情
+                    QcInspectionResultVo existingResult = qcInspectionResultService.queryById(resultId);
                     QcUnqualifiedRecordBo recordBo = new QcUnqualifiedRecordBo();
                     // 关联所属的评审ID
                     recordBo.setReviewId(reviewBo.getReviewId());
-                    BeanUtils.copyProperties(resultBo, recordBo);
+//                    BeanUtils.copyProperties(resultBo, recordBo);
                     // 设置项目编码
-                    recordBo.setItemCode(resultBo.getItemCode());
+                    recordBo.setItemCode(existingResult.getItemCode());
                     // 设置项目名称
-                    recordBo.setItemName(resultBo.getItemName());
+                    recordBo.setItemName(existingResult.getItemName());
                     // 设置检验位置
-                    recordBo.setInspectionPosition(resultBo.getInspectionPosition());
+                    recordBo.setInspectionPosition(existingResult.getInspectionPosition());
                     // 转换分类名称为Long类型并设置
-                    recordBo.setCategoryName(resultBo.getCategoryName());
+                    recordBo.setCategoryName(existingResult.getCategoryName());
                     // 设置类型ID
-                    recordBo.setTypeId(resultBo.getTypeId());
+                    recordBo.setTypeId(existingResult.getTypeId());
                     // recordBo.setInspectionMethod(); // 如果需要可补充检验方法字段
                     // 设置检测类型
-                    recordBo.setDetectType(resultBo.getDetectType());
+                    recordBo.setDetectType(existingResult.getDetectType());
                     // 设置检测结果（是否合格）
-                    recordBo.setDetectResult(resultBo.getDetectResult());
+                    recordBo.setDetectResult(existingResult.getDetectResult());
                     // 设置检测的具体数值
-                    recordBo.setDetectValue(resultBo.getDetectValue());
+                    recordBo.setDetectValue(existingResult.getDetectValue());
                     // 设置上限标准值
-                    recordBo.setUpperLimit(resultBo.getUpperLimit());
+                    recordBo.setUpperLimit(existingResult.getUpperLimit());
                     // 设置下限标准值
-                    recordBo.setLowerLimit(resultBo.getLowerLimit());
+                    recordBo.setLowerLimit(existingResult.getLowerLimit());
                     // 调整规格名称作为特殊检验值存储
-                    recordBo.setSpecInspectionValue(resultBo.getSpecName()); // Adjust
+                    recordBo.setSpecInspectionValue(existingResult.getSpecName()); // Adjust
                     // 设置规格上限
-                    recordBo.setSpecUpper(resultBo.getSpecUpper());
+                    recordBo.setSpecUpper(existingResult.getSpecUpper());
                     // 设置规格下限
-                    recordBo.setSpecLower(resultBo.getSpecLower());
+                    recordBo.setSpecLower(existingResult.getSpecLower());
                     // 设置相关描述信息
-                    recordBo.setDescription(resultBo.getDescription());
+                    recordBo.setDescription(existingResult.getDescription());
 
                     // 插入不合格明细记录到数据库
                     qcUnqualifiedRecordService.insertByBo(recordBo);

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcUnqualifiedReviewServiceImpl.java

@@ -9,6 +9,9 @@ import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.qms.domain.QcInspectionMain;
+import org.dromara.qms.domain.QcInspectionTemplate;
+import org.dromara.qms.domain.QcInspectionType;
 import org.springframework.stereotype.Service;
 import org.dromara.qms.domain.bo.QcUnqualifiedReviewBo;
 import org.dromara.qms.domain.vo.QcUnqualifiedReviewVo;
@@ -39,7 +42,7 @@ public class QcUnqualifiedReviewServiceImpl implements IQcUnqualifiedReviewServi
      * @return 不合格品待评审
      */
     @Override
-    public QcUnqualifiedReviewVo queryById(Long reviewId){
+    public QcUnqualifiedReviewVo queryById(Long reviewId) {
         return baseMapper.selectVoById(reviewId);
     }
 
@@ -72,32 +75,34 @@ public class QcUnqualifiedReviewServiceImpl implements IQcUnqualifiedReviewServi
     private MPJLambdaWrapper<QcUnqualifiedReview> buildQueryWrapper(QcUnqualifiedReviewBo bo) {
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<QcUnqualifiedReview> lqw = JoinWrappers.lambda(QcUnqualifiedReview.class)
-        .selectAll(QcUnqualifiedReview.class)
+            .selectAll(QcUnqualifiedReview.class)
-        .eq(bo.getReviewId() != null, QcUnqualifiedReview::getReviewId, bo.getReviewId())
+            .select(QcInspectionType::getTypeName)
-        .eq(bo.getUnqualifiedReviewNo() != null, QcUnqualifiedReview::getUnqualifiedReviewNo, bo.getUnqualifiedReviewNo())
+            .leftJoin(QcInspectionType.class, QcInspectionType::getTypeId, QcInspectionMain::getInspectionType)
+            .eq(bo.getReviewId() != null, QcUnqualifiedReview::getReviewId, bo.getReviewId())
+            .eq(bo.getUnqualifiedReviewNo() != null, QcUnqualifiedReview::getUnqualifiedReviewNo, bo.getUnqualifiedReviewNo())
 //        .eq(bo.getReviewResult() != null, QcUnqualifiedReview::getReviewResult, bo.getReviewResult())
             .eq(StringUtils.isNotBlank(bo.getReviewResult()), QcUnqualifiedReview::getReviewResult, bo.getReviewResult())
-        .eq(StringUtils.isNotBlank(bo.getInspectionNo()), QcUnqualifiedReview::getInspectionNo, bo.getInspectionNo())
+            .eq(StringUtils.isNotBlank(bo.getInspectionNo()), QcUnqualifiedReview::getInspectionNo, bo.getInspectionNo())
 //        .eq(bo.getInspectionType() != null, QcUnqualifiedReview::getInspectionType, bo.getInspectionType())
-            .eq(StringUtils.isNotBlank(bo.getInspectionType()), QcUnqualifiedReview::getInspectionType, bo.getInspectionType())
+//            .eq(StringUtils.isNotBlank(bo.getInspectionType()), QcUnqualifiedReview::getInspectionType, bo.getInspectionType())
-        .eq(bo.getProductionDate() != null, QcUnqualifiedReview::getProductionDate, bo.getProductionDate())
+            .eq(bo.getProductionDate() != null, QcUnqualifiedReview::getProductionDate, bo.getProductionDate())
-        .eq(StringUtils.isNotBlank(bo.getWorkOrderNo()), QcUnqualifiedReview::getWorkOrderNo, bo.getWorkOrderNo())
+            .eq(StringUtils.isNotBlank(bo.getWorkOrderNo()), QcUnqualifiedReview::getWorkOrderNo, bo.getWorkOrderNo())
-        .like(StringUtils.isNotBlank(bo.getProcessName()), QcUnqualifiedReview::getProcessName, bo.getProcessName())
+            .like(StringUtils.isNotBlank(bo.getProcessName()), QcUnqualifiedReview::getProcessName, bo.getProcessName())
-        .like(StringUtils.isNotBlank(bo.getMaterialName()), QcUnqualifiedReview::getMaterialName, bo.getMaterialName())
+            .like(StringUtils.isNotBlank(bo.getMaterialName()), QcUnqualifiedReview::getMaterialName, bo.getMaterialName())
-        .eq(StringUtils.isNotBlank(bo.getMaterialCode()), QcUnqualifiedReview::getMaterialCode, bo.getMaterialCode())
+            .eq(StringUtils.isNotBlank(bo.getMaterialCode()), QcUnqualifiedReview::getMaterialCode, bo.getMaterialCode())
-        .eq(StringUtils.isNotBlank(bo.getMaterialSpec()), QcUnqualifiedReview::getMaterialSpec, bo.getMaterialSpec())
+            .eq(StringUtils.isNotBlank(bo.getMaterialSpec()), QcUnqualifiedReview::getMaterialSpec, bo.getMaterialSpec())
-        .like(StringUtils.isNotBlank(bo.getSupplierName()), QcUnqualifiedReview::getSupplierName, bo.getSupplierName())
+            .like(StringUtils.isNotBlank(bo.getSupplierName()), QcUnqualifiedReview::getSupplierName, bo.getSupplierName())
-        .eq(StringUtils.isNotBlank(bo.getSupplierCode()), QcUnqualifiedReview::getSupplierCode, bo.getSupplierCode())
+            .eq(StringUtils.isNotBlank(bo.getSupplierCode()), QcUnqualifiedReview::getSupplierCode, bo.getSupplierCode())
-        .eq(bo.getInspectionQty() != null, QcUnqualifiedReview::getInspectionQty, bo.getInspectionQty())
+            .eq(bo.getInspectionQty() != null, QcUnqualifiedReview::getInspectionQty, bo.getInspectionQty())
-        .eq(StringUtils.isNotBlank(bo.getBatchNo()), QcUnqualifiedReview::getBatchNo, bo.getBatchNo())
+            .eq(StringUtils.isNotBlank(bo.getBatchNo()), QcUnqualifiedReview::getBatchNo, bo.getBatchNo())
-        .eq(StringUtils.isNotBlank(bo.getInspector()), QcUnqualifiedReview::getInspector, bo.getInspector())
+            .eq(StringUtils.isNotBlank(bo.getInspector()), QcUnqualifiedReview::getInspector, bo.getInspector())
-        .eq(bo.getInspectorId() != null, QcUnqualifiedReview::getInspectorId, bo.getInspectorId())
+            .eq(bo.getInspectorId() != null, QcUnqualifiedReview::getInspectorId, bo.getInspectorId())
-        .eq(StringUtils.isNotBlank(bo.getReviewer()), QcUnqualifiedReview::getReviewer, bo.getReviewer())
+            .eq(StringUtils.isNotBlank(bo.getReviewer()), QcUnqualifiedReview::getReviewer, bo.getReviewer())
-        .eq(bo.getReviewerId() != null, QcUnqualifiedReview::getReviewerId, bo.getReviewerId())
+            .eq(bo.getReviewerId() != null, QcUnqualifiedReview::getReviewerId, bo.getReviewerId())
 //        .eq(bo.getReviewTime() != null, QcUnqualifiedReview::getReviewTime, bo.getReviewTime())
-                .eq(bo.getReviewStartTime() != null, QcUnqualifiedReview::getReviewStartTime, bo.getReviewStartTime())
+            .eq(bo.getReviewStartTime() != null, QcUnqualifiedReview::getReviewStartTime, bo.getReviewStartTime())
-                .eq(bo.getReviewEndTime() != null, QcUnqualifiedReview::getReviewEndTime, bo.getReviewEndTime())
+            .eq(bo.getReviewEndTime() != null, QcUnqualifiedReview::getReviewEndTime, bo.getReviewEndTime())
-        .orderByDesc(QcUnqualifiedReview::getCreateTime);
+            .orderByDesc(QcUnqualifiedReview::getCreateTime);
 
         Object beginReviewStartTime = params.get("beginReviewStartTime");
         Object endReviewStartTime = params.get("endReviewStartTime");
@@ -144,7 +149,7 @@ public class QcUnqualifiedReviewServiceImpl implements IQcUnqualifiedReviewServi
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(QcUnqualifiedReview entity){
+    private void validEntityBeforeSave(QcUnqualifiedReview entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -157,7 +162,7 @@ public class QcUnqualifiedReviewServiceImpl implements IQcUnqualifiedReviewServi
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteByIds(ids) > 0;