md

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

@@ -35,6 +35,7 @@ public class EmisTmsScanRecord extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+
     /* id */
     private Long id;
     /* 扫描运单号 */
@@ -58,7 +59,7 @@ public class EmisTmsScanRecord extends BaseEntity
     /* 上下一站点人员电话 */
     private String preOrNextManPhone;
     /* 扫描时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date scanDate;
     /* 扫描员代码 */
     private String scanManCode;
@@ -89,7 +90,7 @@ public class EmisTmsScanRecord extends BaseEntity
     /* 派件或取件人电话 */
     private String dispatchOrSendManPhone;
     /* 签收日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date signDate;
     /* 签收人 */
     private String signMan;
@@ -121,6 +122,8 @@ public class EmisTmsScanRecord extends BaseEntity
     private String publicTraceInfo;
     /* 内部公开信息 */
     private String innerTraceInfo;
+    /* 关联id */
+    private String relId;
     /* 状态 1-启用 0-不启用 */
     private String status;
 

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

@@ -64,6 +64,14 @@ public interface EmisTmsScanRecordMapper extends BaseMapper<EmisTmsScanRecord>
      */
     public int updateEmisTmsScanRecord(EmisTmsScanRecord emisTmsScanRecord);
 
+    /**
+     * 删除问题件扫描记录
+     * @param promId
+     * @param billCode
+     * @return
+     */
+    public int deletePromScanRecord(@Param("promId")String promId,@Param("billCode")String billCode);
+
     /**
      * 删除
      * 

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

@@ -1647,6 +1647,8 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
                 return itemList;
             }
 
+
+
             // 生成扫描记录
             EmisTmsScanRecord emisTmsScanRecord = new EmisTmsScanRecord();
             emisTmsScanRecord.setBillCode(scanBillCode);
@@ -1659,10 +1661,6 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
             // 填充公共数据
             this.fillBillBaseData(emisTmsScanRecord);
 
-            // 插入扫描记录
-            addScanRecord(emisTmsScanRecord);
-
-
             // 登记问题件
             EmisWaybillProblemInfo waybillProblemInfo = new EmisWaybillProblemInfo();
             waybillProblemInfo.setBillCode(emisTmsScanRecord.getBillCode());
@@ -1692,6 +1690,12 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
                 waybillProblemInfo.setBlSubBill("0");
             }
             registerWaybillProblemInfo(waybillProblemInfo);
+            if(waybillProblemInfo.getId()!=null) {
+                emisTmsScanRecord.setRelId(waybillProblemInfo.getId().toString());
+            }
+
+            // 插入扫描记录
+            addScanRecord(emisTmsScanRecord);
 
             scanResultItem.getData().put("billWeight", 0);
             scanResultItem.getData().put("totalVolume", 0);

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

@@ -47,6 +47,7 @@
         <result property="picUrl"    column="pic_url"    />
         <result property="publicTraceInfo"    column="public_trace_info"    />
         <result property="innerTraceInfo"    column="inner_trace_info"    />
+        <result property="relId"    column="rel_id"    />
         <result property="status"    column="status"    />
 
     </resultMap>
@@ -240,7 +241,7 @@
 
     <!-- 获取订单最后一条扫描记录 -->
     <select id="selectLastRecordBaseInfoByBillCode" parameterType="string" resultMap="BaseEmisTmsScanRecordResult">
-        select id, bill_code, main_bill_code,bl_sub_bill, order_sn, scan_type, pre_or_next_station, pre_or_next_station_code, pre_or_next_station_phone, pre_or_next_man_code, pre_or_next_man_phone, scan_date, scan_man_code, scan_man_phone, scan_man, pre_or_next_man, scan_site, scan_site_code, scan_site_phone, scan_weight, weight, dest_site_code, dest_code, dispatch_or_send_man, dispatch_or_send_man_code, dispatch_or_send_man_phone, sign_date, sign_man, sign_site, sign_site_code, record_man, record_man_code, record_man_phone, record_site_code, car_no, bag_no, truck_man, truck_code, data_from, pic_url, public_trace_info, inner_trace_info, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site
+        select id, bill_code, main_bill_code, bl_sub_bill, order_sn, scan_type, pre_or_next_station, pre_or_next_station_code, pre_or_next_station_phone, pre_or_next_man_code, pre_or_next_man_phone, scan_date, scan_man_code, scan_man_phone, scan_man, pre_or_next_man, scan_site, scan_site_code, scan_site_phone, scan_weight, weight, dest_site_code, dest_code, dispatch_or_send_man, dispatch_or_send_man_code, dispatch_or_send_man_phone, sign_date, sign_man, sign_site, sign_site_code, record_man, record_man_code, record_man_phone, record_site_code, car_no, bag_no, truck_man, truck_code, data_from, pic_url, public_trace_info, inner_trace_info, rel_id, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site
         from emis_tms_scan_record a
         where del_flag='0' and a.main_bill_code = #{billCode}
         order by create_time desc limit 1
@@ -273,7 +274,7 @@
 
 
     <sql id="selectEmisTmsScanRecordVo">
-        select id, bill_code, main_bill_code, bl_sub_bill, order_sn, scan_type, pre_or_next_station, pre_or_next_station_code, pre_or_next_station_phone, pre_or_next_man_code, pre_or_next_man_phone, scan_date, scan_man_code, scan_man_phone, scan_man, pre_or_next_man, scan_site, scan_site_code, scan_site_phone, scan_weight, weight, dest_site_code, dest_code, dispatch_or_send_man, dispatch_or_send_man_code, dispatch_or_send_man_phone, sign_date, sign_man, sign_site, sign_site_code, record_man, record_man_code, record_man_phone, record_site_code, car_no, bag_no, truck_man, truck_code, data_from, pic_url, public_trace_info, inner_trace_info, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site from emis_tms_scan_record
+        select id, bill_code, main_bill_code, bl_sub_bill, order_sn, scan_type, pre_or_next_station, pre_or_next_station_code, pre_or_next_station_phone, pre_or_next_man_code, pre_or_next_man_phone, scan_date, scan_man_code, scan_man_phone, scan_man, pre_or_next_man, scan_site, scan_site_code, scan_site_phone, scan_weight, weight, dest_site_code, dest_code, dispatch_or_send_man, dispatch_or_send_man_code, dispatch_or_send_man_phone, sign_date, sign_man, sign_site, sign_site_code, record_man, record_man_code, record_man_phone, record_site_code, car_no, bag_no, truck_man, truck_code, data_from, pic_url, public_trace_info, inner_trace_info, rel_id, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site from emis_tms_scan_record
     </sql>
 
 
@@ -438,7 +439,7 @@
 
 
     <select id="selectEmisTmsScanRecordById" parameterType="Long" resultMap="EmisTmsScanRecordResult">
-        select id, bill_code, main_bill_code, bl_sub_bill, order_sn, scan_type, pre_or_next_station, pre_or_next_station_code, pre_or_next_station_phone, pre_or_next_man_code, pre_or_next_man_phone, scan_date, scan_man_code, scan_man_phone, scan_man, pre_or_next_man, scan_site, scan_site_code, scan_site_phone, scan_weight, weight, dest_site_code, dest_code, dispatch_or_send_man, dispatch_or_send_man_code, dispatch_or_send_man_phone, sign_date, sign_man, sign_site, sign_site_code, record_man, record_man_code, record_man_phone, record_site_code, car_no, bag_no, truck_man, truck_code, data_from, pic_url, public_trace_info, inner_trace_info, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site
+        select id, bill_code, main_bill_code, bl_sub_bill, order_sn, scan_type, pre_or_next_station, pre_or_next_station_code, pre_or_next_station_phone, pre_or_next_man_code, pre_or_next_man_phone, scan_date, scan_man_code, scan_man_phone, scan_man, pre_or_next_man, scan_site, scan_site_code, scan_site_phone, scan_weight, weight, dest_site_code, dest_code, dispatch_or_send_man, dispatch_or_send_man_code, dispatch_or_send_man_phone, sign_date, sign_man, sign_site, sign_site_code, record_man, record_man_code, record_man_phone, record_site_code, car_no, bag_no, truck_man, truck_code, data_from, pic_url, public_trace_info, inner_trace_info, rel_id, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site
         from emis_tms_scan_record a
         where a.id = #{id}
     </select>
@@ -488,6 +489,7 @@
             <if test="picUrl != null and picUrl != ''">pic_url,</if>
             <if test="publicTraceInfo != null and publicTraceInfo != ''">public_trace_info,</if>
             <if test="innerTraceInfo != null and innerTraceInfo != ''">inner_trace_info,</if>
+            <if test="relId != null and relId != ''">rel_id,</if>
             <if test="status != null and status != ''">status,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
@@ -541,6 +543,7 @@
             <if test="picUrl != null and picUrl != ''">#{picUrl},</if>
             <if test="publicTraceInfo != null and publicTraceInfo != ''">#{publicTraceInfo},</if>
             <if test="innerTraceInfo != null and innerTraceInfo != ''">#{innerTraceInfo},</if>
+            <if test="relId != null and relId != ''">#{relId},</if>
             <if test="status != null and status != ''">#{status},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
@@ -597,6 +600,7 @@
             <if test="picUrl != null and picUrl != ''">pic_url = #{picUrl},</if>
             <if test="publicTraceInfo != null and publicTraceInfo != ''">public_trace_info = #{publicTraceInfo},</if>
             <if test="innerTraceInfo != null and innerTraceInfo != ''">inner_trace_info = #{innerTraceInfo},</if>
+            <if test="relId != null and relId != ''">rel_id = #{relId},</if>
             <if test="status != null and status != ''">status = #{status},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
@@ -610,6 +614,9 @@
         where id = #{id}
     </update>
 
+    <delete id="deletePromScanRecord" parameterType="String">
+        update emis_tms_scan_record set del_flag='1' where  scan_type='-1' and rel_id = #{promId} and main_bill_code=#{billCode}
+    </delete>
 
     <delete id="deleteEmisTmsScanRecordById" parameterType="Long">
         update emis_tms_scan_record set del_flag='1' where id = #{id}