diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/ReceiptBill.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/ReceiptBill.java
index 2178265..d993241 100644
--- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/ReceiptBill.java
+++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/ReceiptBill.java
@@ -47,16 +47,12 @@ public class ReceiptBill extends Model<ReceiptBill> {
     private String ywrq;
 
 
-
-
     /**
      * 收货数量
      */
     private String shsl;
 
 
-
-
     /**
      * 收货组织编码
      */
@@ -67,6 +63,10 @@ public class ReceiptBill extends Model<ReceiptBill> {
      * 收货仓库编码
      */
     private String ckbm;
+    /**
+     * 收货仓库名称
+     */
+    private String ckmc;
 
     /**
      * 收货库位编码
@@ -74,14 +74,12 @@ public class ReceiptBill extends Model<ReceiptBill> {
     private String kwbm;
 
 
-
     /**
      * 收货库位名称
      */
     private String kwmc;
 
 
-
     /**
      * 分录序号
      */
@@ -110,7 +108,7 @@ public class ReceiptBill extends Model<ReceiptBill> {
 
 
     /**
-     *  修改人
+     * 修改人
      */
     private String update_name;
 
@@ -126,7 +124,7 @@ public class ReceiptBill extends Model<ReceiptBill> {
      */
     @Override
     protected Serializable pkVal() {
-            return this.djid;
+        return this.djid;
     }
 
 }
diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dto/ReceiptBillQuery.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/dto/ReceiptBillQuery.java
index b8f3399..66b3249 100644
--- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dto/ReceiptBillQuery.java
+++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dto/ReceiptBillQuery.java
@@ -60,6 +60,7 @@ public class ReceiptBillQuery extends BaseQuery<ReceiptBillQuery> {
     private String ckbm;
 
 
+
     /**
      * 物料编码
      */
diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dto/ReceiptBillVO.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/dto/ReceiptBillVO.java
index 5304a2d..e9a18d1 100644
--- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dto/ReceiptBillVO.java
+++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dto/ReceiptBillVO.java
@@ -61,6 +61,11 @@ public class ReceiptBillVO extends BaseQuery<ReceiptBill> {
      */
     private String ckbm;
 
+    /**
+     * 收货仓库名称
+     */
+    private String ckmc;
+
     /**
      * 收货库位编码
      */
diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillServiceImpl.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillServiceImpl.java
index 6cbd5a7..f8b7d51 100644
--- a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillServiceImpl.java
+++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillServiceImpl.java
@@ -211,33 +211,33 @@ public class EasOutInBillServiceImpl extends ServiceImpl<EasOutInBillMapper, Eas
     public CommonPage<EasOutInBill> page(EasOutInBillQuery params) {
         Page<EasOutInBill> pageObject = new Page<>(params.getPage(), params.getSize());
         Page<EasOutInBill> receiptBills = easOutInBillMapper.selectPageList(pageObject, params.getFuzzy(),params.getDjlx(),params.getCgybm(), params.getCkbm());
-//        Page<EasOutInBill> easOutInBills = easOutInBillMapper.selectPage(new Page<>(params.getPage(), params.getSize()), new QueryWrapper<EasOutInBill>()
-//                .lambda()
-//                .eq(ObjectUtil.isNotEmpty(params.getDjlx()), EasOutInBill::getDjlx, params.getDjlx())
-//                .eq(ObjectUtil.isNotEmpty(params.getWlbm()), EasOutInBill::getWlbm, params.getCkbm())
-//                .eq(ObjectUtil.isNotEmpty(params.getCkbm()), EasOutInBill::getCkbm, params.getCkbm())
-//                .eq(ObjectUtil.isNotEmpty(params.getCgybm()), EasOutInBill::getCgybm, params.getCgybm())
-//                //.eq(ObjectUtil.isNotEmpty(params.getDjzt()), EasOutInBill::getDjzt, "1".equals(params.getDjzt()) ? "提交" : "审核")
-//                .eq(EasOutInBill::getDjzt, "提交")
-//                .nested(ObjectUtil.isNotEmpty(params.getFuzzy()),
-//                        i -> i.like(EasOutInBill::getDjid, params.getFuzzy())
-//                                .or()
-//                                .like(EasOutInBill::getDjbh, params.getFuzzy())
-//                                .or()
-//                                .like(EasOutInBill::getZzbm, params.getFuzzy())
-//                                .or()
-//                                .like(EasOutInBill::getZzmc, params.getFuzzy())
-//                                .or()
-//                                .like(EasOutInBill::getCkmc, params.getFuzzy())
-//                                .or()
-//                                .like(EasOutInBill::getWlbm, params.getFuzzy())
-//                                .or()
-//                                .like(EasOutInBill::getCkbm, params.getFuzzy())
-//                                .or()
-//                                .like(EasOutInBill::getCjr, params.getFuzzy()
-//                                )
-//                ).orderByDesc(EasOutInBill::getCjsj)
-//        );
+        //        Page<EasOutInBill> easOutInBills = easOutInBillMapper.selectPage(new Page<>(params.getPage(), params.getSize()), new QueryWrapper<EasOutInBill>()
+        //                .lambda()
+        //                .eq(ObjectUtil.isNotEmpty(params.getDjlx()), EasOutInBill::getDjlx, params.getDjlx())
+        //                .eq(ObjectUtil.isNotEmpty(params.getWlbm()), EasOutInBill::getWlbm, params.getCkbm())
+        //                .eq(ObjectUtil.isNotEmpty(params.getCkbm()), EasOutInBill::getCkbm, params.getCkbm())
+        //                .eq(ObjectUtil.isNotEmpty(params.getCgybm()), EasOutInBill::getCgybm, params.getCgybm())
+        //                //.eq(ObjectUtil.isNotEmpty(params.getDjzt()), EasOutInBill::getDjzt, "1".equals(params.getDjzt()) ? "提交" : "审核")
+        //                .eq(EasOutInBill::getDjzt, "提交")
+        //                .nested(ObjectUtil.isNotEmpty(params.getFuzzy()),
+        //                        i -> i.like(EasOutInBill::getDjid, params.getFuzzy())
+        //                                .or()
+        //                                .like(EasOutInBill::getDjbh, params.getFuzzy())
+        //                                .or()
+        //                                .like(EasOutInBill::getZzbm, params.getFuzzy())
+        //                                .or()
+        //                                .like(EasOutInBill::getZzmc, params.getFuzzy())
+        //                                .or()
+        //                                .like(EasOutInBill::getCkmc, params.getFuzzy())
+        //                                .or()
+        //                                .like(EasOutInBill::getWlbm, params.getFuzzy())
+        //                                .or()
+        //                                .like(EasOutInBill::getCkbm, params.getFuzzy())
+        //                                .or()
+        //                                .like(EasOutInBill::getCjr, params.getFuzzy()
+        //                                )
+        //                ).orderByDesc(EasOutInBill::getCjsj)
+        //        );
         return CommonPage.getPage(receiptBills);
     }
 
diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/ReceiptBillServiceImpl.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/ReceiptBillServiceImpl.java
index ee5bba4..83bfe6f 100644
--- a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/ReceiptBillServiceImpl.java
+++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/ReceiptBillServiceImpl.java
@@ -125,6 +125,7 @@ public class ReceiptBillServiceImpl extends ServiceImpl<ReceiptBillMapper, Recei
                                 receiptBill.setKwbm(updatedBill.getKwbm());
                                 receiptBill.setKwmc(updatedBill.getKwmc());
                                 receiptBill.setCkbm(updatedBill.getCkbm());
+                                receiptBill.setCkmc(updatedBill.getCkmc());
                                 receiptBill.setShsl(updatedBill.getShsl());
                                 receiptBill.setBz(updatedBill.getBz());
                                 receiptBill.setBtbz(updatedBill.getBtbz());