Merge remote-tracking branch 'origin/feature/NoScanning' into feature/NoScanning

nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java

@@ -164,12 +164,7 @@ public class IncomingInspectionTaskControllerService {
         User inspectorUser;
         if (Objects.nonNull(inspector.getChangeUserId())) {
             // 转办人是 user.id，需查询对应的 qms_quality_inspector 记录
-            QmsQualityInspector agentInspector = qualityInspectorService.lambdaQuery()
+            QmsQualityInspector agentInspector = qualityInspectorService.getById(inspector.getChangeUserId());
-                    .eq(QmsQualityInspector::getUserId, inspector.getChangeUserId())
-                    .eq(QmsQualityInspector::getInspectionType, 1)
-                    .eq(QmsQualityInspector::getEnable, true)
-                    .last("LIMIT 1")
-                    .one();
             if (Objects.nonNull(agentInspector)) {
                 inspectorId = agentInspector.getId();
                 inspectorUser = userService.getById(agentInspector.getUserId());
@@ -313,12 +308,7 @@ public class IncomingInspectionTaskControllerService {
         String inspectorName;
         User inspectorUser;
         if (Objects.nonNull(inspector.getChangeUserId())) {
-            QmsQualityInspector agentInspector = qualityInspectorService.lambdaQuery()
+            QmsQualityInspector agentInspector = qualityInspectorService.getById(inspector.getChangeUserId());
-                    .eq(QmsQualityInspector::getUserId, inspector.getChangeUserId())
-                    .eq(QmsQualityInspector::getInspectionType, 1)
-                    .eq(QmsQualityInspector::getEnable, true)
-                    .last("LIMIT 1")
-                    .one();
             if (Objects.nonNull(agentInspector)) {
                 inspectorId = agentInspector.getId();
                 inspectorUser = userService.getById(agentInspector.getUserId());

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/QmsInspectionItemExportDTO.java

@@ -11,10 +11,10 @@ import org.ttzero.excel.annotation.MediaColumn;
 public class QmsInspectionItemExportDTO {
 
     /**
-     * 物料类别ID
+     * 物料类别
      */
-    @ExcelColumn("物料类别ID*")
+    @ExcelColumn("物料类别*")
-    private Long materialTypeId;
+    private String materialTypeCode;
 
     /**
      * 检测类型：0=定向，1=定量

nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsQualityInspector.java

@@ -47,7 +47,7 @@ public class QmsQualityInspector implements Serializable {
     private Integer inspectionType;
 
     /**
-     * 转办人ID (user.id)，可为空
+     * 转办人ID可为空
      */
     private Long changeUserId;
 

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaReviewServiceImpl.java

@@ -104,6 +104,7 @@ public class QmsCoaReviewServiceImpl extends ServiceImpl<QmsCoaReviewMapper, Qms
                 .eq(QmsCoaReview::getTaskId, task.getId())
                 .eq(QmsCoaReview::getPurchaseNo, qo.getPurchaseNo())
                 .eq(QmsCoaReview::getBatchNo, qo.getBatchNo())
+                .lt(QmsCoaReview::getStatus, 3)
                 .ne(QmsCoaReview::getDeleted, true)
                 .exists();
         if (exists) {

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionItemServiceImpl.java

@@ -247,12 +247,20 @@ public class QmsInspectionItemServiceImpl extends ServiceImpl<QmsInspectionItemM
         }
         List<QmsInspectionItem> items = query.orderByAsc(QmsInspectionItem::getCreateTime).list();
 
+        List<QmsQcMaterialCategory> categories= materialCategoryService.lambdaQuery()
+                .in(QmsQcMaterialCategory::getId, items.stream().map(QmsInspectionItem::getMaterialTypeId).collect(Collectors.toList()))
+                .list();
+
         // 按主表记录展开到明细行（一行一条明细，无明细也输出主表行）
         return items.stream().flatMap(item -> {
             List<QmsInspectionItemDetails> details = detailsService.listByItemId(item.getId());
+            QmsQcMaterialCategory category=categories.stream()
+                    .filter(c -> c.getId().equals(item.getMaterialTypeId()))
+                    .findFirst()
+                    .get();
             if (details.isEmpty()) {
                 QmsInspectionItemExportDTO dto = new QmsInspectionItemExportDTO();
-                dto.setMaterialTypeId(item.getMaterialTypeId());
+                dto.setMaterialTypeCode(category.getCategoryCode());
                 dto.setDetectionType(item.getDetectionType());
                 dto.setInspectionItemName(item.getInspectionItemName());
                 dto.setInspectionNo(item.getInspectionNo());
@@ -260,7 +268,7 @@ public class QmsInspectionItemServiceImpl extends ServiceImpl<QmsInspectionItemM
             }
             return details.stream().map(d -> {
                 QmsInspectionItemExportDTO dto = new QmsInspectionItemExportDTO();
-                dto.setMaterialTypeId(item.getMaterialTypeId());
+                dto.setMaterialTypeCode(category.getCategoryCode());
                 dto.setDetectionType(item.getDetectionType());
                 dto.setInspectionItemName(item.getInspectionItemName());
                 dto.setInspectionNo(item.getInspectionNo());

nflg-wms-repository/src/main/resources/mapper/QmsQualityInspectorMapper.xml

@@ -30,7 +30,8 @@
         LEFT JOIN "user" u ON u.id = qi.user_id
         LEFT JOIN user_interior ui ON ui.user_id = qi.user_id
         LEFT JOIN department d ON d.id = ui.dept_id
-        LEFT JOIN "user" cu ON cu.id = qi.change_user_id
+        LEFT JOIN qms_quality_inspector cqi ON cqi.id = qi.change_user_id
+        LEFT JOIN "user" cu ON cu.id = cqi.user_id
         <where>
             <if test="request.userCode != null and request.userCode != ''">
                 AND u.user_code = #{request.userCode}