update qmsPDA分页查询质检任务、质检任务检测类型数据类型改为Long

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcPDAController.java

@@ -108,5 +108,15 @@ public class QcPDAController {
         }
     }
 
+    /**
+     * PDA分页查询质检任务
+     * @param bo
+     * @param pageQuery
+     * @return
+     */
+    @GetMapping("/getMainList")
+    public TableDataInfo<QcInspectionMainVo> getMainList(QcInspectionMainBo bo, PageQuery pageQuery) {
+        return qcInspectionMainService.getMainList(bo, pageQuery);
+    }
 
 }

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

@@ -92,9 +92,9 @@ public class QcInspectionMain extends TenantEntity {
     private String workshop;
 
     /**
-     * 检验类别（首检/过程检等等）
+     * 检测类型ID
      */
-    private String inspectionType;
+    private Long inspectionType;
 
     /**
      * 单据状态（0未处理/1完成）
@@ -170,4 +170,10 @@ public class QcInspectionMain extends TenantEntity {
     @TableField(exist = false)
     private String templateName;//join
 
+    /**
+     * 检测类型名称
+     */
+    @TableField(exist = false)
+    private String typeName;
+
 }

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

@@ -2,16 +2,11 @@ package org.dromara.qms.domain.bo;
 
 import org.dromara.qms.domain.QcInspectionMain;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
 import java.math.BigDecimal;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.dromara.qms.domain.bo.QcInspectionResultBo;
 import java.util.List;
 
 /**
@@ -98,9 +93,9 @@ public class QcInspectionMainBo extends BaseEntity {
     private String workshop;
 
     /**
-     * 检验类别（首检/过程检等等）
+     * 检测类型ID
      */
-    private String inspectionType;
+    private Long inspectionType;
 
     /**
      * 单据状态（0未处理/1完成）
@@ -162,6 +157,16 @@ public class QcInspectionMainBo extends BaseEntity {
      */
     private String templateName;//join
 
+    /**
+     * 检测类型字典
+     */
+    private String qcInspectionType;
+
+    /**
+     * 检测类型名称
+     */
+    private String typeName;
+
     /**
      * 检测结果列表
      */

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

@@ -116,11 +116,11 @@ public class QcInspectionMainVo implements Serializable {
     private String workshop;
 
     /**
-     * 检验类别（首检/过程检等等）
+     * 检测类型ID
      */
     @ExcelProperty(value = "检验类别", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "qc_inspection_type")
-    private String inspectionType;
+    private Long inspectionType;
 
     /**
      * 单据状态（0未处理/1完成）
@@ -195,4 +195,10 @@ public class QcInspectionMainVo implements Serializable {
     private String templateName;//join
 
 
+    /**
+     * 检测类型名称
+     */
+    private String typeName;
+
+
 }

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

@@ -66,4 +66,13 @@ public interface IQcInspectionMainService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * PDA分页查询质检任务
+     * @param bo
+     * @param pageQuery
+     * @return
+     */
+    TableDataInfo<QcInspectionMainVo> getMainList(QcInspectionMainBo bo, PageQuery pageQuery);
+
 }

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

@@ -10,6 +10,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.qms.domain.QcInspectionTemplate;
+import org.dromara.qms.domain.QcInspectionType;
 import org.springframework.stereotype.Service;
 import org.dromara.qms.domain.bo.QcInspectionMainBo;
 import org.dromara.qms.domain.vo.QcInspectionMainVo;
@@ -40,7 +41,7 @@ public class QcInspectionMainServiceImpl implements IQcInspectionMainService {
      * @return 质检任务
      */
     @Override
-    public QcInspectionMainVo queryById(Long inspectionId){
+    public QcInspectionMainVo queryById(Long inspectionId) {
         return baseMapper.selectVoById(inspectionId);
     }
 
@@ -73,41 +74,41 @@ public class QcInspectionMainServiceImpl implements IQcInspectionMainService {
     private MPJLambdaWrapper<QcInspectionMain> buildQueryWrapper(QcInspectionMainBo bo) {
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<QcInspectionMain> lqw = JoinWrappers.lambda(QcInspectionMain.class)
-        .selectAll(QcInspectionMain.class)
+            .selectAll(QcInspectionMain.class)
-
+            //关联模板主表
-                //关联模板主表
+            .select(QcInspectionTemplate::getTemplateName)
-                .select(QcInspectionTemplate::getTemplateName)
+            .select(QcInspectionType::getTypeName)
-                .leftJoin(QcInspectionTemplate.class, QcInspectionTemplate::getTemplateId, QcInspectionMain::getTemplateId)
+            .leftJoin(QcInspectionTemplate.class, QcInspectionTemplate::getTemplateId, QcInspectionMain::getTemplateId)
-
+            .leftJoin(QcInspectionType.class, QcInspectionType::getTypeId, QcInspectionMain::getInspectionType)
-        .eq(bo.getInspectionId() != null, QcInspectionMain::getInspectionId, bo.getInspectionId())
+            .eq(bo.getInspectionId() != null, QcInspectionMain::getInspectionId, bo.getInspectionId())
             .eq(bo.getPlanDetailId() != null, QcInspectionMain::getPlanDetailId, bo.getPlanDetailId())//后续添加
-        .eq(StringUtils.isNotBlank(bo.getInspectionNo()), QcInspectionMain::getInspectionNo, bo.getInspectionNo())
+            .eq(StringUtils.isNotBlank(bo.getInspectionNo()), QcInspectionMain::getInspectionNo, bo.getInspectionNo())
-        .eq(bo.getTemplateId() != null, QcInspectionMain::getTemplateId, bo.getTemplateId())
+            .eq(bo.getTemplateId() != null, QcInspectionMain::getTemplateId, bo.getTemplateId())
-        .eq(StringUtils.isNotBlank(bo.getMaterialCode()), QcInspectionMain::getMaterialCode, bo.getMaterialCode())
+            .eq(StringUtils.isNotBlank(bo.getMaterialCode()), QcInspectionMain::getMaterialCode, bo.getMaterialCode())
-        .eq(StringUtils.isNotBlank(bo.getMaterialType()), QcInspectionMain::getMaterialType, bo.getMaterialType())
+            .eq(StringUtils.isNotBlank(bo.getMaterialType()), QcInspectionMain::getMaterialType, bo.getMaterialType())
-        .like(StringUtils.isNotBlank(bo.getMaterialName()), QcInspectionMain::getMaterialName, bo.getMaterialName())
+            .like(StringUtils.isNotBlank(bo.getMaterialName()), QcInspectionMain::getMaterialName, bo.getMaterialName())
-        .like(StringUtils.isNotBlank(bo.getProcessName()), QcInspectionMain::getProcessName, bo.getProcessName())
+            .like(StringUtils.isNotBlank(bo.getProcessName()), QcInspectionMain::getProcessName, bo.getProcessName())
-        .like(StringUtils.isNotBlank(bo.getStationName()), QcInspectionMain::getStationName, bo.getStationName())
+            .like(StringUtils.isNotBlank(bo.getStationName()), QcInspectionMain::getStationName, bo.getStationName())
-        .eq(bo.getInspectionQty() != null, QcInspectionMain::getInspectionQty, bo.getInspectionQty())
+            .eq(bo.getInspectionQty() != null, QcInspectionMain::getInspectionQty, bo.getInspectionQty())
-        .eq(bo.getQualifiedQty() != null, QcInspectionMain::getQualifiedQty, bo.getQualifiedQty())
+            .eq(bo.getQualifiedQty() != null, QcInspectionMain::getQualifiedQty, bo.getQualifiedQty())
-        .eq(bo.getUnqualifiedQty() != null, QcInspectionMain::getUnqualifiedQty, bo.getUnqualifiedQty())
+            .eq(bo.getUnqualifiedQty() != null, QcInspectionMain::getUnqualifiedQty, bo.getUnqualifiedQty())
 //        .eq(bo.getResult() != null, QcInspectionMain::getResult, bo.getResult())
             .eq(StringUtils.isNotBlank(bo.getResult()), QcInspectionMain::getResult, bo.getResult())
-        .eq(StringUtils.isNotBlank(bo.getWorkshop()), QcInspectionMain::getWorkshop, bo.getWorkshop())
+            .eq(StringUtils.isNotBlank(bo.getWorkshop()), QcInspectionMain::getWorkshop, bo.getWorkshop())
 //        .eq(bo.getInspectionType() != null, QcInspectionMain::getInspectionType, bo.getInspectionType())
 //        .eq(bo.getStatus() != null, QcInspectionMain::getStatus, bo.getStatus())
-            .eq(StringUtils.isNotBlank(bo.getInspectionType()), QcInspectionMain::getInspectionType, bo.getInspectionType())
+            .eq(StringUtils.isNotBlank(bo.getQcInspectionType()), QcInspectionType::getQcInspectionType, bo.getQcInspectionType())
             .eq(StringUtils.isNotBlank(bo.getStatus()), QcInspectionMain::getStatus, bo.getStatus())
-        .eq(StringUtils.isNotBlank(bo.getInspector()), QcInspectionMain::getInspector, bo.getInspector())
+            .eq(StringUtils.isNotBlank(bo.getInspector()), QcInspectionMain::getInspector, bo.getInspector())
-        .eq(StringUtils.isNotBlank(bo.getShift()), QcInspectionMain::getShift, bo.getShift())
+            .eq(StringUtils.isNotBlank(bo.getShift()), QcInspectionMain::getShift, bo.getShift())
-        .eq(StringUtils.isNotBlank(bo.getTeam()), QcInspectionMain::getTeam, bo.getTeam())
+            .eq(StringUtils.isNotBlank(bo.getTeam()), QcInspectionMain::getTeam, bo.getTeam())
             .eq(bo.getInspectionStartTime() != null, QcInspectionMain::getInspectionStartTime, bo.getInspectionStartTime())
             .eq(bo.getInspectionEndTime() != null, QcInspectionMain::getInspectionEndTime, bo.getInspectionEndTime())
-        .eq(StringUtils.isNotBlank(bo.getProductionOrder()), QcInspectionMain::getProductionOrder, bo.getProductionOrder())
+            .eq(StringUtils.isNotBlank(bo.getProductionOrder()), QcInspectionMain::getProductionOrder, bo.getProductionOrder())
-        .eq(StringUtils.isNotBlank(bo.getBatchNo()), QcInspectionMain::getBatchNo, bo.getBatchNo())
+            .eq(StringUtils.isNotBlank(bo.getBatchNo()), QcInspectionMain::getBatchNo, bo.getBatchNo())
-        .eq(StringUtils.isNotBlank(bo.getBarcode()), QcInspectionMain::getBarcode, bo.getBarcode())
+            .eq(StringUtils.isNotBlank(bo.getBarcode()), QcInspectionMain::getBarcode, bo.getBarcode())
-        .like(StringUtils.isNotBlank(bo.getSupplierName()), QcInspectionMain::getSupplierName, bo.getSupplierName())
+            .like(StringUtils.isNotBlank(bo.getSupplierName()), QcInspectionMain::getSupplierName, bo.getSupplierName())
-        .orderByDesc(QcInspectionMain::getCreateTime);
+            .orderByDesc(QcInspectionMain::getCreateTime);
 
         Object beginInspectionStartTime = params.get("beginInspectionStartTime");
         Object endInspectionStartTime = params.get("endInspectionStartTime");
@@ -154,7 +155,7 @@ public class QcInspectionMainServiceImpl implements IQcInspectionMainService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(QcInspectionMain entity){
+    private void validEntityBeforeSave(QcInspectionMain entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -167,9 +168,23 @@ public class QcInspectionMainServiceImpl implements IQcInspectionMainService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
+    /**
+     * PDA分页查询质检任务
+     *
+     * @param bo
+     * @param pageQuery
+     * @return
+     */
+    @Override
+    public TableDataInfo<QcInspectionMainVo> getMainList(QcInspectionMainBo bo, PageQuery pageQuery) {
+        MPJLambdaWrapper<QcInspectionMain> lqw = buildQueryWrapper(bo);
+        Page<QcInspectionMainVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
 }

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

@@ -103,7 +103,7 @@ public class QcPDAServiceImpl implements IQcPDAService {
         inspectionBo.setPlanDetailId(planDetail.getPlanDetailId());
         inspectionBo.setTemplateId(templateVo.getTemplateId());
         inspectionBo.setTemplateName(templateVo.getTemplateName());
-        inspectionBo.setInspectionType(templateVo.getQcInspectionType());
+        inspectionBo.setInspectionType(templateVo.getTypeId());
         inspectionBo.setMaterialCode(planDetail.getMaterialCode());
         inspectionBo.setMaterialName(planDetail.getMaterialName());
         inspectionBo.setProcessName(planDetail.getProcessName());
@@ -206,6 +206,13 @@ public class QcPDAServiceImpl implements IQcPDAService {
         // 设置质检结果：'1'表示不合格，'0'表示合格
         bo.setResult(isUnqualified ? "1" : "0");
         // 更新主记录
+        if (isUnqualified){
+            bo.setQualifiedQty(new BigDecimal(0));
+            bo.setUnqualifiedQty(main.getQualifiedQty());
+        } else {
+            bo.setQualifiedQty(main.getQualifiedQty());
+            bo.setUnqualifiedQty(new BigDecimal(0));
+        }
         bo.setInspector(username);
         bo.setInspectionStartTime(nowDate);
         bo.setInspectionEndTime(nowDate);
@@ -213,15 +220,16 @@ public class QcPDAServiceImpl implements IQcPDAService {
 
         // 如果存在不合格项，则需要创建不合格评审流程及相关记录
         if (isUnqualified) {
+            String unqualifiedReviewNo = remoteCodeRuleService.selectCodeRuleCode("4");
             // 构建一个新的不合格评审业务对象
             QcUnqualifiedReviewBo reviewBo = new QcUnqualifiedReviewBo();
             // 设置不合格检测单号
-            reviewBo.setUnqualifiedReviewNo(IdUtils.fastSimpleUUID());
+            reviewBo.setUnqualifiedReviewNo(unqualifiedReviewNo);
             // 关联原检验单号，质检单号
             reviewBo.setInspectionNo(main.getInspectionNo());
             BeanUtils.copyProperties(bo, reviewBo);
             // 复制检验类型信息
-            reviewBo.setInspectionType(main.getInspectionType());
+//            reviewBo.setInspectionType(main.getInspectionType());
             // 关联生产工单号
             reviewBo.setWorkOrderNo(main.getProductionOrder());
             // 复制工序名称
@@ -230,7 +238,6 @@ public class QcPDAServiceImpl implements IQcPDAService {
             reviewBo.setMaterialName(main.getMaterialName());
             // 复制物料编码
             reviewBo.setMaterialCode(main.getMaterialCode());
-
             reviewBo.setSupplierName(main.getSupplierName());
             // 复制检验数量
             reviewBo.setInspectionQty(main.getInspectionQty());