diff --git a/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusConfig.java b/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusConfig.java
index 940f44a7..f9728b97 100644
--- a/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusConfig.java
+++ b/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusConfig.java
@@ -272,7 +272,7 @@ public class MybatisPlusConfig {
 
     public MybatisConfiguration configuration(DataSource dataSource){
         MybatisConfiguration mybatisConfiguration = new MybatisConfiguration();
-        mybatisConfiguration.setMapUnderscoreToCamelCase(false);
+        mybatisConfiguration.setMapUnderscoreToCamelCase(true);
         mybatisConfiguration.setCacheEnabled(false);
         mybatisConfiguration.addInterceptor(mybatisPlusInterceptor());
         mybatisConfiguration.setLogImpl(Slf4jImpl.class);
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java
index 410331f8..f7c0d61b 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java
@@ -477,23 +477,25 @@ public class CollectionController {
  //子表数据转换
 		List<Collection_item0Entity> jg_collection_item0List = collectionService.GetCollection_item0List(id);
 		List<Collection_item0Model> jg_collection_item0ModelList = JsonUtil.getJsonToList(jg_collection_item0List,Collection_item0Model.class);
-		for(Collection_item0Model jg_collection_item0Model : jg_collection_item0ModelList){
+		for(Collection_item0Model jg_collection_item0Model : jg_collection_item0ModelList) {
             QueryWrapper<SaleorderitemEntity> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().eq(SaleorderitemEntity::getId,jg_collection_item0Model.getSalesorderId());
+            queryWrapper.lambda().eq(SaleorderitemEntity::getId, jg_collection_item0Model.getSalesorderId());
             SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper);
-            jg_collection_item0Model.setPrice(String.valueOf(saleorderitemEntity.getPrice()));
-            jg_collection_item0Model.setAmountCollected(String.valueOf(saleorderitemEntity.getAmountCollected()));
-            jg_collection_item0Model.setContractId(saleorderitemEntity.getContractId());
-            jg_collection_item0Model.setSalesorderId(saleorderitemEntity.getDocumentNo());
-            jg_collection_item0Model.setNum(String.valueOf(saleorderitemEntity.getNum()));
-            jg_collection_item0Model.setAdvanceAmount(String.valueOf(saleorderitemEntity.getAdvanceAmount()));
-            jg_collection_item0Model.setRate(String.valueOf(saleorderitemEntity.getRate()));
-            jg_collection_item0Model.setNotPrice(String.valueOf(saleorderitemEntity.getNotPrice()));
+            if (ObjectUtils.isNotEmpty(saleorderitemEntity)) {
+                jg_collection_item0Model.setPrice(String.valueOf(saleorderitemEntity.getPrice()));
+                jg_collection_item0Model.setAmountCollected(String.valueOf(saleorderitemEntity.getAmountCollected()));
+                jg_collection_item0Model.setContractId(saleorderitemEntity.getContractId());
+                jg_collection_item0Model.setSalesorderId(saleorderitemEntity.getDocumentNo());
+                jg_collection_item0Model.setNum(String.valueOf(saleorderitemEntity.getNum()));
+                jg_collection_item0Model.setAdvanceAmount(String.valueOf(saleorderitemEntity.getAdvanceAmount()));
+                jg_collection_item0Model.setRate(String.valueOf(saleorderitemEntity.getRate()));
+                jg_collection_item0Model.setNotPrice(String.valueOf(saleorderitemEntity.getNotPrice()));
 //            Map<String,Object> salesorderIdMap = new HashMap<>();
 //            jg_collection_item0Model.setSalesorderId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",jg_collection_item0Model.getSalesorderId(),salesorderIdMap));
-            Map<String,Object> deleteTimeMap = new HashMap<>();
-            jg_collection_item0Model.setContractId(generaterSwapUtil.getPopupSelectValue("398848549678332037","id","contract_code",jg_collection_item0Model.getContractId(),deleteTimeMap));
-    }
+                Map<String, Object> deleteTimeMap = new HashMap<>();
+                jg_collection_item0Model.setContractId(generaterSwapUtil.getPopupSelectValue("398848549678332037", "id", "contract_code", jg_collection_item0Model.getContractId(), deleteTimeMap));
+            }
+        }
 		vo.setCollection_item0List(jg_collection_item0ModelList);
 
  //附表数据转换
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/CollectionService.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/CollectionService.java
index 73b19199..248dd68b 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/CollectionService.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/CollectionService.java
@@ -37,5 +37,7 @@ public interface CollectionService extends IService<CollectionEntity> {
 
      PoundlistEntity queryPoundInfo(String poundlistId);
 
+     PoundlistEntity test (String poundlistId);
+
     //列表子表数据方法
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java
index 9efc09ed..9c391c6c 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java
@@ -277,6 +277,11 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
 //        return collectionMapper.queryPound(poundlistId);
     }
 
+    @Override
+    public PoundlistEntity test(String poundlistId) {
+        return collectionMapper.queryPound(poundlistId);
+    }
+
     //列表子表数据方法
 
 
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPagination.java
index 3eac151e..6d6f789c 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPagination.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPagination.java
@@ -21,6 +21,9 @@ public class ReceiptoutPagination extends Pagination {
 
         /** 业务类型 */
         private String type;
+
+        /** 出库日期 */
+        private List<String> issueDate;
 	/**
     * 菜单id
     */
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPagination.java
index 604d4987..e11620f2 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPagination.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPagination.java
@@ -21,6 +21,9 @@ public class SaleorderitemPagination extends Pagination {
 
         /** 单据状态  */
         private String status;
+
+        /** 单据状态  */
+        private List<String> creatorTime;
 	/**
     * 菜单id
     */
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java
index 2a0404ab..bdbcdeed 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java
@@ -1,5 +1,6 @@
 package jnpf.saleorder.service.impl;
 
+import jnpf.arinvoices.entity.ArinvoicesEntity;
 import jnpf.receiptout.entity.Receiptout_item0Entity;
 import jnpf.receiptout.service.Receiptout_item0Service;
 import jnpf.saleorder.entity.*;
@@ -227,6 +228,16 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
             saleorderitemNum++;
                 saleorderitemQueryWrapper.lambda().eq(SaleorderitemEntity::getStatus,saleorderitemPagination.getStatus());
                     }
+			if(StringUtil.isNotEmpty(saleorderitemPagination.getCreatorTime())){
+            saleorderitemNum++;
+            List<String> creatorTime =  saleorderitemPagination.getCreatorTime();
+            Long fir = Long.valueOf(creatorTime.get(0));
+            Long sec = Long.valueOf(creatorTime.get(1));
+
+                saleorderitemQueryWrapper.lambda().ge(SaleorderitemEntity::getCreatorTime, new Date(fir))
+                    .le(SaleorderitemEntity::getCreatorTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
+
+        }
 
         if(AllIdList.size()>0){
             saleorderitemQueryWrapper.lambda().in(SaleorderitemEntity::getId, AllIdList);
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
index d532e932..01f9ab73 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
@@ -1,5 +1,4 @@
 <template>
-<!--<<<<<<< HEAD-->
 <el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
            :close-on-click-modal="false" append-to-body
            :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/index.vue b/SC-web/src/views/scm/basicInformation/saleorder/index.vue
index ea1d57b2..8de779cc 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/index.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/index.vue
@@ -19,6 +19,14 @@
                                         </el-select>
                                 </el-form-item>
                             </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="制单日期">
+                      <el-date-picker v-model="query.creatorTime" type="daterange"
+                                      value-format="timestamp" format="yyyy-MM-dd" start-placeholder="开始日期"
+                                      end-placeholder="结束日期" >
+                      </el-date-picker>
+                    </el-form-item>
+                  </el-col>
                     <el-col :span="6">
                         <el-form-item>
                             <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>