fix:审批通过时推送信息到CRM,发货记录详情中展示收货地址
parent
f7516a9ffe
commit
c410d4e2e3
|
|
@ -50,6 +50,13 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="6">
|
||||||
|
<el-form-item label="收货地址" prop="notifierAddress">
|
||||||
|
<el-input v-model="detail.notifierAddress"/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
<el-row :gutter="10" class="mb8">
|
<el-row :gutter="10" class="mb8">
|
||||||
|
|
|
||||||
|
|
@ -49,6 +49,8 @@ public class InventoryDelivery extends BaseEntity
|
||||||
private String projectCode;
|
private String projectCode;
|
||||||
@Excel(name = "合同编号")
|
@Excel(name = "合同编号")
|
||||||
private String orderCode;
|
private String orderCode;
|
||||||
|
/** 收货地址 */
|
||||||
|
private String notifierAddress;
|
||||||
@Excel(name = "项目名称")
|
@Excel(name = "项目名称")
|
||||||
private String projectName;
|
private String projectName;
|
||||||
@Excel(name = "产品编码")
|
@Excel(name = "产品编码")
|
||||||
|
|
|
||||||
|
|
@ -328,7 +328,6 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
|
||||||
}
|
}
|
||||||
//修改项目预计下单时间
|
//修改项目预计下单时间
|
||||||
projectInfoMapper.updateOrderTimeById(projectOrderInfo.getProjectId());
|
projectInfoMapper.updateOrderTimeById(projectOrderInfo.getProjectId());
|
||||||
projectInfoService.scheduleOpportunityUpdateByProjectId(projectOrderInfo.getProjectId());
|
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1737,6 +1736,8 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
|
||||||
productInfoService.calcByDiscountFold(dbProjectOrderInfo.getDiscountFold(), dbProjectOrderInfo.getProjectId());
|
productInfoService.calcByDiscountFold(dbProjectOrderInfo.getDiscountFold(), dbProjectOrderInfo.getProjectId());
|
||||||
}
|
}
|
||||||
handleApproveOrder(businessKey);
|
handleApproveOrder(businessKey);
|
||||||
|
// 订单审批通过时推送项目信息到CRM
|
||||||
|
projectInfoService.scheduleOpportunityUpdateByProjectId(dbProjectOrderInfo.getProjectId());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
, t1.delivery_time_type, t1.delivery_time, t1.delivery_type, t1.create_by, t1.create_time, t1.update_by, t1.update_time
|
, t1.delivery_time_type, t1.delivery_time, t1.delivery_type, t1.create_by, t1.create_time, t1.update_by, t1.update_time
|
||||||
,t2.warehouse_name,
|
,t2.warehouse_name,
|
||||||
t5.project_code, t5.project_name,
|
t5.project_code, t5.project_name,
|
||||||
t4.order_code,
|
t4.order_code,t4.notifier_address,
|
||||||
t6.user_name as create_by_name,
|
t6.user_name as create_by_name,
|
||||||
t7.product_code,t7.model
|
t7.product_code,t7.model
|
||||||
from oms_inventory_delivery t1
|
from oms_inventory_delivery t1
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue