demand: 需要新增成本录入状态，需要可以导出并且查看哪些组批次是已经进行成本录入的，哪些组批次是未进行成本录入的

committer: heyu

emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java

@@ -110,6 +110,9 @@ public class EmisTmsSiteBatch extends BaseEntity
     private String startSiteName;
     private String nextSiteName;
 
+    /* 货物批次是否录入，0：未录入，1：已录入，默认为0 */
+    private String blEntering;
+
     private List<EmisTmsSiteBatchDtl> batchDtlList;
 
 

emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMapper.java

@@ -83,4 +83,12 @@ public interface EmisTmsSiteBatchMapper extends BaseMapper<EmisTmsSiteBatch>
 
     // 打提成标识
     public int updateHasDoProfit(String batchNo);
+
+    /**
+     * 更新录入状态 0：未录入，1：已录入
+     *
+     * @param batchNo 批次号
+     * @return 结果
+     */
+    public int updateEnteringStatus(String batchNo);
 }

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java

@@ -64,6 +64,9 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
     @Autowired
     private EmisExchangeRateMapper emisExchangeRateMapper;
 
+    @Autowired
+    private EmisTmsSiteBatchMapper emisTmsSiteBatchMapper;
+
     /**
      * 查询TMS运输成本账单
      * @param id TMS运输成本账单主键
@@ -180,6 +183,7 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
         }
 
         emisTmsCostFeeMapper.insertEmisTmsCostFee(emisTmsCostFee);
+        emisTmsSiteBatchMapper.updateEnteringStatus(emisTmsCostFee.getBatchNo());
 
         // 计算分摊费用
 //      reCalcSplitCostFee(costNo);

emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml

@@ -34,6 +34,7 @@
         <result property="totalVolume"    column="total_volume"    />
         <result property="totalWeight"    column="total_weight"    />
         <result property="opMan"    column="op_man"    />
+        <result property="blEntering"    column="bl_entering"    />
 
         <!--   扩展     -->
         <association property="productTypeName"    column="product_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectProdNameByCode"/>
@@ -49,7 +50,7 @@
     </resultMap>
 
     <sql id="selectEmisTmsSiteBatchVo">
-        select id, batch_no, batch_name, batch_date, supplier_code, supplier_name, trans_line_type, product_type, batch_type, trans_type, start_site_code, send_country, next_site_code, air_billl_no, etd, eta, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, trans_weight, pack_num, total_parcel_qty, total_waybill_qty, total_volume, total_weight, op_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_site_batch
+        select id, batch_no, batch_name, batch_date, supplier_code, supplier_name, trans_line_type, product_type, batch_type, trans_type, start_site_code, send_country, next_site_code, air_billl_no, etd, eta, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, trans_weight, pack_num, total_parcel_qty, total_waybill_qty, total_volume, total_weight, op_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site, bl_entering from emis_tms_site_batch
     </sql>
 
     <select id="selectEmisTmsSiteBatchList" parameterType="EmisTmsSiteBatch" resultMap="EmisTmsSiteBatchResult">
@@ -93,6 +94,7 @@
             <if test="updateTime != null "> and update_time = #{updateTime}</if>
             <if test="createSite != null  and createSite != ''"> and create_site=#{createSite}</if>
             <if test="updateSite != null  and updateSite != ''"> and update_site=#{updateSite}</if>
+            <if test="blEntering != null  and blEntering != ''"> and bl_entering=#{blEntering}</if>
 
             <if test="searchValue != null  and searchValue != '' ">
                 and  ( batch_no like concat('%', #{searchValue},'%') or batch_name like concat('%', #{searchValue},'%') or car_no like concat('%', #{searchValue},'%')  )
@@ -204,6 +206,13 @@
         where batch_no=#{batchNo}
     </update>
 
+    <!--  更新录入状态 -->
+    <update id="updateEnteringStatus" parameterType="String">
+        update emis_tms_site_batch set
+            bl_entering = '1'
+        where batch_no=#{batchNo}
+    </update>
+
     <insert id="insertEmisTmsSiteBatch" parameterType="EmisTmsSiteBatch" useGeneratedKeys="true" keyProperty="id">
         insert into emis_tms_site_batch
         <trim prefix="(" suffix=")" suffixOverrides=",">