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-06-18 05:18:06 +08:00
parent 33356376e2
commit 087d0bbc05
2 changed files with 49 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -502,6 +502,16 @@ public class EmisBaseService {
return null;
}
/**
* 根据用户id获取信息
* @param userId
* @return
*/
public SysUser getSysUserByUserId(Long userId){
return sysUserMapper.selectUserById(userId);
}
/**
* 获取国际物流信息
*/
@ -521,7 +531,12 @@ public class EmisBaseService {
List<EmisWaybillTransfer> listTransfer = emisWaybillTransferMapper.selectEmisWaybillTransferList(qEmisWaybillTransfer);
if(!CollectionUtil.isEmpty(listTransfer)) {
EmisWaybillTransfer trans0=listTransfer.get(0);
updateSignStatus(rstUpd.getBillCode(),"转件签收",trans0.getCreateBy(),trans0.getCreateSite(),rstUpd.getLastTraceDate(),"");
SysUser sysUser=getSysUserByUserId(Long.valueOf(trans0.getCreateBy()));
updateSignStatus(
rstUpd.getBillCode(),"转件签收",sysUser.getEmpCode(),
trans0.getCreateSite(),rstUpd.getLastTraceDate(),
"",sysUser.getEmpCode());
}
}
emisTmsTransferTraceMapper.updateEmisTmsTransferTrace(rstUpd);
@ -712,7 +727,10 @@ public class EmisBaseService {
* 更新签收状态
* @param billCode
*/
public void updateSignStatus(String billCode,String signMan,String signManCode,String signSiteCode,Date signDate,String billPicDispatchRmk) {
public void updateSignStatus(String billCode,String signMan,String signManCode,
String signSiteCode,Date signDate,
String billPicDispatchRmk,
String dispatchOrSendManCode) {
String mainBillCode = billCode;
if(billCode.startsWith("T7080") && billCode.length()>14 ){
mainBillCode=billCode.substring(0,14);
@ -726,7 +744,10 @@ public class EmisBaseService {
waybill.setSignDate(signDate);
waybill.setWaybillStatus(WaybillStatus.SIGNED.statusCode);
waybill.setBillPicDispatchRmk(billPicDispatchRmk);
waybill.preUpdate();
// 派件员
waybill.setDispatchManCode(dispatchOrSendManCode);
emisWaybillMapper.updateSignStatus(waybill);
}

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

@ -501,9 +501,10 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// "signMan": "签收人",
// "picUrl": "签收图片,逗号隔开",
// "remark": "签收备注",
String signMan = (String)scanDataItem.get("signMan");
String picUrl = (String)scanDataItem.get("picUrl");
String remark = (String)scanDataItem.get("remark");
String signMan = MapUtils.getString(scanDataItem,"signMan",null) ;
String dispatchOrSendManCode = MapUtils.getString(scanDataItem,"dispatchOrSendManCode",null) ;
String picUrl = MapUtils.getString(scanDataItem,"picUrl",null) ;
String remark = MapUtils.getString(scanDataItem,"remark",null) ;
if(StringUtils.isEmpty(signMan)) {
throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"签收人必填");
@ -511,6 +512,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
emisTmsScanRecord.setSignMan(signMan);
emisTmsScanRecord.setDispatchOrSendManCode(dispatchOrSendManCode);
emisTmsScanRecord.setSignDate(emisTmsScanRecord.getScanDate());
emisTmsScanRecord.setPicUrl(picUrl);
@ -545,7 +547,8 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
emisTmsScanRecord.getScanManCode(),
emisTmsScanRecord.getSignSiteCode(),
emisTmsScanRecord.getSignDate(),
emisTmsScanRecord.getPicUrl()
emisTmsScanRecord.getPicUrl(),
dispatchOrSendManCode
);
changeWaybillCurrentSite(emisTmsScanRecord.getBillCode(),emisTmsScanRecord.getScanSiteCode());
@ -633,8 +636,9 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
String transferResean =MapUtils.getString(scanDataItem,"transferResean",null) ;
String linkMan =MapUtils.getString(scanDataItem,"linkMan",null) ;
String linkPhone =MapUtils.getString(scanDataItem,"linkPhone",null) ;
Float transferWeight =MapUtils.getFloat(scanDataItem,"transferWeight",0.0f) ;
Float transferVolume =MapUtils.getFloat(scanDataItem,"transferVolume",0.0f) ;
Float transferWeight =MapUtils.getFloat(scanDataItem,"transferWeight",null) ;
Float transferVolume =MapUtils.getFloat(scanDataItem,"transferVolume",null) ;
Float transferFee =MapUtils.getFloat(scanDataItem,"transferFee",null) ;
emisTmsScanRecord.setPreOrNextStation(destCity);
@ -648,13 +652,26 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// 插入转件记录表
EmisWaybillTransfer emisWaybillTransfer = new EmisWaybillTransfer();
emisWaybillTransfer.setBillCode(emisTmsScanRecord.getBillCode());
emisWaybillTransfer.setTransferDate(emisTmsScanRecord.getScanDate());
emisWaybillTransfer.setTransferExpress(transferCode);
emisWaybillTransfer.setTransferBillCode(transferBillcode);
emisWaybillTransfer.setTransferCity(destCity);
emisWaybillTransfer.setTransferResean(transferResean);
emisWaybillTransfer.setLinkMan(linkMan);
emisWaybillTransfer.setLinkPhone(linkPhone);
emisWaybillTransfer.setTransferWeight(BigDecimal.valueOf(transferWeight));
emisWaybillTransfer.setTransferVolume(BigDecimal.valueOf(transferVolume));
if(transferWeight!=null) {
emisWaybillTransfer.setTransferWeight(BigDecimal.valueOf(transferWeight));
}
if(transferVolume!=null) {
emisWaybillTransfer.setTransferVolume(BigDecimal.valueOf(transferVolume));
}
if(transferFee!=null) {
emisWaybillTransfer.setTransferFee(BigDecimal.valueOf(transferFee));
}
emisWaybillTransferMapper.insertEmisWaybillTransfer(emisWaybillTransfer);
// 更新waybill做转单