This commit is contained in:
linfso 2025-01-03 07:53:14 +08:00
parent 008964963e
commit b93148ba8b

View File

@ -308,6 +308,15 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
queryCargo.setWaybillId(dbEmisWaybill.getId());
List<EmisWaybillCargo> dbCargoList=emisWaybillCargoMapper.selectEmisWaybillCargoList(queryCargo);
// 快递单证商品资料
EmisWaybillDeclareGoods queryDeclareGoods = new EmisWaybillDeclareGoods();
queryDeclareGoods.setWaybillId(dbEmisWaybill.getId());
List<EmisWaybillDeclareGoods> dbDeclareGoodsList=emisWaybillDeclareGoodsMapper.selectEmisWaybillDeclareGoodsList(queryDeclareGoods);
// 陆运单证商品资料
List<EmisWaybillDeclareAttachment> dbDeclareAttachmentList=emisWaybillDeclareAttachmentMapper.selectAttachmentListByBillCode(dbEmisWaybill.getBillCode());
// 附件清单
List<EmisWaybillAttachment> dbAttachmentList=emisWaybillAttachmentMapper.selectAttachmentListByBillCode(dbEmisWaybill.getBillCode());
String goodsImgBmk="";
@ -336,7 +345,11 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
dbEmisWaybill.setBillPicDispatchRmk(signImgBmk);
dbEmisWaybill.setBillPicSendRmk(gotImgBmk);
return WaybillOrder.toVo(dbEmisWaybill,dbCargoList,dbFeeItemList,dbAttachmentList);
return WaybillOrder.toVo(
dbEmisWaybill,dbCargoList,dbFeeItemList,dbAttachmentList,
dbDeclareGoodsList,
dbDeclareAttachmentList
);
}