From c410d4e2e37291e392bba90077c3c44ed9ffb49f Mon Sep 17 00:00:00 2001 From: jiangpeng Date: Mon, 20 Apr 2026 17:09:02 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=AE=A1=E6=89=B9=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E6=97=B6=E6=8E=A8=E9=80=81=E4=BF=A1=E6=81=AF=E5=88=B0?= =?UTF-8?q?CRM=EF=BC=8C=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E4=B8=AD=E5=B1=95=E7=A4=BA=E6=94=B6=E8=B4=A7=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oms_web/oms_vue/src/views/inventory/delivery/Detail.vue | 7 +++++++ .../main/java/com/ruoyi/sip/domain/InventoryDelivery.java | 2 ++ .../sip/service/impl/ProjectOrderInfoServiceImpl.java | 3 ++- .../resources/mapper/inventory/InventoryDeliveryMapper.xml | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) 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