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 2025-03-21 10:04:16 +08:00
parent 4dc37fbb0a
commit 6f4f5125cf
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
View File

@ -150,7 +150,7 @@ public interface IEmisWaybillService extends IDataAuditService
* @param emisWaybillSave * @param emisWaybillSave
* @throws EmisBizError * @throws EmisBizError
*/ */
public void reUpdateWayBill(EmisWaybill oldEmisWaybill,EmisWaybill emisWaybillSave) throws EmisBizError ; public void reUpdateWayBill(EmisWaybill oldEmisWaybill,EmisWaybill emisWaybillSave,boolean needUpdateAttach) throws EmisBizError ;

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java
View File

@ -275,7 +275,7 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
); );
emisWaybillService.reUpdateWayBill(emisWaybillOld,emisWaybillSave); emisWaybillService.reUpdateWayBill(emisWaybillOld,emisWaybillSave,false);
String title="费用调整已审批通过，单号【"+emisWaybillAjustApply.getBillCode()+"】"; String title="费用调整已审批通过，单号【"+emisWaybillAjustApply.getBillCode()+"】";
sendNoticeToEmpUser(emisWaybillAjustApply.getApplyManCode(), title, "", "/d24/expenseRecognitionManagemen/WaybillAjustApplyList"); sendNoticeToEmpUser(emisWaybillAjustApply.getApplyManCode(), title, "", "/d24/expenseRecognitionManagemen/WaybillAjustApplyList");

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

@ -1480,7 +1480,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
} }
emisWaybillSave.setId(emisWaybillOld.getId()); emisWaybillSave.setId(emisWaybillOld.getId());
reUpdateWayBillByOms(emisWaybillOld,emisWaybillSave); reUpdateWayBillByOms(emisWaybillOld,emisWaybillSave,true);
} }
return 1; return 1;
@ -3462,7 +3462,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
* @throws EmisBizError * @throws EmisBizError
*/ */
@Override @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()); emisWaybillSave.setId(oldEmisWaybill.getId());
@ -3516,28 +3516,29 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
} }
} }
// 插入商品信息 if(needUpdateAttach) {
if(!CollectionUtil.isEmpty(emisWaybillSave.getCargoList() )){ // 插入商品信息
List<EmisWaybillCargo> cargoList=emisWaybillSave.getCargoList(); if(!CollectionUtil.isEmpty(emisWaybillSave.getCargoList() )){
for (EmisWaybillCargo cargoItem:cargoList) { List<EmisWaybillCargo> cargoList=emisWaybillSave.getCargoList();
cargoItem.setWaybillId(emisWaybillSave.getId()); for (EmisWaybillCargo cargoItem:cargoList) {
emisWaybillCargoMapper.insertEmisWaybillCargo(cargoItem); cargoItem.setWaybillId(emisWaybillSave.getId());
emisWaybillCargoMapper.insertEmisWaybillCargo(cargoItem);
}
} }
}
// 保存货物图片 // 保存货物图片
if(!StringUtils.isEmpty(goodsPicsStr)){ if (!StringUtils.isEmpty(goodsPicsStr)) {
// 删除图片插入新图片 // 删除图片插入新图片
emisWaybillAttachmentMapper.deleteByBillCodeAndAttachType(emisWaybillSave.getBillCode(),WaybillAttachType.GOODS_PIC.typeCode); emisWaybillAttachmentMapper.deleteByBillCodeAndAttachType(emisWaybillSave.getBillCode(), WaybillAttachType.GOODS_PIC.typeCode);
EmisWaybillAttachment goodsPicAttachment = new EmisWaybillAttachment(); EmisWaybillAttachment goodsPicAttachment = new EmisWaybillAttachment();
goodsPicAttachment.setWaybillId(emisWaybillSave.getId()); goodsPicAttachment.setWaybillId(emisWaybillSave.getId());
goodsPicAttachment.setAttachType(WaybillAttachType.GOODS_PIC.typeCode); goodsPicAttachment.setAttachType(WaybillAttachType.GOODS_PIC.typeCode);
goodsPicAttachment.setBillCode(emisWaybillSave.getBillCode()); goodsPicAttachment.setBillCode(emisWaybillSave.getBillCode());
goodsPicAttachment.setFileUrl(goodsPicsStr); goodsPicAttachment.setFileUrl(goodsPicsStr);
emisWaybillAttachmentMapper.insertEmisWaybillAttachment(goodsPicAttachment);
emisWaybillAttachmentMapper.insertEmisWaybillAttachment(goodsPicAttachment);
}
} }

1
emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
View File

@ -159,7 +159,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if> </if>
<if test="params.privSiteCode != null and params.privSiteCode != '88888'"> <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
and EXISTS( and EXISTS(
select 1 from emis_settle_bill x2,emis_settle_invoice_bill_rel x3 select 1 from emis_settle_bill x2,emis_settle_invoice_bill_rel x3