|
@@ -256,19 +256,6 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
|
|
|
String realUserId = userId;//实际跟单业务人默认登录人
|
|
String realUserId = userId;//实际跟单业务人默认登录人
|
|
|
boolean daikeFlag = false;//是否代客录单业务
|
|
boolean daikeFlag = false;//是否代客录单业务
|
|
|
//添加出单员报价的逻辑,
|
|
//添加出单员报价的逻辑,
|
|
|
-
|
|
|
|
|
- //判断传入的用户id 是admin 或者 前线人员的id
|
|
|
|
|
- if(StringUtils.isNotEmpty(quoteInfoVo.getUserId())){
|
|
|
|
|
- if("admin".equals(quoteInfoVo.getUserId()) || quoteInfoVo.getUserId().contains("M")){
|
|
|
|
|
- realUserId=quoteInfoVo.getUserId();
|
|
|
|
|
- //userId=quoteInfoVo.getUserId();
|
|
|
|
|
- }else{
|
|
|
|
|
- throw new SystemException("后线人员不允许报价!!");
|
|
|
|
|
- }
|
|
|
|
|
- }else{
|
|
|
|
|
- throw new SystemException("未选择业务员!!");
|
|
|
|
|
- }
|
|
|
|
|
- /**
|
|
|
|
|
boolean isCdy = false;//是否出单员标志
|
|
boolean isCdy = false;//是否出单员标志
|
|
|
if (StringUtils.isNotEmpty(userId)) {
|
|
if (StringUtils.isNotEmpty(userId)) {
|
|
|
SysUserRole userRole = sysUserRoleService.selectByUserId(userId);
|
|
SysUserRole userRole = sysUserRoleService.selectByUserId(userId);
|
|
@@ -288,19 +275,18 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
|
|
|
daikeFlag = true;
|
|
daikeFlag = true;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- **/
|
|
|
|
|
// 1. 验证订单参数
|
|
// 1. 验证订单参数
|
|
|
orderComponents.checkEmpty(quoteInfoVo);
|
|
orderComponents.checkEmpty(quoteInfoVo);
|
|
|
SysUser user = sysUserService.getById(realUserId);
|
|
SysUser user = sysUserService.getById(realUserId);
|
|
|
SysDept dept = sysDeptService.getById(user.getDeptId());
|
|
SysDept dept = sysDeptService.getById(user.getDeptId());
|
|
|
// 2 构造订单
|
|
// 2 构造订单
|
|
|
InsOrders insOrders = new InsOrders(user, dept, quoteInfoVo);
|
|
InsOrders insOrders = new InsOrders(user, dept, quoteInfoVo);
|
|
|
- //if (daikeFlag) {//当时代客录单业务时,才需要赋值该字段
|
|
|
|
|
- // insOrders.setOperatorid(userId);//赋值代客录单操作人为登录人
|
|
|
|
|
- //}
|
|
|
|
|
- //if (isCdy) {//赋值出单员 操作人为登录人
|
|
|
|
|
|
|
+ if (daikeFlag) {//当时代客录单业务时,才需要赋值该字段
|
|
|
|
|
+ insOrders.setOperatorid(userId);//赋值代客录单操作人为登录人
|
|
|
|
|
+ }
|
|
|
|
|
+ if (isCdy) {//赋值出单员 操作人为登录人
|
|
|
insOrders.setOperatorid(userId);
|
|
insOrders.setOperatorid(userId);
|
|
|
- //}
|
|
|
|
|
|
|
+ }
|
|
|
InsOrders insOrders1 = baseMapper.selectById(quoteInfoVo.getOrderNo());
|
|
InsOrders insOrders1 = baseMapper.selectById(quoteInfoVo.getOrderNo());
|
|
|
|
|
|
|
|
//需要赋值代录单人ID
|
|
//需要赋值代录单人ID
|