From b1648336300e25af5cbb1d73375bedc3cc0fac20 Mon Sep 17 00:00:00 2001
From: chuang <994001556@qq.com>
Date: Wed, 12 Apr 2023 15:57:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E5=8D=95=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=EF=BC=8C=E5=AF=BC=E5=85=A5=E4=B8=8B=E8=BD=BDword?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=9B=BE=E7=89=87=E9=AB=98=E5=BA=A6=E4=B8=BA?=
 =?UTF-8?q?0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PaymentdocServiceImpl.java   |  1 -
 .../impl/PurchaseorderitemServiceImpl.java    | 27 +++++++++----------
 2 files changed, 12 insertions(+), 16 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 40fd8c2f..4b272951 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
@@ -428,7 +428,6 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
                 Object name = o.get("name");
                 if (i==0){
                     payEnclosureStr.append(name);
-                    payEnclosureStr.append("<br/>"+name);
                 }else {
                     payEnclosureStr.append("<br/>"+name);
                 }
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 bcc602a1..7c88b952 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
@@ -583,6 +583,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
 
                             Section sectionn = document.getLastSection();
                             PageSetup pageSetup = sectionn.getPageSetup();
+
 //获取页面宽度
                             float pageWidth = (float)pageSetup.getPageSize().getWidth();
 //获取左右页边距宽度
@@ -593,7 +594,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
 
 //设置图片大小代码
 
-                            picture.setWidth(width );
+
                             Integer     height = 0;
                             Integer    widthh = 0;
                             if (map1.get("width") != null) {
@@ -603,7 +604,15 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
                            height = Integer.valueOf(String.valueOf(map1.get("height")));
                             }
 
-                            picture.setHeight(widthh!=0?width*(height/widthh):0);
+
+                            if (widthh!=0){
+                                float i2 =(float) height / widthh;
+                                picture.setHeight(width*i2);
+                                picture.setWidth(width);
+                            }else {
+                                picture.setHeight(0);
+                                picture.setWidth(0);
+                            }
 
 
 //                            picture.setWidth(picWidth==0?500:picWidth);
@@ -1361,8 +1370,6 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
 
     @Override
     public void getVehicle(List<HashMap<String, Object>> vehicleInfo, String templateFilePath,String settlements) throws Exception {
-//        BufferedInputStream input = null;
-//        BufferedOutputStream out = null;
         if (vehicleInfo != null && vehicleInfo.size() > 0) {
             for (int i = 0; i < vehicleInfo.size(); i++) {
                 HashMap<String, Object> map = vehicleInfo.get(i);
@@ -1382,18 +1389,8 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
                             if (!parentFile.exists()) {
                                 parentFile.mkdirs();
                             }
-//                               log.warn(templateFilePath+s1+"\\"+"vehicle\\"+ UUID.randomUUID().toString().replaceAll("-", "")+".png");
-//
                             FileCopy.copyFile(vehicleImg, templateFilePath + "车辆信息照片"+settlements+"吨\\" + s1 + "\\");
-//                                   input = new BufferedInputStream(new FileInputStream(vehicleImg));
-//                                   out = new BufferedOutputStream(new FileOutputStream(outImg));
-//                                   byte[] bys = new byte[1024];
-//                                   int len = 0;
-//                                   while ((len = input.read(bys)) != -1)
-//                                   {
-//                                       out.write(bys, 0, len);
-//                                   }
-//
+
                         }
                     }
                 }

From 72b2e7b85d0176c84f8471858ae74c416f5eb84d Mon Sep 17 00:00:00 2001
From: chuang <994001556@qq.com>
Date: Wed, 12 Apr 2023 16:36:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=B7=BB=E5=8A=A0=E4=B8=8B=E8=BD=BD=E7=9A=84?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MobilePortController.java      |  6 +--
 .../service/PurchaseorderitemService.java     |  2 +-
 .../impl/PurchaseorderitemServiceImpl.java    | 48 +++++++++++++++++--
 .../scm/basicInformation/paymentdoc/index.vue |  8 ++++
 .../basicInformation/purchaseorder/index.vue  |  3 +-
 5 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/controller/MobilePortController.java b/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/controller/MobilePortController.java
