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-12-22 21:45:13 +08:00
parent 50eb097336
commit fb18d972d6
1 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -668,7 +668,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
emisWaybillSave.setCustomsClear(customsClear);
// "发送寄件/签收短信不正确"
emisWaybillSave.setBlMessage("1");
emisWaybillSave.setBlMessage("0");
emisWaybillSave.setBlAcceptMessage("0");
// 计算目的地
@ -3045,28 +3046,28 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
}
// 保存货物图片
if(!StringUtils.isEmpty(emisWaybillSave.getGoodsPics())){
// 删除图片插入新图片
emisWaybillAttachmentMapper.deleteByBillCodeAndAttachType(emisWaybillSave.getBillCode(),WaybillAttachType.GOODS_PIC.typeCode);
EmisWaybillAttachment goodsPicAttachment = new EmisWaybillAttachment();
goodsPicAttachment.setWaybillId(emisWaybillSave.getId());
goodsPicAttachment.setAttachType(WaybillAttachType.GOODS_PIC.typeCode);
goodsPicAttachment.setBillCode(emisWaybillSave.getBillCode());
goodsPicAttachment.setFileUrl(emisWaybillSave.getGoodsPics());
emisWaybillAttachmentMapper.insertEmisWaybillAttachment(goodsPicAttachment);
}
// if(!StringUtils.isEmpty(emisWaybillSave.getGoodsPics())){
// // 删除图片插入新图片
// emisWaybillAttachmentMapper.deleteByBillCodeAndAttachType(emisWaybillSave.getBillCode(),WaybillAttachType.GOODS_PIC.typeCode);
//
// EmisWaybillAttachment goodsPicAttachment = new EmisWaybillAttachment();
// goodsPicAttachment.setWaybillId(emisWaybillSave.getId());
// goodsPicAttachment.setAttachType(WaybillAttachType.GOODS_PIC.typeCode);
// goodsPicAttachment.setBillCode(emisWaybillSave.getBillCode());
// goodsPicAttachment.setFileUrl(emisWaybillSave.getGoodsPics());
//
// emisWaybillAttachmentMapper.insertEmisWaybillAttachment(goodsPicAttachment);
//
// }
// 插入其他附件信息
if(!CollectionUtil.isEmpty(emisWaybillSave.getAttachmentList() )){
List<EmisWaybillAttachment> attachmentList=emisWaybillSave.getAttachmentList();
for (EmisWaybillAttachment attachmentItem:attachmentList) {
attachmentItem.setWaybillId(emisWaybillSave.getId());
emisWaybillAttachmentMapper.insertEmisWaybillAttachment(attachmentItem);
}
}
// if(!CollectionUtil.isEmpty(emisWaybillSave.getAttachmentList() )){
// List<EmisWaybillAttachment> attachmentList=emisWaybillSave.getAttachmentList();
// for (EmisWaybillAttachment attachmentItem:attachmentList) {
// attachmentItem.setWaybillId(emisWaybillSave.getId());
// emisWaybillAttachmentMapper.insertEmisWaybillAttachment(attachmentItem);
// }
// }
}
@ -3558,8 +3559,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
public void calcVolumeWeight(EmisWaybill emisWaybill) throws EmisBizError {
if (
StringUtils.isEmpty(emisWaybill.getProductType())
|| emisWaybill.getTotalVolume() == null
( StringUtils.isEmpty(emisWaybill.getProductType()) && StringUtils.isEmpty(emisWaybill.getTransLineType()) )
|| emisWaybill.getTotalVolume() == null
)
{
@ -3572,11 +3573,16 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
double totalVolume=emisWaybill.getTotalVolume().doubleValue();
// 获取产品信息
EmisTransProduct emisTransProduct = getTransProductByCode(emisWaybill.getProductType());
EmisTransLine emisTransLine=null;
if(StringUtils.isEmpty(emisWaybill.getTransLineType())){
// 获取产品信息
EmisTransProduct emisTransProduct = getTransProductByCode(emisWaybill.getProductType());
// 获取泡重比,计算体积重量
emisTransLine= getTransLineByCode(emisTransProduct.getTransLineCode());
// 获取泡重比,计算体积重量
EmisTransLine emisTransLine= getTransLineByCode(emisTransProduct.getTransLineCode());
}else{
emisTransLine= getTransLineByCode(emisWaybill.getTransLineType());
}
double volumeWeight=0.0D;
if(!StringUtils.isEmpty(emisTransLine.getMeterRate())) {