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 c1a7d5f28..be0984631 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
@@ -156,7 +156,7 @@ public class IoOrderDetailBizController extends BaseController {
             datas.add(addBizProductReqeust);
         }
         for (AddBizProductReqeust item : datas) {
-            UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectSupGroupById(item.getRelId());
+            UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectSupGroupById(item.getRelId(), addBizProductReqeust.getSupId());
 
 //            todo 查询产品是否已经通过认证
 //            BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
diff --git a/src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java b/src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java
index db65bf9b7..4d1873a3f 100644
--- a/src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java
+++ b/src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java
@@ -100,7 +100,6 @@ public class InvRemindSetController {
     /**
      * 通过库存ID查询生成库存预警设置的信息
      *
-     * @param invId
      * @return
      */
     @GetMapping("/udiwms/inv/remind/set/getInfoByInvId")
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 6c3efdb2c..2daec8a10 100644
--- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
@@ -10,6 +10,7 @@ public class FilterUdiRelRequest extends ListPageRequest {
 
     private String ylqxzcrbarmc;
     private String cpmctymc;
+    private String entireCpmctymc;
     private String nameCode;
     private String uuid;
     private String originUuid;
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 91ce2aca4..decf0ac92 100644
--- a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java
+++ b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java
@@ -55,7 +55,9 @@ public interface UdiRelevanceService extends IService<UdiRelevanceEntity> {
 
     UdiRelevanceResponse selectUdiId(Long id);
 
-    UdiRelevanceResponse selectSupGroupById(Long id);
+
+    UdiRelevanceResponse selectSupGroupById(Long id, String supId);
+
 
     UdiRelevanceEntity selectUpdateByUuid(String uuid);
 
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 9ef75a4ec..0fc11ca77 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
@@ -198,9 +198,21 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
     }
 
     @Override
-    public UdiRelevanceResponse selectSupGroupById(Long id) {
+    public UdiRelevanceResponse selectUdiId(Long id) {
         FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
         filterUdiRelRequest.setId(id);
+        List<UdiRelevanceResponse> data = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest);
+        if (data != null && data.size() > 0)
+            return data.get(0);
+        return null;
+    }
+
+    @Override
+    public UdiRelevanceResponse selectSupGroupById(Long id, String supId) {
+        FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
+        if (StrUtil.isNotEmpty(supId))
+            filterUdiRelRequest.setUnitFk(supId);
+        filterUdiRelRequest.setId(id);
         filterUdiRelRequest.setDiType(1);
         return udiRelevanceDao.selectOneUdiJoinSup(filterUdiRelRequest);
     }
@@ -390,15 +402,4 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
         UdiEntity udi = FilterUdiUtils.getUdi(code);
         return udiRelevanceDao.selectRelIdByNameCode(udi.getUdi());
     }
-
-    @Override
-    public UdiRelevanceResponse selectUdiId(Long id) {
-        FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
-        filterUdiRelRequest.setId(id);
-        List<UdiRelevanceResponse> data = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest);
-        if (data != null && data.size() > 0)
-            return data.get(0);
-        return null;
-    }
-
 }
diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
index 1401d1cbd..16bd6b994 100644
--- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
@@ -306,7 +306,7 @@ public class IoAddInoutService {
     public void genOrderDetailCode(IoOrderEntity orderEntity, IoCodeTempEntity codeTempEntity) {
 
         List<IoOrderDetailCodeEntity> ioOrderDetailCodeEntities = orderDetailCodeDao.selectList(new QueryWrapper<IoOrderDetailCodeEntity>().select("id", "count", "reCount", "bindRlFk", "batchNo").eq("orderIdFk", orderEntity.getBillNo()));
-        UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectSupGroupById(codeTempEntity.getRelId());
+        UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectSupGroupById(codeTempEntity.getRelId(), orderEntity.getFromCorp());
 //        UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(codeTempEntity.getRelId());
         if (CollUtil.isEmpty(ioOrderDetailCodeEntities)) {
             orderDetailCodeService.insert(buildEntity(orderEntity, codeTempEntity, udiRelevanceResponse));
diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
index 15ebc2e0c..1fa106d1b 100644
--- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
@@ -504,21 +504,29 @@ public class IoOrderServiceImpl implements IoOrderService {
     @Override
     public boolean rollbackUnReOrder(String billNo) {
 
+
         IoOrderEntity orderEntity = findByBillNo(billNo);
-        List<IoCodeEntity> codeEntityList = codeService.findByOrderId(billNo);
-        List<IoCodeTempEntity> codeTempEntities = new ArrayList<>();
-        for (IoCodeEntity codeEntity : codeEntityList) {
-            IoCodeTempEntity codeTempEntity = new IoCodeTempEntity();
-            BeanUtils.copyProperties(codeEntity, codeTempEntity);
-            codeTempEntity.setId(null);
-            codeTempEntities.add(codeTempEntity);
+        if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) {
+            List<IoCodeEntity> codeEntityList = codeService.findByOrderId(billNo);
+            List<IoCodeTempEntity> codeTempEntities = new ArrayList<>();
+            for (IoCodeEntity codeEntity : codeEntityList) {
+                IoCodeTempEntity codeTempEntity = new IoCodeTempEntity();
+                BeanUtils.copyProperties(codeEntity, codeTempEntity);
+                codeTempEntity.setId(null);
+                codeTempEntities.add(codeTempEntity);
+            }
+            codeTempService.insertBatch(codeTempEntities);
+            codeService.deleteCodeByOrderId(billNo);
+            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
+            orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
+            orderEntity.setUpdateTime(new Date());
+            update(orderEntity);
+        } else if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) {
+            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_SUCCESS);
+            orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
+            orderEntity.setUpdateTime(new Date());
+            update(orderEntity);
         }
-        codeTempService.insertBatch(codeTempEntities);
-        codeService.deleteCodeByOrderId(billNo);
-        orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
-        orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
-        orderEntity.setUpdateTime(new Date());
-        update(orderEntity);
         return true;
     }
 
@@ -833,7 +841,7 @@ public class IoOrderServiceImpl implements IoOrderService {
 
     @Override
     public List<IoOrderEntity> selectList(Long userId) {
-        List<IoOrderEntity> ioOrderEntities = orderDao.selectList(new QueryWrapper<IoOrderEntity>().eq("createUser",userId));
+        List<IoOrderEntity> ioOrderEntities = orderDao.selectList(new QueryWrapper<IoOrderEntity>().eq("createUser", userId));
         return ioOrderEntities;
     }
 
diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java
index 1d9d24b73..0aeebd44f 100644
--- a/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java
@@ -138,6 +138,7 @@ public class InvRemindSetServiceImpl implements InvRemindSetService {
                 response.setExpireDate(invRemindSetEntity.getExpireDate());
                 response.setRecentDate(invRemindSetEntity.getRecentDate());
             }
+
             if (response.getIsDateBy() == 1 && null != response.getRecentDateTime()) {
                 //将近效期预警值由小时换算成天
                 response.setRecentDateTime(response.getRecentDateTime() / 24);
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index 7e5b9db52..a900f4f03 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -330,6 +330,9 @@
             <if test="cpmctymc != '' and cpmctymc != null">
                 AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
             </if>
+            <if test="entireCpmctymc != '' and entireCpmctymc != null">
+                AND cpmctymc = #{entireCpmctymc}
+            </if>
             <if test="ggxh != '' and ggxh != null">
                 AND ggxh LIKE concat('%', #{ggxh}, '%')
             </if>
@@ -424,63 +427,63 @@
     <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
+               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
-        inner join company_product_relevance on company_product_relevance.udiRlIdFk = basic_udirel.id
+                     inner JOIN basic_udirel
+                ON basic_products.uuid = basic_udirel.uuid
+                     left join basic_hosp_type bht on basic_udirel.relCode = bht.code
+                     inner join company_product_relevance on company_product_relevance.udiRlIdFk = basic_udirel.id
         <where>
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
                 AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
@@ -493,7 +496,7 @@
             </if>
             <if test="bindType != '' and bindType != null">
                 AND relCode is null
-                or trim(relCode) = ''
+                        or trim(relCode) = ''
             </if>
             <if test="supName != '' and supName != null">
                 AND supName LIKE concat('%', #{supName}, '%')
@@ -509,19 +512,19 @@
             </if>
             <if test="unionCode != '' and unionCode != null">
                 and (
-                nameCode LIKE concat('%', #{unionCode}, '%')
-                or ybbm LIKE concat('%', #{unionCode}, '%')
-                or sptm LIKE concat('%', #{unionCode}, '%'))
+                            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}, '%'))
+                        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}
@@ -540,31 +543,31 @@
             </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[<>]]> ''
+                     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[<>]]> ''
+                        and basic_products.originUuid <![CDATA[<>]]> ''
             </if>
             <if test="filterType != null and filterType == 4">
                 AND thirdId1 is NULL
-                and basic_products.originUuid <![CDATA[<>]]> ''
+                        and basic_products.originUuid <![CDATA[<>]]> ''
             </if>
             <if test="filterType != null and filterType == 5">
                 AND thirdId2 is NULL
-                and basic_products.originUuid <![CDATA[<>]]> ''
+                        and basic_products.originUuid <![CDATA[<>]]> ''
             </if>
             <if test="filterType != null and filterType == 6">
                 AND thirdId3 is NULL
-                and basic_products.originUuid <![CDATA[<>]]> ''
+                        and basic_products.originUuid <![CDATA[<>]]> ''
             </if>
             <if test="filterType != null and filterType == 7">
                 AND thirdId4 is NULL
-                and basic_products.originUuid <![CDATA[<>]]> ''
+                        and basic_products.originUuid <![CDATA[<>]]> ''
             </if>
             <if test="filterType != null and filterType == 10">
                 AND basic_udirel.updateTime is NULL
@@ -584,8 +587,6 @@
             <if test="tyshxydm != '' and tyshxydm != null">
                 AND basic_products.tyshxydm = #{tyshxydm}
             </if>
-
-
         </where>
         GROUP BY cpmctymc, manufactory
     </select>
@@ -1249,5 +1250,4 @@
         </where>
         limit 1
     </select>
-
 </mapper>
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
index feb2258c2..41ca1051e 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
@@ -25,13 +25,14 @@
 
     <select id="filterOrderList" resultType="com.glxp.api.res.inout.IoOrderDetailResultResponse">
         SELECT a2.*,
-        a1.mainAction,
-        b1.NAME AS                                                               fromCorpName,
-        (SELECT NAME FROM basic_bussiness_type bus WHERE bus.action = a1.action) billTypeName
+               a1.mainAction,
+               b1.NAME AS                                                               fromCorpName,
+               (SELECT NAME FROM basic_bussiness_type bus WHERE bus.action = a1.action) billTypeName
         FROM io_order_detail_result a2
-        LEFT JOIN io_order a1 ON a1.billNo = a2.orderIdFk
-        LEFT JOIN basic_corp b1 ON b1.erpId = a1.fromCorp
+                     LEFT JOIN io_order a1 ON a1.billNo = a2.orderIdFk
+                     LEFT JOIN basic_corp b1 ON b1.erpId = a1.fromCorp
         <where>
+            a1.status = 7
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND a2.orderIdFk = #{orderIdFk}
             </if>