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-23 15:08:07 +08:00
parent f41cc7cbee
commit 7594a2d0e8
4 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
import com.xdadan.erp.common.config.PayConfig;
import com.xdadan.erp.common.core.domain.entity.SysUser;
import com.xdadan.erp.common.utils.DateUtils;
import com.xdadan.erp.common.utils.file.FileUtils;
import com.xdadan.erp.common.utils.idgen.UUID;
@ -34,6 +35,8 @@ import com.xdadan.erp.emis.service.print.IXddTplPrint;
import com.xdadan.erp.emis.service.print.tanex.TanexTplPrintImpl;
import com.xdadan.erp.system.domain.SysFileInfo;
import com.xdadan.erp.system.service.ISysFileInfoService;
import com.xdadan.erp.system.service.ISysUserService;
import com.xdadan.erp.system.service.impl.SysUserServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -71,6 +74,9 @@ public class EmisWaybillController extends BaseController
@Autowired
private ISysFileInfoService sysFileInfoService;
@Autowired
private ISysUserService sysUserService;
@Autowired
@ -101,6 +107,12 @@ public class EmisWaybillController extends BaseController
}
}
// 获取取件员电话
if(!StringUtils.isEmpty(waybillOrder.getTakePieceEmployeeCode())){
SysUser user= sysUserService.selectUserByUserName(waybillOrder.getTakePieceEmployeeCode());
waybillOrder.setTakePieceEmployeePhone(user.getPhonenumber());
}
return AjaxResult.success("获取成功",waybillOrder);
}
catch (Exception ex){

5
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
View File

@ -388,8 +388,11 @@ public class EmisWaybill extends BaseEntity
/* 录单人 */
private String registerManName;
// 取件员 ,操作员
// 取件员 取件员电话
private String takePieceEmployeeName;
private String takePieceEmployeePhone;
// 操作员
private String operateEmployeeName;
private String sendSiteName;

11
emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
View File

@ -36,6 +36,11 @@ public class WaybillOrder implements Serializable {
/* 客户单号，合同号 */
private String custOrderId;
/* 订单状态 字典 */
private String orderStatus;
/* 运单状态 字典 */
private String waybillStatus;
/* 运单号 */
private String billCode;
@ -262,6 +267,8 @@ public class WaybillOrder implements Serializable {
// 取件员
private String takePieceEmployeeName;
private String takePieceEmployeePhone;
// 操作员
private String operateEmployeeName;
@ -375,8 +382,8 @@ public class WaybillOrder implements Serializable {
voItem.setBillCode(dbWaybill.getBillCode());
voItem.setBillCodeSub(dbWaybill.getBillCodeSub());
// voItem.setOrderStatus(dbWaybill.getOrderStatus());
// voItem.setWaybillStatus(dbWaybill.getWaybillStatus());
voItem.setOrderStatus(dbWaybill.getOrderStatus());
voItem.setWaybillStatus(dbWaybill.getWaybillStatus());
// voItem.setOrderType(dbWaybill.getOrderType());
voItem.setOrderDate(dbWaybill.getOrderDate());

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

@ -31,6 +31,7 @@ import com.xdadan.erp.emis.mapper.EmisRegionMapper;
import com.xdadan.erp.emis.mapper.EmisTransLineMapper;
import com.xdadan.erp.emis.service.*;
import com.xdadan.erp.emis.utils.WaybillHelper;
import com.xdadan.erp.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -66,6 +67,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
private EmisTransLineMapper emisTransLineMapper;
/**
* 精准查询 查询运单列表 by billCode
*
@ -175,6 +178,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
return null;
}
// 收费项 // 查询收费项
EmisWaybillFeeitem queryFeeitem = new EmisWaybillFeeitem();
queryFeeitem.setWaybillId(dbEmisWaybill.getId());