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 2024-06-17 18:19:54 +08:00
parent a812b82a82
commit 39b426cf3f
2 changed files with 35 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,22 +43,6 @@ public interface IEmisWaybillService
/**
* 根据客户单号查询
* @param custOrderId
* @return
*/
// public EmisWaybill selectEmisWaybillByCustOrderId(String custOrderId);
/**
* 主键查询
* @param id
* @return
*/
public EmisWaybill selectEmisWaybillById(Long id);
/**
* 查询运单列表列表
*
@ -67,38 +51,6 @@ public interface IEmisWaybillService
*/
public List<EmisWaybill> selectEmisWaybillList(EmisWaybill emisWaybill);
/**
* 新增运单列表
*
* @param emisWaybill 运单列表
* @return 结果
*/
public int insertEmisWaybill(EmisWaybill emisWaybill);
/**
* 修改运单列表
*
* @param emisWaybill 运单列表
* @return 结果
*/
public int updateEmisWaybill(EmisWaybill emisWaybill);
/**
* 批量删除运单列表
*
* @param ids 需要删除的运单列表主键集合
* @return 结果
*/
public int deleteEmisWaybillByIds(Long[] ids);
/**
* 删除运单列表信息
*
* @param id 运单列表主键
* @return 结果
*/
public int deleteEmisWaybillById(Long id);
/**
* 获取运单信息 根据 billCode

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

@ -74,7 +74,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
private IEmisTmsScanRecordService emisTmsScanRecordService;
/**
* 直接数据查询运单列表 by billCode
*
@ -93,17 +92,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
return emisWaybillMapper.selectEmisWaybillByOrderSn(orderSn);
}
/**
* 查询运单列表
*
* @param id 运单列表主键
* @return 运单列表
*/
@Override
public EmisWaybill selectEmisWaybillById(Long id)
{
return emisWaybillMapper.selectEmisWaybillById(id);
}
/**
* 查询运单列表列表
@ -165,17 +153,11 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
/**
* 删除运单列表信息
*
* @param id 运单列表主键
* @return 结果
* 根据运单获取订单
* @param billCode
* @return
* @throws EmisBizError
*/
@Override
public int deleteEmisWaybillById(Long id)
{
return emisWaybillMapper.deleteEmisWaybillById(id);
}
@Override
public WaybillOrder getWaybillDetailByBillCode(String billCode) throws EmisBizError{
@ -184,6 +166,36 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
throw new EmisBizError(EmisBizErrorType.NOT_EXISTS,"运单不存在");
}
return getWaybillDetailExtInfo(dbEmisWaybill);
}
/**
* 根据订单获取运单
* @param orderSn
* @return
* @throws EmisBizError
*/
@Override
public WaybillOrder getWaybillDetailByOrderSn(String orderSn) throws EmisBizError{
EmisWaybill dbEmisWaybill = this.selectEmisWaybillByOrderSn(orderSn);
if(dbEmisWaybill==null){
throw new EmisBizError(EmisBizErrorType.NOT_EXISTS,"运单不存在");
}
return getWaybillDetailExtInfo(dbEmisWaybill);
}
/**
* 获取运单其他信息
* @param dbEmisWaybill
* @return
* @throws EmisBizError
*/
public WaybillOrder getWaybillDetailExtInfo(EmisWaybill dbEmisWaybill) throws EmisBizError{
// 设置运单锁单指令
boolean isLock=isOutTimeLock(dbEmisWaybill);
if(isLock){
@ -224,85 +236,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
queryAttachment.setWaybillId(dbEmisWaybill.getId());
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);
}
@Override
public WaybillOrder getWaybillDetailByOrderSn(String orderSn) throws EmisBizError{
EmisWaybill dbEmisWaybill = this.selectEmisWaybillByOrderSn(orderSn);
if(dbEmisWaybill==null){
throw new EmisBizError(EmisBizErrorType.NOT_EXISTS,"运单不存在");
}
// 设置运单锁单指令
boolean isLock=isOutTimeLock(dbEmisWaybill);
if(isLock){
dbEmisWaybill.setLockFlag("T");
dbEmisWaybill.setLockReason("不允许修改");
}else{
dbEmisWaybill.setLockFlag("F");
}
if("1".equals(dbEmisWaybill.getBlSign())){
dbEmisWaybill.setLockFlag("T");
dbEmisWaybill.setLockReason("已签收，不允许修改");
}
boolean isBillLock=isBillLock(dbEmisWaybill);
if(isBillLock){
dbEmisWaybill.setLockFlag("T");
dbEmisWaybill.setLockReason("已锁账,不允许修改");
}else{
dbEmisWaybill.setLockFlag("F");
}
// 收费项 // 查询收费项
EmisWaybillFeeitem queryFeeitem = new EmisWaybillFeeitem();
queryFeeitem.setWaybillId(dbEmisWaybill.getId());
List<EmisWaybillFeeitem> dbFeeItemList=emisWaybillFeeitemMapper.selectEmisWaybillFeeitemList(queryFeeitem);
// 货物清单
EmisWaybillCargo queryCargo = new EmisWaybillCargo();
queryCargo.setWaybillId(dbEmisWaybill.getId());
List<EmisWaybillCargo> dbCargoList=emisWaybillCargoMapper.selectEmisWaybillCargoList(queryCargo);
// 附件清单
EmisWaybillAttachment queryAttachment = new EmisWaybillAttachment();
queryAttachment.setWaybillId(dbEmisWaybill.getId());
List<EmisWaybillAttachment> dbAttachmentList=emisWaybillAttachmentMapper.selectEmisWaybillAttachmentList(queryAttachment);
String goodsImgBmk="";
String signImgBmk="";
String gotImgBmk="";
@ -331,6 +264,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
}
/**
* 草稿下单接口
* @param emisWaybillSave