diff --git a/oms_web/oms_vue/src/views/inventory/delivery/Detail.vue b/oms_web/oms_vue/src/views/inventory/delivery/Detail.vue
index 35483689..07d275ae 100644
--- a/oms_web/oms_vue/src/views/inventory/delivery/Detail.vue
+++ b/oms_web/oms_vue/src/views/inventory/delivery/Detail.vue
@@ -50,6 +50,13 @@
+
+
+
+
+
+
+
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/InventoryDelivery.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/InventoryDelivery.java
index 99863f0b..5e442d1a 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/InventoryDelivery.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/InventoryDelivery.java
@@ -49,6 +49,8 @@ public class InventoryDelivery extends BaseEntity
private String projectCode;
@Excel(name = "合同编号")
private String orderCode;
+ /** 收货地址 */
+ private String notifierAddress;
@Excel(name = "项目名称")
private String projectName;
@Excel(name = "产品编码")
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
index a96c6052..bb86f89a 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
@@ -328,7 +328,6 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
}
//修改项目预计下单时间
projectInfoMapper.updateOrderTimeById(projectOrderInfo.getProjectId());
- projectInfoService.scheduleOpportunityUpdateByProjectId(projectOrderInfo.getProjectId());
return i;
}
@@ -1737,6 +1736,8 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
productInfoService.calcByDiscountFold(dbProjectOrderInfo.getDiscountFold(), dbProjectOrderInfo.getProjectId());
}
handleApproveOrder(businessKey);
+ // 订单审批通过时推送项目信息到CRM
+ projectInfoService.scheduleOpportunityUpdateByProjectId(dbProjectOrderInfo.getProjectId());
}
@Override
diff --git a/ruoyi-sip/src/main/resources/mapper/inventory/InventoryDeliveryMapper.xml b/ruoyi-sip/src/main/resources/mapper/inventory/InventoryDeliveryMapper.xml
index a72d77e9..f05b6972 100644
--- a/ruoyi-sip/src/main/resources/mapper/inventory/InventoryDeliveryMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/inventory/InventoryDeliveryMapper.xml
@@ -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
,t2.warehouse_name,
t5.project_code, t5.project_name,
- t4.order_code,
+ t4.order_code,t4.notifier_address,
t6.user_name as create_by_name,
t7.product_code,t7.model
from oms_inventory_delivery t1