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-05-31 19:04:01 +08:00
parent 7e3966c49d
commit 2ff97f82d1
3 changed files with 64 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
View File

@ -101,7 +101,7 @@ public class EmisWaybillController extends BaseController
} }
if(!StringUtils.isEmpty(billCode) ){ if(!StringUtils.isEmpty(billCode) ){
waybillOrder = emisWaybillService.getWaybillDetail(billCode); waybillOrder = emisWaybillService.getWaybillDetailByBillCode(billCode);
if(waybillOrder==null){ if(waybillOrder==null){
return AjaxResult.error("运单不存在"); return AjaxResult.error("运单不存在");
} }

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

@ -100,30 +100,65 @@ public interface IEmisWaybillService
public int deleteEmisWaybillById(Long id); public int deleteEmisWaybillById(Long id);
public WaybillOrder getWaybillDetail(String billCode); /**
* 获取运单信息 根据 billCode
* @param billCode
* @return
*/
public WaybillOrder getWaybillDetailByBillCode(String billCode);
/**
* 获取运单信息 根据 orderSn
* @param orderSn
* @return
*/
public WaybillOrder getWaybillDetailByOrderSn(String orderSn); public WaybillOrder getWaybillDetailByOrderSn(String orderSn);
/**
* 账单保存
* @param emisWaybill
// 账单保存 * @return
* @throws EmisBizError
*/
public int realSubmitOrder(EmisWaybill emisWaybill) throws EmisBizError; public int realSubmitOrder(EmisWaybill emisWaybill) throws EmisBizError;
// 费用试算 /**
* 费用试算
* @param emisWaybill
* @return
* @throws EmisBizError
*/
public List<Map> preCalcWaybillFee(EmisWaybill emisWaybill) throws EmisBizError; public List<Map> preCalcWaybillFee(EmisWaybill emisWaybill) throws EmisBizError;
//计算运单费用
/**
* 计算运单费用
* @param emisWaybill
* @throws EmisBizError
*/
public void calcWaybillFee(EmisWaybill emisWaybill) throws EmisBizError; public void calcWaybillFee(EmisWaybill emisWaybill) throws EmisBizError;
// 计算体积重量
/**
* 计算体积重量
* @param emisWaybill
* @throws EmisBizError
*/
public void calcVolumeWeight(EmisWaybill emisWaybill) throws EmisBizError; public void calcVolumeWeight(EmisWaybill emisWaybill) throws EmisBizError;
// 计算结算重量 /**
* 计算结算重量
* @param emisWaybill
* @throws EmisBizError
*/
public void calcSettledWeight(EmisWaybill emisWaybill) throws EmisBizError; public void calcSettledWeight(EmisWaybill emisWaybill) throws EmisBizError;
/**
* 获取多个运单
* @param billCodes
* @return
*/
public List<EmisWaybill> selectEmisWaybillByMutiBillCode(String[] billCodes); public List<EmisWaybill> selectEmisWaybillByMutiBillCode(String[] billCodes);
} }

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

@ -67,10 +67,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
private EmisTransLineMapper emisTransLineMapper; private EmisTransLineMapper emisTransLineMapper;
/** /**
* 精准查询 查询运单列表 by billCode * 直接数据查询运单列表 by billCode
* *
* @param billCode 运单列表主键 * @param billCode 运单列表主键
* @return 运单列表 * @return 运单列表
@ -171,13 +169,20 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
} }
@Override @Override
public WaybillOrder getWaybillDetail(String billCode){ public WaybillOrder getWaybillDetailByBillCode(String billCode){
EmisWaybill dbEmisWaybill = this.selectEmisWaybillByBillCode(billCode); EmisWaybill dbEmisWaybill = this.selectEmisWaybillByBillCode(billCode);
if(dbEmisWaybill==null){ if(dbEmisWaybill==null){
return null; return null;
} }
// 设置运单锁单指令
boolean isLock=isWaybillLock(dbEmisWaybill);
if(isLock){
dbEmisWaybill.setLockFlag("T");
}else{
dbEmisWaybill.setLockFlag("F");
}
// 收费项 // 查询收费项 // 收费项 // 查询收费项
@ -211,6 +216,14 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
return null; return null;
} }
// 设置运单锁单指令
boolean isLock=isWaybillLock(dbEmisWaybill);
if(isLock){
dbEmisWaybill.setLockFlag("T");
}else{
dbEmisWaybill.setLockFlag("F");
}
// 收费项 // 查询收费项 // 收费项 // 查询收费项
EmisWaybillFeeitem queryFeeitem = new EmisWaybillFeeitem(); EmisWaybillFeeitem queryFeeitem = new EmisWaybillFeeitem();
queryFeeitem.setWaybillId(dbEmisWaybill.getId()); queryFeeitem.setWaybillId(dbEmisWaybill.getId());
@ -229,12 +242,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
List<EmisWaybillAttachment> dbAttachmentList=emisWaybillAttachmentMapper.selectEmisWaybillAttachmentList(queryAttachment); List<EmisWaybillAttachment> dbAttachmentList=emisWaybillAttachmentMapper.selectEmisWaybillAttachmentList(queryAttachment);
boolean isLock=isWaybillLock(dbEmisWaybill);
if(isLock){
dbEmisWaybill.setLockFlag("T");
}else{
dbEmisWaybill.setLockFlag("F");
}
return WaybillOrder.toVo(dbEmisWaybill,dbCargoList,dbFeeItemList,dbAttachmentList); return WaybillOrder.toVo(dbEmisWaybill,dbCargoList,dbFeeItemList,dbAttachmentList);