From 303392dbff8f071960c4ae01779080e5d6949412 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sat, 25 Mar 2023 17:27:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E8=B4=A8=E8=AF=81=E4=B9=A6=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/UdiRelevanceController.java         |   14 +
 .../inout/IoOrderDetailBizController.java     |    2 +-
 .../purchase/SupCertController.java           |    2 +-
 .../purchase/SupProductController.java        |    8 +-
 .../glxp/api/dao/basic/UdiRelevanceDao.java   |    2 +
 .../api/entity/basic/BasicProductsEntity.java |    6 +-
 .../api/entity/basic/UdiProductEntity.java    |    8 +-
 .../api/entity/basic/UdiRelevanceEntity.java  |    3 +
 .../api/entity/purchase/SupProductEntity.java |   34 +-
 .../com/glxp/api/idc/thread/AsyncIdcTask.java |    2 +-
 .../api/req/basic/FilterUdiRelRequest.java    |    3 +-
 .../glxp/api/req/basic/UdiInfoRequest.java    |    2 +-
 .../req/basic/UdiRelevanceSaveRequest.java    |    2 +
 .../api/req/purchase/FilterPoductRequest.java |    2 +-
 .../CompanyProductRelevanceResponse.java      |    1 +
 .../api/res/basic/UdiRelevanceResponse.java   |    9 +-
 .../glxp/api/res/basic/UdiRlSupResponse.java  |    1 +
 .../glxp/api/res/thrsys/UdiInfoResponse.java  |    1 +
 .../service/basic/UdiRelevanceService.java    |    2 +
 .../impl/BasicBussinessTypeServiceImpl.java   |   23 +-
 .../basic/impl/UdiRelevanceServiceImpl.java   |   17 +
 .../service/purchase/SupProductService.java   |    3 +
 .../purchase/impl/SupProductServiceImpl.java  |   10 +
 .../basic/CompanyProductRelevanceDao.xml      |    1 +
 .../mybatis/mapper/basic/UdiProductDao.xml    | 1149 ++++++++++++-----
 .../mybatis/mapper/basic/UdiRelevanceDao.xml  |  169 +++
 .../mybatis/mapper/basic/UdiRlSupDao.xml      |    1 +
 .../mybatis/mapper/purchase/SupProductDao.xml |   33 +-
 src/main/resources/schemas/schema_v2.1.sql    |   14 +
 29 files changed, 1137 insertions(+), 387 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
index 328e14fb..cd215260 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
@@ -188,6 +188,19 @@ public class UdiRelevanceController extends BaseController {
     }
 
 
