diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionQuote.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionQuote.java
index 0cf8d5169..31a8db1ea 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionQuote.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionQuote.java
@@ -52,10 +52,10 @@ public class EmisCommissionQuote extends BaseEntity
     /* 员工名称 */
     private String empName;
     /* 开始日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date startDate;
     /* 结束日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date endDate;
     /* 优先级 */
     private Integer priorityLevel;
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBillPayLog.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBillPayLog.java
index 9d3ebf72c..8edba701a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBillPayLog.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBillPayLog.java
@@ -82,10 +82,10 @@ public class EmisSettleBillPayLog extends BaseEntity
     /* 跳转地址 */
     private String returnUrl;
     /* 订单失效时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date expireTime;
     /* 订单支付成功时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date paySuccTime;
     /* 支付返回信息 */
     private String credential;
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 8a4af4cc7..6b9f45eb6 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
@@ -50,21 +50,19 @@ public class EmisWarehouseIn extends BaseEntity
     /* 客户名称 */
     private String customerName;
     /* 进仓日期 */
-     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date entryDate;
-    /* 客户确认状态 0-未确认 1-确认 2-部分确认 3-异常反馈 */
+    /* 客户确认状态 0-未确认 1-确认 2-部分确认3-异常反馈 */
     private String confirmStatus;
     /* 确认时间 */
-     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date confirmDate;
-    /* 占用状态 0-未占用 1-已全部占用 2-不分占用 */
+    /* 占用状态 0-未占用 1-已全部占用 2-部分占用 */
     private String usedStatus;
-
-    /* 进仓标记 0-未进仓 1-已进仓 */
-    private String stockInFlag;
-
     /* 状态 0-初始 */
     private String status;
+    /* 0-未入仓 1-已入仓 */
+    private String stockInFlag;
 
     // ---------  扩展参数
     private EmisWaybill waybillDetail;
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java
index f0f311cc4..e51e2e3b0 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java
@@ -54,12 +54,12 @@ public class EmisWarehouseInBatch extends BaseEntity
     /* 运输工具编号 例如车牌号等  */
     private String transCarNo;
     /* 进仓日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date entryDate;
     /* 客户确认状态 0-未确认 1-确认 2-部分确认3-异常反馈 */
     private String confirmStatus;
     /* 确认时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date confirmDate;
     /* 状态 */
     private String status;
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInMapper.java
index e4bd0a9d9..90196717a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInMapper.java
@@ -84,4 +84,7 @@ public interface EmisWarehouseInMapper extends BaseMapper<EmisWarehouseIn>
      * @return
      */
     public int changeUseStatusByUse(EmisWarehouseIn emisWarehouseIn);
+
+
+    public int updateHasStockInFlag(String inNo);
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java
index 48f97d5a7..6c83b2c24 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java
@@ -44,7 +44,6 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
     @Autowired
     private EmisSettlePayRecordMapper emisSettlePayRecordMapper;
 
-
     @Autowired
     private EmisSettlePayRelMapper emisSettlePayRelMapper;
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
index 45ccdf695..1874d16f9 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
@@ -18,6 +18,7 @@ import com.xdadan.erp.emis.domain.EmisWarehouseInDtl;
 import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
 import com.xdadan.erp.emis.mapper.EmisWarehouseInDtlMapper;
+import com.xdadan.erp.emis.mapper.EmisWarehouseInMapper;
 import com.xdadan.erp.emis.utils.WaybillHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -42,6 +43,9 @@ public class EmisWarehouseInBatchServiceImpl implements IEmisWarehouseInBatchSer
     @Autowired
     private EmisWarehouseInDtlMapper emisWarehouseInDtlMapper;
 
