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-15 22:05:11 +08:00
parent 30781d5253
commit 0ce900c58d
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,11 +23,8 @@ import com.xdadan.erp.common.core.domain.AjaxResult;
import com.xdadan.erp.common.utils.DateUtils;
import com.xdadan.erp.common.utils.DictUtils;
import com.xdadan.erp.emis.domain.*;
import com.xdadan.erp.emis.domain.enumtype.ScanType;
import com.xdadan.erp.emis.domain.enumtype.TransType;
import com.xdadan.erp.emis.domain.enumtype.WaybillAttachType;
import com.xdadan.erp.emis.domain.enumtype.*;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
import com.xdadan.erp.emis.domain.vo.*;
import com.xdadan.erp.emis.domain.vo.scan.ScanInfo;
import com.xdadan.erp.emis.mapper.EmisRegionMapper;
@ -200,13 +197,11 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
dbEmisWaybill.setLockReason("已签收，不允许修改");
}
// 收费项 // 查询收费项
// 收费项
EmisWaybillFeeitem queryFeeitem = new EmisWaybillFeeitem();
queryFeeitem.setWaybillId(dbEmisWaybill.getId());
List<EmisWaybillFeeitem> dbFeeItemList=emisWaybillFeeitemMapper.selectEmisWaybillFeeitemList(queryFeeitem);
// 货物清单
EmisWaybillCargo queryCargo = new EmisWaybillCargo();
queryCargo.setWaybillId(dbEmisWaybill.getId());
@ -218,6 +213,30 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
queryAttachment.setWaybillId(dbEmisWaybill.getId());
List<EmisWaybillAttachment> dbAttachmentList=emisWaybillAttachmentMapper.selectEmisWaybillAttachmentList(queryAttachment);
String goodsImgBmk="";
String signImgBmk="";
String gotImgBmk="";
// 赋值货物图片清单
for (EmisWaybillAttachment attachment:dbAttachmentList
) {
if(WaybillAttachType.SIGNED_PIC.typeCode.equals(attachment.getAttachType())){
signImgBmk=signImgBmk+attachment.getFileUrl()+",";
}
else if(WaybillAttachType.GOODS_PIC.typeCode.equals(attachment.getAttachType())){
goodsImgBmk=goodsImgBmk+attachment.getFileUrl()+",";
}
else if(WaybillAttachType.GOT_PIC.typeCode.equals(attachment.getAttachType())){
gotImgBmk=gotImgBmk+attachment.getFileUrl()+",";
}
}
// private String billPicSendRmk;
// /* 签收底单图片 */
// private String billPicDispatchRmk;
dbEmisWaybill.setBillPicGoodsRmk(goodsImgBmk);
dbEmisWaybill.setBillPicDispatchRmk(signImgBmk);
dbEmisWaybill.setBillPicSendRmk(gotImgBmk);
return WaybillOrder.toVo(dbEmisWaybill,dbCargoList,dbFeeItemList,dbAttachmentList);
}