From 8ea5d6dd3bcb0307c75e4a14ff969badb6b1a5f6 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Wed, 20 Nov 2024 09:52:39 +0800
Subject: [PATCH] 20241120

---
 .../label/service/impl/PrintLabelRecordServiceImpl.java  | 4 ++--
 .../modules/part/entity/ExternalLabelTemplate.java       | 7 +++++++
 .../mapper/part/ExternalLabelTemplateMapper.xml          | 9 +++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/label/service/impl/PrintLabelRecordServiceImpl.java b/src/main/java/com/gaotao/modules/label/service/impl/PrintLabelRecordServiceImpl.java
index b9ab6b0..61be0a4 100644
--- a/src/main/java/com/gaotao/modules/label/service/impl/PrintLabelRecordServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/label/service/impl/PrintLabelRecordServiceImpl.java
@@ -82,7 +82,7 @@ public class PrintLabelRecordServiceImpl extends ServiceImpl<PrintLabelRecordMap
         SysUserEntity userEntity = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
         // 判断是否需要打印SN
         Map<String,String> pictureMap = new HashMap<>();
-        if ("Alpha/Hard Tag-Serials".equalsIgnoreCase(printLabelRecord.getCategory()) && "Y".equalsIgnoreCase(userEntity.getAutoSerialNumber())){
+        if ("Hardware(Antenna)-Serials".equalsIgnoreCase(printLabelRecord.getCategory()) && "Y".equalsIgnoreCase(userEntity.getAutoSerialNumber())){
             printLabelRecord.setCreateTime(new Date());
             // 获取SN
             list = baseMapper.autoCreateSerialNumber(printLabelRecord, cartonCount.intValue());
@@ -136,7 +136,7 @@ public class PrintLabelRecordServiceImpl extends ServiceImpl<PrintLabelRecordMap
         Page<PrintLabelRecord> page = new Page<>(no, size);
         IPage<PrintLabelRecord> iPage = baseMapper.selectPrintLabelRecordPage(page, printLabelRecord);
         for (PrintLabelRecord record : iPage.getRecords()) {
-            if (!"Alpha/Hard Tag-Serials".equals(record.getCategory())){
+            if (!"Hardware(Antenna)-Serials".equals(record.getCategory())){
                 continue;
             }
             // 获取 认证
diff --git a/src/main/java/com/gaotao/modules/part/entity/ExternalLabelTemplate.java b/src/main/java/com/gaotao/modules/part/entity/ExternalLabelTemplate.java
index ae0e1e6..52d5ae8 100644
--- a/src/main/java/com/gaotao/modules/part/entity/ExternalLabelTemplate.java
+++ b/src/main/java/com/gaotao/modules/part/entity/ExternalLabelTemplate.java
@@ -1,6 +1,7 @@
 package com.gaotao.modules.part.entity;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -21,4 +22,10 @@ public class ExternalLabelTemplate {
     private String templateUrl;
 
     private Integer sortNo;
+
+    @TableField(exist = false)
+    private String site;
+
+    @TableField(exist = false)
+    private String partNo;
 }
diff --git a/src/main/resources/mapper/part/ExternalLabelTemplateMapper.xml b/src/main/resources/mapper/part/ExternalLabelTemplateMapper.xml
index e034db6..7337cf4 100644
--- a/src/main/resources/mapper/part/ExternalLabelTemplateMapper.xml
+++ b/src/main/resources/mapper/part/ExternalLabelTemplateMapper.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.gaotao.modules.part.mapper.ExternalLabelTemplateMapper">
-
     <select id="queryLabelTemplate" resultType="com.gaotao.modules.part.entity.ExternalLabelTemplate">
-        select template_no,template_name,template_url,sort_no from external_label_template group by template_no,template_name,template_url,sort_no order by sort_no
+        select template_no, template_name, template_url, sort_no
+        from external_label_template
+        <if test="partNo!= null and partNo != '' and site!= null and site!= ''">
+            where template_no in (select template_no from external_part_picture where site = #{site} and part_no = #{partNo} and picture_classify = 'ProPicture' group by template_no)
+        </if>
+        group by template_no, template_name, template_url, sort_no
+        order by sort_no
     </select>
 
     <select id="queryLabelTemplateByPosition" resultType="com.gaotao.modules.part.entity.ExternalPartPicture">