diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillAttachmentMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillAttachmentMapper.java index 05d6bb432..357dc4c4c 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillAttachmentMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillAttachmentMapper.java @@ -38,6 +38,9 @@ public interface EmisWaybillAttachmentMapper extends BaseMapper selectEmisWaybillAttachmentList(EmisWaybillAttachment emisWaybillAttachment); + public List selectAttachmentListByBillCode(String billCode); + + /** * 新增 * diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 39f8a8b7d..328ef5933 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -197,18 +197,13 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb queryCargo.setWaybillId(dbEmisWaybill.getId()); List dbCargoList=emisWaybillCargoMapper.selectEmisWaybillCargoList(queryCargo); - // 附件清单 - EmisWaybillAttachment queryAttachment = new EmisWaybillAttachment(); - queryAttachment.setWaybillId(dbEmisWaybill.getId()); - List dbAttachmentList=emisWaybillAttachmentMapper.selectEmisWaybillAttachmentList(queryAttachment); - + List dbAttachmentList=emisWaybillAttachmentMapper.selectAttachmentListByBillCode(dbEmisWaybill.getBillCode()); String goodsImgBmk=""; String signImgBmk=""; String gotImgBmk=""; // 赋值货物图片清单 - for (EmisWaybillAttachment attachment:dbAttachmentList - ) { + for (EmisWaybillAttachment attachment:dbAttachmentList) { if(WaybillAttachType.SIGNED_PIC.typeCode.equals(attachment.getAttachType())){ signImgBmk=signImgBmk+attachment.getFileUrl()+","; } diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml index b2b5e9dca..bf1098cd7 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml @@ -69,6 +69,13 @@ order by create_time desc + + +