From 262e807292c54e81e7a0d0804700acf128266a58 Mon Sep 17 00:00:00 2001
From: chuang <994001556@qq.com>
Date: Fri, 14 Apr 2023 10:07:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E9=97=A8=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PaymentdocServiceImpl.java   | 18 +++++++++++++-
 .../impl/PurchaseorderitemServiceImpl.java    | 24 ++++++++++++-------
 .../main/resources/templates/export/test.ftl  |  4 ++--
 3 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java
index 76b0c9b1..d15a8796 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java
@@ -36,6 +36,7 @@ import jnpf.supplier.entity.SupplierEntity;
 import jnpf.supplier.service.SupplierService;
 import jnpf.util.*;
 import jnpf.util.context.SpringContext;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -422,9 +423,24 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
             String fullName = paymentdocMessage.getFullName();
             substring = fullName.substring(fullName.indexOf("/")+1, fullName.indexOf("/", fullName.indexOf("/")+1));
             if (fullName.length()>fullName.indexOf(substring)+2){
-               substring1 = fullName.substring(fullName.indexOf(substring) + substring.length()+1, fullName.length());
+                substring1 = fullName.substring(fullName.indexOf(substring) + substring.length()+1, fullName.length());
+            }
+            while (substring1.contains("公司")){
+                if (!substring1.contains("/")){
+                    break;
+                }
+                substring=substring1.substring(0,substring1.indexOf("/"));
+                substring1=substring1.substring(substring1.indexOf("/")+1,substring1.length());
             }
 
+            while (true){
+                int intNum = StringUtils.countMatches(paymentdocMessage.getFullName(), "公司");
+                if (intNum>1){
+                    paymentdocMessage.setFullName(fullName.substring(fullName.indexOf("公司")+3,fullName.length()));
+                }else {
+                    break;
+                }
+            }
         }
         StringBuilder payEnclosureStr = new StringBuilder();
         if (paymentdocMessage.getEnclosure()!=null){
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
index daa29fc1..27f79c46 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
@@ -632,17 +632,23 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
 
 
         if (fullName!=null){
-            substring = fullName.substring(fullName.indexOf("/")+1, fullName.indexOf("/", fullName.indexOf("/")+1));
-            if (fullName.length()>fullName.indexOf(substring)+2){
-                substring1 = fullName.substring(fullName.indexOf(substring) + substring.length()+1, fullName.length());
-            }
-            while (substring1.contains("公司")){
-                if (!substring1.contains("/")){
-                    break;
+            if (fullName.indexOf("/", fullName.indexOf("/")+1)!=-1){
+                substring = fullName.substring(fullName.indexOf("/")+1, fullName.indexOf("/", fullName.indexOf("/")+1));
+                if (fullName.length()>fullName.indexOf(substring)+2){
+                    substring1 = fullName.substring(fullName.indexOf(substring) + substring.length()+1, fullName.length());
+                }
+                while (substring1.contains("公司")){
+                    if (!substring1.contains("/")){
+                        break;
+                    }
+                    substring=substring1.substring(0,substring1.indexOf("/"));
+                    substring1=substring1.substring(substring1.indexOf("/")+1,substring1.length());
                 }
-                substring=substring1.substring(0,substring1.indexOf("/"));
-                substring1=substring1.substring(substring1.indexOf("/")+1,substring1.length());
+            }else {
+                substring=fullName.substring(fullName.indexOf("/")+1,fullName.length());
+                substring1="再生资源事业部";
             }
+
         }
 
 
diff --git a/SC-boot/linkage-scm/src/main/resources/templates/export/test.ftl b/SC-boot/linkage-scm/src/main/resources/templates/export/test.ftl
index cbccc264..6c2e7295 100644
--- a/SC-boot/linkage-scm/src/main/resources/templates/export/test.ftl
+++ b/SC-boot/linkage-scm/src/main/resources/templates/export/test.ftl
@@ -37,11 +37,11 @@
 <body>
 <div class='wrapper'>
 
-    <h1 style="text-align: center">${title!""}</h1>
+    <h1 style="text-align: center">${title!"济钢城市矿产科技有限公司采购订单"}</h1>
 
 
 
-    <p style="font-weight: bold">业务部门:${name!""}</p>
+    <p style="font-weight: bold">业务部门:${name!"再生资源事业部"}</p>
     <table border="1" cellspacing="0" width="100%">
         <tr bgcolor="#6495ed" style="line-height: 44px" >
             <td  colspan="1" rowspan="2">订单日期</td>