代码备份

src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java

@@ -188,7 +188,7 @@ public class InvInnerOrderPrintController {
         } else {
             Map<String, Object> data = new HashMap<String, Object>();
             data.put("data", printEntities);
-            JasperUtils.jasperReport(request, response, data, filePath + "/pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf");
+            JasperUtils.jasperReport(request, response, data, filePath + "/pdf/template/" + FileUtils.getLastFileName(systemPDFTemplateEntity.getPath()), "pdf");
 
 
         }
@@ -231,7 +231,7 @@ public class InvInnerOrderPrintController {
             @RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception {
 
         //查询模板文件是否存在
-        SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity = systemPDFModuleService.selectByStatemenId(inspectionPDFTemplateRequest.getLabelId()+"");
+        SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity = systemPDFModuleService.selectByStatemenId(inspectionPDFTemplateRequest.getLabelId() + "");
         if (null == sysPdfTemplateRelevanceStatemenEntity) {
             return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误");
         }
@@ -249,7 +249,7 @@ public class InvInnerOrderPrintController {
             @RequestBody InnerOrderQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest,
             HttpServletRequest request, HttpServletResponse response) throws Exception {
 
-        SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity = systemPDFModuleService.selectByStatemenId(stockQRCodeTextPDFTemplateRequest.getLabelId()+"");
+        SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity = systemPDFModuleService.selectByStatemenId(stockQRCodeTextPDFTemplateRequest.getLabelId() + "");
         if (sysPdfTemplateRelevanceStatemenEntity == null) return ResultVOUtils.error(500, "未找到单据模板模块设置，请检查");
 
         SystemPDFTemplateEntity systemPDFTemplateEntity =
@@ -281,10 +281,10 @@ public class InvInnerOrderPrintController {
             }
         }
 
-        Map<String,Object> map=new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
-        map.put("data",printEntities);
+        map.put("data", printEntities);
         String param = JSON.toJSONString(map);
-        JasperUtils.jasperReport(request, response, param, filePath + "/pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf");
+        JasperUtils.jasperReport(request, response, param, filePath + "/pdf/template/" + FileUtils.getLastFileName(systemPDFTemplateEntity.getPath()), "pdf");
 
         String orderId = "";
         for (InnerOrderPrintResponse InnerOrderPrintResponse : mStockPrintEntities) {

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -167,6 +167,7 @@ public class IoOrderServiceImpl implements IoOrderService {
             orderEntity.setRelKey(UUID.fastUUID().toString(true));
         }
         orderEntity.setExportStatus(0); //上传状态：未上传
+        orderEntity.setInCodeStatus(0);
         return orderDao.insert(orderEntity);
     }
 

src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java

@@ -162,8 +162,6 @@ public class ThrDeptServiceImpl extends ServiceImpl<ThrDeptDao, ThrDeptEntity> i
                             thrInvWarehouseDao.insertThrInvWarehouse(thrInvWarehouseEntity);
                         }
                     }
-
-
                 }
                 //插入数据
                 thrDeptDao.insertInvWarehouses(list);

src/main/java/com/glxp/api/util/FileUtils.java

@@ -1,5 +1,7 @@
 package com.glxp.api.util;
 
+import cn.hutool.core.util.StrUtil;
+
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -529,6 +531,16 @@ public class FileUtils {
         }
     }
 
+    public static String getLastFileName(String fileName) {
+        String fileNameNow = fileName.substring(fileName.lastIndexOf("/") + 1);
+        if (StrUtil.isEmpty(fileNameNow))
+            return fileName;
+        else
+            return fileNameNow;
+
+    }
+
+
     /**
      * 得到相对路径。
      * 文件名不是目录名的子节点时返回文件名。