diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 1c5c4717b..9a435e1e2 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -1448,7 +1448,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             emisWaybillSave.setDataFrom(WaybillHelper.getDataFrom());
         }
 
-
         if(StringUtils.isEmpty(emisWaybillSave.getPackType())){
             emisWaybillSave.setPackType("2");
         }
@@ -1529,6 +1528,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
         sendAddress.setUseSiteCode(emisWaybillSave.getSendSiteCode());
         sendAddress.setAddressType("1");
+        sendAddress.setCustomerCode(customerCode);
 
         // 收件地址
         EmisCustomerAddress recieveAddress = new EmisCustomerAddress();
@@ -1544,6 +1544,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         recieveAddress.setCompany(emisWaybillSave.getReceiveCompany());
         recieveAddress.setUseSiteCode(emisWaybillSave.getSendSiteCode());
         recieveAddress.setAddressType("2");
+        recieveAddress.setCustomerCode(customerCode);
 
 
         // 获取客户简码
@@ -1600,7 +1601,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             try {
                 //    TAN-SMD-240603-01
                 String YYMMDD = "yyMMdd";
-                String hbKey = "TAN" + "-" + simpleName +"-"+ DateUtils.parseDateToStr(YYMMDD, new Date());
+//                String hbKey = "TAN" + "-" + simpleName +"-"+ DateUtils.parseDateToStr(YYMMDD, new Date());
+                String hbKey = "TAN" + "-" + simpleName +"-"+ DateUtils.parseDateToStr(YYMMDD, emisWaybillSave.getPickStartDate());
                 Long lockNo = redissonService.addAndGetLong(hbKey, 1L);
                 String wayhoustInNo = hbKey + "" + StringUtils.leftPad(String.valueOf(lockNo), 2, "0");
                 emisWaybillSave.setIntoWarehouseBillCode(wayhoustInNo);
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
index 120d31c92..d06803941 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
@@ -146,7 +146,7 @@
                     AND exists (
                         select 1 from emis_settle_sub_bill b
                         where x2.settle_bill_no=b.settle_bill_no
-                        and ( FIND_IN_SET(b.`bill_code`,#{params.billCode}) or b.bill_code like concat('%', #{params.billCode}, '%') )
+                        and ( FIND_IN_SET(b.`bill_code`,#{params.billCode}) )
                     )
                 )