From 128b28e62fadd885163a3631451651aa06a0ce51 Mon Sep 17 00:00:00 2001
From: lijiaqi <lijq@ydool.com>
Date: Tue, 15 Oct 2024 10:29:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E6=88=90=E6=82=9F=E5=8A=A8ERP?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E5=B9=B6=E6=B7=BB=E5=8A=A0=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在采购订单、零售出库单、销售订单和库存调整单的审批通知中添加ERP系统链接
- 重构相关服务类以支持新增的链接信息
- 更新pom文件，添加xingyun-template依赖
---
 xingyun-sc/pom.xml                                           | 4 ++++
 .../sc/controller/ydool/YdoolPurchaseOrderController.java    | 5 +++++
 .../xingyun/sc/impl/purchase/PurchaseOrderServiceImpl.java   | 1 +
 .../xingyun/sc/impl/retail/RetailOutSheetServiceImpl.java    | 1 +
 .../xingyun/sc/impl/sale/SaleOrderServiceImpl.java           | 1 +
 .../sc/impl/stock/adjust/StockAdjustSheetServiceImpl.java    | 1 +
 6 files changed, 13 insertions(+)

diff --git a/xingyun-sc/pom.xml b/xingyun-sc/pom.xml
index 12fa213..46b380b 100644
--- a/xingyun-sc/pom.xml
+++ b/xingyun-sc/pom.xml
@@ -22,5 +22,9 @@
             <groupId>com.lframework</groupId>
             <artifactId>xingyun-basedata</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.lframework</groupId>
+            <artifactId>xingyun-template</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/ydool/YdoolPurchaseOrderController.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/ydool/YdoolPurchaseOrderController.java
index 6b123bd..e920fea 100644
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/ydool/YdoolPurchaseOrderController.java
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/ydool/YdoolPurchaseOrderController.java
@@ -1,6 +1,8 @@
 package com.lframework.xingyun.sc.controller.ydool;
 
 import com.lframework.starter.web.annotations.OpenApi;
+import com.lframework.starter.web.common.security.AbstractUserDetails;
+import com.lframework.starter.web.common.utils.ApplicationUtil;
 import com.lframework.starter.web.controller.DefaultBaseController;
 import com.lframework.starter.web.resp.InvokeResult;
 import com.lframework.starter.web.resp.InvokeResultBuilder;
@@ -9,6 +11,9 @@ import com.lframework.xingyun.sc.bo.purchase.GetPurchaseOrderBo;
 import com.lframework.xingyun.sc.dto.purchase.PurchaseOrderFullDto;
 import com.lframework.xingyun.sc.service.purchase.PurchaseOrderService;
 import com.lframework.xingyun.sc.vo.ydool.YdoolApproveOrderVo;
+import com.lframework.xingyun.template.inner.controller.AuthController;
+import com.lframework.xingyun.template.inner.dto.LoginDto;
+import com.lframework.xingyun.template.inner.impl.UserDetailsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/PurchaseOrderServiceImpl.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/PurchaseOrderServiceImpl.java
index db66c33..feb6e78 100644
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/PurchaseOrderServiceImpl.java
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/purchase/PurchaseOrderServiceImpl.java
@@ -676,6 +676,7 @@ public class PurchaseOrderServiceImpl extends BaseMpServiceImpl<PurchaseOrderMap
                 .set("audit_person_ids", "120,262")
                 .set("push_person_ids", "120,262")
                 .set("remark", bo.getDescription())
+                .set("url","https://erp.fpvone.cn/#/purchasedet/"+id)
                 .set("ghd_goodlist_info", list);
 
         String jsonString = JSONObject.toJSONString(dict);
diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/retail/RetailOutSheetServiceImpl.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/retail/RetailOutSheetServiceImpl.java
index 2a3f8ed..99f593d 100644
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/retail/RetailOutSheetServiceImpl.java
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/retail/RetailOutSheetServiceImpl.java
@@ -732,6 +732,7 @@ public class RetailOutSheetServiceImpl extends
             .set("audit_person_ids", "120,262")
             .set("push_person_ids", "120,262")
             .set("remark", bo.getDescription())
+            .set("url","https://erp.fpvone.cn/#/retaildetail/"+id)
             .set("ghd_goodlist_info", list);
 
     String jsonString = JSONObject.toJSONString(dict);
diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/sale/SaleOrderServiceImpl.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/sale/SaleOrderServiceImpl.java
index 22554a6..f6432ed 100644
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/sale/SaleOrderServiceImpl.java
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/sale/SaleOrderServiceImpl.java
@@ -637,6 +637,7 @@ public class SaleOrderServiceImpl extends BaseMpServiceImpl<SaleOrderMapper, Sal
             .set("audit_person_ids", "120,262")
             .set("push_person_ids", "120,262")
             .set("remark", result.getDescription())
+            .set("url","https://erp.fpvone.cn/#/saledetail/"+id)
             .set("ghd_goodlist_info", list);
     String jsonString = JSONObject.toJSONString(dict);
     String json = HttpUtil.post("https://nb.ydool.com/api/ydoolerp/erp_ajax.ashx/send_xs", jsonString);
diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/stock/adjust/StockAdjustSheetServiceImpl.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/stock/adjust/StockAdjustSheetServiceImpl.java
index 53ec0fc..27cf0e8 100644
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/stock/adjust/StockAdjustSheetServiceImpl.java
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/stock/adjust/StockAdjustSheetServiceImpl.java
@@ -535,6 +535,7 @@ public class StockAdjustSheetServiceImpl extends
             .set("audit_person_ids", "120,262")
             .set("push_person_ids", "120,262")
             .set("remark", bo.getDescription())
+            .set("url","https://erp.fpvone.cn/#/stockdetail/"+id)
             .set("ghd_goodlist_info", list);
 
     String jsonString = JSONObject.toJSONString(dict);