index 2fd6abaf..d8dcd12e 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/controller/MobilePortController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/controller/MobilePortController.java
@@ -38,12 +38,12 @@ public class MobilePortController {
      * @param documentNo 采购订单编码
      * @throws Exception
      */
-    @GetMapping(value = "/exportPdf/{documentNo}", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public void exportBillInfo(HttpServletResponse response,@PathVariable("documentNo") String documentNo) throws Exception {
+    @GetMapping(value = "/exportPdf/{documentNo}/{token}", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public void exportBillInfo(HttpServletResponse response,@PathVariable("documentNo") String documentNo,@PathVariable("token")String token) throws Exception {
 //    public void exportBillInfo(HttpServletResponse response) throws Exception {
         PurchaseorderitemEntity purchaseorderitemEntity = new PurchaseorderitemEntity();
         purchaseorderitemEntity.setDocumentNo(documentNo);
-        purchaseorderitemService.getPdfInfo(purchaseorderitemEntity,response);
+        purchaseorderitemService.getPdfInfo(purchaseorderitemEntity,response,token);
     }
 
     /**
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderitemService.java
index 17e3c7ce..a5c60e44 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderitemService.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderitemService.java
@@ -23,7 +23,7 @@ import java.util.Map;
  * 日期： 2023-02-01
  */
 public interface PurchaseorderitemService extends IService<PurchaseorderitemEntity> {
-    public void getPdfInfo(PurchaseorderitemEntity purchaseorderitemEntity,HttpServletResponse response ) throws Exception;
+    public void getPdfInfo(PurchaseorderitemEntity purchaseorderitemEntity,HttpServletResponse response ,String token) throws Exception;
 
 //    List<PurchaseOrderVO> getPMap(PurchaseorderPagination purchaseorderPagination);
 
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 7c88b952..86593bcb 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
@@ -20,6 +20,7 @@ import com.spire.doc.fields.DocPicture;
 import jnpf.Jg_natural.entity.Jg_naturalEntity;
 import jnpf.Jg_natural.mapper.Jg_naturalMapper;
 import jnpf.base.ActionResult;
+import jnpf.base.UserInfo;
 import jnpf.base.controller.BillRuleController;
 import jnpf.base.entity.ProvinceEntity;
 import jnpf.base.mapper.ProvinceMapper;
@@ -33,6 +34,8 @@ import jnpf.mobilePort.utils.FileCopy;
 import jnpf.mobilePort.utils.MultipartFileDto;
 import jnpf.permission.model.authorize.AuthorizeConditionModel;
 import jnpf.permission.service.AuthorizeService;
+import jnpf.permission.service.OrganizeService;
+import jnpf.permission.util.PermissionUtil;
 import jnpf.poundlist.entity.PoundlistEntity;
 import jnpf.poundlist.mapper.PoundlistMapper;
 import jnpf.poundlist.service.PoundlistService;
@@ -435,6 +438,9 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
      * @throws Exception
      */
     public void getPdf(LambdaQueryWrapper<PurchaseorderitemEntity> wrapper, String templateFilePath,String settlements) throws Exception {
+        String[] s = settlements.split("_");
+        settlements=s[0];
+        String organizeName=s[1];
         for (HashMap<String, Object> orderMap : purchaseorderitemMapper.getPdfInfo(wrapper)) {
             byte[] bytes = null;
             HttpHeaders headers = null;
@@ -445,7 +451,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
             Map map = orderMap;
 //
             map.put("title", "济钢城市矿产科技有限公司采购订单");
-            map.put("name", "城市矿产再生资源事业部");
+            map.put("name", organizeName);
             List<HashMap<String, Object>> reportList = (List<HashMap<String, Object>>) map.get("reportList");
             if (reportList != null) {
                 Integer settlement = 0;
@@ -630,8 +636,41 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
         }
     }
 
+    @Resource
+    private OrganizeService organizeService;
+
     @Override
-    public void getPdfInfo(PurchaseorderitemEntity purchaseorderitemEntity, HttpServletResponse response) throws Exception {
+    public void getPdfInfo(PurchaseorderitemEntity purchaseorderitemEntity, HttpServletResponse response,String token) throws Exception {
+        UserProvider userProvider = SpringContext.getBean(UserProvider.class);
+
+        UserInfo userInfo = userProvider.get(token);
+        String id1 = userInfo.getUserId();
+//        String id1 = userProvider.get().getId();
+        String fullName=null;
+        if (id1!=null){
+
+            // 获取组织
+            if(StringUtil.isNotNull(userInfo.getOrganizeId())){
+             fullName=   PermissionUtil.getLinkInfoByOrgId(userInfo.getOrganizeId(), organizeService, false);
+            }
+        }
+        String substring = null;
+        String substring1 = null;
+        String    organizeName= null;
+        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());
+            }
+
+        }
+        if (substring.contains("日照")){
+       organizeName=substring;
+        }else {
+         organizeName="城市矿产再生资源事业部";
+        }
+
         //        临时文件夹地址
         String s = UUID.randomUUID().toString();
         String templateFilePath = configValueUtil.getTemplateFilePath() + "info\\"+s+"\\";
@@ -648,7 +687,8 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
         if (info != null && info.size() > 0) {
             List<HashMap<String, Object>> vehicleInfo = purchaseorderitemMapper.getVehicleInfo(wrapper);
             List<HashMap<String, Object>> titleInfo = purchaseorderitemMapper.getTitleInfo(wrapper);
-            String settlement = String.valueOf(titleInfo.get(0).get("settlement"));
+            String settlement = String.valueOf(titleInfo.get(0).get("settlement"))+"_"+organizeName;
+
 
 
 
@@ -663,6 +703,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
 
                         executorService.execute(() -> {
                             try {
+
                                 this.getPdf(wrapper, templateFilePath,settlement);
                             } catch (Exception e) {
                                 throw new RuntimeException(e);
@@ -712,6 +753,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
                 }
             this.getZIP(templateFilePath, response,settlement);
         } else {
+            organizeName = "";
             log.error("采购订单号出错！查不到该采购订单！");
         }
 
diff --git a/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue b/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue
index e0ae704c..06ac779f 100644
--- a/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue
+++ b/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue
@@ -579,6 +579,14 @@ export default {
       //   });
       //   return;
       // }
+      if (!this.multipleSelectionItem.length || this.multipleSelectionItem.length != 1) {
+        this.$message({
+          type: "error",
+          message: "请选择一条数据",
+          duration: 2500,
+        });
+        return;
+      }
       this.multipleSelectionItem.forEach((item, index) => {
         //console.log(this.$store.getters.token);
         // let url = "/api/info/getPaymentDocPdf/" + item.id+"/"+this.$store.getters.token;
diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
index e9a5d5f1..eeb7d526 100644
--- a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
+++ b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
@@ -172,6 +172,7 @@
     getDataInterfaceRes
   } from '@/api/systemData/dataInterface'
   import Detail from './Detail'
+  import {getToken} from "@/utils/auth";
 
   export default {
     components: {
@@ -381,7 +382,7 @@
         	})
         	return
         }
-        window.open(this.define.APIURl + '/api/info/exportPdf/' + this.multipleSelectionItem[0].documentNo)
+        window.open(this.define.APIURl + '/api/info/exportPdf/' + this.multipleSelectionItem[0].documentNo+"/"+getToken())
       },
       uploadForm() {
         this.importFormVisible = true