diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java
index 0a021076..2cc5d40f 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java
@@ -146,7 +146,7 @@ public class UdiRelevanceController {
             }
 
         }
-        filterUdiInfoRequest.setDiType(1);
+        //filterUdiInfoRequest.setDiType(1);
 
         udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
         PageInfo<UdiRelevanceResponse> pageInfo;
diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java
index 9b4e8489..9c4688b9 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java
@@ -31,7 +31,6 @@ import com.glxp.api.admin.service.auth.CustomerService;
 import com.glxp.api.admin.service.basic.BussinessTypeService;
 import com.glxp.api.admin.service.basic.EntrustReceService;
 import com.glxp.api.admin.service.business.StockOrderService;
-import com.glxp.api.admin.service.info.CompanyService;
 import com.glxp.api.admin.service.info.SystemParamConfigService;
 import com.glxp.api.admin.service.inout.*;
 import com.glxp.api.admin.service.inventory.InvWarehouseService;
@@ -669,6 +668,7 @@ public class OrderController {
         OrderEntity orderEntity = orderService.findById(orderFilterRequest.getId());
         orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
         orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_UN);
+        orderEntity.setErpFk(""); //将业务单据号置空
         List<WarehouseEntity> warehouseEntityList = codesService.findByReceiptId(orderEntity.getId());
         codesTempService.insertCodesTemp(warehouseEntityList);
         codesService.deleteByOrderId(orderEntity.getId());
diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductServiceImpl.java
index 11b5c38a..9b246505 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductServiceImpl.java
@@ -42,6 +42,7 @@ public class InvProductServiceImpl implements InvProductService {
             int offset = (filterInvProductRequest.getPage() - 1) * filterInvProductRequest.getLimit();
             PageHelper.offsetPage(offset, filterInvProductRequest.getLimit());
         }
+
         List<InvProductResponse> data = invProductDao.filterJoinInvProduct(filterInvProductRequest);
         return data;
     }
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
index fcefc6a4..11d7ed44 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
@@ -129,7 +129,6 @@
         left join inv_warehouse on inv_warehouse.code=inv_product.invStorageCode
         left join inv_warehouse_sub on inv_warehouse_sub.code = inv_product.invWarehouseCode
         <where>
-            basic_products.diType=1
             <if test="cpmctymc != null and cpmctymc != ''">
                 AND basic_products.cpmctymc like concat('%',#{cpmctymc},'%')
             </if>