From 60a4d88f5ef855cfbe19cba51113d98ebf9f1c3d Mon Sep 17 00:00:00 2001
From: chuang <994001556@qq.com>
Date: Wed, 22 Mar 2023 14:12:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95-=E5=BC=80?=
 =?UTF-8?q?=E7=A5=A8=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BDbug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml        |  4 +-
 .../java/jnpf/mobilePort/utils/FileCopy.java  |  5 +-
 .../impl/PurchaseorderitemServiceImpl.java    | 38 +++++----
 .../purchaseorder/PurchaseorderMapper.xml     | 84 +++----------------
 4 files changed, 38 insertions(+), 93 deletions(-)

diff --git a/SC-boot/linkage-admin/src/main/resources/application.yml b/SC-boot/linkage-admin/src/main/resources/application.yml
index 3392c6b6..3cde125b 100644
--- a/SC-boot/linkage-admin/src/main/resources/application.yml
+++ b/SC-boot/linkage-admin/src/main/resources/application.yml
@@ -3,8 +3,8 @@ spring:  #环境 dev|test|pro|preview
     active: dev
   servlet:
     multipart: #文件传输配置
-      max-file-size: 100MB #单个数据大小限制
-      max-request-size: 100MB #请求总数据大小限制
+      max-file-size: 1000MB #单个数据大小限制
+      max-request-size: 1000MB #请求总数据大小限制
       enabled: true  #是否启用分段上传支持
   mvc:
     hiddenmethod: #隐式方法过滤器
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/utils/FileCopy.java b/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/utils/FileCopy.java
index 1843e177..6c991c72 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/utils/FileCopy.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/utils/FileCopy.java
@@ -79,6 +79,7 @@ public class FileCopy {
                     MultipartFile multipartFile = new MultipartFileDto(file.getName(), file.getName(), ContentType.JSON.toString(), FileCopyUtils.copyToByteArray(input));
                     UtilsController utilsController = SpringContext.getBean(UtilsController.class);
                     System.out.println(multipartFile.getName());
+                    Thread.sleep(1000);
                     ActionResult annex = utilsController.uploader(multipartFile, "annex");
                     if (annex.getCode() == 200) {
                         list.add(annex.getData());
@@ -261,7 +262,7 @@ public class FileCopy {
                 String type = url.substring(16, i);
 //                System.out.println("type"+type);
 //                System.out.println("type.toLowerCase()"+type.toLowerCase());
-                String fileId = map.get("name");
+//                String fileId = map.get("name");
 //           本地文件路径
                 String filePath = FilePathUtil.getFilePath(type.toLowerCase()) + fileName;
 //            获得图片的base64码
@@ -269,7 +270,7 @@ public class FileCopy {
                 int[] imgWidthHeight = FileCopy.getImgWidthHeight(filePath);
                 HashMap<String, Object> map1 = new HashMap<>();
                 map1.put("imgBase", imageBase);
-                map1.put("name", fileId);
+                map1.put("name", fileName);
                 map1.put("filePath", filePath);
                 if (imgWidthHeight != null) {
                     map1.put("width", String.valueOf(imgWidthHeight[0]));
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 dbc633c8..2879f116 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
@@ -502,26 +502,33 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
                         paragraph1.appendText(String.valueOf(map.get("supplierNm")));
                         paragraph1.applyStyle("paraStyle");
                         Paragraph paragraph = section.addParagraph();
-                        DocPicture pic = paragraph.appendPicture((String) map1.get("filePath"));
-                        int picHeight = 300;
-                        int picWidth = 250;
-                        Integer width = null;
+                        File filePath = new File((String) map1.get("filePath"));
+                        DocPicture pic =null;
+                        if (filePath.exists()){
+                            pic = paragraph.appendPicture((String) map1.get("filePath"));
+                            int picHeight = 300;
+                            int picWidth = 250;
+                            Integer width = null;
 
-                        Integer height = null;
+                            Integer height = null;
 
 
-                        if (map1.get("width") != null) {
-                            width = Integer.valueOf(String.valueOf(map1.get("width")));
-                        }
-                        if (map1.get("height") != null) {
-                            height = Integer.valueOf(String.valueOf(map1.get("height")));
-                        }
-                        if (width != null && height != null) {
-                            picWidth = picHeight * width / height;
+                            if (map1.get("width") != null) {
+                                width = Integer.valueOf(String.valueOf(map1.get("width")));
+                            }
+                            if (map1.get("height") != null) {
+                                height = Integer.valueOf(String.valueOf(map1.get("height")));
+                            }
+                            if (width != null && height != null) {
+                                picWidth = picHeight * width / height;
+//                            if (picWidth == null)
+                            }
+
+                            pic.setWidth(picWidth==0?250:picWidth);
+                            pic.setHeight(picHeight==0?300:picHeight);
                         }
 
-                        pic.setWidth(picWidth);
-                        pic.setHeight(picHeight);
+
                     }
                 }
             }
@@ -1479,7 +1486,6 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
                     } else {
                         model.setCauseError("销售合同不存在！请添加销售合同后尝试添加！");
                         errList.add(model);
-
                         ints.add(i);
                         continue;
                     }
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml
index 4ab2baef..15b9ef2f 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml
@@ -69,73 +69,6 @@
 
     </resultMap>
 
-<!--    <select id="getPurchorderItemMap" resultMap="purchorderItemMap">-->
-<!--        SELECT-->
-<!--            *-->
-<!--        FROM-->
-<!--            (-->
-<!--                SELECT-->
-<!--                    a.DOCUMENT_NO,-->
-<!--                    a.creator_user_name AS `creatorUserName`,-->
-<!--                    a.creator_time AS `creatorTime`,-->
-<!--                    a.contract_no AS `contractNo`,-->
-<!--                    a.contract_code AS `contractCode`,-->
-<!--                    a.supplier_name AS `supplierName`,-->
-<!--                    a.document_no AS `documentNo`,-->
-<!--                    b.material_name AS `materialName`,-->
-<!--                    (-->
-<!--                        CASE-->
-<!--                            b.rate-->
-<!--                            WHEN '0' THEN-->
-<!--                                13-->
-<!--                            WHEN '1' THEN-->
-<!--                                9-->
-<!--                            WHEN '2' THEN-->
-<!--                                6-->
-<!--                            WHEN '3' THEN-->
-<!--                                5-->
-<!--                            WHEN '4' THEN-->
-<!--                                3 ELSE b.unit-->
-<!--                            END-->
-<!--                        ) AS `rate1`,-->
-<!--                    AVG( b.price ) AS `price1`,-->
-<!--                    SUM( b.settlement ) AS `settlement1`,-->
-<!--                    ( CASE b.unit WHEN 0 THEN '吨' ELSE '千克' END ) AS `unit1`,-->
-<!--                    SUM( b.amount ) `amount1`,-->
-<!--                    b.pound_pictures poundPictures,-->
-<!--                    c.vehicle_pictures vehiclePictures,-->
-<!--                    d.supplier_nm,-->
-<!--                    c.pound_date 收货日期,-->
-<!--                    e.ticketno 送货车号,-->
-<!--                    c.gross_weight 毛重,-->
-<!--                    c.tare_weight 皮重,-->
-<!--                    c.buckle_weight 扣重,-->
-<!--                    c.settlement 结算重量-->
-<!--                FROM-->
-<!--                    jg_purchaseorder AS a-->
-<!--                        LEFT JOIN jg_purchaseorder_item0 AS b ON a.id = b.purchaseorder_id-->
-<!--                        AND (-->
-<!--                                                                     b.delete_mark != '1'-->
-<!--			OR ISNULL( b.delete_mark ))-->
-<!--                        LEFT JOIN jg_poundlist AS c ON b.poundlist_id = c.id-->
-<!--                        AND (-->
-<!--                                                           c.delete_mark != '1'-->
-<!--			OR ISNULL( c.delete_mark ))-->
-<!--                        AND (-->
-<!--                                                               ( c.pound_status != '1' AND c.pound_status != '2' )-->
-<!--                                                               OR ISNULL( c.pound_status ))-->
-<!--                        LEFT JOIN jg_customer AS d ON c.customer_id = d.id-->
-<!--                        AND (-->
-<!--                                                          d.delete_mark != '1'-->
-<!--			OR ISNULL( d.delete_mark ))-->
-<!--                        LEFT JOIN jg_vehicle e ON c.vehicle_id = e.id-->
-<!--                GROUP BY-->
-<!--                    b.material_name,-->
-<!--                    b.rate,-->
-<!--                    b.unit,-->
-<!--                    a.id-->
-<!--            ) aaa ${ew.customSqlSegment}-->
-<!--    </select>-->
 
     <select id="getPdfInfo" resultMap="resultPdfInfoMap">
         SELECT
@@ -223,7 +156,8 @@
             (
                 SELECT
                     a.document_no,
-                    a.supplier_name AS `supplierName`,
+                    IFNULL(g.supplier_name,'供应商信息查不到') AS `supplierName`,
+                    c.supplier_id,
                     f.item_name AS `materialName`,
                     c.vehicle_pictures vehiclePictures,
                     c.pound_pictures poundPictures,
@@ -238,7 +172,9 @@
                     ( CASE c.unit WHEN 0 THEN '吨' ELSE '千克' END ) AS `unit`
                 FROM
                     jg_purchaseorder AS a
-                        LEFT JOIN jg_poundlist AS c ON c.purchase_id = a.contract_code
+                        LEFT JOIN jg_purchaseorder_item0 b ON a.id = b.purchaseorder_id
+                        AND b.delete_mark = '0'
+                        LEFT JOIN jg_poundlist AS c ON c.id = b.poundlist_id
                         AND c.delete_mark = '0'
                         LEFT JOIN jg_material f ON c.material_id = f.id
                         AND f.delete_mark = '0'
@@ -246,9 +182,10 @@
                         AND d.delete_mark = '0'
                         LEFT JOIN jg_vehicle e ON c.vehicle_id = e.id
                         AND e.delete_mark = '0'
+                        LEFT JOIN jg_supplier g on c.supplier_id=g.id
                 WHERE
                     a.delete_mark = '0'
-            ) aaa ${ew.customSqlSegment}
+            ) aaa  ${ew.customSqlSegment}
     </select>
 
     <select id="getVehicleInfo" resultType="hashMap">
@@ -265,13 +202,14 @@
                     e.drivername
                 FROM
                     jg_purchaseorder AS a
-                        LEFT JOIN jg_poundlist AS c ON c.purchase_id = a.contract_code
-                        AND c.delete_mark = '0'
+                        LEFT JOIN jg_purchaseorder_item0 b ON a.id = b.purchaseorder_id
+                        AND b.delete_mark = '0'
+                        LEFT JOIN jg_poundlist AS c ON c.id = b.poundlist_id
                         LEFT JOIN jg_vehicle e ON c.vehicle_id = e.id
                         AND e.delete_mark = '0'
                 WHERE
                     a.delete_mark = '0'
-            ) aaa ${ew.customSqlSegment}
+            ) aaa  ${ew.customSqlSegment}
     </select>
 
     <select id="queryByKeyword" resultType="jnpf.purchaseorder.entity.PurchaseorderitemEntity">