aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

面单

Browse Source
This commit is contained in:
linfso 2024-06-17 18:14:36 +08:00
parent 5d985d8813
commit a812b82a82
1 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,13 +199,15 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
} }
boolean isBillLock=isBillLock(dbEmisWaybill); boolean isBillLock=isBillLock(dbEmisWaybill);
if(isLock){ if(isBillLock){
dbEmisWaybill.setLockFlag("T"); dbEmisWaybill.setLockFlag("T");
dbEmisWaybill.setLockReason("已锁账,不允许修改"); dbEmisWaybill.setLockReason("已锁账,不允许修改");
}else{ }else{
dbEmisWaybill.setLockFlag("F"); dbEmisWaybill.setLockFlag("F");
} }
// 收费项 // 收费项
EmisWaybillFeeitem queryFeeitem = new EmisWaybillFeeitem(); EmisWaybillFeeitem queryFeeitem = new EmisWaybillFeeitem();
queryFeeitem.setWaybillId(dbEmisWaybill.getId()); queryFeeitem.setWaybillId(dbEmisWaybill.getId());
@ -274,6 +276,15 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
dbEmisWaybill.setLockReason("已签收，不允许修改"); dbEmisWaybill.setLockReason("已签收，不允许修改");
} }
boolean isBillLock=isBillLock(dbEmisWaybill);
if(isBillLock){
dbEmisWaybill.setLockFlag("T");
dbEmisWaybill.setLockReason("已锁账,不允许修改");
}else{
dbEmisWaybill.setLockFlag("F");
}
// 收费项 // 查询收费项 // 收费项 // 查询收费项
EmisWaybillFeeitem queryFeeitem = new EmisWaybillFeeitem(); EmisWaybillFeeitem queryFeeitem = new EmisWaybillFeeitem();
queryFeeitem.setWaybillId(dbEmisWaybill.getId()); queryFeeitem.setWaybillId(dbEmisWaybill.getId());
@ -291,6 +302,31 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
queryAttachment.setWaybillId(dbEmisWaybill.getId()); queryAttachment.setWaybillId(dbEmisWaybill.getId());
List<EmisWaybillAttachment> dbAttachmentList=emisWaybillAttachmentMapper.selectEmisWaybillAttachmentList(queryAttachment); 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); return WaybillOrder.toVo(dbEmisWaybill,dbCargoList,dbFeeItemList,dbAttachmentList);
} }