diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java index 24faaeb78..a51be8b61 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java @@ -431,6 +431,9 @@ public class EmisWaybill extends BaseEntity // 最后一条跟踪记录 private String lastTraceInfo; + // 问题件类型 + private String problemTypeName; + // 最近一条扫描记录 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java index a9c2f3c79..74cf141e5 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java @@ -81,4 +81,15 @@ public class EmisWaybillProblemInfo extends BaseEntity /* 文件路径 */ private String filePath; + +// 扩展 通知网点 + private String problemTypeName; + private String sendSiteName; + private String registerManName; + private String registerSiteName; + + + + + } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java index d2dd98e3d..49568f61f 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java @@ -313,8 +313,6 @@ public class WaybillOrder implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date signDate; - - /* 当前网点编号 */ private String currentSiteCode; /* 下一网点编号 */ @@ -326,7 +324,7 @@ public class WaybillOrder implements Serializable { private String lockFlag; - + private String problemTypeName; // 销售,回款 // private String salesmenName; @@ -592,6 +590,8 @@ public class WaybillOrder implements Serializable { voItem.setLockFlag(dbWaybill.getLockFlag()); + voItem.setProblemTypeName(dbWaybill.getProblemTypeName()); + return voItem; } 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 15a20eabe..7e714acc8 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 @@ -495,12 +495,18 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm waybillProblemInfo.setBillCode(emisTmsScanRecord.getBillCode()); waybillProblemInfo.setProblemType(problemType); waybillProblemInfo.setProblemCause(remark); + waybillProblemInfo.setSendSiteCode(notifySite); + waybillProblemInfo.setRegisterDate(emisTmsScanRecord.getScanDate()); waybillProblemInfo.setRegisterManCode(emisTmsScanRecord.getScanManCode()); waybillProblemInfo.setRegisterSiteCode(emisTmsScanRecord.getScanSiteCode()); waybillProblemInfo.setProblemTitle(remark); waybillProblemInfo.setFilePath(picUrl); + + if(emisTmsScanRecord.getScanSiteCode().equals(notifySite)){ + waybillProblemInfo.setIsSendSiteRegister("1"); + } registerWaybillProblemInfo(waybillProblemInfo); // 更新运单状态为问题件 diff --git a/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml b/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml index 39c05f72a..23fc67a04 100644 --- a/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml @@ -104,5 +104,10 @@ select a.name from emis_brand a where a.code = #{code} limit 1 + + + \ No newline at end of file diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 5de6a657f..f384c9e71 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -202,6 +202,7 @@ + diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml index 76ad7430b..996874630 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml @@ -28,6 +28,13 @@ + + + + + + +