From 2eb08ebb77799444aab24f1d70e40d5c47ab87fd Mon Sep 17 00:00:00 2001 From: linfso Date: Fri, 5 Jul 2024 08:41:05 +0800 Subject: [PATCH] md --- .../erp/web/emis/EmisWaybillController.java | 44 +++++++++++++++---- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git 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 index cb5149359..253a1b256 100644 --- 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 @@ -701,17 +701,43 @@ public class EmisWaybillController extends EmisBaseController if(billCodeArr.length>0){ IXddTplPrint xtp = new TanexSubBillPrintImpl(); for (String billCodeItem:billCodeArr) { -// EmisWaybill emisWaybill= emisBaseService.getWaybillByBillCode(billCodeItem); -// billSubCodeAllStr=billSubCodeAllStr+emisWaybill.getBillCodeSub()+","; + // 查询主单信息 + EmisWaybill emisWaybill = emisBaseService.getWaybillByBillCode(billCodeItem); - Map order = emisBaseService.getWaybillPrintOrder(billCodeItem, billCodeRange,tpCodeItem, "zh", "",printManCode); - String pdfBase64Data=xtp.genPDFBase64(order); - JSONObject jObj=new JSONObject(); - jObj.put("result","success"); - jObj.put("billCodeItem",billCodeItem); - jObj.put("file",pdfBase64Data); + // 获取所有子单号 + if(StringUtils.isEmpty(billCodeRange)) { + billSubCodeAllStr = emisWaybill.getBillCodeSub() ; + }else{ + String [] subRange=billCodeRange.split(","); + int start=Integer.valueOf(subRange[0]); + int end=emisWaybill.getParcelQty(); + int len=subRange.length; + if(len>1){ + end=Integer.valueOf(subRange[1]); + } - fileArrAll.add(jObj); + while (start<=end){ + billSubCodeAllStr=billSubCodeAllStr+""+emisWaybill.getBillCode()+""+StringUtils.leftPad(start,4,'0')+","; + start++; + } + + } + // 循环子单 + if(!StringUtils.isEmpty(billSubCodeAllStr)) { + String[] subCodArr=billSubCodeAllStr.split(","); + for (String item:subCodArr) { + if(!StringUtils.isEmpty(item)) { + Map order = emisBaseService.getWaybillPrintOrder(billCodeItem, billCodeRange, tpCodeItem, "zh", "", printManCode); + String pdfBase64Data = xtp.genPDFBase64(order); + JSONObject jObj = new JSONObject(); + jObj.put("result", "success"); + jObj.put("billCodeItem", item); + jObj.put("file", pdfBase64Data); + + fileArrAll.add(jObj); + } + } + } } }