From 2e4b29aac0d70130036b734484cb30c27f7bfbdf Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 3 Jun 2024 17:59:22 +0800 Subject: [PATCH] md --- .../emis/EmisWaybillAttachmentController.java | 1 + .../erp/emis/domain/EmisTmsScanRecord.java | 4 +++ .../emis/domain/EmisWaybillAttachment.java | 2 +- .../domain/enumtype/WaybillAttachType.java | 18 ++++++++++ .../erp/emis/domain/vo/scan/ScanInfo.java | 1 + .../erp/emis/service/EmisBaseService.java | 3 +- .../impl/EmisTmsScanRecordServiceImpl.java | 19 ++++++++--- .../mapper/EmisTmsScanRecordMapper.xml | 33 +++++++++++-------- 8 files changed, 61 insertions(+), 20 deletions(-) create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/WaybillAttachType.java diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java index 63bf403c9..5a9fee33e 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java @@ -91,6 +91,7 @@ public class EmisWaybillAttachmentController extends BaseController @PostMapping public AjaxResult add(@RequestBody EmisWaybillAttachment emisWaybillAttachment) { + // 1-揽收底单 return toAjax(emisWaybillAttachmentService.insertEmisWaybillAttachment(emisWaybillAttachment)); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java index b54304bc7..b01ecd221 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java @@ -113,6 +113,10 @@ public class EmisTmsScanRecord extends BaseEntity private String dataFrom; /* 图片路径 */ private String picUrl; + /* 对外公开的信息 */ + private String publicTraceInfo; + /* 内部公开信息 */ + private String innerTraceInfo; /* 状态 1-启用 0-不启用 */ private String status; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAttachment.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAttachment.java index b3834284a..dc283d607 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAttachment.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAttachment.java @@ -39,7 +39,7 @@ public class EmisWaybillAttachment extends BaseEntity private Long waybillId; /* 运单号 */ private String billCode; - /* 附件类型 1-清关文件 2-揽收底单 3-签收底单 */ + /* 附件类型 1-揽收底单 2-签收底单 3-清关文件 */ private String attachType; /* 文件名称 */ private String fileName; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/WaybillAttachType.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/WaybillAttachType.java new file mode 100644 index 000000000..2bbeaffc9 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/WaybillAttachType.java @@ -0,0 +1,18 @@ +package com.xdadan.erp.emis.domain.enumtype; + +public enum WaybillAttachType { + + GOT_PIC("1","揽收底单"), + SIGNED_PIC("2","签收底单"), + DECLEAR_PIC("3","报关文件"), + CLEAR_PIC("4","清关文件") + ; + + public String typeCode; + public String typeName; + + WaybillAttachType(String typeCode, String typeName) { + this.typeCode = typeCode; + this.typeName = typeName; + } +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/scan/ScanInfo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/scan/ScanInfo.java index 1cb955acf..1db21b413 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/scan/ScanInfo.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/scan/ScanInfo.java @@ -24,6 +24,7 @@ public class ScanInfo implements Serializable { private String scanType; private Integer opType; + private String dataFrom; private List> scanData; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 59f70d012..50c77f434 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -262,8 +262,7 @@ public class EmisBaseService { } // 问题件 else if(ScanType.ISSUE.opCode.equals(scanType)){ - - content=" 问题件:"; + content="问题件"; } // 合包 else if(ScanType.CO_PACKING.opCode.equals(scanType)){ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java index 7e714acc8..37a8ae25a 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java @@ -17,6 +17,7 @@ import com.xdadan.erp.common.core.domain.entity.SysUser; import com.xdadan.erp.common.utils.DateUtils; import com.xdadan.erp.emis.domain.*; import com.xdadan.erp.emis.domain.enumtype.ScanType; +import com.xdadan.erp.emis.domain.enumtype.WaybillAttachType; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.stat.ScanStatDataInfo; import com.xdadan.erp.emis.domain.vo.scan.ScanInfo; @@ -223,7 +224,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm * @param scanDataItem * @return */ - public List doScan(String scanType,Map scanDataItem){ + public List doScan(String scanType,Map scanDataItem,String dataFrom){ List itemList = new ArrayList<>(); String billCodeInStr = (String)scanDataItem.get("billCode"); @@ -414,11 +415,21 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm emisTmsScanRecord.setRemark(remark); + // 运单附件签收图片信息 + EmisWaybillAttachment emisWaybillAttachment = new EmisWaybillAttachment(); + emisWaybillAttachment.setBillCode(emisTmsScanRecord.getBillCode()); + emisWaybillAttachment.setAttachType(WaybillAttachType.SIGNED_PIC.typeCode); // 签收图片 + emisWaybillAttachment.setFileSiez(0); + emisWaybillAttachment.setFileDesc("签收图片"); + emisWaybillAttachment.setFileUrl(picUrl); + emisWaybillAttachment.setDataFrom(emisTmsScanRecord.getDataFrom()); + emisWaybillAttachmentMapper.insertEmisWaybillAttachment(emisWaybillAttachment); + EmisTmsScanPicInfo emisTmsScanPicInfo = new EmisTmsScanPicInfo(); emisTmsScanPicInfo.setBillCode(emisTmsScanRecord.getBillCode()); emisTmsScanPicInfo.setPicType(scanType); emisTmsScanPicInfo.setPicUrl(picUrl); - emisTmsScanPicInfo.preInsert(); + emisTmsScanPicInfoMapper.insertEmisTmsScanPicInfo(emisTmsScanPicInfo); // 更新总运单签收记录 @@ -483,7 +494,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm // "scanDate": "2024-05-02 12:03:05", // "scanWeight": "0.2" - String problemType = (String)scanDataItem.get("problemType"); + String problemType = String.valueOf(scanDataItem.get("problemType")); String notifySite = (String)scanDataItem.get("notifySite"); String picUrl = (String)scanDataItem.get("picUrl"); String remark = (String)scanDataItem.get("remark"); @@ -633,7 +644,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm List resultList = new ArrayList<>(); if(scanInfo.getOpType()==2){ for (Map item: scanInfo.getScanData()) { - List itemCheckList=doScan(scanInfo.getScanType(),item); + List itemCheckList=doScan(scanInfo.getScanType(),item,scanInfo.getDataFrom()); resultList.addAll(itemCheckList); } } diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml index f4c1ca4d1..ec99e877e 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml @@ -43,6 +43,8 @@ + + @@ -149,12 +151,7 @@ - - + - + + - select id, bill_code, 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, 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, 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 @@ -280,12 +282,12 @@ - + insert into emis_tms_scan_record id, @@ -326,6 +328,8 @@ truck_code, data_from, pic_url, + public_trace_info, + inner_trace_info, status, del_flag, create_by, @@ -375,6 +379,8 @@ #{truckCode}, #{dataFrom}, #{picUrl}, + #{publicTraceInfo}, + #{innerTraceInfo}, #{status}, #{delFlag}, #{createBy}, @@ -390,8 +396,8 @@ update emis_tms_scan_record - bill_code = #{billCode}, - order_sn = #{orderSn}, + bill_code = #{billCode}, + order_sn = #{orderSn}, scan_type = #{scanType}, pre_or_next_station = #{preOrNextStation}, pre_or_next_station_code = #{preOrNextStationCode}, @@ -427,6 +433,8 @@ truck_code = #{truckCode}, data_from = #{dataFrom}, pic_url = #{picUrl}, + public_trace_info = #{publicTraceInfo}, + inner_trace_info = #{innerTraceInfo}, status = #{status}, del_flag = #{delFlag}, create_by = #{createBy}, @@ -436,7 +444,6 @@ remark = #{remark}, update_site = #{updateSite}, create_site = #{createSite}, - where id = #{id}