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-07 00:12:44 +08:00
parent b6f2d3c857
commit 6ed35b33aa
3 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,10 +56,11 @@ public class EmisWaybillController extends BaseController
* 获取电子运单信息
*/
@RequestMapping(value = "/getWaybillDetail")
public AjaxResult getWaybillDetail(@RequestParam("billCode")String billCode )
public AjaxResult getWaybillDetail(String billCode ,String orderSn)
{
try {
WaybillOrder waybillOrder=null;
if(StringUtils.isEmpty(billCode) ){
return AjaxResult.error("参数错误");
}
@ -69,6 +70,11 @@ public class EmisWaybillController extends BaseController
if(waybillOrder==null){
return AjaxResult.error("运单不存在");
}
}else if(!StringUtils.isEmpty(orderSn)){
waybillOrder = emisWaybillService.getWaybillDetailByOrderSn(orderSn);
if(waybillOrder==null){
return AjaxResult.error("订单不存在");
}
}
return AjaxResult.success("获取成功",waybillOrder);

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

@ -100,6 +100,8 @@ public interface IEmisWaybillService
public WaybillOrder getWaybillDetail(String billCode);
public WaybillOrder getWaybillDetailByOrderSn(String orderSn);
// 账单保存
public int realSubmitOrder(EmisWaybill emisWaybill) throws EmisBizError;

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

@ -163,9 +163,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
return emisWaybillMapper.deleteEmisWaybillById(id);
}
@Override
public WaybillOrder getWaybillDetail(String billCode){
@ -196,6 +193,36 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
}
@Override
public WaybillOrder getWaybillDetailByOrderSn(String orderSn){
EmisWaybill dbEmisWaybill = this.selectEmisWaybillByOrderSn(orderSn);
if(dbEmisWaybill==null){
return null;
}
// 收费项 // 查询收费项
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);
return WaybillOrder.toVo(dbEmisWaybill,dbCargoList,dbFeeItemList,dbAttachmentList);
}
/**
* 下单接口
* @param emisWaybillSave