md

2025-07-08 10:30:53 +08:00 · 2025-07-08 10:30:53 +08:00 · e5c2f68687
commit e5c2f68687
parent 876003afd9
2 changed files with 3 additions and 219 deletions
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
@ -1248,7 +1248,7 @@ public class EmisWaybillController extends EmisBaseController
                            return AjaxResult.error("打印模版数据为空:"+tpCodeItem);
                        }

-
+                        // 子单
                        if("TAN-GC-130".equals(tpCodeItem)||"TAN-ENGC-130".equals(tpCodeItem)) {

                            // 循环获取主单信息
@ -1299,7 +1299,8 @@ public class EmisWaybillController extends EmisBaseController
                                }
                            }

-                        }else{
+                        }
+                        else {
                            // 直接获取
                            String[] billCodeArr = billCode.split(",");
                            if(billCodeArr.length>0) {
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/print/cpcl/CvtTplToCpcl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/print/cpcl/CvtTplToCpcl.java