From 714fe8061b71ada57cd083c8cafc83d79d478fa0 Mon Sep 17 00:00:00 2001
From: chuang <994001556@qq.com>
Date: Mon, 3 Apr 2023 10:13:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E6=96=87=E4=BB=B6=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E8=BD=A6=E8=BE=86=E4=BF=A1=E6=81=AF=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=B9=E5=91=BD=E5=90=8D=E8=A7=84=E5=88=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PurchaseorderitemServiceImpl.java     | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

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 77bb2eb2..7b505885 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
@@ -1341,12 +1341,10 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
                         if (!String.valueOf(stringObjectMap.get("filePath")).equals("null")) {
                             String s = String.valueOf(stringObjectMap.get("filePath"));
                             File vehicleImg = new File(s);
-                            String s2 = String.valueOf(map.get("ticketNo")).equals("null") ? "" : String.valueOf(map.get("ticketNo"));
-                            String s3 = String.valueOf(map.get("drivername")).equals("null") ? "" : String.valueOf(map.get("drivername"));
-                            String s4 = String.valueOf(map.get("contact")).equals("null") ? "" : String.valueOf(map.get("contact"));
-
-
-                            String s1 = (i+1) + "-" + s2 + s3 + s4;
+                            String s2 = String.valueOf(map.get("ticketNo")).equals("null") ? "" : "-" + String.valueOf(map.get("ticketNo"));
+                            String s3 = String.valueOf(map.get("drivername")).equals("null") ? "" : "-" + String.valueOf(map.get("drivername"));
+                            String s4 = String.valueOf(map.get("contact")).equals("null") ? "" : "-" + String.valueOf(map.get("contact"));
+                            String s1 = (i+1) + s2 + s3 + s4;
                             File outImg = new File(templateFilePath + "车辆信息照片"+settlements+"吨\\" + s1 + "\\" + UUID.randomUUID().toString().replaceAll("-", "") + ".png");
                             File parentFile = outImg.getParentFile();
                             if (!parentFile.exists()) {