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-05-11 13:26:49 +08:00
parent af28359a3f
commit 9a4ed7eed4
2 changed files with 46 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,6 +209,9 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// 公共部分 // 公共部分
emisTmsScanRecord.setBillCode(billCode); emisTmsScanRecord.setBillCode(billCode);
emisTmsScanRecord.setOrderSn(emisWaybill.getOrderSn());
emisTmsScanRecord.setWeight(emisWaybill.getBillWeight());
emisTmsScanRecord.setScanType(scanType); emisTmsScanRecord.setScanType(scanType);
emisTmsScanRecord.setScanDate(scanDate); emisTmsScanRecord.setScanDate(scanDate);
emisTmsScanRecord.setScanManCode(getCurrentUser().getEmpCode()); emisTmsScanRecord.setScanManCode(getCurrentUser().getEmpCode());
@ -222,10 +225,12 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
emisTmsScanRecord.setScanSitePhone(scanSite.getPhone()); emisTmsScanRecord.setScanSitePhone(scanSite.getPhone());
} }
if(ScanType.GOT.opCode.equals(scanType)){
setScanGot(emisTmsScanRecord,scanDataItem); // 原始数据返回
scanResultItem.getData().putAll(scanDataItem); scanResultItem.getData().putAll(scanDataItem);
}
// 填充特殊数据
this.fillScanDataByScanType(scanType,emisTmsScanRecord,scanDataItem);
emisTmsScanRecord.setRecordMan(getCurrentUser().getEmpName()); emisTmsScanRecord.setRecordMan(getCurrentUser().getEmpName());
@ -249,25 +254,36 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
return itemList; return itemList;
} }
private void setScanGot(EmisTmsScanRecord emisTmsScanRecord,Map<String,Object> scanDataItem){ public void fillScanDataByScanType(String scanType, EmisTmsScanRecord emisTmsScanRecord, Map<String,Object> scanDataItem){
String scanWeightStr = (String)scanDataItem.get("scanWeight"); // 揽收扫描
String dispatchOrSendManCode = (String)scanDataItem.get("dispatchOrSendManCode"); if(ScanType.GOT.opCode.equals(scanType)){
String scanWeightStr = (String)scanDataItem.get("scanWeight");
String dispatchOrSendManCode = (String)scanDataItem.get("dispatchOrSendManCode");
double scanWeight = 0.0D;
if(!StringUtils.isEmpty(scanWeightStr)){
scanWeight= Double.valueOf(scanWeightStr);
emisTmsScanRecord.setScanWeight(BigDecimal.valueOf(scanWeight));
}
emisTmsScanRecord.setDispatchOrSendManCode(dispatchOrSendManCode);
SysUser emUser=getEmisStaffByCode(dispatchOrSendManCode);
if(emUser!=null){
emisTmsScanRecord.setDispatchOrSendMan(emUser.getEmpName());
emisTmsScanRecord.setDispatchOrSendManPhone(emUser.getPhonenumber());
}
}
// 发件扫描
else if(ScanType.DEPARTURE.opCode.equals(scanType)){
double scanWeight = 0.0D;
if(!StringUtils.isEmpty(scanWeightStr)){
scanWeight= Double.valueOf(scanWeightStr);
emisTmsScanRecord.setWeight(BigDecimal.valueOf(scanWeight));
} }
emisTmsScanRecord.setDispatchOrSendManCode(dispatchOrSendManCode);
SysUser emUser=getEmisStaffByCode(dispatchOrSendManCode);
if(emUser!=null){
emisTmsScanRecord.setDispatchOrSendMan(emUser.getEmpName());
emisTmsScanRecord.setDispatchOrSendManPhone(emUser.getPhonenumber());
}
} }
@Override @Override
public ScanResult scan(ScanInfo scanInfo) throws EmisBizError{ public ScanResult scan(ScanInfo scanInfo) throws EmisBizError{

13
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/ScanDataHelper.java Normal file
View File

@ -0,0 +1,13 @@
package com.xdadan.erp.emis.service.impl;
import com.xdadan.erp.common.core.domain.entity.SysUser;
import com.xdadan.erp.emis.domain.EmisTmsScanRecord;
import com.xdadan.erp.emis.domain.enumtype.ScanType;
import org.apache.commons.lang3.StringUtils;
import java.math.BigDecimal;
import java.util.Map;
public class ScanDataHelper {
}