更改

5 months ago · fb4ad077b4
2 changed files with 1429 additions and 518 deletions
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java
@ -514,7 +514,7 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
        }else if ("02".equals(wmsInventoryCheckbillReportDetailsVo.getWarehouseTypeKey())){
            inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "jjpdbg" + ".ftl");
        }else if ("03".equals(wmsInventoryCheckbillReportDetailsVo.getWarehouseTypeKey())){
-            inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "cjpdbg" + ".ftl");
+            inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "cj" + ".ftl");
        }
        //生成word文件名
        String targetPath = docPdfComponent.getUploadTemplateUrl();
--- a/yxt-wms-biz/src/main/resources/ftl/cjpdbg.ftl
+++ b/yxt-wms-biz/src/main/resources/ftl/cjpdbg.ftl