Merge remote-tracking branch 'origin/qms/develop' into qms/develop

- 在查询结果中添加warehouse字段
- 在查询结果中添加storage_days字段
- 保持callback_result字段不变
- 完善LEFT JOIN语句相关字段映射关系

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

@@ -288,7 +288,7 @@ public class QmsIssueTicketControllerService {
                         .eq(User::getPurchasingGroup, detail.getPurchaseGroup())
                         .list();
                 List<QmsTodoItem> todoItems = users.stream().map(user -> new QmsTodoItem()
-                        .setCode(basdeSerialNumberControllerService.generateSerialNumber(32))
+                        .setCode(detail.getTaskNo())
                         .setSourceTypeId(dictionaryItemService.getIdByCode("MessageType", "IncomingMaterialInspectionApproval"))
                         .setSourceId(entity.getId())
                         .setCreateUserId(user.getId())

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskAqlRuleVO.java

@@ -10,6 +10,8 @@ import java.time.LocalDateTime;
 @Data
 public class QmsIncomingInspectionTaskAqlRuleVO {
 
+    private Long id;
+
     /**
      * 检测任务编号
      */
@@ -50,11 +52,21 @@ public class QmsIncomingInspectionTaskAqlRuleVO {
      */
     private Long calculatedAqlType;
 
+    /**
+     * 计算的AQL类型名称
+     */
+    private String calculatedAqlTypeName;
+
     /**
      * 使用的AQL类型（字典项id）
      */
     private Long usedAqlType;
 
+    /**
+     * 使用的AQL类型名称
+     */
+    private String usedAqlTypeName;
+
     /**
      * 触发类别：0=默认状态，1=触发规则，2=手动调整
      */

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

@@ -4,6 +4,7 @@
 
     <select id="search" resultType="com.nflg.wms.common.pojo.vo.QmsIncomingInspectionTaskAqlRuleVO">
         SELECT
+            r.id,
             t.task_no,
             t.supplier_code,
             t.supplier_name,
@@ -12,7 +13,9 @@
             m.material_desc,
             s.version,
             r.calculated_aql_type,
+            di1.name AS calculated_aql_type_name,
             r.used_aql_type,
+            di2.name AS used_aql_type_name,
             r.trigger_category,
             CASE r.trigger_category
                 WHEN 0 THEN '默认状态'
@@ -26,6 +29,8 @@
         INNER JOIN qms_incoming_inspection_task t ON r.task_id = t.id
         INNER JOIN qms_qc_material m ON t.material_id = m.id
         LEFT JOIN qms_inspection_standard s ON r.inspection_standard_id = s.id
+        LEFT JOIN dictionary_item di1 on r.calculated_aql_type=di1.id
+        LEFT JOIN dictionary_item di2 on r.used_aql_type=di2.id
         <where>
             t.inspection_status IN (0, 1)
             <if test="request.supplierCode != null and request.supplierCode != ''">

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

@@ -39,7 +39,9 @@
         t.update_user_name,
         t.update_time,
         t.purchase_group,
-        t.callback_result
+        t.callback_result,
+        t.warehouse,
+        t.storage_days
         FROM qms_incoming_inspection_task t
         LEFT JOIN qms_qc_material m ON t.material_id = m.id
         LEFT JOIN qms_inspection_standard s ON t.inspection_standard_id = s.id