diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/EntrustReceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/EntrustReceController.java
index 3423ce6a..acb9adde 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/EntrustReceController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/EntrustReceController.java
@@ -62,9 +62,8 @@ public class EntrustReceController {
 
 
     @GetMapping("/spms/entrust/rece/filterAllNoUse")
-    public BaseResponse filterAllNoUse(BasicEntrustRecRequest basicExportStatusRequest) {
+    public BaseResponse filterAllNoUse(BussinessTypeFilterRequest bussinessTypeFilterRequest) {
         Integer uerId = customerService.getUserId();
-        BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();
         bussinessTypeFilterRequest.setUserId(uerId);
         List<BussinessTypeEntity> bussinessTypeEntities = bussinessTypeService.filterAllByUser(bussinessTypeFilterRequest);
         return ResultVOUtils.success(bussinessTypeEntities);
diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java
index b35fa305..3f5073dd 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java
@@ -510,15 +510,17 @@ public class OrderServiceImpl implements OrderService {
                     }
                     //删除码详情
                     codesDao.deleteByOrderId(id);
-                    //查询业务单据
                     StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
-                    stockOrderFilterRequest.setBillNo(orderEntity.getErpFk());
-                    StockOrderEntity stockOrderEntity = stockOrderDao.findOne(stockOrderFilterRequest);
-                    if (stockOrderEntity != null) {
-                        //删除业务单据详情
-                        stockOrderDetailDao.deleteByOrderIdFk(stockOrderEntity.getId());
-                        //删除业务单据
-                        stockOrderDao.deleteById(stockOrderEntity.getId());
+                    //查询业务单据
+                    if (StrUtil.isNotEmpty(orderEntity.getErpFk())) {
+                        stockOrderFilterRequest.setBillNo(orderEntity.getErpFk());
+                        StockOrderEntity stockOrderEntity = stockOrderDao.findOne(stockOrderFilterRequest);
+                        if (stockOrderEntity != null) {
+                            //删除业务单据详情
+                            stockOrderDetailDao.deleteByOrderIdFk(stockOrderEntity.getId());
+                            //删除业务单据
+                            stockOrderDao.deleteById(stockOrderEntity.getId());
+                        }
                     }
                     //删除扫码单据详情
                     orderDetailDao.deleteByOrderId(id);
@@ -536,15 +538,18 @@ public class OrderServiceImpl implements OrderService {
                     orderDetailDao.deleteByOrderId(id);
 
                     //查询业务单据
-                    StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
-                    stockOrderFilterRequest.setBillNo(orderEntity.getErpFk());
-                    StockOrderEntity stockOrderEntity = stockOrderDao.findOne(stockOrderFilterRequest);
-                    if (stockOrderEntity != null) {
-                        //删除业务单据详情
-                        stockOrderDetailDao.deleteByOrderIdFk(stockOrderEntity.getId());
-                        //删除业务单据
-                        stockOrderDao.deleteById(stockOrderEntity.getId());
+                    if (StrUtil.isNotEmpty(orderEntity.getErpFk())) {
+                        StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
+                        stockOrderFilterRequest.setBillNo(orderEntity.getErpFk());
+                        StockOrderEntity stockOrderEntity = stockOrderDao.findOne(stockOrderFilterRequest);
+                        if (stockOrderEntity != null) {
+                            //删除业务单据详情
+                            stockOrderDetailDao.deleteByOrderIdFk(stockOrderEntity.getId());
+                            //删除业务单据
+                            stockOrderDao.deleteById(stockOrderEntity.getId());
+                        }
                     }
+
                     //删除码
                     codesDao.deleteByOrderId(id);
                 } catch (Exception e) {
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml
index e216bbb0..46af03fb 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml
@@ -74,7 +74,8 @@
         basic_bussiness_type.name ,
         basic_bussiness_type.action,basic_bussiness_type.checkEnable,basic_bustype_local.advanceType,basic_bustype_local.changeEnable,
         basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.corpType,basic_bussiness_type.mainAction,basic_bussiness_type.prefix,basic_bustype_local.prefix localPrefix
-        ,basic_bustype_local.preIn
+        ,basic_bustype_local.preIn,
+        basic_bussiness_type.ullageFill, basic_bussiness_type.scanPreIn, basic_bussiness_type.vailInv, basic_bussiness_type.codeFillCheck
         FROM basic_bustype_local
         inner join basic_bussiness_type
         on basic_bustype_local.action = basic_bussiness_type.localAction
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml
index fe3cad21..bdf5ff32 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml
@@ -151,6 +151,9 @@
             <if test="pcode != null">
                 AND pcode = #{pcode}
             </if>
+            <if test="status != null">
+                AND status = #{status}
+            </if>
             <if test="spUse != null">
                 AND spUse = #{spUse}
             </if>