+    @Autowired
+    private EmisWarehouseInMapper emisWarehouseInMapper;
+
     /**
      * 查询进仓单批次
      * 
@@ -77,7 +81,7 @@ public class EmisWarehouseInBatchServiceImpl implements IEmisWarehouseInBatchSer
     public int insertEmisWarehouseInBatch(EmisWarehouseInBatch emisWarehouseInBatch) throws EmisBizError {
 
         if(StringUtils.isEmpty(emisWarehouseInBatch.getInNo())){
-            throw new EmisBizError(EmisBizErrorType.FAIL,"进仓货物列表不能为空");
+            throw new EmisBizError(EmisBizErrorType.FAIL,"进仓单号不能为空");
         }
 
         List<EmisWarehouseInDtl> cargoList=emisWarehouseInBatch.getCargoList();
@@ -100,6 +104,9 @@ public class EmisWarehouseInBatchServiceImpl implements IEmisWarehouseInBatchSer
         emisWarehouseInBatch.setId(null);
         emisWarehouseInBatchMapper.insertEmisWarehouseInBatch(emisWarehouseInBatch);
 
+        // 更新入库状态
+        emisWarehouseInMapper.updateHasStockInFlag(emisWarehouseInBatch.getInNo());
+
         return 1;
     }
 
diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
index 12b8db326..b698cf421 100644
--- a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
@@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="confirmDate"    column="confirm_date"    />
         <result property="usedStatus"    column="used_status"    />
         <result property="status"    column="status"    />
+        <result property="stockInFlag"    column="stock_in_flag"    />
 
     </resultMap>
 
@@ -39,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <sql id="selectEmisWarehouseInVo">
-        select id, serial_no, in_no, order_sn, bill_code, customer_code, customer_name, entry_date, confirm_status, confirm_date, used_status, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_warehouse_in
+        select id, serial_no, in_no, order_sn, bill_code, customer_code, customer_name, entry_date, confirm_status, confirm_date, used_status, status, stock_in_flag, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_warehouse_in
     </sql>
 
     <select id="selectEmisWarehouseInList" parameterType="EmisWarehouseIn" resultMap="EmisWarehouseInResult">
@@ -70,6 +71,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
             <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
 
+            <if test="stockInFlag != null  and stockInFlag != ''"> and stock_in_flag=#{stockInFlag}</if>
+
+
             <if test="usedStatus != null  and usedStatus == 1">
                 and used_status= '1'
              </if>
@@ -83,21 +87,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
   
     <select id="selectEmisWarehouseInById" parameterType="Long" resultMap="EmisWarehouseInResult">
-        select id, serial_no, in_no, order_sn, bill_code, customer_code, customer_name, entry_date, confirm_status, confirm_date, used_status, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site 
+        select id, serial_no, in_no, order_sn, bill_code, customer_code, customer_name, entry_date, confirm_status, confirm_date, used_status, status, stock_in_flag, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_warehouse_in a
         where a.id = #{id}
     </select>
 
     <select id="selectEmisWarehouseInByInNo" parameterType="String" resultMap="EmisWarehouseInResult">
-        select id, serial_no, in_no, order_sn, bill_code, customer_code, customer_name, entry_date, confirm_status, confirm_date, used_status, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, serial_no, in_no, order_sn, bill_code, customer_code, customer_name, entry_date, confirm_status, confirm_date, used_status, status, stock_in_flag, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_warehouse_in a
         where a.in_no = #{inNo}
     </select>
-        
+
     <insert id="insertEmisWarehouseIn" parameterType="EmisWarehouseIn" useGeneratedKeys="true" keyProperty="id">
         insert into emis_warehouse_in
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
             <if test="serialNo != null and serialNo != ''">serial_no,</if>
             <if test="inNo != null and inNo != ''">in_no,</if>
             <if test="orderSn != null and orderSn != ''">order_sn,</if>
@@ -109,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="confirmDate != null">confirm_date,</if>
             <if test="usedStatus != null and usedStatus != ''">used_status,</if>
             <if test="status != null and status != ''">status,</if>
+            <if test="stockInFlag != null and stockInFlag != ''">stock_in_flag,</if>
             <if test="remark != null and remark != ''">remark,</if>
             <if test="tenantId != null and tenantId != ''">tenant_id,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
@@ -118,9 +122,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="createSite != null and createSite != ''">create_site,</if>
             <if test="updateSite != null and updateSite != ''">update_site,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
             <if test="serialNo != null and serialNo != ''">#{serialNo},</if>
             <if test="inNo != null and inNo != ''">#{inNo},</if>
             <if test="orderSn != null and orderSn != ''">#{orderSn},</if>
@@ -132,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="confirmDate != null">#{confirmDate},</if>
             <if test="usedStatus != null and usedStatus != ''">#{usedStatus},</if>
             <if test="status != null and status != ''">#{status},</if>
+            <if test="stockInFlag != null and stockInFlag != ''">#{stockInFlag},</if>
             <if test="remark != null and remark != ''">#{remark},</if>
             <if test="tenantId != null and tenantId != ''">#{tenantId},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
@@ -141,7 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createSite != null and createSite != ''">#{createSite},</if>
             <if test="updateSite != null and updateSite != ''">#{updateSite},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateEmisWarehouseIn" parameterType="EmisWarehouseIn">
@@ -158,6 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="confirmDate != null">confirm_date = #{confirmDate},</if>
             <if test="usedStatus != null and usedStatus != ''">used_status = #{usedStatus},</if>
             <if test="status != null and status != ''">status = #{status},</if>
+            <if test="stockInFlag != null and stockInFlag != ''">stock_in_flag = #{stockInFlag},</if>
             <if test="remark != null and remark != ''">remark = #{remark},</if>
             <if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
@@ -195,6 +200,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where in_no = #{inNo}
     </update>
 
+    <update id="updateHasStockInFlag" parameterType="String">
+        update emis_warehouse_in set  stock_in_flag = '1' where in_no = #{inNo}
+    </update>
+
 
 
     <update id="useInNo" parameterType="EmisWarehouseIn">