nflg-wms-admin/pom.xml

@@ -119,15 +119,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!--        <dependency>-->
-        <!--            <groupId>cn.idev.excel</groupId>-->
-        <!--            <artifactId>fastexcel</artifactId>-->
-        <!--            <version>1.3.0</version>-->
-        <!--        </dependency>-->
         <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>easyexcel</artifactId>
-            <version>3.3.4</version>
+            <groupId>cn.idev.excel</groupId>
+            <artifactId>fastexcel</artifactId>
+            <version>1.3.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.retry</groupId>

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java

@@ -8,13 +8,12 @@ import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.digest.DigestUtil;
 import cn.hutool.json.JSONUtil;
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.enums.CellDataTypeEnum;
-import com.alibaba.excel.metadata.data.ImageData;
-import com.alibaba.excel.metadata.data.WriteCellData;
-import com.alibaba.excel.write.metadata.WriteSheet;
-import com.alibaba.excel.write.metadata.fill.FillConfig;
+import cn.idev.excel.EasyExcel;
+import cn.idev.excel.enums.CellDataTypeEnum;
+import cn.idev.excel.metadata.data.ImageData;
+import cn.idev.excel.metadata.data.WriteCellData;
+import cn.idev.excel.write.metadata.WriteSheet;
+import cn.idev.excel.write.metadata.fill.FillConfig;
 import com.nflg.wms.admin.pojo.document.PackageMaterialScanRecord;
 import com.nflg.wms.admin.pojo.dto.PdfPageDTO;
 import com.nflg.wms.admin.pojo.dto.SAPMaterialInfoInOrderDTO;
@@ -686,10 +685,10 @@ public class StructuralPackageOrderController extends BaseController {
         ImageData imageData = new ImageData();
         imageData.setImageType(ImageData.ImageType.PICTURE_TYPE_PNG);
         imageData.setImage(QRCodeUtil.generateQRCode(deliverOrder.getNo(), 100, 100));
-        imageData.setTop(0);
-        imageData.setRight(0);
-        imageData.setBottom(0);
-        imageData.setLeft(0);
+        imageData.setTop(5);
+        imageData.setRight(5);
+        imageData.setBottom(5);
+        imageData.setLeft(5);
         imageData.setRelativeFirstRowIndex(0);
         imageData.setRelativeFirstColumnIndex(0);
         imageData.setRelativeLastRowIndex(2);
@@ -700,7 +699,7 @@ public class StructuralPackageOrderController extends BaseController {
         VUtil.trueThrowBusinessError(Objects.isNull(supplier)).throwMessage("供应商不存在");
         info.put("supplierName", supplier.getSupplierName());
         info.put("abbreviation", supplier.getAbbreviation());
-        info.put("today", DateTimeUtil.format(LocalDate.now()));
+        info.put("today", DateTimeUtil.format(LocalDate.now(), "yyyy-MM-dd"));
         List<DeliverStructuralPackageOrderForPackageItemVO> datas = deliverStructuralPackageOrderService.getInfoByDeliverOrderNo(deliverOrder.getNo());
         datas.forEach(it -> {
             it.setTrayNum(Math.toIntExact(deliverStructuralPackageOrderTrayService.lambdaQuery()
@@ -709,7 +708,7 @@ public class StructuralPackageOrderController extends BaseController {
         });
         response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
         response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode(deliverOrder.getNo() + "送货单.xlsx", StandardCharsets.UTF_8));
-        try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).withTemplate(new ClassPathResource("template/钢构包送货单模版.xlsx").getInputStream()).build()) {
+        try (cn.idev.excel.ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).withTemplate(new ClassPathResource("template/钢构包送货单模版.xlsx").getInputStream()).build()) {
             WriteSheet writeSheet = EasyExcel.writerSheet().build();
             FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
             excelWriter.fill(datas, fillConfig, writeSheet);