Merge pull request 'demand: 组批次添加操作监控，批量扫描漏组批次改为硬删除' (#106) from develop into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/106

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

@@ -11,8 +11,10 @@
 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 com.xdadan.erp.common.annotation.audit.DataAuditField;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.xdadan.erp.common.annotation.Excel;
@@ -48,6 +50,8 @@ public class EmisTmsSiteBatch extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date batchDate;
     /* 供应商代码 */
+    @TableField
+    @DataAuditField(fieldComment = "供应商编码")
     private String supplierCode;
     /* 供应商名称 */
     private String supplierName;
@@ -56,24 +60,36 @@ public class EmisTmsSiteBatch extends BaseEntity
     /* 所属产品 */
     private String productType;
     /* 批次类型 1-网点组批次 2-总部组批 */
+    @TableField
+    @DataAuditField(fieldComment = "批次类型")
     private String batchType;
     /* 运输方式: 空运 陆运 海运 */
+    @TableField
+    @DataAuditField(fieldComment = "运输方式")
     private String transType;
     /* 起始网点 */
+    @TableField
+    @DataAuditField(fieldComment = "起始网点")
     private String startSiteCode;
     /* 发件国家 */
     private String sendCountry;
     /* 下一网点 */
+    @TableField
+    @DataAuditField(fieldComment = "下一网点")
     private String nextSiteCode;
     /* 航空单号 */
     private String airBilllNo;
     /* 预计出发时间 */
     @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    @TableField
+    @DataAuditField(fieldComment = "预计出发时间")
     private Date etd;
     /* 预计到达时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date eta;
     /* 车牌号 */
+    @TableField
+    @DataAuditField(fieldComment = "运输号")
     private String carNo;
     /* 船次号 */
     private String shipNo;
@@ -86,8 +102,12 @@ public class EmisTmsSiteBatch extends BaseEntity
     /* 目的国家名称 */
     private String destCountryName;
     /* 运输重量 */
+    @TableField
+    @DataAuditField(fieldComment = "运输重量")
     private BigDecimal transWeight;
     /* 包裹数 */
+    @TableField
+    @DataAuditField(fieldComment = "包裹数")
     private Integer packNum;
     /* 总票数 */
     private Integer totalParcelQty;

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

@@ -11,8 +11,10 @@
 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 com.xdadan.erp.common.annotation.audit.DataAuditField;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.xdadan.erp.common.annotation.Excel;
@@ -39,6 +41,8 @@ public class EmisTmsSiteBatchDtl extends BaseEntity
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     /* 运单号 */
+    @TableField
+    @DataAuditField(fieldComment = "组批次运单号")
     private String billCode;
     /* 批次代码 */
     private String batchNo;

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

@@ -85,4 +85,6 @@ public interface EmisTmsSiteBatchMissMapper {
      * @param billCodes
      */
     void deleteByBillCodes(@Param("billCodes") List<String> billCodes);
+
+    void deleteReally(String lineCode);
 }

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

@@ -146,7 +146,7 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements
     @Override
     public void autoScanSiteBatch(String lineCode) {
         try {
-            emisTmsSiteBatchMissMapper.deleteAll(lineCode);
+            emisTmsSiteBatchMissMapper.deleteReally(lineCode);
             long startTime = System.currentTimeMillis();
             int pageSize = 1000;
             int offset = 0;

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

@@ -140,7 +140,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     w.send_country, c1.name as send_country_name, w.destination_code, n.dest_name as destination_name, w.bl_is_question,
                     l.line_name as line_name,
                     w.receive_country, c2.name as receive_country_name, w.send_date, w.bl_sign, w.sign_date,
-                    w.product_type,
                     w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight,
                     w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark, 
                     null as manager, null as trans_manager,
@@ -358,6 +357,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </update>
 
+    <delete id="deleteReally">
+        delete from emis_tms_site_batch_miss
+        <if test="lineCode != null and lineCode != ''">
+            where line_code = #{lineCode}
+        </if>
+    </delete>
+
     <update id="deleteByBillCodes">
         update emis_tms_site_batch_miss set del_flag = '1'
          where bill_code in