diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/AionPrintStrategy.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/AionPrintStrategy.java
index 53cc58c..0b8d661 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/AionPrintStrategy.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/AionPrintStrategy.java
@@ -37,7 +37,8 @@ public class AionPrintStrategy implements IPrintTemplateStrategyService {
     private MesPartRepository mesPartRao;
     @Override
     public Map<String,Object> execute(MesProductionPsOutContext sn, String organizeCode) {
-
+        //零件条码中获取 serialNo
+        String productSn = sn.getProductSn();
         //构造标签
         Map<String,Object> map = new HashMap<>();
         String partNo = sn.getPartNo();
diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/GqaaPrintStrategy.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/GqaaPrintStrategy.java
new file mode 100644
index 0000000..c9a58c8
--- /dev/null
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/GqaaPrintStrategy.java
@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.strategy;
+
+import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.IPrintTemplateStrategyService;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsOutContext;
+import cn.estsh.impp.framework.boot.auth.AuthUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2024/6/17 16:10
+ * @Modify:
+ **/
+@Service
+@Slf4j
+public class GqaaPrintStrategy implements IPrintTemplateStrategyService {
+    @Override
+    public Map<String, Object> execute(MesProductionPsOutContext sn, String organizeCode) {
+        Map<String,Object> map = new HashMap<>();
+
+        String partNo = sn.getPartNo();
+        String partName = sn.getPartName();
+        String factoryName = AuthUtil.getOrganize().getName();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yy/MM/dd");
+        LocalDateTime now = LocalDateTime.now();
+        String productDate = now.format(formatter);
+
+        //构造二维码
+        StringBuilder barcode = new StringBuilder();
+
+        //第三位 供应商代码 // 配置表
+        String supplierCode = "VD501";
+        barcode.append(supplierCode);
+        //第四位 生产线代号 // 配置表
+        String workCenterCode = "1";
+        barcode.append(workCenterCode);
+
+        int no = 1;
+        String noStr = String.format("%07d", no);
+        map.put("no",noStr);
+        map.put("partNo", partNo);
+        map.put("partName", partName);
+        map.put("factoryName", factoryName);
+        map.put("productDate", productDate);
+        map.put("barcode", barcode.toString());
+        return map;
+    }
+}
diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/NoSortBarCodeGzNewStrategy.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/NoSortBarCodeGzNewStrategy.java
index dd816bd..801bc1c 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/NoSortBarCodeGzNewStrategy.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/NoSortBarCodeGzNewStrategy.java
@@ -24,23 +24,18 @@ import java.util.Map;
 public class NoSortBarCodeGzNewStrategy implements IPrintTemplateStrategyService {
     @Override
     public Map<String, Object> execute(MesProductionPsOutContext sn, String organizeCode) {
-
+        //从条码中截取流水号，流水号 后四位
+        String productSn = sn.getProductSn();
         Map<String,Object> map = new HashMap<>();
         String partNo = sn.getPartNo();
         String partName = sn.getPartName();
         LocalDateTime now = LocalDateTime.now();
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
         String productDateTime = now.format(formatter);
-        DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        String productDate = now.format(dateFormatter);
-        int no = 1;
-        String noStr = String.format("%05d", no);
-        String custPartNo = sn.getCustPartNo();
-        String barcode = custPartNo +"-"+ productDate+noStr;
         map.put("partNo",partNo);
         map.put("partName",partName);
         map.put("productDateTime",productDateTime);
-        map.put("barcode",barcode);
+        map.put("barcode",productSn);
         return map;
     }
 }