diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java
index d8f2e2f3d..5ca55bc13 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java
@@ -11,6 +11,7 @@
 package com.xdadan.erp.emis.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -74,9 +75,17 @@ public class EmisWarehouseIn extends BaseEntity
     private BigDecimal totalVolume;
     /* 总重量 */
     private BigDecimal totalWeight;
-    // ---------  扩展参数
 
+
+    // ---------  扩展参数
     private EmisWaybill waybillDetail;
+
+    // 是否已锁单 T,锁单原因
+    @TableField(exist = false)
+    private String lockFlag;
+    @TableField(exist = false)
+    private String lockReason;
+
     // 入仓批次信息
     private List<EmisWarehouseInBatch> stockInBatchList;
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java
index 3243f6124..ea6c08a9f 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java
@@ -53,6 +53,7 @@ public class EmisWarehouseInServiceImpl implements IEmisWarehouseInService
     public EmisWarehouseIn selectEmisWarehouseInByInNo(String inNo)
     {
         EmisWarehouseIn emisWarehouseIn=emisWarehouseInMapper.selectEmisWarehouseInByInNo(inNo);
+
         if(emisWarehouseIn!=null){
             List<EmisWarehouseInBatch> stockInBatchList= emisWarehouseInBatchMapper.selectInBatchListByInNo(inNo);
             emisWarehouseIn.setStockInBatchList(stockInBatchList);
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 981dc75e0..5e1092c8e 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
@@ -1983,6 +1983,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         String orderSn = WaybillHelper.genOrderSn();
 
         // 订单号
+        // 新开单历史数据要清除，避免上一单脏数据带过来
         if(isNew) {
             emisWaybillSave.setOrderSn(orderSn);
         }
@@ -2952,6 +2953,11 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         emisWaybillSave.setOrderType("0");
         emisWaybillSave.setOrderDate(new Date());
 
+        // 新开单清除费用备注，录单备注
+        emisWaybillSave.setRemark(null);
+        emisWaybillSave.setFeeRemark(null);
+
+
         // 如果是孟加拉单子，把运单号变为 12位
         if("0880".equals(emisWaybillSave.getReceiveCountry()) || "0880".equals(emisWaybillSave.getSendCountry())){
             if(emisWaybillSave.getBillCode().length()==14 && emisWaybillSave.getBillCode().startsWith("T7080")){