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 0875e719f..5ee117669 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
@@ -72,6 +72,10 @@ public class EmisWarehouseIn extends BaseEntity
     /* 总重量 */
     private BigDecimal totalWeight;
 
+
+    /* 进仓标记 0-未进仓 1-已进仓 */
+    private String stockInFlag;
+
     // 入仓批次信息
     private List<EmisWarehouseInBatch> 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 fd7c8c68b..5c12c412e 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
@@ -3350,7 +3350,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             // 生成模版
             XWPFTemplate template = XWPFTemplate.compile(fis, config).render(fillMap);
 
-            response.setContentType("application/octet-stream");
+//            response.setContentType("application/octet-stream");
+            response.setContentType("application/pdf");
             response.setHeader("Content-Disposition", "attachment;fileName=" + fileName + ".pdf");
 
             ByteArrayOutputStream bos = new ByteArrayOutputStream();
diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
index 24ea1092b..12b8db326 100644
--- a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
@@ -29,16 +29,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </resultMap>
 
-    <resultMap id="EmisWarehouseInDetailResult" type="EmisWarehouseIn" extends="BaseEmisWarehouseInResult"  >
-        <association property="waybillDetail"
-                     column="bill_code"
-                     select="com.xdadan.erp.emis.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"
-                     fetchType="lazy"
-        />
-
-    </resultMap>
-
-
 <!--    <resultMap id="EmisWarehouseInDetailWithBatchListResult" type="EmisWarehouseIn" extends="BaseEmisWarehouseInResult"  >-->
 <!--        <association property="stockInBatchList"-->
 <!--                     column="in_no"-->