diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java
index ba18d2f..afc627a 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java
@@ -364,6 +364,7 @@ public class OrderController {
         List<String> orderList = orderMergeRequest.getOrderList();
 
         List<ErpOrderEntity> mergeList = new ArrayList<>();
+        String tempCode = null;
         if (orderList != null && orderList.size() > 1) {
             for (String orderId : orderList) {
                 OrderEntity orderEntity = orderService.findById(orderId);
@@ -376,7 +377,21 @@ public class OrderController {
                 if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
                     mergeList.addAll(erpOrderEntities);
                 }
-
+                List<WarehouseEntity> warehouseEntities;
+                if (orderMergeRequest.getType() == 1) {
+                    warehouseEntities = codesService.findByReceiptId(orderId);
+                } else {
+                    warehouseEntities = codesTempService.findByOrderId(orderId);
+                }
+                if (!warehouseEntities.isEmpty()) {
+                    for (WarehouseEntity warehouseEntity : warehouseEntities) {
+                        if (tempCode == null) {
+                            tempCode = warehouseEntity.getCode();
+                        }else if(tempCode .equals(warehouseEntity.getCode())){
+                            return ResultVOUtils.error(500, "存在重复条码无法合并！");
+                        }
+                    }
+                }
             }
             for (String orderId : orderList) {
                 orderDetailService.deleteByOrderId(orderId);
@@ -430,10 +445,18 @@ public class OrderController {
 
     public List<String> getDocids(List<ErpOrderEntity> mergeList) {
         List<String> docids = new ArrayList<>();
-        Map<String, List<ErpOrderEntity>> mapErps = mergeList.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId));
-        for (String key : mapErps.keySet()) {
-            docids.add(key);
+        if (mergeList != null && mergeList.size() > 0) {
+            try {
+                Map<String, List<ErpOrderEntity>> mapErps = mergeList.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId));
+                for (String key : mapErps.keySet()) {
+                    docids.add(key);
+                }
+            } catch (Exception e) {
+                return docids;
+            }
+
         }
+
         return docids;
     }
 
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
index 4046305..cad46a9 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
@@ -367,6 +367,9 @@ public class WareHouseController {
                 if (baseResponse != null)
                     return baseResponse;
             } else {
+                if (baseResponse.getCode() == 501) {
+                    return baseResponse;
+                }
                 checkSupId(bussinessTypeEntity, warehouseEntity);
                 return baseResponse;
             }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemPDFModuleController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemPDFModuleController.java
index e0d3a3e..3408455 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemPDFModuleController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemPDFModuleController.java
@@ -105,7 +105,7 @@ public class SystemPDFModuleController {
 
     }
 
-    @AuthRuleAnnotation("system/pdf/module/update")
+    @AuthRuleAnnotation("system/pdf/module/updateRl")
     @PostMapping("/system/pdf/module/updateRl")
     public BaseResponse updateRl(@RequestBody SystemPDFTemplateRelevanceEntity systemPDFModuleSaveRequest) {
         systemPDFTemplateRelevanceService.udpateRl(systemPDFModuleSaveRequest);
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFModuleEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFModuleEntity.java
index d6499ac..83d9575 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFModuleEntity.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFModuleEntity.java
@@ -17,4 +17,7 @@ public class SystemPDFModuleEntity {
     private Date update_time;
     private String templateDlUrl;
     private Integer templateType;
+    private String remark1;
+    private String remark2;
+    private String remark3;
 }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFTemplateRelevanceEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFTemplateRelevanceEntity.java
index 22f9e4a..31447eb 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFTemplateRelevanceEntity.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFTemplateRelevanceEntity.java
@@ -13,5 +13,8 @@ public class SystemPDFTemplateRelevanceEntity {
     private Integer adminId;
     private Integer moduleId;
     private String localAction;
+    private String remark1;
+    private String remark2;
+    private String remark3;
 
 }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderMergeRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderMergeRequest.java
index dafa9ac..7589d06 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderMergeRequest.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderMergeRequest.java
@@ -8,4 +8,5 @@ import java.util.List;
 public class OrderMergeRequest {
 
     List<String> orderList;
+    private int type;
 }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemPDFTemplateRelevanceResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemPDFTemplateRelevanceResponse.java
index 28d26da..c3967c1 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemPDFTemplateRelevanceResponse.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemPDFTemplateRelevanceResponse.java
@@ -20,6 +20,9 @@ public class SystemPDFTemplateRelevanceResponse {
     private int templateId;
     private String localAction;
     private String localActionName;
+    private String remark1;
+    private String remark2;
+    private String remark3;
 
 
 }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/CodesTempService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/CodesTempService.java
index 2b187b0..a9028a1 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/CodesTempService.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/CodesTempService.java
@@ -23,6 +23,8 @@ public interface CodesTempService {
 
     int deleteCodesTempById(WarehouseEntity warehouseEntitie);
 
+    List<WarehouseEntity> findByOrderId(String orderId);
+
     List<WarehouseEntity> findByOrderId(WarehouseQueryRequest warehouseQueryRequest);
 
     List<WarehouseEntity> findByOrderIdAndCode(WarehouseQueryRequest warehouseQueryRequest);
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/CodesTempServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/CodesTempServiceImpl.java
index 4f39169..c6a72ea 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/CodesTempServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/CodesTempServiceImpl.java
@@ -58,6 +58,13 @@ public class CodesTempServiceImpl implements CodesTempService {
         return codesTempDao.deleteCodesTempById(warehouseEntitie);
     }
 
+    @Override
+    public List<WarehouseEntity> findByOrderId(String orderId) {
+        WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest();
+        warehouseQueryRequest.setOrderId(orderId);
+        return codesTempDao.findByOrderId(warehouseQueryRequest);
+    }
+
     @Override
     public List<WarehouseEntity> findByOrderId(WarehouseQueryRequest warehouseQueryRequest) {
         if (warehouseQueryRequest == null) {
diff --git a/api-admin/src/main/resources/mybatis/mapper/param/SystemPDFModuleDao.xml b/api-admin/src/main/resources/mybatis/mapper/param/SystemPDFModuleDao.xml
index e02d2f1..dd7ab24 100644
--- a/api-admin/src/main/resources/mybatis/mapper/param/SystemPDFModuleDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/param/SystemPDFModuleDao.xml
@@ -6,6 +6,7 @@
     <select id="queryPage" parameterType="com.glxp.sale.admin.req.param.SystemPDFModuleRequest"
             resultType="com.glxp.sale.admin.entity.param.SystemPDFModuleEntity">
         SELECT id,name,param,fieldExplain,remark,templateId,create_time,update_time,templateDlUrl,templateType
+        ,remark1,remark2,remark3
         FROM system_pdf_module
         <where>
             <if test="templateId != null and '' != templateId">
@@ -39,6 +40,9 @@
             <if test="update_time != null">update_time=#{update_time},</if>
             <if test="templateDlUrl != null">templateDlUrl=#{templateDlUrl},</if>
             <if test="templateType != null">templateType=#{templateType},</if>
+            <if test="remark1 != null">remark1=#{remark1},</if>
+            <if test="remark2 != null">remark2=#{remark2},</if>
+            <if test="remark3 != null">remark3=#{remark3},</if>
 
 
         </set>
@@ -47,6 +51,7 @@
 
     <insert id="insert" parameterType="com.glxp.sale.admin.entity.param.SystemPDFModuleEntity">
        insert INTO system_pdf_module(name,param,fieldExplain,remark,templateId,create_time,update_time,templateDlUrl,templateType
+       ,remark1,remark2,remark3
        ) values
        (
       #{name},
@@ -55,7 +60,7 @@
       #{templateId},
       #{remark},
       #{create_time},
-      #{update_time},#{templateDlUrl},#{templateType}
+      #{update_time},#{templateDlUrl},#{templateType},#{remark1},#{remark2},#{remark3}
       )
     </insert>
 
diff --git a/api-admin/src/main/resources/mybatis/mapper/param/SystemPDFTemplateRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/param/SystemPDFTemplateRelevanceDao.xml
index 4caff6c..6c3e11e 100644
--- a/api-admin/src/main/resources/mybatis/mapper/param/SystemPDFTemplateRelevanceDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/param/SystemPDFTemplateRelevanceDao.xml
@@ -15,7 +15,7 @@
         basic_bustype_local.action localAction,
         templateId,
         moduleId,
-        system_pdf_template.name templateName
+        system_pdf_template.name templateName,system_pdf_template_relevance.remark1,system_pdf_template_relevance.remark2,system_pdf_template_relevance.remark3
         from basic_bustype_local
         LEFT JOIN system_pdf_template_relevance
         on basic_bustype_local.action = system_pdf_template_relevance.localAction
@@ -63,13 +63,13 @@
         insert
         ignore
         INTO system_pdf_template_relevance
-            (templateId, customerId, adminId, moduleId, localAction)
+            (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3)
         values (
         #{templateId},
         #{customerId},
         #{adminId},
         #{moduleId},
-        #{localAction}
+        #{localAction}, #{remark1}, #{remark2}, #{remark3}
         )
     </insert>
     <update id="udpateRl" parameterType="com.glxp.sale.admin.entity.param.SystemPDFTemplateRelevanceEntity">
@@ -80,6 +80,9 @@
             <if test="adminId != null">adminId = #{adminId},</if>
             <if test="moduleId != null">moduleId = #{moduleId},</if>
             <if test="localAction != null">localAction=#{localAction},</if>
+            <if test="remark1 != null">remark1=#{remark1},</if>
+            <if test="remark2 != null">remark2=#{remark2},</if>
+            <if test="remark3 != null">remark3=#{remark3},</if>
         </trim>
         WHERE id = #{id}
     </update>
diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml
index 36297dd..d7c89e1 100644
--- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml
@@ -23,6 +23,9 @@
                 AND spec LIKE concat('%',#{spec},'%')
             </if>
 
+            <if test="supName != '' and supName != null">
+                AND supName LIKE concat('%',#{supName},'%')
+            </if>
             <if test="unionCode != '' and unionCode != null">
                 or code LIKE concat('%',#{unionCode},'%') or sptm LIKE concat('%',#{unionCode},'%') or ybbm LIKE
                 concat('%',#{unionCode},'%')