+    //资质证书选入产品列表  产品名称，生产企业过滤
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/cert/filterUdi")
+    public BaseResponse filterCertUdi(FilterUdiRelRequest filterUdiRelRequest) {
+        List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterCertUdi(filterUdiRelRequest);
+        PageInfo<UdiRelevanceResponse> pageInfo;
+        pageInfo = new PageInfo<>(udiRelevanceResponses);
+        PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(udiRelevanceResponses);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
     /**
      * 耗材字典信息获取同一产品对应DI信息
      */
@@ -322,6 +335,7 @@ public class UdiRelevanceController extends BaseController {
         udiProductEntity.setAllowNoBatch(udiRelevanceSaveRequest.getAllowNoBatch());
         udiProductEntity.setAllowNoExpire(udiRelevanceSaveRequest.getAllowNoExpire());
         udiProductEntity.setAllowNoProduct(udiRelevanceSaveRequest.getAllowNoProduct());
+        udiProductEntity.setAllowNoSerial(udiRelevanceSaveRequest.getAllowNoBatch());
         udiProductEntity.setZxxsbzbhsydysl(udiRelevanceEntity.getUseNum());
         udiProductEntity.setBasicPrductRemak1(udiRelevanceSaveRequest.getBasicPrductRemak1());
         udiProductEntity.setBasicPrductRemak2(udiRelevanceSaveRequest.getBasicPrductRemak2());
diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
index fcd877c5..23d01ef1 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
@@ -152,7 +152,7 @@ public class IoOrderDetailBizController extends BaseController {
 //            todo 查询产品是否已经通过认证
 
             if (isVailCert && udiRelevanceResponse.isNeedCert()) {
-                SupProductEntity supProductEntity = supProductService.findByRelIdFk(udiRelevanceResponse.getId() + "");
+                SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory());
                 if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) {
 
                 } else {
diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java
index 4a745f56..d43b779b 100644
--- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java
+++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java
@@ -493,7 +493,7 @@ public class SupCertController {
                 supData.put("productType", supProductEntity.getProductType() == null ? ' ' : supProductEntity.getProductType());
                 supData.put("productDirectoryCode", supProductEntity.getProductDirectoryCode() == null ? ' ' : supProductEntity.getProductDirectoryCode());
                 supData.put("specification", supProductEntity.getSpecification() == null ? ' ' : supProductEntity.getSpecification());
-                supData.put("cpms", supProductEntity.getCpms() == null ? ' ' : supProductEntity.getCpms());
+//                supData.put("cpms", supProductEntity.getCpms() == null ? ' ' : supProductEntity.getCpms());
                 supData.put("remark1", supProductEntity.getRemark() == null ? ' ' : supProductEntity.getRemark());
 
                 supData.put("index", String.valueOf(i));
diff --git a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java
index 8a7be91b..a0296b55 100644
--- a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java
+++ b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java
@@ -150,10 +150,12 @@ public class SupProductController {
     @PostMapping("/sup/product/selectBind")
     public BaseResponse selectBind(@RequestBody SelectProductBindRequest selectProductBindRequest) {
 
-
         UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(Long.valueOf(selectProductBindRequest.getRelIdFk()));
-
-        SupProductEntity supProductEntity = new SupProductEntity();
+        SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory());
+        if (supProductEntity != null) {
+            return ResultVOUtils.error(500, "资质证书已存在，请勿重复添加！");
+        }
+        supProductEntity = new SupProductEntity();
         BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity);
         supProductEntity.setProductId(selectProductBindRequest.getProductId());
         supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh());
diff --git a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java
index aa53b62f..2230afe0 100644
--- a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java
+++ b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java
@@ -17,6 +17,8 @@ public interface UdiRelevanceDao extends BaseMapperPlus<UdiRelevanceDao, UdiRele
 
     List<UdiRelevanceResponse> filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest);
 
+    List<UdiRelevanceResponse> filterCertUdi(FilterUdiRelRequest filterUdiRelRequest);
+
 
     List<UdiRelevanceResponse> filterUdiGp(FilterUdiRelRequest filterUdiRelRequest);
 
diff --git a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java
index 965edb9b..9c28c388 100644
--- a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java
@@ -69,7 +69,7 @@ public class BasicProductsEntity {
     private Integer bhzxxsbzsl;
 
     /**
-     * 最小包装单元内包含使用单元数量: 
+     * 最小包装单元内包含使用单元数量:
 最小销售标识包含使用单元数量
      */
     @TableField(value = "zxxsbzbhsydysl")
@@ -229,7 +229,7 @@ public class BasicProductsEntity {
      * 是否允许无批次号扫码
      */
     @TableField(value = "allowNoBatch")
-    private Byte allowNoBatch;
+    private Boolean allowNoBatch;
 
     /**
      * 是否允许无生产日期扫码
@@ -461,4 +461,4 @@ public class BasicProductsEntity {
     public static final String COL_UPDATEUSER = "updateUser";
 
     public static final String COL_REMARK = "remark";
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
index d725ed77..e408cc71 100644
--- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
@@ -47,6 +47,7 @@ public class UdiProductEntity {
     private Boolean allowNoBatch;
     private Boolean allowNoExpire;
     private Boolean allowNoProduct;
+    private Boolean allowNoSerial;
     private String spmc;
     private String cplx;
     private String hchzsb;
@@ -95,6 +96,9 @@ public class UdiProductEntity {
             return false;
         return allowNoProduct;
     }
-
-
+    public Boolean getAllowNoSerial() {
+        if (allowNoSerial == null)
+            return false;
+        return allowNoSerial;
+    }
 }
diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
index 00c3fff2..2e489e97 100644
--- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
@@ -169,4 +169,7 @@ public class UdiRelevanceEntity {
     @TableField(value = "needCert")
     private boolean needCert;           //是否需要资质材料
 
+    @TableField(value = "certIdFk")
+    private String certIdFk;
+
 }
diff --git a/src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java b/src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java
index dffec45b..eb7700e7 100644
--- a/src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java
+++ b/src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java
@@ -10,7 +10,7 @@ import java.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author 作者
@@ -18,7 +18,7 @@ import java.util.Date;
  */
 @TableName("sup_product")
 @Data
-public class SupProductEntity{
+public class SupProductEntity {
 
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
@@ -209,8 +209,6 @@ public class SupProductEntity{
     @TableField("measname")
     private String measname;
 
-    @TableField("cpms")
-    private String cpms;
 
     /**
      * 耗材字典关联主键
@@ -254,10 +252,38 @@ public class SupProductEntity{
     @TableField("updateTime")
     private Date updateTime;
 
+
+    @TableField(value = "manufactory")
+    private String manufactory;
+
     /**
      * 往来单位ID
      */
     @TableField(exist = false)
     private String companyName;
 
+
+    /**
+     * 是否允许无批次号扫码
+     */
+    @TableField(value = "allowNoBatch")
+    private Boolean allowNoBatch;
+
+    /**
+     * 是否允许无生产日期扫码
+     */
+    @TableField(value = "allowNoExpire")
+    private Boolean allowNoExpire;
+
+    /**
+     * 是否允许无失效日期扫码
+     */
+    @TableField(value = "allowNoProduct")
+    private Boolean allowNoProduct;
+
+    /**
+     * 是否允许无序列号
+     */
+    @TableField(value = "allowNoSerial")
+    private Boolean allowNoSerial;
 }
diff --git a/src/main/java/com/glxp/api/idc/thread/AsyncIdcTask.java b/src/main/java/com/glxp/api/idc/thread/AsyncIdcTask.java
index 2e76095e..98118bfa 100644
--- a/src/main/java/com/glxp/api/idc/thread/AsyncIdcTask.java
+++ b/src/main/java/com/glxp/api/idc/thread/AsyncIdcTask.java
@@ -34,7 +34,7 @@ public class AsyncIdcTask implements SchedulingConfigurer {
                     scheduledRequest.setCronName("syncIdc");
                     logger.info("syncIdc----------------");
                     ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
-                    String cron = scheduledEntity != null ? scheduledEntity.getCron() : "5 * * * * ?";
+                    String cron = scheduledEntity != null ? scheduledEntity.getCron() : "* 0/30 * * * ?";
 
                     if (cron.isEmpty()) {
                         logger.error("cron is null");
diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
index 043503cb..7c324d33 100644
--- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
@@ -63,5 +63,6 @@ public class FilterUdiRelRequest extends ListPageRequest {
     private String bindRlIds;
     private String relCode;
     private String bindType;
-
+    private String certIdFk;
+    private String manufactory;
 }
diff --git a/src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java b/src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java
index 490c426f..d00ed478 100644
--- a/src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java
@@ -62,7 +62,7 @@ public class UdiInfoRequest {
     private boolean allowNoBatch;
     private boolean allowNoExpire;
     private boolean allowNoProduct;
-
+    private boolean allowNoSerial;
     private String price;
     private String cplx;
     private String hchzsb;
diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java
index 37416755..d7c1527a 100644
--- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java
@@ -70,6 +70,7 @@ public class UdiRelevanceSaveRequest {
     private Boolean allowNoBatch;
     private Boolean allowNoExpire;
     private Boolean allowNoProduct;
+    private Boolean allowNoSerial;
     private String spmc;
     private String cplx;
     private String hchzsb;
@@ -98,4 +99,5 @@ public class UdiRelevanceSaveRequest {
     private boolean dispatch;           //是否可配送
     private boolean groupBuy;           //是否集采产品
     private boolean needCert;           //是否需要资质材料
+    private String certIdFk;
 }
diff --git a/src/main/java/com/glxp/api/req/purchase/FilterPoductRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterPoductRequest.java
index b36a4673..57fc3a7f 100644
--- a/src/main/java/com/glxp/api/req/purchase/FilterPoductRequest.java
+++ b/src/main/java/com/glxp/api/req/purchase/FilterPoductRequest.java
@@ -12,7 +12,7 @@ public class FilterPoductRequest extends ListPageRequest {
     private String recordCode;
     private String recordProductName;
     private String recordPeopleName;
-
+    private String manufactory;
 
     private String productId;
     private String manufacturerIdFk;
diff --git a/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java
index 8e545c6f..c123629d 100644
--- a/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java
@@ -68,6 +68,7 @@ public class CompanyProductRelevanceResponse {
     private boolean allowNoBatch;
     private boolean allowNoExpire;
     private boolean allowNoProduct;
+    private boolean allowNoSerial;
     private String spmc;
     private Integer productType;
     private String price;
diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
index e75499ea..cae21f03 100644
--- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
@@ -70,6 +70,7 @@ public class UdiRelevanceResponse {
     private Boolean allowNoBatch;
     private Boolean allowNoExpire;
     private Boolean allowNoProduct;
+    private Boolean allowNoSerial;
     private String spmc;
     private String cplx;
     private String hchzsb;
@@ -108,6 +109,8 @@ public class UdiRelevanceResponse {
 
     private String classifyName;        //物资分类名称
 
+    private String certIdFk;
+
 
     public int getBhzxxsbzsl() {
         if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {
@@ -134,7 +137,11 @@ public class UdiRelevanceResponse {
             return false;
         return allowNoProduct;
     }
-
+    public Boolean getAllowNoSerial() {
+        if (allowNoSerial == null)
+            return false;
+        return allowNoSerial;
+    }
 
     public Boolean getUseDy() {
         if (isUseDy == null)
diff --git a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java
index 45bb7cbc..31178271 100644
--- a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java
@@ -68,6 +68,7 @@ public class UdiRlSupResponse {
     private boolean allowNoBatch;
     private boolean allowNoExpire;
     private boolean allowNoProduct;
+    private boolean allowNoSerial;
     private String spmc;
     private Integer productType;
     private String price;
diff --git a/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java b/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java
index 2e741511..e7a3dc27 100644
--- a/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java
+++ b/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java
@@ -67,6 +67,7 @@ public class UdiInfoResponse {
     private boolean allowNoBatch;
     private boolean allowNoExpire;
     private boolean allowNoProduct;
+    private boolean allowNoSerial;
 
     private String price;
     private String cplx;
diff --git a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java
index 886af28a..b7687545 100644
--- a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java
+++ b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java
@@ -14,6 +14,8 @@ public interface UdiRelevanceService {
 
     List<UdiRelevanceResponse> filterUdiRelevance(FilterUdiRelRequest filterUdiRelRequest);
 
+    List<UdiRelevanceResponse> filterCertUdi(FilterUdiRelRequest filterUdiRelRequest);
+
     List<UdiRelevanceResponse> filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest);
 
     List<UdiRelevanceEntity> filterUdiEntity(FilterUdiRelRequest filterUdiRelRequest);
diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
index 569c30d0..b3a8978b 100644
--- a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
@@ -13,6 +13,7 @@ import com.glxp.api.req.basic.FilterBussinessTypeRequest;
 import com.glxp.api.res.basic.BasicBussinessTypeResponse;
 import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
+import com.glxp.api.service.system.SystemParamConfigService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -191,6 +192,10 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService
         return list;
     }
 
+
+    @Resource
+    SystemParamConfigService systemParamConfigService;
+
     @Override
     public List<BasicBussinessTypeEntity> findByVueType(String vueType) {
 
@@ -204,18 +209,26 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService
 
             case Constant.ORDER_ACTION_PRE_DETAIL:
                 bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
-                        .eq("actionType", 3).eq("inStock", true).eq("enable",true));
+                        .eq("actionType", 3).eq("inStock", true).eq("enable", true));
                 break;
             case Constant.ORDER_ACTION_SUP_DELIVERY:
-                bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
-                        .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
-                        .eq("spUse", true).eq("inStock", false).eq("enable",true));
+                //允许送货单直接入库变更库存,则不判断送货单是否入库
+                String deliveryInstock = systemParamConfigService.selectValueByParamKey("deliveryInstock");
+                if (StrUtil.isNotEmpty(deliveryInstock) && deliveryInstock.equals("1")) {
+                    bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
+                            .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
+                            .eq("spUse", true).eq("enable", true));
+                } else {
+                    bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
+                            .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
+                            .eq("spUse", true).eq("inStock", false).eq("enable", true));
+                }
 
                 break;
             case Constant.ORDER_ACTION_SUP_INVOICE:
                 bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
                         .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
-                        .eq("spUse", true).eq("actionType", 1).eq("enable",true));
+                        .eq("spUse", true).eq("actionType", 1).eq("enable", true));
                 break;
             default:
                 break;
diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java
index 12740dc4..8ceab1d7 100644
--- a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java
@@ -39,6 +39,22 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
         return data;
     }
 
+    @Override
+    public List<UdiRelevanceResponse> filterCertUdi(FilterUdiRelRequest filterUdiRelRequest) {
+
+
+        if (filterUdiRelRequest == null) {
+            return Collections.emptyList();
+        }
+        if (filterUdiRelRequest.getPage() != null) {
+            int offset = (filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit();
+            PageHelper.offsetPage(offset, filterUdiRelRequest.getLimit());
+        }
+        List<UdiRelevanceResponse> data = udiRelevanceDao.filterCertUdi(filterUdiRelRequest);
+        return data;
+
+    }
+
     @Override
     public List<UdiRelevanceResponse> filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest) {
         if (filterUdiRelRequest == null) {
@@ -177,6 +193,7 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
             return data.get(0);
         return null;
     }
+
     @Override
     public UdiRelevanceResponse selectSupGroupById(Long id) {
         FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
diff --git a/src/main/java/com/glxp/api/service/purchase/SupProductService.java b/src/main/java/com/glxp/api/service/purchase/SupProductService.java
index bcc7a079..f764afe6 100644
--- a/src/main/java/com/glxp/api/service/purchase/SupProductService.java
+++ b/src/main/java/com/glxp/api/service/purchase/SupProductService.java
@@ -16,6 +16,9 @@ public interface SupProductService {
 
     SupProductEntity findByRelIdFk(String relIdFk);
 
+
+    SupProductEntity findByManufactury(String cpmctymc, String manufactory);
+
     SupProductResponse findByPassByReCert(String registerCert);
 
     SupProductResponse findJoinRegistration(Long id);
diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java
index dcdd33d4..42e0cca9 100644
--- a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java
@@ -79,6 +79,16 @@ public class SupProductServiceImpl implements SupProductService {
         else return null;
     }
 
+    @Override
+    public SupProductEntity findByManufactury(String cpmctymc, String manufactory) {
+        List<SupProductEntity> supProductEntities = supProductDao.selectList(new QueryWrapper<SupProductEntity>().eq("manufactory", manufactory)
+                .eq("recordProductName", cpmctymc)
+                .last("LIMIT 1"));
+        if (CollUtil.isNotEmpty(supProductEntities))
+            return supProductEntities.get(0);
+        else return null;
+    }
+
     @Override
     public SupProductEntity findRegistrationByName(String recordProductName) {
         return supProductDao.findRegistrationByName(recordProductName);
diff --git a/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml
index 9295ef4e..f6c5c24d 100644
--- a/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml
@@ -74,6 +74,7 @@
         basic_products.allowNoBatch,
         basic_products.allowNoExpire,
         basic_products.allowNoProduct,
+        basic_products.allowNoSerial,
         basic_products.productType,
         basic_products.nameCode,
         basic_products.packRatio,
diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
index 1abe8e8f..9c104d56 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 
 <mapper namespace="com.glxp.api.dao.basic.UdiProductDao">
-
     <select id="filterUdiInfo" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
             resultType="com.glxp.api.entity.basic.UdiProductEntity">
-        SELECT * FROM basic_products
+        SELECT *
+        FROM basic_products
         <where>
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
-                AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%')
+                AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc}, '%')
             </if>
             <if test="cpmctymc != '' and cpmctymc != null">
-                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+                AND cpmctymc LIKE concat(#{cpmctymc}, '%')
             </if>
             <if test="nameCode != '' and nameCode != null">
-                AND nameCode LIKE concat(#{nameCode},'%')
+                AND nameCode LIKE concat(#{nameCode}, '%')
             </if>
             <if test="uuid != '' and uuid != null">
                 AND uuid = #{uuid}
@@ -26,54 +26,92 @@
                 AND sptm = #{sptm}
             </if>
         </where>
-
     </select>
 
     <select id="filterUdiInfo2" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
             resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
         SELECT basic_products.id,
-        basic_udirel.thirdId,basic_udirel.thirdName,basic_udirel.isUseDy,
-        basic_udirel.thirdId1,basic_udirel.thirdId2,basic_udirel.thirdId3,basic_udirel.thirdId4,
-        basic_udirel.ybbm,basic_udirel.sptm,basic_udirel.isDisable,
-        basic_udirel.thirdName1,basic_udirel.thirdName2,basic_udirel.thirdName3,basic_udirel.thirdName4,
-        basic_udirel.manufactory,basic_udirel.measname,basic_udirel.udplatCode,
-        basic_products.nameCode,basic_products.packRatio,basic_products.packLevel,basic_products.packUnit,
-        basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl,
-        basic_products.bhxjcpbm,basic_products.bzcj,basic_products.addType,basic_products.deviceRecordKey,
-        basic_products.cpmctymc,basic_products.cplb,basic_products.flbm,basic_products.ggxh,basic_products.qxlb,
-        basic_products.tyshxydm,basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc,
-        basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType,
-        basic_products.scbssfbhph,
-        basic_products.scbssfbhxlh,
-        basic_products.scbssfbhscrq,
-        basic_products.scbssfbhsxrq,basic_products.cpms,basic_products.originUuid,basic_products.allowNoBatch,
-        basic_products.allowNoExpire,basic_products.allowNoProduct,basic_products.spmc,basic_products.cplx,basic_products.hchzsb
+               basic_udirel.thirdId,
+               basic_udirel.thirdName,
+               basic_udirel.isUseDy,
+               basic_udirel.thirdId1,
+               basic_udirel.thirdId2,
+               basic_udirel.thirdId3,
+               basic_udirel.thirdId4,
+               basic_udirel.ybbm,
+               basic_udirel.sptm,
+               basic_udirel.isDisable,
+               basic_udirel.thirdName1,
+               basic_udirel.thirdName2,
+               basic_udirel.thirdName3,
+               basic_udirel.thirdName4,
+               basic_udirel.manufactory,
+               basic_udirel.measname,
+               basic_udirel.udplatCode,
+               basic_products.nameCode,
+               basic_products.packRatio,
+               basic_products.packLevel,
+               basic_products.packUnit,
+               basic_products.bhxjsl,
+               basic_products.bhzxxsbzsl,
+               basic_products.zxxsbzbhsydysl,
+               basic_products.bhxjcpbm,
+               basic_products.bzcj,
+               basic_products.addType,
+               basic_products.deviceRecordKey,
+               basic_products.cpmctymc,
+               basic_products.cplb,
+               basic_products.flbm,
+               basic_products.ggxh,
+               basic_products.qxlb,
+               basic_products.tyshxydm,
+               basic_products.ylqxzcrbarmc,
+               basic_products.zczbhhzbapzbh,
+               basic_products.ylqxzcrbarywmc,
+               basic_products.sydycpbs,
+               basic_products.uuid,
+               basic_products.sjcpbm,
+               basic_products.versionNumber,
+               basic_products.diType,
+               basic_products.scbssfbhph,
+               basic_products.scbssfbhxlh,
+               basic_products.scbssfbhscrq,
+               basic_products.scbssfbhsxrq,
+               basic_products.cpms,
+               basic_products.originUuid,
+               basic_products.allowNoBatch,
+               basic_products.allowNoExpire,
+               basic_products.allowNoProduct,
+               basic_products.allowNoSerial,
+               basic_products.spmc,
+               basic_products.cplx,
+               basic_products.hchzsb
         FROM (company_product_relevance
-        inner JOIN basic_udirel
-        ON company_product_relevance.udiRlIdFk = basic_udirel.id)
-        inner JOIN basic_products
-        ON basic_udirel.uuid = basic_products.uuid
+                inner JOIN basic_udirel
+                ON company_product_relevance.udiRlIdFk = basic_udirel.id)
+                     inner JOIN basic_products
+                ON basic_udirel.uuid = basic_products.uuid
         <where>
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
-                AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%')
+                AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc}, '%')
             </if>
             <if test="cpmctymc != '' and cpmctymc != null">
-                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+                AND cpmctymc LIKE concat(#{cpmctymc}, '%')
             </if>
             <if test="nameCode != '' and nameCode != null">
-                AND nameCode LIKE concat(#{nameCode},'%')
+                AND nameCode LIKE concat(#{nameCode}, '%')
             </if>
             <if test="unionCode != '' and unionCode != null">
-                or nameCode LIKE concat('%',#{unionCode},'%')
-                or basic_udirel.ybbm LIKE concat('%',#{unionCode},'%')
-                or basic_udirel.sptm LIKE concat('%',#{unionCode},'%')
+                or nameCode LIKE concat('%', #{unionCode}, '%')
+                or basic_udirel.ybbm LIKE concat('%', #{unionCode}, '%')
+                or basic_udirel.sptm LIKE concat('%', #{unionCode}, '%')
             </if>
             <if test="thrPiId != '' and thrPiId != null">
-                or thirdId LIKE concat('%',#{thrPiId},'%')
-                or thirdId1 LIKE concat('%',#{thrPiId},'%')
-                or thirdId2 LIKE concat('%',#{thrPiId},'%')
-                or thirdId3 LIKE concat('%',#{thrPiId},'%')
-                or thirdId4 LIKE concat('%',#{thrPiId},'%')
+                or thirdId LIKE concat('%', #{thrPiId}, '%')
+                or thirdId1 LIKE concat('%', #{thrPiId}, '%')
+                or thirdId2 LIKE concat('%', #{thrPiId}, '%')
+                or thirdId3 LIKE concat('%', #{thrPiId}, '%')
+                or thirdId4 LIKE concat('%', #{thrPiId}, '%')
             </if>
             <if test="uuid != '' and uuid != null">
                 AND uuid = #{uuid}
@@ -82,7 +120,7 @@
                 AND thirdId = #{thirdId}
             </if>
             <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
-                AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh},'%')
+                AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
             </if>
             <if test="customerId != '' and customerId != null">
                 AND company_product_relevance.customerId = #{customerId}
@@ -90,7 +128,6 @@
             <if test="originUuid != '' and originUuid != null">
                 AND originUuid = #{originUuid}
             </if>
-
         </where>
         ORDER BY updateTime DESC
     </select>
@@ -99,14 +136,16 @@
             resultType="com.glxp.api.entity.basic.UdiProductEntity">
         SELECT *
         FROM basic_products
-        WHERE (id = #{id}) limit 1
+        WHERE (id = #{id})
+        limit 1
     </select>
 
     <select id="findByUuid" parameterType="java.lang.String"
             resultType="com.glxp.api.entity.basic.UdiProductEntity">
         SELECT *
         FROM basic_products
-        WHERE (uuid = #{uuid}) limit 1
+        WHERE (uuid = #{uuid})
+        limit 1
     </select>
 
     <select id="findByUuids" parameterType="java.lang.String"
@@ -120,132 +159,138 @@
             resultType="com.glxp.api.entity.basic.UdiProductEntity">
         SELECT *
         FROM basic_products
-        WHERE (nameCode = #{nameCode}) limit 1
+        WHERE (nameCode = #{nameCode})
+        limit 1
     </select>
     <insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.api.entity.basic.UdiProductEntity">
         replace
-        INTO basic_products
-        (uuid,originUuid,nameCode,deviceRecordKey,packRatio,packLevel,packUnit,bhxjsl,bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,
-        ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,sydycpbs,sjcpbm,versionNumber,diType,ybbm,sptm,manufactory,measname,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms,allowNoBatch,allowNoExpire,
-        allowNoProduct,spmc,cplx,hchzsb,cpdls,price,basicPrductRemak1,basicPrductRemak2,basicPrductRemak3,basicPrductRemak4,basicPrductRemak5,basicPrductRemak6,basicPrductRemak7,basicPrductRemak8)
-        values
-            (
-        #{uuid},
-        #{originUuid},
-        #{nameCode},
-        #{deviceRecordKey},
-        #{packRatio},
-        #{packLevel},
-        #{packUnit},
-        #{bhxjsl},
-        #{bhzxxsbzsl },
-        #{zxxsbzbhsydysl},
-        #{bhxjcpbm},
-        #{bzcj},
-        #{cpmctymc},
-        #{cplb},
-        #{flbm},
-        #{ggxh},
-        #{qxlb},
-        #{tyshxydm},
-        #{ylqxzcrbarmc},
-        #{zczbhhzbapzbh},
-        #{ylqxzcrbarywmc},
-        #{sydycpbs},
-        #{sjcpbm},
-        #{versionNumber},
-        #{diType},
-        #{ybbm},
-        #{sptm},
-        #{manufactory},
-        #{measname},
-        #{productType},
-        #{scbssfbhph},
-        #{scbssfbhxlh},
-        #{scbssfbhscrq},
-        #{scbssfbhsxrq},
-        #{cpms},
-        #{allowNoBatch},
-        #{allowNoExpire},
-        #{allowNoProduct},
-        #{spmc},
-        #{cplx},
-        #{hchzsb},
-        #{cpdls},
-        #{price},
-        #{basicPrductRemak1},
-        #{basicPrductRemak2},
-        #{basicPrductRemak3},
-        #{basicPrductRemak4},
-        #{basicPrductRemak5},
-        #{basicPrductRemak6},
-        #{basicPrductRemak7},
-        #{basicPrductRemak8}
-        )
+                INTO basic_products
+                (uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl,
+                 zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm,
+                 ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm,
+                 manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms,
+                 allowNoBatch, allowNoExpire,
+                 allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2,
+                 basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7,
+                 basicPrductRemak8)
+        values (#{uuid},
+                #{originUuid},
+                #{nameCode},
+                #{deviceRecordKey},
+                #{packRatio},
+                #{packLevel},
+                #{packUnit},
+                #{bhxjsl},
+                #{bhzxxsbzsl },
+                #{zxxsbzbhsydysl},
+                #{bhxjcpbm},
+                #{bzcj},
+                #{cpmctymc},
+                #{cplb},
+                #{flbm},
+                #{ggxh},
+                #{qxlb},
+                #{tyshxydm},
+                #{ylqxzcrbarmc},
+                #{zczbhhzbapzbh},
+                #{ylqxzcrbarywmc},
+                #{sydycpbs},
+                #{sjcpbm},
+                #{versionNumber},
+                #{diType},
+                #{ybbm},
+                #{sptm},
+                #{manufactory},
+                #{measname},
+                #{productType},
+                #{scbssfbhph},
+                #{scbssfbhxlh},
+                #{scbssfbhscrq},
+                #{scbssfbhsxrq},
+                #{cpms},
+                #{allowNoBatch},
+                #{allowNoExpire},
+                #{allowNoProduct}, #{allowNoSerial},
+                #{spmc},
+                #{cplx},
+                #{hchzsb},
+                #{cpdls},
+                #{price},
+                #{basicPrductRemak1},
+                #{basicPrductRemak2},
+                #{basicPrductRemak3},
+                #{basicPrductRemak4},
+                #{basicPrductRemak5},
+                #{basicPrductRemak6},
+                #{basicPrductRemak7},
+                #{basicPrductRemak8})
     </insert>
 
     <insert id="insertUdiInfos" keyProperty="id" parameterType="java.util.List">
         replace INTO basic_products
-        (uuid,originUuid,nameCode,deviceRecordKey,packRatio,packLevel,packUnit,bhxjsl,bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,
-        ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,sydycpbs,sjcpbm,versionNumber,diType,ybbm,sptm,manufactory,measname,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms,allowNoBatch,allowNoExpire,
-        allowNoProduct,spmc,cplx,hchzsb,cpdls,price,basicPrductRemak1,basicPrductRemak2,basicPrductRemak3,basicPrductRemak4,basicPrductRemak5,basicPrductRemak6,basicPrductRemak7,basicPrductRemak8)
-        values
+                (uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl,
+                 zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm,
+                 ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm,
+                 manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms,
+                 allowNoBatch, allowNoExpire,
+                 allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2,
+                 basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7,
+                 basicPrductRemak8)
+                values
 
         <foreach collection="udiInfoEntities" item="item" index="index"
                  separator=",">
-            (
-            #{item.uuid},
-            #{item.originUuid},
-            #{item.nameCode},
-            #{item.deviceRecordKey},
-            #{item.packRatio},
-            #{item.packLevel},
-            #{item.packUnit},
-            #{item.bhxjsl},
-            #{item.bhzxxsbzsl},
-            #{item.zxxsbzbhsydysl},
-            #{item.bhxjcpbm},
-            #{item.bzcj},
-            #{item.cpmctymc},
-            #{item.cplb},
-            #{item.flbm},
-            #{item.ggxh},
-            #{item.qxlb},
-            #{item.tyshxydm},
-            #{item.ylqxzcrbarmc},
-            #{item.zczbhhzbapzbh},
-            #{item.ylqxzcrbarywmc},
-            #{item.sydycpbs},
-            #{item.sjcpbm},
-            #{item.versionNumber},
-            #{item.diType},
-            #{item.ybbm},
-            #{item.sptm},
-            #{item.manufactory},
-            #{item.measname},
-            #{item.productType},
-            #{item.scbssfbhph},
-            #{item.scbssfbhxlh},
-            #{item.scbssfbhscrq},
-            #{item.scbssfbhsxrq},
-            #{item.cpms},
-            #{item.allowNoBatch},
-            #{item.allowNoExpire},
-            #{item.allowNoProduct},
-            #{item.spmc},
-            #{item.cplx},
-            #{item.hchzsb},
-            #{item.cpdls},
-            #{item.price},
-            #{item.basicPrductRemak1},
-            #{item.basicPrductRemak2},
-            #{item.basicPrductRemak3},
-            #{item.basicPrductRemak4},
-            #{item.basicPrductRemak5},
-            #{item.basicPrductRemak6},
-            #{item.basicPrductRemak7},
-            #{item.basicPrductRemak8}
-            )
+            (#{item.uuid},
+             #{item.originUuid},
+             #{item.nameCode},
+             #{item.deviceRecordKey},
+             #{item.packRatio},
+             #{item.packLevel},
+             #{item.packUnit},
+             #{item.bhxjsl},
+             #{item.bhzxxsbzsl},
+             #{item.zxxsbzbhsydysl},
+             #{item.bhxjcpbm},
+             #{item.bzcj},
+             #{item.cpmctymc},
+             #{item.cplb},
+             #{item.flbm},
+             #{item.ggxh},
+             #{item.qxlb},
+             #{item.tyshxydm},
+             #{item.ylqxzcrbarmc},
+             #{item.zczbhhzbapzbh},
+             #{item.ylqxzcrbarywmc},
+             #{item.sydycpbs},
+             #{item.sjcpbm},
+             #{item.versionNumber},
+             #{item.diType},
+             #{item.ybbm},
+             #{item.sptm},
+             #{item.manufactory},
+             #{item.measname},
+             #{item.productType},
+             #{item.scbssfbhph},
+             #{item.scbssfbhxlh},
+             #{item.scbssfbhscrq},
+             #{item.scbssfbhsxrq},
+             #{item.cpms},
+             #{item.allowNoBatch},
+             #{item.allowNoExpire},
+             #{item.allowNoProduct}, #{item.allowNoSerial},
+             #{item.spmc},
+             #{item.cplx},
+             #{item.hchzsb},
+             #{item.cpdls},
+             #{item.price},
+             #{item.basicPrductRemak1},
+             #{item.basicPrductRemak2},
+             #{item.basicPrductRemak3},
+             #{item.basicPrductRemak4},
+             #{item.basicPrductRemak5},
+             #{item.basicPrductRemak6},
+             #{item.basicPrductRemak7},
+             #{item.basicPrductRemak8})
         </foreach>
     </insert>
 
@@ -264,113 +309,319 @@
     <update id="updateUdiInfo" parameterType="com.glxp.api.entity.basic.UdiProductEntity">
         UPDATE basic_products
         <trim prefix="set" suffixOverrides=",">
-            <if test="originUuid != null">originUuid=#{originUuid},</if>
-            <if test="nameCode != null">nameCode=#{nameCode},</if>
-            <if test="deviceRecordKey != null">deviceRecordKey=#{deviceRecordKey},</if>
-            <if test="packRatio != null">packRatio=#{packRatio},</if>
-            <if test="packLevel != null">packLevel=#{packLevel},</if>
-            <if test="packUnit != null">packUnit=#{packUnit},</if>
-            <if test="bhxjsl != null">bhxjsl=#{bhxjsl},</if>
-            <if test="bhzxxsbzsl != null">bhzxxsbzsl=#{bhzxxsbzsl},</if>
-            <if test="zxxsbzbhsydysl != null">zxxsbzbhsydysl=#{zxxsbzbhsydysl},</if>
-            <if test="bhxjcpbm != null">bhxjcpbm=#{bhxjcpbm},</if>
-            <if test="bzcj != null">bzcj=#{bzcj},</if>
-            <if test="cpmctymc != null">cpmctymc=#{cpmctymc},</if>
-            <if test="cplb != null">cplb=#{cplb},</if>
-            <if test="flbm != null">flbm=#{flbm},</if>
-            <if test="ggxh != null">ggxh=#{ggxh},</if>
-            <if test="qxlb != null">qxlb=#{qxlb},</if>
-            <if test="tyshxydm != null">tyshxydm=#{tyshxydm},</if>
-            <if test="ylqxzcrbarmc != null">ylqxzcrbarmc=#{ylqxzcrbarmc},</if>
-            <if test="zczbhhzbapzbh != null">zczbhhzbapzbh=#{zczbhhzbapzbh},</if>
-            <if test="ylqxzcrbarywmc != null">ylqxzcrbarywmc=#{ylqxzcrbarywmc},</if>
-            <if test="sydycpbs != null">sydycpbs=#{sydycpbs},</if>
-            <if test="sjcpbm != null">sjcpbm=#{sjcpbm},</if>
-            <if test="versionNumber != null">versionNumber=#{versionNumber},</if>
-            <if test="diType != null">diType=#{diType},</if>
-            <if test="ybbm != null">ybbm=#{ybbm},</if>
-            <if test="sptm != null">sptm=#{sptm},</if>
-            <if test="manufactory != null">manufactory=#{manufactory},</if>
-            <if test="measname != null">measname=#{measname},</if>
-            <if test="productType != null">productType=#{productType},</if>
-            <if test="scbssfbhph != null">scbssfbhph=#{scbssfbhph},</if>
-            <if test="scbssfbhxlh != null">scbssfbhxlh=#{scbssfbhxlh},</if>
-            <if test="scbssfbhscrq != null">scbssfbhscrq=#{scbssfbhscrq},</if>
-            <if test="scbssfbhsxrq != null">scbssfbhsxrq=#{scbssfbhsxrq},</if>
-            <if test="cpms != null">cpms=#{cpms},</if>
-            <if test="allowNoBatch != null">allowNoBatch=#{allowNoBatch},</if>
-            <if test="allowNoExpire != null">allowNoExpire=#{allowNoExpire},</if>
-            <if test="allowNoProduct != null">allowNoProduct=#{allowNoProduct},</if>
-            <if test="spmc != null">spmc=#{spmc},</if>
-            <if test="cplx != null">cplx=#{cplx},</if>
-            <if test="hchzsb != null">hchzsb=#{hchzsb},</if>
-            <if test="cpdls != null">cpdls=#{cpdls},</if>
-            <if test="price != null">price=#{price},</if>
-            <if test="basicPrductRemak1 != null">basicPrductRemak1=#{basicPrductRemak1},</if>
-            <if test="basicPrductRemak2 != null">basicPrductRemak2=#{basicPrductRemak2},</if>
-            <if test="basicPrductRemak3 != null">basicPrductRemak3=#{basicPrductRemak3},</if>
-            <if test="basicPrductRemak4 != null">basicPrductRemak4=#{basicPrductRemak4},</if>
-            <if test="basicPrductRemak5 != null">basicPrductRemak5=#{basicPrductRemak5},</if>
-            <if test="basicPrductRemak6 != null">basicPrductRemak6=#{basicPrductRemak6},</if>
-            <if test="basicPrductRemak7 != null">basicPrductRemak7=#{basicPrductRemak7},</if>
-            <if test="basicPrductRemak8 != null">basicPrductRemak8=#{basicPrductRemak8},</if>
+            <if test="originUuid != null">
+                originUuid=#{originUuid},
+            </if>
+            <if test="nameCode != null">
+                nameCode=#{nameCode},
+            </if>
+            <if test="deviceRecordKey != null">
+                deviceRecordKey=#{deviceRecordKey},
+            </if>
+            <if test="packRatio != null">
+                packRatio=#{packRatio},
+            </if>
+            <if test="packLevel != null">
+                packLevel=#{packLevel},
+            </if>
+            <if test="packUnit != null">
+                packUnit=#{packUnit},
+            </if>
+            <if test="bhxjsl != null">
+                bhxjsl=#{bhxjsl},
+            </if>
+            <if test="bhzxxsbzsl != null">
+                bhzxxsbzsl=#{bhzxxsbzsl},
+            </if>
+            <if test="zxxsbzbhsydysl != null">
+                zxxsbzbhsydysl=#{zxxsbzbhsydysl},
+            </if>
+            <if test="bhxjcpbm != null">
+                bhxjcpbm=#{bhxjcpbm},
+            </if>
+            <if test="bzcj != null">
+                bzcj=#{bzcj},
+            </if>
+            <if test="cpmctymc != null">
+                cpmctymc=#{cpmctymc},
+            </if>
+            <if test="cplb != null">
+                cplb=#{cplb},
+            </if>
+            <if test="flbm != null">
+                flbm=#{flbm},
+            </if>
+            <if test="ggxh != null">
+                ggxh=#{ggxh},
+            </if>
+            <if test="qxlb != null">
+                qxlb=#{qxlb},
+            </if>
+            <if test="tyshxydm != null">
+                tyshxydm=#{tyshxydm},
+            </if>
+            <if test="ylqxzcrbarmc != null">
+                ylqxzcrbarmc=#{ylqxzcrbarmc},
+            </if>
+            <if test="zczbhhzbapzbh != null">
+                zczbhhzbapzbh=#{zczbhhzbapzbh},
+            </if>
+            <if test="ylqxzcrbarywmc != null">
+                ylqxzcrbarywmc=#{ylqxzcrbarywmc},
+            </if>
+            <if test="sydycpbs != null">
+                sydycpbs=#{sydycpbs},
+            </if>
+            <if test="sjcpbm != null">
+                sjcpbm=#{sjcpbm},
+            </if>
+            <if test="versionNumber != null">
+                versionNumber=#{versionNumber},
+            </if>
+            <if test="diType != null">
+                diType=#{diType},
+            </if>
+            <if test="ybbm != null">
+                ybbm=#{ybbm},
+            </if>
+            <if test="sptm != null">
+                sptm=#{sptm},
+            </if>
+            <if test="manufactory != null">
+                manufactory=#{manufactory},
+            </if>
+            <if test="measname != null">
+                measname=#{measname},
+            </if>
+            <if test="productType != null">
+                productType=#{productType},
+            </if>
+            <if test="scbssfbhph != null">
+                scbssfbhph=#{scbssfbhph},
+            </if>
+            <if test="scbssfbhxlh != null">
+                scbssfbhxlh=#{scbssfbhxlh},
+            </if>
+            <if test="scbssfbhscrq != null">
+                scbssfbhscrq=#{scbssfbhscrq},
+            </if>
+            <if test="scbssfbhsxrq != null">
+                scbssfbhsxrq=#{scbssfbhsxrq},
+            </if>
+            <if test="cpms != null">
+                cpms=#{cpms},
+            </if>
+            <if test="allowNoBatch != null">
+                allowNoBatch=#{allowNoBatch},
+            </if>
+            <if test="allowNoExpire != null">
+                allowNoExpire=#{allowNoExpire},
+            </if>
+            <if test="allowNoProduct != null">
+                allowNoProduct=#{allowNoProduct},
+            </if>
+            <if test="allowNoSerial != null">
+                allowNoSerial=#{allowNoSerial},
+            </if>
+
+
+            <if test="spmc != null">
+                spmc=#{spmc},
+            </if>
+            <if test="cplx != null">
+                cplx=#{cplx},
+            </if>
+            <if test="hchzsb != null">
+                hchzsb=#{hchzsb},
+            </if>
+            <if test="cpdls != null">
+                cpdls=#{cpdls},
+            </if>
+            <if test="price != null">
+                price=#{price},
+            </if>
+            <if test="basicPrductRemak1 != null">
+                basicPrductRemak1=#{basicPrductRemak1},
+            </if>
+            <if test="basicPrductRemak2 != null">
+                basicPrductRemak2=#{basicPrductRemak2},
+            </if>
+            <if test="basicPrductRemak3 != null">
+                basicPrductRemak3=#{basicPrductRemak3},
+            </if>
+            <if test="basicPrductRemak4 != null">
+                basicPrductRemak4=#{basicPrductRemak4},
+            </if>
+            <if test="basicPrductRemak5 != null">
+                basicPrductRemak5=#{basicPrductRemak5},
+            </if>
+            <if test="basicPrductRemak6 != null">
+                basicPrductRemak6=#{basicPrductRemak6},
+            </if>
+            <if test="basicPrductRemak7 != null">
+                basicPrductRemak7=#{basicPrductRemak7},
+            </if>
+            <if test="basicPrductRemak8 != null">
+                basicPrductRemak8=#{basicPrductRemak8},
+            </if>
         </trim>
-        WHERE nameCode = #{nameCode}  and uuid = #{uuid}
+        WHERE nameCode = #{nameCode}
+          and uuid = #{uuid}
     </update>
 
     <update id="updateUdiInfoByUuid" parameterType="com.glxp.api.entity.basic.UdiProductEntity">
         update basic_products
         <trim prefix="set" suffixOverrides=",">
-            <if test="originUuid != null">originUuid=#{originUuid},</if>
-            <if test="nameCode != null">nameCode=#{nameCode},</if>
-            <if test="deviceRecordKey != null">deviceRecordKey=#{deviceRecordKey},</if>
-            <if test="packRatio != null">packRatio=#{packRatio},</if>
-            <if test="packLevel != null">packLevel=#{packLevel},</if>
-            <if test="packUnit != null">packUnit=#{packUnit},</if>
-            <if test="bhxjsl != null">bhxjsl=#{bhxjsl},</if>
-            <if test="bhzxxsbzsl != null">bhzxxsbzsl=#{bhzxxsbzsl},</if>
-            <if test="zxxsbzbhsydysl != null">zxxsbzbhsydysl=#{zxxsbzbhsydysl},</if>
-            <if test="bhxjcpbm != null">bhxjcpbm=#{bhxjcpbm},</if>
-            <if test="bzcj != null">bzcj=#{bzcj},</if>
-            <if test="cpmctymc != null">cpmctymc=#{cpmctymc},</if>
-            <if test="cplb != null">cplb=#{cplb},</if>
-            <if test="flbm != null">flbm=#{flbm},</if>
-            <if test="ggxh != null">ggxh=#{ggxh},</if>
-            <if test="qxlb != null">qxlb !==#{qxlb !=},</if>
-            <if test="tyshxydm != null">tyshxydm=#{tyshxydm},</if>
-            <if test="ylqxzcrbarmc != null">ylqxzcrbarmc=#{ylqxzcrbarmc},</if>
-            <if test="zczbhhzbapzbh != null">zczbhhzbapzbh=#{zczbhhzbapzbh},</if>
-            <if test="ylqxzcrbarywmc != null">ylqxzcrbarywmc=#{ylqxzcrbarywmc},</if>
-            <if test="sydycpbs != null">sydycpbs=#{sydycpbs},</if>
-            <if test="sjcpbm != null">sjcpbm=#{sjcpbm},</if>
-            <if test="versionNumber != null">versionNumber=#{versionNumber},</if>
-            <if test="diType != null">diType=#{diType},</if>
-            <if test="ybbm != null">ybbm=#{ybbm},</if>
-            <if test="sptm != null">sptm=#{sptm},</if>
-            <if test="manufactory != null">manufactory=#{manufactory},</if>
-            <if test="measname != null">measname=#{measname},</if>
-            <if test="productType != null">productType=#{productType},</if>
-            <if test="scbssfbhph != null">scbssfbhph=#{scbssfbhph},</if>
-            <if test="scbssfbhxlh != null">scbssfbhxlh=#{scbssfbhxlh},</if>
-            <if test="scbssfbhscrq != null">scbssfbhscrq=#{scbssfbhscrq},</if>
-            <if test="scbssfbhsxrq != null">scbssfbhsxrq=#{scbssfbhsxrq},</if>
-            <if test="cpms != null">cpms=#{cpms},</if>
-            <if test="allowNoBatch != null">allowNoBatch=#{allowNoBatch},</if>
-            <if test="allowNoExpire != null">allowNoExpire=#{allowNoExpire},</if>
-            <if test="allowNoProduct != null">allowNoProduct=#{allowNoProduct},</if>
-            <if test="spmc != null">spmc=#{spmc},</if>
-            <if test="cplx != null">cplx=#{cplx},</if>
-            <if test="hchzsb != null">hchzsb=#{hchzsb},</if>
-            <if test="cpdls != null">cpdls=#{cpdls},</if>
-            <if test="price != null">price=#{price},</if>
-            <if test="basicPrductRemak1 != null">basicPrductRemak1=#{basicPrductRemak1},</if>
-            <if test="basicPrductRemak2 != null">basicPrductRemak2=#{basicPrductRemak2},</if>
-            <if test="basicPrductRemak3 != null">basicPrductRemak3=#{basicPrductRemak3},</if>
-            <if test="basicPrductRemak4 != null">basicPrductRemak4=#{basicPrductRemak4},</if>
-            <if test="basicPrductRemak5 != null">basicPrductRemak5=#{basicPrductRemak5},</if>
-            <if test="basicPrductRemak6 != null">basicPrductRemak6=#{basicPrductRemak6},</if>
-            <if test="basicPrductRemak7 != null">basicPrductRemak7=#{basicPrductRemak7},</if>
-            <if test="basicPrductRemak8 != null">basicPrductRemak8=#{basicPrductRemak8},</if>
+            <if test="originUuid != null">
+                originUuid=#{originUuid},
+            </if>
+            <if test="nameCode != null">
+                nameCode=#{nameCode},
+            </if>
+            <if test="deviceRecordKey != null">
+                deviceRecordKey=#{deviceRecordKey},
+            </if>
+            <if test="packRatio != null">
+                packRatio=#{packRatio},
+            </if>
+            <if test="packLevel != null">
+                packLevel=#{packLevel},
+            </if>
+            <if test="packUnit != null">
+                packUnit=#{packUnit},
+            </if>
+            <if test="bhxjsl != null">
+                bhxjsl=#{bhxjsl},
+            </if>
+            <if test="bhzxxsbzsl != null">
+                bhzxxsbzsl=#{bhzxxsbzsl},
+            </if>
+            <if test="zxxsbzbhsydysl != null">
+                zxxsbzbhsydysl=#{zxxsbzbhsydysl},
+            </if>
+            <if test="bhxjcpbm != null">
+                bhxjcpbm=#{bhxjcpbm},
+            </if>
+            <if test="bzcj != null">
+                bzcj=#{bzcj},
+            </if>
+            <if test="cpmctymc != null">
+                cpmctymc=#{cpmctymc},
+            </if>
+            <if test="cplb != null">
+                cplb=#{cplb},
+            </if>
+            <if test="flbm != null">
+                flbm=#{flbm},
+            </if>
+            <if test="ggxh != null">
+                ggxh=#{ggxh},
+            </if>
+            <if test="qxlb != null">
+                qxlb !==#{qxlb !=},
+            </if>
+            <if test="tyshxydm != null">
+                tyshxydm=#{tyshxydm},
+            </if>
+            <if test="ylqxzcrbarmc != null">
+                ylqxzcrbarmc=#{ylqxzcrbarmc},
+            </if>
+            <if test="zczbhhzbapzbh != null">
+                zczbhhzbapzbh=#{zczbhhzbapzbh},
+            </if>
+            <if test="ylqxzcrbarywmc != null">
+                ylqxzcrbarywmc=#{ylqxzcrbarywmc},
+            </if>
+            <if test="sydycpbs != null">
+                sydycpbs=#{sydycpbs},
+            </if>
+            <if test="sjcpbm != null">
+                sjcpbm=#{sjcpbm},
+            </if>
+            <if test="versionNumber != null">
+                versionNumber=#{versionNumber},
+            </if>
+            <if test="diType != null">
+                diType=#{diType},
+            </if>
+            <if test="ybbm != null">
+                ybbm=#{ybbm},
+            </if>
+            <if test="sptm != null">
+                sptm=#{sptm},
+            </if>
+            <if test="manufactory != null">
+                manufactory=#{manufactory},
+            </if>
+            <if test="measname != null">
+                measname=#{measname},
+            </if>
+            <if test="productType != null">
+                productType=#{productType},
+            </if>
+            <if test="scbssfbhph != null">
+                scbssfbhph=#{scbssfbhph},
+            </if>
+            <if test="scbssfbhxlh != null">
+                scbssfbhxlh=#{scbssfbhxlh},
+            </if>
+            <if test="scbssfbhscrq != null">
+                scbssfbhscrq=#{scbssfbhscrq},
+            </if>
+            <if test="scbssfbhsxrq != null">
+                scbssfbhsxrq=#{scbssfbhsxrq},
+            </if>
+            <if test="cpms != null">
+                cpms=#{cpms},
+            </if>
+            <if test="allowNoBatch != null">
+                allowNoBatch=#{allowNoBatch},
+            </if>
+            <if test="allowNoExpire != null">
+                allowNoExpire=#{allowNoExpire},
+            </if>
+            <if test="allowNoProduct != null">
+                allowNoProduct=#{allowNoProduct},
+            </if>
+            <if test="spmc != null">
+                spmc=#{spmc},
+            </if>
+            <if test="cplx != null">
+                cplx=#{cplx},
+            </if>
+            <if test="hchzsb != null">
+                hchzsb=#{hchzsb},
+            </if>
+            <if test="cpdls != null">
+                cpdls=#{cpdls},
+            </if>
+            <if test="price != null">
+                price=#{price},
+            </if>
+            <if test="basicPrductRemak1 != null">
+                basicPrductRemak1=#{basicPrductRemak1},
+            </if>
+            <if test="basicPrductRemak2 != null">
+                basicPrductRemak2=#{basicPrductRemak2},
+            </if>
+            <if test="basicPrductRemak3 != null">
+                basicPrductRemak3=#{basicPrductRemak3},
+            </if>
+            <if test="basicPrductRemak4 != null">
+                basicPrductRemak4=#{basicPrductRemak4},
+            </if>
+            <if test="basicPrductRemak5 != null">
+                basicPrductRemak5=#{basicPrductRemak5},
+            </if>
+            <if test="basicPrductRemak6 != null">
+                basicPrductRemak6=#{basicPrductRemak6},
+            </if>
+            <if test="basicPrductRemak7 != null">
+                basicPrductRemak7=#{basicPrductRemak7},
+            </if>
+            <if test="basicPrductRemak8 != null">
+                basicPrductRemak8=#{basicPrductRemak8},
+            </if>
         </trim>
         where uuid = #{uuid}
     </update>
@@ -378,56 +629,159 @@
     <update id="updateUdiInfoById" parameterType="com.glxp.api.entity.basic.UdiProductEntity">
         update basic_products
         <trim prefix="set" suffixOverrides=",">
-            <if test="originUuid != null">originUuid=#{originUuid},</if>
-            <if test="nameCode != null">nameCode=#{nameCode},</if>
-            <if test="deviceRecordKey != null">deviceRecordKey=#{deviceRecordKey},</if>
-            <if test="packRatio != null">packRatio=#{packRatio},</if>
-            <if test="packLevel != null">packLevel=#{packLevel},</if>
-            <if test="packUnit != null">packUnit=#{packUnit},</if>
-            <if test="bhxjsl != null">bhxjsl=#{bhxjsl},</if>
-            <if test="bhzxxsbzsl != null">bhzxxsbzsl=#{bhzxxsbzsl},</if>
-            <if test="zxxsbzbhsydysl != null">zxxsbzbhsydysl=#{zxxsbzbhsydysl},</if>
-            <if test="bhxjcpbm != null">bhxjcpbm=#{bhxjcpbm},</if>
-            <if test="bzcj != null">bzcj=#{bzcj},</if>
-            <if test="cpmctymc != null">cpmctymc=#{cpmctymc},</if>
-            <if test="cplb != null">cplb=#{cplb},</if>
-            <if test="flbm != null">flbm=#{flbm},</if>
-            <if test="ggxh != null">ggxh=#{ggxh},</if>
-            <if test="qxlb != null">qxlb !==#{qxlb !=},</if>
-            <if test="tyshxydm != null">tyshxydm=#{tyshxydm},</if>
-            <if test="ylqxzcrbarmc != null">ylqxzcrbarmc=#{ylqxzcrbarmc},</if>
-            <if test="zczbhhzbapzbh != null">zczbhhzbapzbh=#{zczbhhzbapzbh},</if>
-            <if test="ylqxzcrbarywmc != null">ylqxzcrbarywmc=#{ylqxzcrbarywmc},</if>
-            <if test="sydycpbs != null">sydycpbs=#{sydycpbs},</if>
-            <if test="sjcpbm != null">sjcpbm=#{sjcpbm},</if>
-            <if test="versionNumber != null">versionNumber=#{versionNumber},</if>
-            <if test="diType != null">diType=#{diType},</if>
-            <if test="ybbm != null">ybbm=#{ybbm},</if>
-            <if test="sptm != null">sptm=#{sptm},</if>
-            <if test="manufactory != null">manufactory=#{manufactory},</if>
-            <if test="measname != null">measname=#{measname},</if>
-            <if test="productType != null">productType=#{productType},</if>
-            <if test="scbssfbhph != null">scbssfbhph=#{scbssfbhph},</if>
-            <if test="scbssfbhxlh != null">scbssfbhxlh=#{scbssfbhxlh},</if>
-            <if test="scbssfbhscrq != null">scbssfbhscrq=#{scbssfbhscrq},</if>
-            <if test="scbssfbhsxrq != null">scbssfbhsxrq=#{scbssfbhsxrq},</if>
-            <if test="cpms != null">cpms=#{cpms},</if>
-            <if test="allowNoBatch != null">allowNoBatch=#{allowNoBatch},</if>
-            <if test="allowNoExpire != null">allowNoExpire=#{allowNoExpire},</if>
-            <if test="allowNoProduct != null">allowNoProduct=#{allowNoProduct},</if>
-            <if test="spmc != null">spmc=#{spmc},</if>
-            <if test="cplx != null">cplx=#{cplx},</if>
-            <if test="hchzsb != null">hchzsb=#{hchzsb},</if>
-            <if test="cpdls != null">cpdls=#{cpdls},</if>
-            <if test="price != null">price=#{price},</if>
-            <if test="basicPrductRemak1 != null">basicPrductRemak1=#{basicPrductRemak1},</if>
-            <if test="basicPrductRemak2 != null">basicPrductRemak2=#{basicPrductRemak2},</if>
-            <if test="basicPrductRemak3 != null">basicPrductRemak3=#{basicPrductRemak3},</if>
-            <if test="basicPrductRemak4 != null">basicPrductRemak4=#{basicPrductRemak4},</if>
-            <if test="basicPrductRemak5 != null">basicPrductRemak5=#{basicPrductRemak5},</if>
-            <if test="basicPrductRemak6 != null">basicPrductRemak6=#{basicPrductRemak6},</if>
-            <if test="basicPrductRemak7 != null">basicPrductRemak7=#{basicPrductRemak7},</if>
-            <if test="basicPrductRemak8 != null">basicPrductRemak8=#{basicPrductRemak8},</if>
+            <if test="originUuid != null">
+                originUuid=#{originUuid},
+            </if>
+            <if test="nameCode != null">
+                nameCode=#{nameCode},
+            </if>
+            <if test="deviceRecordKey != null">
+                deviceRecordKey=#{deviceRecordKey},
+            </if>
+            <if test="packRatio != null">
+                packRatio=#{packRatio},
+            </if>
+            <if test="packLevel != null">
+                packLevel=#{packLevel},
+            </if>
+            <if test="packUnit != null">
+                packUnit=#{packUnit},
+            </if>
+            <if test="bhxjsl != null">
+                bhxjsl=#{bhxjsl},
+            </if>
+            <if test="bhzxxsbzsl != null">
+                bhzxxsbzsl=#{bhzxxsbzsl},
+            </if>
+            <if test="zxxsbzbhsydysl != null">
+                zxxsbzbhsydysl=#{zxxsbzbhsydysl},
+            </if>
+            <if test="bhxjcpbm != null">
+                bhxjcpbm=#{bhxjcpbm},
+            </if>
+            <if test="bzcj != null">
+                bzcj=#{bzcj},
+            </if>
+            <if test="cpmctymc != null">
+                cpmctymc=#{cpmctymc},
+            </if>
+            <if test="cplb != null">
+                cplb=#{cplb},
+            </if>
+            <if test="flbm != null">
+                flbm=#{flbm},
+            </if>
+            <if test="ggxh != null">
+                ggxh=#{ggxh},
+            </if>
+            <if test="qxlb != null">
+                qxlb !==#{qxlb !=},
+            </if>
+            <if test="tyshxydm != null">
+                tyshxydm=#{tyshxydm},
+            </if>
+            <if test="ylqxzcrbarmc != null">
+                ylqxzcrbarmc=#{ylqxzcrbarmc},
+            </if>
+            <if test="zczbhhzbapzbh != null">
+                zczbhhzbapzbh=#{zczbhhzbapzbh},
+            </if>
+            <if test="ylqxzcrbarywmc != null">
+                ylqxzcrbarywmc=#{ylqxzcrbarywmc},
+            </if>
+            <if test="sydycpbs != null">
+                sydycpbs=#{sydycpbs},
+            </if>
+            <if test="sjcpbm != null">
+                sjcpbm=#{sjcpbm},
+            </if>
+            <if test="versionNumber != null">
+                versionNumber=#{versionNumber},
+            </if>
+            <if test="diType != null">
+                diType=#{diType},
+            </if>
+            <if test="ybbm != null">
+                ybbm=#{ybbm},
+            </if>
+            <if test="sptm != null">
+                sptm=#{sptm},
+            </if>
+            <if test="manufactory != null">
+                manufactory=#{manufactory},
+            </if>
+            <if test="measname != null">
+                measname=#{measname},
+            </if>
+            <if test="productType != null">
+                productType=#{productType},
+            </if>
+            <if test="scbssfbhph != null">
+                scbssfbhph=#{scbssfbhph},
+            </if>
+            <if test="scbssfbhxlh != null">
+                scbssfbhxlh=#{scbssfbhxlh},
+            </if>
+            <if test="scbssfbhscrq != null">
+                scbssfbhscrq=#{scbssfbhscrq},
+            </if>
+            <if test="scbssfbhsxrq != null">
+                scbssfbhsxrq=#{scbssfbhsxrq},
+            </if>
+            <if test="cpms != null">
+                cpms=#{cpms},
+            </if>
+            <if test="allowNoBatch != null">
+                allowNoBatch=#{allowNoBatch},
+            </if>
+            <if test="allowNoExpire != null">
+                allowNoExpire=#{allowNoExpire},
+            </if>
+            <if test="allowNoProduct != null">
+                allowNoProduct=#{allowNoProduct},
+            </if>
+            <if test="allowNoSerial != null">
+                allowNoSerial=#{allowNoSerial},
+            </if>
+            <if test="spmc != null">
+                spmc=#{spmc},
+            </if>
+            <if test="cplx != null">
+                cplx=#{cplx},
+            </if>
+            <if test="hchzsb != null">
+                hchzsb=#{hchzsb},
+            </if>
+            <if test="cpdls != null">
+                cpdls=#{cpdls},
+            </if>
+            <if test="price != null">
+                price=#{price},
+            </if>
+            <if test="basicPrductRemak1 != null">
+                basicPrductRemak1=#{basicPrductRemak1},
+            </if>
+            <if test="basicPrductRemak2 != null">
+                basicPrductRemak2=#{basicPrductRemak2},
+            </if>
+            <if test="basicPrductRemak3 != null">
+                basicPrductRemak3=#{basicPrductRemak3},
+            </if>
+            <if test="basicPrductRemak4 != null">
+                basicPrductRemak4=#{basicPrductRemak4},
+            </if>
+            <if test="basicPrductRemak5 != null">
+                basicPrductRemak5=#{basicPrductRemak5},
+            </if>
+            <if test="basicPrductRemak6 != null">
+                basicPrductRemak6=#{basicPrductRemak6},
+            </if>
+            <if test="basicPrductRemak7 != null">
+                basicPrductRemak7=#{basicPrductRemak7},
+            </if>
+            <if test="basicPrductRemak8 != null">
+                basicPrductRemak8=#{basicPrductRemak8},
+            </if>
         </trim>
         where id = #{id}
     </update>
@@ -450,13 +804,16 @@
     </select>
 
     <select id="selectPackLevel" resultType="java.lang.Integer">
-        select packLevel from basic_products where nameCode = #{nameCode} limit 1
+        select packLevel
+        from basic_products
+        where nameCode = #{nameCode}
+        limit 1
     </select>
 
     <select id="selectGgxhList" resultType="java.lang.String">
         select distinct ggxh
         from basic_products
-                 left join basic_udirel on basic_products.uuid = basic_udirel.uuid
+                     left join basic_udirel on basic_products.uuid = basic_udirel.uuid
         where basic_udirel.id = #{relId}
     </select>
 
@@ -464,51 +821,133 @@
     <update id="updateUdiInfoNotAll" parameterType="com.glxp.api.req.basic.UdiInfoRequest">
         UPDATE basic_products
         <trim prefix="set" suffixOverrides=",">
-            <if test="packRatio != null">packRatio=#{packRatio},</if>
-            <if test="packLevel != null">packLevel=#{packLevel},</if>
-            <if test="bhxjsl != null">bhxjsl=#{bhxjsl},</if>
-            <if test="bhzxxsbzsl != null">bhzxxsbzsl=#{bhzxxsbzsl},</if>
-            <if test="zxxsbzbhsydysl != null">zxxsbzbhsydysl=#{zxxsbzbhsydysl},</if>
-            <if test="bhxjcpbm != null">bhxjcpbm=#{bhxjcpbm},</if>
-            <if test="bzcj != null">bzcj=#{bzcj},</if>
-            <if test="addType != null">addType=#{addType},</if>
-            <if test="deviceRecordKey != null">deviceRecordKey=#{deviceRecordKey},</if>
-            <if test="cpmctymc != null">cpmctymc=#{cpmctymc},</if>
-            <if test="cplb != null">cplb=#{cplb},</if>
-            <if test="flbm != null">flbm=#{flbm},</if>
-            <if test="ggxh != null">ggxh=#{ggxh},</if>
-            <if test="qxlb != null">qxlb=#{qxlb},</if>
-            <if test="tyshxydm != null">tyshxydm=#{tyshxydm},</if>
-            <if test="ylqxzcrbarmc != null">ylqxzcrbarmc=#{ylqxzcrbarmc},</if>
-            <if test="ylqxzcrbarywmc != null">ylqxzcrbarywmc=#{ylqxzcrbarywmc},</if>
-            <if test="uuid != null">uuid=#{uuid},</if>
-            <if test="sjcpbm != null">sjcpbm=#{sjcpbm},</if>
-            <if test="versionNumber != null">versionNumber=#{versionNumber},</if>
-            <if test="sptm != null">sptm=#{sptm},</if>
-            <if test="manufactory != null">manufactory=#{manufactory},</if>
-            <if test="ybbm != null">ybbm=#{ybbm},</if>
-            <if test="measname != null">measname=#{measname},</if>
-            <if test="diType != null">diType=#{diType},</if>
-            <if test="productType != null">productType=#{productType},</if>
-            <if test="scbssfbhph != null">scbssfbhph=#{scbssfbhph},</if>
-            <if test="scbssfbhxlh != null">scbssfbhxlh=#{scbssfbhxlh},</if>
-            <if test="scbssfbhscrq != null">scbssfbhscrq=#{scbssfbhscrq},</if>
-            <if test="scbssfbhsxrq != null">scbssfbhsxrq=#{scbssfbhsxrq},</if>
-            <if test="cpms != null">cpms=#{cpms},</if>
-            <if test="originUuid != null">originUuid=#{originUuid},</if>
-            <if test="spmc != null">spmc=#{spmc},</if>
-            <if test="cpdls != null">cpdls=#{cpdls},</if>
-            <if test="basicPrductRemak1 != null">basicPrductRemak1=#{basicPrductRemak1},</if>
-            <if test="basicPrductRemak2 != null">basicPrductRemak2=#{basicPrductRemak2},</if>
-            <if test="basicPrductRemak3 != null">basicPrductRemak3=#{basicPrductRemak3},</if>
-            <if test="basicPrductRemak4 != null">basicPrductRemak4=#{basicPrductRemak4},</if>
-            <if test="basicPrductRemak5 != null">basicPrductRemak5=#{basicPrductRemak5},</if>
-            <if test="basicPrductRemak6 != null">basicPrductRemak6=#{basicPrductRemak6},</if>
-            <if test="basicPrductRemak7 != null">basicPrductRemak7=#{basicPrductRemak7},</if>
-            <if test="basicPrductRemak8 != null">basicPrductRemak8=#{basicPrductRemak8},</if>
+            <if test="packRatio != null">
+                packRatio=#{packRatio},
+            </if>
+            <if test="packLevel != null">
+                packLevel=#{packLevel},
+            </if>
+            <if test="bhxjsl != null">
+                bhxjsl=#{bhxjsl},
+            </if>
+            <if test="bhzxxsbzsl != null">
+                bhzxxsbzsl=#{bhzxxsbzsl},
+            </if>
+            <if test="zxxsbzbhsydysl != null">
+                zxxsbzbhsydysl=#{zxxsbzbhsydysl},
+            </if>
+            <if test="bhxjcpbm != null">
+                bhxjcpbm=#{bhxjcpbm},
+            </if>
+            <if test="bzcj != null">
+                bzcj=#{bzcj},
+            </if>
+            <if test="addType != null">
+                addType=#{addType},
+            </if>
+            <if test="deviceRecordKey != null">
+                deviceRecordKey=#{deviceRecordKey},
+            </if>
+            <if test="cpmctymc != null">
+                cpmctymc=#{cpmctymc},
+            </if>
+            <if test="cplb != null">
+                cplb=#{cplb},
+            </if>
+            <if test="flbm != null">
+                flbm=#{flbm},
+            </if>
+            <if test="ggxh != null">
+                ggxh=#{ggxh},
+            </if>
+            <if test="qxlb != null">
+                qxlb=#{qxlb},
+            </if>
+            <if test="tyshxydm != null">
+                tyshxydm=#{tyshxydm},
+            </if>
+            <if test="ylqxzcrbarmc != null">
+                ylqxzcrbarmc=#{ylqxzcrbarmc},
+            </if>
+            <if test="ylqxzcrbarywmc != null">
+                ylqxzcrbarywmc=#{ylqxzcrbarywmc},
+            </if>
+            <if test="uuid != null">
+                uuid=#{uuid},
+            </if>
+            <if test="sjcpbm != null">
+                sjcpbm=#{sjcpbm},
+            </if>
+            <if test="versionNumber != null">
+                versionNumber=#{versionNumber},
+            </if>
+            <if test="sptm != null">
+                sptm=#{sptm},
+            </if>
+            <if test="manufactory != null">
+                manufactory=#{manufactory},
+            </if>
+            <if test="ybbm != null">
+                ybbm=#{ybbm},
+            </if>
+            <if test="measname != null">
+                measname=#{measname},
+            </if>
+            <if test="diType != null">
+                diType=#{diType},
+            </if>
+            <if test="productType != null">
+                productType=#{productType},
+            </if>
+            <if test="scbssfbhph != null">
+                scbssfbhph=#{scbssfbhph},
+            </if>
+            <if test="scbssfbhxlh != null">
+                scbssfbhxlh=#{scbssfbhxlh},
+            </if>
+            <if test="scbssfbhscrq != null">
+                scbssfbhscrq=#{scbssfbhscrq},
+            </if>
+            <if test="scbssfbhsxrq != null">
+                scbssfbhsxrq=#{scbssfbhsxrq},
+            </if>
+            <if test="cpms != null">
+                cpms=#{cpms},
+            </if>
+            <if test="originUuid != null">
+                originUuid=#{originUuid},
+            </if>
+            <if test="spmc != null">
+                spmc=#{spmc},
+            </if>
+            <if test="cpdls != null">
+                cpdls=#{cpdls},
+            </if>
+            <if test="basicPrductRemak1 != null">
+                basicPrductRemak1=#{basicPrductRemak1},
+            </if>
+            <if test="basicPrductRemak2 != null">
+                basicPrductRemak2=#{basicPrductRemak2},
+            </if>
+            <if test="basicPrductRemak3 != null">
+                basicPrductRemak3=#{basicPrductRemak3},
+            </if>
+            <if test="basicPrductRemak4 != null">
+                basicPrductRemak4=#{basicPrductRemak4},
+            </if>
+            <if test="basicPrductRemak5 != null">
+                basicPrductRemak5=#{basicPrductRemak5},
+            </if>
+            <if test="basicPrductRemak6 != null">
+                basicPrductRemak6=#{basicPrductRemak6},
+            </if>
+            <if test="basicPrductRemak7 != null">
+                basicPrductRemak7=#{basicPrductRemak7},
+            </if>
+            <if test="basicPrductRemak8 != null">
+                basicPrductRemak8=#{basicPrductRemak8},
+            </if>
         </trim>
         WHERE uuid = #{uuid}
     </update>
-
-
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index 016c8fe5..ac196592 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -43,6 +43,8 @@
                basic_products.allowNoBatch,
                basic_products.allowNoExpire,
                basic_products.allowNoProduct,
+               basic_products.allowNoSerial,
+
                basic_products.spmc,
                basic_products.cplx,
                basic_products.hchzsb,
@@ -161,6 +163,7 @@
                basic_products.allowNoBatch,
                basic_products.allowNoExpire,
                basic_products.allowNoProduct,
+               basic_products.allowNoSerial,
                basic_products.spmc,
                basic_products.cplx,
                basic_products.hchzsb,
@@ -289,6 +292,7 @@
                basic_products.allowNoBatch,
                basic_products.allowNoExpire,
                basic_products.allowNoProduct,
+               basic_products.allowNoSerial,
                basic_products.spmc,
                basic_products.cplx,
                basic_products.hchzsb,
@@ -404,6 +408,169 @@
         ORDER BY modifyTime DESC
     </select>
 
+
+    <!--    资质证书选入产品分组查询-->
+    <select id="filterCertUdi" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
+            resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
+        select basic_udirel.*,
+               bht.name classifyName,
+               basic_products.originUuid,
+               basic_products.nameCode,
+               basic_products.deviceRecordKey,
+               basic_products.packRatio,
+               basic_products.packUnit,
+               basic_products.packLevel,
+               basic_products.bhxjsl,
+               basic_products.bhzxxsbzsl,
+               basic_products.zxxsbzbhsydysl,
+               basic_products.bhxjcpbm,
+               basic_products.bzcj,
+               basic_products.cpmctymc,
+               basic_products.cplb,
+               basic_products.flbm,
+               basic_products.ggxh,
+               basic_products.qxlb,
+               basic_products.tyshxydm,
+               basic_products.ylqxzcrbarmc,
+               basic_products.zczbhhzbapzbh,
+               basic_products.ylqxzcrbarywmc,
+               basic_products.sydycpbs,
+               basic_products.sjcpbm,
+               basic_products.versionNumber,
+               basic_products.diType,
+               basic_products.ybbm,
+               basic_products.sptm,
+               basic_products.manufactory,
+               basic_products.measname,
+               basic_products.productType,
+               basic_products.scbssfbhph,
+               basic_products.scbssfbhxlh,
+               basic_products.scbssfbhscrq,
+               basic_products.scbssfbhsxrq,
+               basic_products.cpms,
+               basic_products.allowNoBatch,
+               basic_products.allowNoExpire,
+               basic_products.allowNoProduct,
+               basic_products.allowNoSerial,
+               basic_products.spmc,
+               basic_products.cplx,
+               basic_products.hchzsb,
+               basic_products.cpdls,
+               basic_products.price,
+               basic_products.basicPrductRemak1,
+               basic_products.basicPrductRemak2,
+               basic_products.basicPrductRemak3,
+               basic_products.basicPrductRemak4,
+               basic_products.basicPrductRemak5,
+               basic_products.basicPrductRemak6,
+               basic_products.basicPrductRemak7,
+               basic_products.basicPrductRemak8
+        FROM basic_products
+                     inner JOIN basic_udirel
+                ON basic_products.uuid = basic_udirel.uuid
+                     left join basic_hosp_type bht on basic_udirel.relCode = bht.code
+        <where>
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+                AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
+            </if>
+            <if test="manufactory != '' and manufactory != null">
+                AND manufactory LIKE concat('%', #{manufactory}, '%')
+            </if>
+            <if test="relCode != '' and relCode != null">
+                AND relCode = #{relCode}
+            </if>
+            <if test="bindType != '' and bindType != null">
+                AND relCode is null
+                        or trim(relCode) = ''
+            </if>
+            <if test="supName != '' and supName != null">
+                AND supName LIKE concat('%', #{supName}, '%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode}, '%')
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
+            </if>
+            <if test="ggxh != '' and ggxh != null">
+                AND ggxh LIKE concat('%', #{ggxh}, '%')
+            </if>
+            <if test="unionCode != '' and unionCode != null">
+                and (
+                            nameCode LIKE concat('%', #{unionCode}, '%')
+                                    or ybbm LIKE concat('%', #{unionCode}, '%')
+                                    or sptm LIKE concat('%', #{unionCode}, '%'))
+            </if>
+            <if test="isDisable == false">
+                AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false)
+            </if>
+            <if test="thrPiId != '' and thrPiId != null">
+                and (thirdId LIKE concat('%', #{thrPiId}, '%')
+                        or thirdId1 LIKE concat('%', #{thrPiId}, '%')
+                        or thirdId2 LIKE concat('%', #{thrPiId}, '%')
+                        or thirdId3 LIKE concat('%', #{thrPiId}, '%')
+                        or thirdId4 LIKE concat('%', #{thrPiId}, '%'))
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND basic_udirel.uuid = #{uuid}
+            </if>
+            <if test="thirdId != '' and thirdId != null">
+                AND thirdId = #{thirdId}
+            </if>
+            <if test="udplatCode != '' and udplatCode != null">
+                AND udplatCode = #{udplatCode}
+            </if>
+            <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
+                AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
+            </if>
+            <if test="diType != '' and diType != null">
+                AND diType = #{diType}
+            </if>
+            <if test="filterType != null and filterType == 1">
+                AND (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or
+                     thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '')
+                        and basic_products.originUuid <![CDATA[<>]]> ''
+            </if>
+            <if test="filterType != null and filterType == 2">
+                AND basic_products.originUuid is NULL
+            </if>
+            <if test="filterType != null and filterType == 3">
+                AND (mainId is NULL or mainId = '')
+                        and basic_products.originUuid <![CDATA[<>]]> ''
+            </if>
+            <if test="filterType != null and filterType == 4">
+                AND thirdId1 is NULL
+                        and basic_products.originUuid <![CDATA[<>]]> ''
+            </if>
+            <if test="filterType != null and filterType == 5">
+                AND thirdId2 is NULL
+                        and basic_products.originUuid <![CDATA[<>]]> ''
+            </if>
+            <if test="filterType != null and filterType == 6">
+                AND thirdId3 is NULL
+                        and basic_products.originUuid <![CDATA[<>]]> ''
+            </if>
+            <if test="filterType != null and filterType == 7">
+                AND thirdId4 is NULL
+                        and basic_products.originUuid <![CDATA[<>]]> ''
+            </if>
+            <if test="filterType != null and filterType == 10">
+                AND basic_udirel.updateTime is NULL
+            </if>
+            <if test="lockStatus != '' and lockStatus != null">
+                AND basic_udirel.lockStatus = #{lockStatus}
+            </if>
+            <if test="mainId != '' and mainId != null">
+                AND mainId = #{mainId}
+            </if>
+            <if test="id != '' and id != null">
+                AND basic_udirel.id = #{id}
+            </if>
+        </where>
+        GROUP BY cpmctymc, manufactory
+    </select>
+
+
     <select id="contrastJoinSelect" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
             resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
         select basic_udirel.*,
@@ -444,6 +611,7 @@
                basic_products.allowNoBatch,
                basic_products.allowNoExpire,
                basic_products.allowNoProduct,
+               basic_products.allowNoSerial,
                basic_products.spmc,
                basic_products.cplx,
                basic_products.hchzsb,
@@ -863,6 +1031,7 @@
                basic_products.allowNoBatch,
                basic_products.allowNoExpire,
                basic_products.allowNoProduct,
+               basic_products.allowNoSerial,
                basic_products.spmc,
                basic_products.cplx,
                basic_products.hchzsb,
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
index 46859be4..dda92ab8 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
@@ -91,6 +91,7 @@
                basic_products.allowNoBatch,
                basic_products.allowNoExpire,
                basic_products.allowNoProduct,
+               basic_products.allowNoSerial,
                basic_products.spmc,
                basic_products.cplx,
                basic_products.hchzsb,
diff --git a/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml b/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml
index 5928e8f4..f8a89e87 100644
--- a/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml
@@ -33,7 +33,9 @@
             <if test="relIdFk != null and relIdFk != ''">
                 and sup_product.relIdFk = #{relIdFk}
             </if>
-
+            <if test="manufactory != null and manufactory != ''">
+                and sup_product.manufactory = #{manufactory}
+            </if>
 
             <if test="recordCode != null and recordCode != ''">
                 and sup_product.recordCode like concat('%', #{recordCode}, '%')
@@ -126,7 +128,9 @@
             <if test="relIdFk != null and relIdFk != ''">
                 and sup_product.relIdFk = #{relIdFk}
             </if>
-
+            <if test="manufactory != null and manufactory != ''">
+                and sup_product.manufactory = #{manufactory}
+            </if>
             <if test="auditStatus == 22">
                 and (sup_product.auditStatus = 1 or sup_product.auditStatus = 4)
             </if>
@@ -247,15 +251,27 @@
             <if test="measname != null">
                 measname=#{measname},
             </if>
-            <if test="cpms != null">
-                cpms=#{cpms},
-            </if>
             <if test="hchzsb != null">
                 hchzsb=#{hchzsb},
             </if>
             <if test="relIdFk != null">
                 relIdFk=#{relIdFk},
             </if>
+            <if test="manufactory != null">
+                manufactory=#{manufactory},
+            </if>
+            <if test="allowNoBatch != null">
+                allowNoBatch=#{allowNoBatch},
+            </if>
+            <if test="allowNoExpire != null">
+                allowNoExpire=#{allowNoExpire},
+            </if>
+            <if test="allowNoProduct != null">
+                allowNoProduct=#{allowNoProduct},
+            </if>
+            <if test="allowNoSerial != null">
+                allowNoSerial=#{allowNoSerial},
+            </if>
         </set>
         WHERE id = #{id}
     </update>
@@ -272,7 +288,8 @@
                                  specification, structure, `scope`,
                                  other, filePath, remark,
                                  createTime, updateTime, manufacturerIdFk, customerId, productId
-                , auditStatus, auditComment, sptm, ybbm, measname, cpms, hchzsb, relIdFk)
+                , auditStatus, auditComment, sptm, ybbm, measname, hchzsb, relIdFk, manufactory, allowNoBatch,
+                                 allowNoExpire, allowNoProduct, allowNoSerial)
         values (#{enterpriseId},
                 #{recordCode},
                 #{recordProductName},
@@ -311,8 +328,8 @@
                 #{sptm},
                 #{ybbm},
                 #{measname},
-                #{cpms},
-                #{hchzsb}, #{relIdFk})
+                #{hchzsb}, #{relIdFk}, #{manufactory}, #{allowNoBatch}, #{allowNoExpire}, #{allowNoProduct},
+                #{allowNoSerial})
     </insert>
 
     <delete id="deleteById" parameterType="Map">
diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql
index 563004b0..46095dd2 100644
--- a/src/main/resources/schemas/schema_v2.1.sql
+++ b/src/main/resources/schemas/schema_v2.1.sql
@@ -24,6 +24,10 @@ CALL Pro_Temp_ColumnWork('basic_udirel', 'dispatch', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_udirel', 'groupBuy', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_udirel', 'isDateBy', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_udirel', 'needCert', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_udirel', 'certIdFk', 'varchar(255)', 1);
+
+CALL Pro_Temp_ColumnWork('basic_products', 'allowNoSerial', 'tinyint', 1);
+
 
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailDispatch', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailGroupBuy', 'tinyint', 1);
@@ -89,4 +93,14 @@ CALL Pro_Temp_ColumnWork('inv_prein_detail', 'originReCount', 'int', 1);
 
 CALL Pro_Temp_ColumnWork('io_code_lost', 'nameCode', 'varchar(255)', 1);
 
+INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`,
+                                      `paramType`, `paramExplain`)
+VALUES (20040, 0, '允许送货单直接入库变更库存', 'deliveryInstock', '0', 1, 0, '0：否；1：是');
+
+CALL Pro_Temp_ColumnWork('sup_product', 'manufactory', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('sup_product', 'allowNoBatch', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('sup_product', 'allowNoExpire', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('sup_product', 'allowNoProduct', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('sup_product', 'allowNoSerial', 'tinyint', 1);
+