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

demand: 增加接单时查详情接口

Browse Source
This commit is contained in:
aike 2026-04-09 10:08:29 +08:00
parent 2fa6f8a061
commit 9fa9315169
1 changed files with 68 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,6 +104,9 @@ public class EmisWaybillController extends EmisBaseController
@Autowired
private IEmisSettleSubBillService emisSettleSubBillService;
@Autowired
private IEmisCustomerUserService emisCustomerUserService;
@Autowired
RedissonService redissonService;
@ -228,6 +231,71 @@ public class EmisWaybillController extends EmisBaseController
return AjaxResult.error("服务器异常，联系客服");
}
}
@GetMapping(value = "/getWaybillDetailForOrder")
public AjaxResult getWaybillDetailForOrder(String billCode)
{
try {
WaybillOrder waybillOrder=null;
if(StringUtils.isEmpty(billCode) ){
return AjaxResult.error("参数错误");
}
billCode=WaybillHelper.formatQueryValue(billCode);
if(!StringUtils.isEmpty(billCode) ){
boolean isExists=emisBaseService.checkWaybillIsExists(billCode);
if(!isExists){
return AjaxResult.error("运单不存在");
}
String mainBillCode=emisBaseService.getMainBillCode(billCode);
waybillOrder = emisWaybillService.getWaybillOrderByBillCode(mainBillCode);
if(waybillOrder==null){
return AjaxResult.error("运单不存在");
}
// 返回子单信息
waybillOrder.setBillCode(billCode);
}
if(waybillOrder!=null){
String paymentType = waybillOrder.getPaymentType();
String custNo = waybillOrder.getCustNo();
if(!StringUtils.isEmpty(custNo)){
if("2".equals(paymentType) || "4".equals(paymentType) || "5".equals(paymentType)){
EmisCustomerUser query = new EmisCustomerUser();
query.setMonthlyPayCode(custNo);
List<EmisCustomerUser> cusList = emisCustomerUserService.selectEmisCustomerUserList(query);
if(cusList!=null && !cusList.isEmpty()){
EmisCustomerUser cu = cusList.get(0);
waybillOrder.setSalesmen(cu.getSalesmen());
waybillOrder.setPayee(cu.getPayee());
waybillOrder.setSalesSupport(cu.getSalesSupport());
}
}
}
}
// 获取取件员电话
if (waybillOrder!=null && !StringUtils.isEmpty(waybillOrder.getTakePieceEmployeeCode())) {
SysUser user = sysUserService.selectUserByUserName(waybillOrder.getTakePieceEmployeeCode());
if (Objects.nonNull(user)) {
waybillOrder.setTakePieceEmployeePhone(user.getPhonenumber());
}
}
return AjaxResult.success("获取成功",waybillOrder);
}
catch (Exception ex){
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
}
}
@Log(title = "Excel草稿方式下单", businessType = BusinessType.INSERT)
@PostMapping(value = "/draftSubmitOrder")