aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-07-07 11:57:13 +08:00
parent 20d74632ac
commit 597b47e3b9
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1264,6 +1264,27 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// emisTmsScanRecord.setScanWeight(BigDecimal.valueOf(scanWeight)); // emisTmsScanRecord.setScanWeight(BigDecimal.valueOf(scanWeight));
// } // }
// 揽收特殊情况
String scanManCode=MapUtils.getString(scanDataItem,"scanManCode",null);
String scanSiteCode=MapUtils.getString(scanDataItem,"scanSiteCode",null);
if(!StringUtils.isEmpty(scanManCode)){
SysUser staff = getEmisStaffByCode(scanManCode);
if(staff!=null){
emisTmsScanRecord.setScanMan(staff.getEmpName());
emisTmsScanRecord.setScanManCode(scanManCode);
}
}
if(!StringUtils.isEmpty(scanSiteCode)){
EmisSite site=getSiteByCode(scanSiteCode);
if(site!=null){
emisTmsScanRecord.setScanSite(site.getSiteName());
emisTmsScanRecord.setScanSiteCode(scanSiteCode);
}
}
String dispatchOrSendManCode = MapUtils.getString(scanDataItem,"dispatchOrSendManCode",null); String dispatchOrSendManCode = MapUtils.getString(scanDataItem,"dispatchOrSendManCode",null);
if(!StringUtils.isEmpty(dispatchOrSendManCode)) { if(!StringUtils.isEmpty(dispatchOrSendManCode)) {

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -1096,6 +1096,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
Map<String,Object> scanDateItem = new HashMap<>(); Map<String,Object> scanDateItem = new HashMap<>();
scanDateItem.put("billCode",emisWaybillSave.getBillCode()); scanDateItem.put("billCode",emisWaybillSave.getBillCode());
scanDateItem.put("scanSiteCode",emisWaybillSave.getSendSiteCode());
scanDateItem.put("scanManCode",dispatchOrSendManCode);
scanDateItem.put("dispatchOrSendManCode",dispatchOrSendManCode); scanDateItem.put("dispatchOrSendManCode",dispatchOrSendManCode);
scanDateItem.put("scanDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,emisWaybillSave.getSendDate())); scanDateItem.put("scanDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,emisWaybillSave.getSendDate()));
scanDateItem.put("scanWeight", "0.0"); scanDateItem.put("scanWeight", "0.0");