diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java index a212a47ae..1cc9ed00d 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java @@ -150,7 +150,7 @@ public interface IEmisWaybillService extends IDataAuditService * @param emisWaybillSave * @throws EmisBizError */ - public void reUpdateWayBill(EmisWaybill oldEmisWaybill,EmisWaybill emisWaybillSave) throws EmisBizError ; + public void reUpdateWayBill(EmisWaybill oldEmisWaybill,EmisWaybill emisWaybillSave,boolean needUpdateAttach) throws EmisBizError ; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java index ea357184c..c7f9ae090 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java @@ -275,7 +275,7 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements ); - emisWaybillService.reUpdateWayBill(emisWaybillOld,emisWaybillSave); + emisWaybillService.reUpdateWayBill(emisWaybillOld,emisWaybillSave,false); String title="费用调整已审批通过,单号【"+emisWaybillAjustApply.getBillCode()+"】"; sendNoticeToEmpUser(emisWaybillAjustApply.getApplyManCode(), title, "", "/d24/expenseRecognitionManagemen/WaybillAjustApplyList"); 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 94f2d6a5a..40febecdf 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 @@ -1480,7 +1480,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb } emisWaybillSave.setId(emisWaybillOld.getId()); - reUpdateWayBillByOms(emisWaybillOld,emisWaybillSave); + reUpdateWayBillByOms(emisWaybillOld,emisWaybillSave,true); } return 1; @@ -3462,7 +3462,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb * @throws EmisBizError */ @Override - public void reUpdateWayBill(EmisWaybill oldEmisWaybill,EmisWaybill emisWaybillSave) throws EmisBizError { + public void reUpdateWayBill(EmisWaybill oldEmisWaybill,EmisWaybill emisWaybillSave,boolean needUpdateAttach) throws EmisBizError { // 公共计算部分 emisWaybillSave.setId(oldEmisWaybill.getId()); @@ -3516,28 +3516,29 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb } } - // 插入商品信息 - if(!CollectionUtil.isEmpty(emisWaybillSave.getCargoList() )){ - List cargoList=emisWaybillSave.getCargoList(); - for (EmisWaybillCargo cargoItem:cargoList) { - cargoItem.setWaybillId(emisWaybillSave.getId()); - emisWaybillCargoMapper.insertEmisWaybillCargo(cargoItem); + if(needUpdateAttach) { + // 插入商品信息 + if(!CollectionUtil.isEmpty(emisWaybillSave.getCargoList() )){ + List cargoList=emisWaybillSave.getCargoList(); + for (EmisWaybillCargo cargoItem:cargoList) { + cargoItem.setWaybillId(emisWaybillSave.getId()); + emisWaybillCargoMapper.insertEmisWaybillCargo(cargoItem); + } } - } - // 保存货物图片 - if(!StringUtils.isEmpty(goodsPicsStr)){ - // 删除图片插入新图片 - emisWaybillAttachmentMapper.deleteByBillCodeAndAttachType(emisWaybillSave.getBillCode(),WaybillAttachType.GOODS_PIC.typeCode); + // 保存货物图片 + if (!StringUtils.isEmpty(goodsPicsStr)) { + // 删除图片插入新图片 + 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(goodsPicsStr); - - emisWaybillAttachmentMapper.insertEmisWaybillAttachment(goodsPicAttachment); + EmisWaybillAttachment goodsPicAttachment = new EmisWaybillAttachment(); + goodsPicAttachment.setWaybillId(emisWaybillSave.getId()); + goodsPicAttachment.setAttachType(WaybillAttachType.GOODS_PIC.typeCode); + goodsPicAttachment.setBillCode(emisWaybillSave.getBillCode()); + goodsPicAttachment.setFileUrl(goodsPicsStr); + emisWaybillAttachmentMapper.insertEmisWaybillAttachment(goodsPicAttachment); + } } diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml index 02713993b..315d8ecae 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml @@ -159,7 +159,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and EXISTS( select 1 from emis_settle_bill x2,emis_settle_invoice_bill_rel x3