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 13:21:01 +08:00
parent 597b47e3b9
commit f6d275fe2c
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1266,24 +1266,26 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// 揽收特殊情况 // 揽收特殊情况
String scanManCode=MapUtils.getString(scanDataItem,"scanManCode",null); // String scanManCode=MapUtils.getString(scanDataItem,"scanManCode",null);
String scanSiteCode=MapUtils.getString(scanDataItem,"scanSiteCode",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(scanManCode)){ // if(!StringUtils.isEmpty(scanSiteCode)){
SysUser staff = getEmisStaffByCode(scanManCode); // EmisSite site=getSiteByCode(scanSiteCode);
if(staff!=null){ // if(site!=null){
emisTmsScanRecord.setScanMan(staff.getEmpName()); // emisTmsScanRecord.setScanSite(site.getSiteName());
emisTmsScanRecord.setScanManCode(scanManCode); // emisTmsScanRecord.setScanSiteCode(scanSiteCode);
} // }
} // }
if(!StringUtils.isEmpty(scanSiteCode)){ emisTmsScanRecord.setScanSite(emisWaybill.getSendSiteCode());
EmisSite site=getSiteByCode(scanSiteCode); emisTmsScanRecord.setScanSiteCode(emisWaybill.getSendSiteName());
if(site!=null){
emisTmsScanRecord.setScanSite(site.getSiteName());
emisTmsScanRecord.setScanSiteCode(scanSiteCode);
}
}
String dispatchOrSendManCode = MapUtils.getString(scanDataItem,"dispatchOrSendManCode",null); String dispatchOrSendManCode = MapUtils.getString(scanDataItem,"dispatchOrSendManCode",null);

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

@ -1096,8 +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("scanSiteCode",emisWaybillSave.getSendSiteCode());
scanDateItem.put("scanManCode",dispatchOrSendManCode); // 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");